gentoo resync : 30.05.2020

55 files changed, 1043 insertions, 1213 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 37e16506f2cc..7204264fb96c 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 8a9ddef5939e..42af40abdb67 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,5 +1,3 @@
-DIST aqbanking-5.7.8.tar.gz 3818825 BLAKE2B 6536b11251fda4977fd964f513f4b2bb23cd14d62adffdd18e7508afe85d660b86aa1aadc80fe4ba47c5b393659ba7139c65eaf342795f6f05599efdd2c3904d SHA512 4078c3bc2c0b6f38f853fed064e37b6188c0b8158416ca6482756232ef8fe71e9cc1df0abe8c6bcbe8a7e818c24210f553c367f540d60cb7b7cf0161a9ca7117
 DIST aqbanking-6.0.1.tar.gz 2551617 BLAKE2B 0f18e63f6fc695b4fb3c5b831d324cf039f02ce740655953bacbcb6fa805e441ac989fa1ef7504cf3417b366acc9dc5562b13788af72faedfd27778bd3097769 SHA512 57a4f1416efddff4ce0a7b1cd5f1035df95a01001fff3b43b0febbb62b322839b1d0e8be2c765863da6de3e30c85726a8866529d9b16162b18d5c204e7eb8081
-EBUILD aqbanking-5.7.8.ebuild 1597 BLAKE2B 23dfae67ac7874727307ac8bae890b804ff84cea65f1ec6f239cad33891541ab81e9ab80e6956dddeaf74fc365ceeba6fef5b71bc4eb159630a88f201c52f71b SHA512 5ff2f013a85766a9c292bbcfaaa51dfdad02871d98d7639444d72f02720a6ad616482738ed07064e037c42a64020fe50c586cee724c54027cb94db752eccfabd
 EBUILD aqbanking-6.0.1.ebuild 1401 BLAKE2B 62f4704d2c6d7ba8d7dbed14872d85a731b3112eb706d9603d5af6c295a43f1945171cee5d176bfec1f83df8cd581b9522cbeeb303179089b356f5d9b5cf3eda SHA512 e07837eb55fb8986fcf0c815f5949e1a8e5809531738e12c8d3310ba82378c8081ca8eb45d2e2324e077a9d8c34ed3026612156386b18a2f0a0eb19fd41432dc
-MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999
+MISC metadata.xml 342 BLAKE2B 0bf9cf1a12561f8866abed7cdc86bcd8c7d669455c45124a7fa75245b5f824a43c12ebb32a068e941a34bf592555f400dc8d6564c498823038c9579a1fbcbedc SHA512 f31c89fe2a274397cf78c5b95f019090fcc80bb898f29d8beadbb3615425ae960f2d779329e96a2dcb0645021c8fa102110b82df8b353de28d1c9a717b44f38e
diff --git a/net-libs/aqbanking/aqbanking-5.7.8.ebuild b/net-libs/aqbanking/aqbanking-5.7.8.ebuild
deleted file mode 100644
index ec6994a53840..000000000000
--- a/net-libs/aqbanking/aqbanking-5.7.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/_beta/beta}"
-DESCRIPTION="Generic Online Banking Interface"
-HOMEPAGE="https://www.aquamaniac.de/aqbanking/"
-SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=03&release=217&file=02&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="chipcard debug doc ebics examples gtk ofx"
-
-RDEPEND="
-	app-misc/ktoblzcheck
-	dev-libs/gmp:0=
-	sys-libs/gwenhywfar:=[gtk?]
-	virtual/libintl
-	chipcard? ( >=sys-libs/libchipcard-5.0.2 )
-	ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )
-	ofx? ( >=dev-libs/libofx-0.9.5 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-MAKEOPTS="${MAKEOPTS} -j1" # 5.7.8 still fails with > -j1
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local backends="aqhbci aqnone aqpaypal"
-	use ofx && backends="${backends} aqofxconnect"
-	use ebics && backends="${backends} aqebics"
-
-	local mytest
-	use gtk && mytest="--enable-gui-tests"
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable doc full-doc) \
-		--with-backends="${backends}" \
-		--with-docpath=/usr/share/doc/${PF}/apidoc \
-		${mytest}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rv "${ED}"/usr/share/doc/ || die
-
-	einstalldocs
-
-	newdoc src/plugins/backends/aqhbci/tools/aqhbci-tool/README \
-		README.aqhbci-tool
-
-	if use examples; then
-		docinto tutorials
-		dodoc tutorials/*.{c,h} tutorials/README
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/aqbanking/metadata.xml b/net-libs/aqbanking/metadata.xml
index 24b547cfcad1..917a7c0d65ea 100644
--- a/net-libs/aqbanking/metadata.xml
+++ b/net-libs/aqbanking/metadata.xml
@@ -4,7 +4,6 @@
   <maintainer type="person">
     <email>hanno@gentoo.org</email></maintainer>
   <use>
-    <flag name="chipcard">Enable support for DDV/RSA-chipcards</flag>
     <flag name="ebics">Enable support for Electronic Banking Internet Communication Standard (EBICS)</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index cdffc840fc81..fa1ccedacb45 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,3 +1,5 @@
 DIST ignition-msgs-1.0.0.tar.bz2 315469 BLAKE2B a481f740ffb0795e64d1fa222ea4925e09839d56212f5218b4849c6f49a3e3a899af757ac1ad1997a95b57a401bac831a754ffa351cd142e6e9cbf07e7bae0ac SHA512 3ec16d68c35b1c7d77373eb3ed72304f5a990f57fc15a91f49af49bf0c6b43e6f31e888e4b0a8308cc63840aa995dd423d5b23d28a98f132b4be13c46f5d7d6e
+DIST ignition-msgs5_5.2.0.tar.gz 390042 BLAKE2B 733f57aaa91d6a34201e247c34ace74653ebc7e23df03f89a4a2ec76361e5ea0270f3b63d6452abb15b1380acacfe87294cbb9f0c01655707481300a34aa8408 SHA512 b1c6017da39c79ebdb2d76e960c6b60d0b82af7f5c09144a1f25c6e7b7b06ec5a7922e6d0bc08951baf0d4797d6ea061cea11b703238c954445d67762f2bc983
 EBUILD ignition-msgs-1.0.0.ebuild 653 BLAKE2B afcc192b543a7ae2fc9f859943708e40ba36e2e0f260a729927c9d38a651e078995879e3c2cef643b342c35b1d3fe4fa93c8e2b8526579261adc91c427b3a20d SHA512 4c769905c78b7bf5b91c80a2188ba5e29ba91aaca55ceaec0434347858b2fe8d657521382380881ab455c98897bd911ced6425e5749047caadb10a916914b869
+EBUILD ignition-msgs-5.2.0.ebuild 727 BLAKE2B 2e4d124127e3d7af8a935788a2c5310c42aca5cb7fce7c2a3c0c0e9427cff2a7ea8ab3128245a4ddb2f2bcda934a619691ec8ddbf7f9fd6a79189b1d72a2a886 SHA512 8877dc70ac3f0650c521e2fe098625c9c5ef9fe3bdcf7960a840f913d21e630392e22df59590164f5675d036f9f729ad05fbfccad799fc70a26ccc0969f0064e
 MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
diff --git a/net-libs/ignition-msgs/ignition-msgs-5.2.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.2.0.ebuild
new file mode 100644
index 000000000000..d7d923a8efe9
--- /dev/null
+++ b/net-libs/ignition-msgs/ignition-msgs-5.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Protobuf messages and functions for robot applications"
+HOMEPAGE="https://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs https://github.com/ignitionrobotics/ign-msgs"
+SRC_URI="https://github.com/ignitionrobotics/ign-msgs/archive/${PN}5_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/protobuf:=
+	sci-libs/ignition-math:6=
+	dev-libs/tinyxml2:=
+"
+DEPEND="${RDEPEND}
+	dev-util/ignition-cmake:2"
+BDEPEND="dev-util/ignition-cmake:2"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+S="${WORKDIR}/ign-msgs-${PN}5_${PV}"
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index 4f6dcb9016f0..f438a4658471 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1,4 +1,6 @@
 AUX zmq.patch 1378 BLAKE2B 4fd868bc3d791e2f17fec392f8cdc5a6ce076b96453c35da46e8717e7274f29aa323dfc1985e819c49b587963b22813d4eb11b685d24c417d67720a7c5e3ac84 SHA512 9128f976e51dd333d856c15f1899955ff4879db229a174839be8e6d8c464cd7e0932c58098bcd1aa2e45fefdf5527bbe8a301306ddc75c022bc1fc0fd4ea9edc
 DIST ignition-transport4-4.0.0.tar.bz2 396662 BLAKE2B cb4c56954ddcd863d60941c43e38624747ca07e6cb5c7404309012dc9d22fb8a053e1113b117a0ee8447e32b6b52318b5b4844a050e4b8c1feccc2de391c46bf SHA512 90facd527e953d3319b4b3b7c5efa610d6c965fcaaf053b8b32039825fccca89c17f153ffec5c0562d4d3d534741f3d6c1a603eb2c75fd5cb217bf22a6d6e503
+DIST ignition-transport8_8.0.0.tar.gz 543654 BLAKE2B 6f4154795d1f4708ad22d19fa573aeafe05710b280ea033d3fe92e50cf7e2426022ea5e98dd3a966dfe9a8b4765fa879050303fe11171a6586294facf7c278aa SHA512 ab1bae994a8676864ceb78b87f2258b8ed22036aed87e815fc22f830edd8b087d1ef0406dc0d053ea823d95b5fb765c4867d27ce5653f1d685001aab0cf0ec03
 EBUILD ignition-transport-4.0.0.ebuild 780 BLAKE2B 66873b9eb374d0775ce5ecbd794504c740a7c10279b35e76df328adc4c697db225f23d8ade9ffbbb08b8df976fbec8c752f477d0eedad6fdbd9084f7ad3c2be8 SHA512 df93993a6794f2d17f2f1c223bb944ce1b6b8eb8c45f865c247ad0bdee9c84b9095cbdb2062e6029a89d0ac0a2e5a9365fed44fec873aa7f0cac0590c0947f73
+EBUILD ignition-transport-8.0.0.ebuild 813 BLAKE2B 6f25224233eac67cd25e873a94e943bc5ff6fae13852cd1b6f0997f773c5abf04833b763921ff1f3d0ee9687483f21f5ff2e8fddc8a4779a5b50fc4c189f6187 SHA512 71d668c92c9b1347a0b2b1444b3a1499065589ea590643f53688c529d2a5c7cf7e8c40f6f78cd2e235da476e4a2b2948ab3f1c7a0278e6d32d4ee24604b2ae90
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/net-libs/ignition-transport/ignition-transport-8.0.0.ebuild b/net-libs/ignition-transport/ignition-transport-8.0.0.ebuild
new file mode 100644
index 000000000000..9e15e8e7f1ab
--- /dev/null
+++ b/net-libs/ignition-transport/ignition-transport-8.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system"
+HOMEPAGE="https://ignitionrobotics.org/libraries/transport"
+SRC_URI="https://github.com/ignitionrobotics/ign-transport/archive/${PN}8_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	net-libs/ignition-msgs:5=
+	dev-libs/protobuf:=
+	>=net-libs/zeromq-4.2.0:=
+	sys-apps/util-linux
+	net-libs/cppzmq
+	dev-db/sqlite:3
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ignition-cmake:2"
+BDEPEND="
+	dev-util/ignition-cmake:2
+	virtual/pkgconfig"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+S="${WORKDIR}/ign-transport-${PN}8_${PV}"
+PATCHES=( "${FILESDIR}/zmq.patch" )
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index ac6c1ad4f255..fb4861018673 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,5 +1,3 @@
-DIST libaccounts-glib-1.24.tar.gz 116578 BLAKE2B d3569ee9d4b92f285f20ab7bc285c62c9817a16f632ad9da83a86ab69e7e3ded74afbcb1307deee788a74796372c0011563ecd293cba4b0e81d15252eae4cf50 SHA512 d4e6906f642c7a196cb42172f31345f58037d528950bee3af2b8cb388aea386056cbaa22f0e7c604a4e00038b231e9ee455f6a1d48f82344cfc0037ad7251b7c
 DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
-EBUILD libaccounts-glib-1.24-r1.ebuild 1224 BLAKE2B 182cab44010e82d4f03117ac6389bb342dc6be98480d1971f4574b240401b94d978e9867e70bb99fc05520b15319afcedf9405c7dc9ba90b8949b44722a65490 SHA512 abf2db02a4678f7968568dc510f64c40e6f6c7c1dd673208b81c0c7b989036dd03c65ad4f0580cc86351b904349071ad145559a8b9f3546ce8da12767303e6f7
 EBUILD libaccounts-glib-1.25-r1.ebuild 1310 BLAKE2B 6c513410dd11fda7262bfe9d5c096ba1121dd0c125eb4dfcdab28a76400028571988dcb1bef8b7b08cb2989c5a8fb4ba5ff1ec8cf86d342469a750dbf89f3dc8 SHA512 a58f84f4f760159b6209d00117d91e8859de258deea787c9c723609fd393193ac8f89b66001b6e8113e140bfb4a7a3e29b345696969e47b4f1d09be98a1aef02
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild
deleted file mode 100644
index 04a8a740b14f..000000000000
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit meson python-r1 vala vcs-snapshot
-
-DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gobject-introspection:=
-	dev-libs/libxml2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-libs/check
-	doc? ( dev-util/gtk-doc )
-"
-
-# fails
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	vala_src_prepare --ignore-use
-
-	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir meson_src_compile
-}
-
-src_install() {
-	einstalldocs
-	python_foreach_impl run_in_build_dir meson_src_install
-}
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 3a6ebac7e87a..20ef0ab096bd 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,3 @@
-DIST libhtp-0.5.32.tar.gz 496086 BLAKE2B 73a9a3cdfe45326a01a53597d25cf30535780de84770a47bd6ea425d5891db893bb0afa77dbaa23fb8c32c6c66c568d3fcd8df78d64fe569056f252ffc89cf04 SHA512 3df877b158b40a2c59bc66c0caf589d51b20d1d3ca27dab82f516693c22bfb9d6845305cfd42bf1a61c5df98a05fcad25850cc78cf948047600d6783ace7fc63
-EBUILD libhtp-0.5.32.ebuild 856 BLAKE2B 662ab3523934bb8e16e01312f5c919d654cab285c063b59bc958a30c6c7ec140d6ad51fb89b4490a1167aeca1ea8675e46bea8ea56bed9c527db696abbe9312e SHA512 af7d56ce1d18b5248583d57698914b34c013c0a0a30ebd583272475337fa9206b59e501fcdc9d361e8fce7468e3b36829e05fbd0ca0fbc1c9f46ff3cdd56d1d7
+DIST libhtp-0.5.33.tar.gz 496010 BLAKE2B 9648632e9f37c20a3efa5edf9b5ee5ed97b5ba767faf6b276c4d38760422b601f9443cfaf30e60c6e6dd555d259a3b5613f0370040753d7336f6ef5e94b32d55 SHA512 52bbb72710fd0f5fc917d62f5a2b659092669eda0553586e75c17c558e3f6559dcf8eb7707db931045af532592cbad691461af2dd5362f95e2a4884e7475bf94
+EBUILD libhtp-0.5.33.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.32.ebuild b/net-libs/libhtp/libhtp-0.5.33.ebuild
index d737b3ef282d..4c0e8229142d 100644
--- a/net-libs/libhtp/libhtp-0.5.32.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.33.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
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 5913bbd928ce..00850d0b25bc 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -5,8 +5,10 @@ AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb82
 DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498f15823f5df745ef4e16800a3676afa3328c42809c3cb891d5e534990620ae1766b7863b3e1c010227182d9caa727ce3 SHA512 a76c8566c9b06b38ea7c7cfcea896beb23808686af9485dc80b8858c20c7a425f0869f18899fa7ad3e685c25c6c0d2bc7a934724d500211966d01b37964018a0
 DIST libtrace-4.0.11_p1.tar.gz 1855693 BLAKE2B 9135b03258005587ef2e2b51c6e8c87bb2fb4963489b1ce5933c46100d708fa32978fc5b449ffde11fc6c27706afd36a82428cc55f0555a864ffad636f9c991d SHA512 b3cab7d24efe4503358f2265957170b0857f52c4ea2bac0d5424fe3b9565ead51795596ce28410e15741d89e3ba1db3c22046557a3e5b21af8c1b6f8ed9cd585
 DIST libtrace-4.0.12_p1.tar.gz 1865404 BLAKE2B 3b628cc8264fd76bd513a56de9aaa1e0458b10271532853964b8cd1979d73925d48e7255589087e36f98d45809e71bc8dba972e48af9cc26285987327a4bd5f9 SHA512 b2253ba37b6c5d6f6d0efe1ac5c02b67b382e294e291abdb92c697e1a26cbe75b5f54a44bc7e07b1a0c8cb5efc36a3cc3fb48a9d79a090d6732692dbd268b8f8
+DIST libtrace-4.0.13_p1.tar.gz 1867583 BLAKE2B 5f6526a19255a2e8fccc345ae7682a44709325eb031352234358be08b963339fffaa7f4324ef738cf19bac941bcb7b1e748caaf51a2defd937c5684616a7efa0 SHA512 23f9a55b3185ede5a5d345dd12cda3eb2b77b1e76c46e210ad847b3e70c22de5c9eccf5a34b8b9305d35ed22e6b68fe7003dc699a28968f7b30895f0341cb4b9
 EBUILD libtrace-4.0.10_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
 EBUILD libtrace-4.0.11_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
 EBUILD libtrace-4.0.12_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
+EBUILD libtrace-4.0.13_p1.ebuild 1455 BLAKE2B d1c7326ad7d64233a467a9cc67b9b8574f129516ffd49351fcb1599ee1d157f684f39a9f31bf083180d6235747197e813509c8b88bc9f1b3e83e5bd2332d6196 SHA512 359083f3763ad856abcd374f444d79e674cb1e8ca9195e24fcba6a57fdc27a7521045ef4fa27b5d4f3bca147abbc7a4950a7ba0d88710b6b9db5c889e6ef4555
 EBUILD libtrace-99999.ebuild 1422 BLAKE2B bf1e1d0ff2bd0c9cd8932ba643152f47b1f3a402f528ea0cd822a02b8e7bde6d500296b569fc4a9b16590c21b277b0a2f30323471f6ab0e7f6ea40ee9f5026b3 SHA512 7a61a58ea0a678f56a1e79da53673b257a1f2bea232ddc3b359756996b888f1b1a48763ed9e312ab6c62176c1976e0ce72918a34428e40e1ec398e9d17be54cc
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-4.0.13_p1.ebuild b/net-libs/libtrace/libtrace-4.0.13_p1.ebuild
new file mode 100644
index 000000000000..9cd5b1a63f43
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.13_p1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ncurses numa static-libs"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+	dev-libs/libyaml
+	dev-libs/openssl:0=
+	net-libs/wandio
+	ncurses? ( sys-libs/ncurses:0= )
+	numa? ( sys-process/numactl )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+)
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# Comment out FILE_PATTERNS definition (bug #706230)
+	if has_version ~app-doc/doxygen-1.8.16; then
+		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
+	fi
+	# Update doxygen configuration
+	doxygen -u docs/libtrace.doxygen.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ncurses) \
+		$(use_with numa) \
+		--with-man \
+		--without-dpdk
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r docs/doxygen/html
+
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a7c304c91e2d..8a3712f89214 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,11 +1,5 @@
-AUX mbedtls-2.19.1-zlib.patch 1163 BLAKE2B a5b44c2af4d9e7dd37a004063b69ae9878bf240abcd75376c14e73b01a99586e06da1ece285cbbb06905dfbeff28c173bb9d170a9a22ad1045fa20b225185df0 SHA512 cc8128b55383caddc9a3d51a22222b5da51b41bdaa0b44ad4d9a447b85b9ac96eb7aa7c9e88823e62ec51ee5567531138741f03603c563cfe99172226e61ed73
-AUX mbedtls-dont-overwrite-headers.patch 2183 BLAKE2B 1353eb9c929e4d79bc1f4eecd671c9b6602917198724b42e1b43153a4751cd5a36737fd706f97e933beb857a246dc16574f4d989cc674661dd774f7df9d1c3a3 SHA512 19dec50ce70821b0c94e7bd9c50c1f8ebd7d7abc087cb91a637e5349ac938b4b07236f7fc4580e4a348ecb9de68d4b0b45cdced6e5103ce94178be710b2563a3
-AUX mbedtls-un-pebcak-705038-wrong-file.patch 2766 BLAKE2B df7ef73f53f4a2b69cc8b435d21decffb580d28e75b9ec52620c305dfc395cc088cf7e4bbcaad381a3c9f8587b1678700d8df1cd65ceeef8079e4ed250ec9ec7 SHA512 376a5c7009122b60345b9edc3ce8a2f765d1c7ef11f6a398a9b9fe1c6e4a9d36d62483f036a6c77e21fc86f2900d9d3a7c477582463a80121097a56cb08a0515
-DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a
 DIST mbedtls-2.16.6.tar.gz 2603563 BLAKE2B a4011bb2b7e3eca554cded05c4650fc16b48d86ae1ac7fefe29df6b29e38c1e76c880f082be83759b4dddd96f831a1238c2df41671bd9794b028402b3dd63f60 SHA512 a4c2e70c0cc6b1f1571a9f2ec27ede2620eb1937361599cab0e05b807068397d25695d5cd23931fd0f4cc051de6367c2b6c77f3507ed8b33cd492589c51eebac
-DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
 DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09
 EBUILD mbedtls-2.16.6.ebuild 2456 BLAKE2B 824980b51af9638aeaff09e840d570c0ae353064101e483a7544efdea43c211f4ff05d9656ad01987269cf3826a303196319460bb66c727ebd5055b6bccb0e1c SHA512 41169cfda1cbdb59eedcd9addad2bd6e3aaea65a5ad2f3d2ef1aa155ad7427825b6338cf212fec49821996fd985b96de97220d8cf7d689370fabd48cd5fcd7b7
-EBUILD mbedtls-2.19.1-r2.ebuild 2848 BLAKE2B f20b47e615ee152e8b3e444cf5e2fb113eb2e4d32b9d904dd7e797c8cdb842fc0e50b1db4a2ae24cb3751bf8358713c40bd10943229f9607b32c20a9143e398a SHA512 bfdfbc437b6fea7e3f9737a5b78ff69f4ec7c3a05a773d1f396b052cc54f88dc6eef5ae6587cd6d61e765bd7b202904d0b55e0a3ecf47e90d12e9775c425d17c
 EBUILD mbedtls-2.22.0-r1.ebuild 2456 BLAKE2B b45760f975b321105ca5c8d71c9ec08b73a9bcf16acd35b72b48d4200c1dd4bbaef247d4b6702178c8d0f3847d858d804712a969dc5026a5bb9be4b54c67cdda SHA512 be621cdabf58009ea35059af3fe8a6e7600167301707099df92e255b018d8f504ca1915492f542e218982f24f8c2da7dfeed44443b5431f489df905fbaaa71df
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch b/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
deleted file mode 100644
index ba4559cfc9be..000000000000
--- a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f25b8deff8e5b8fad8493db421b4639f14d2e5d Mon Sep 17 00:00:00 2001
-From: jiblime <47689567+jiblime@users.noreply.github.com>
-Date: Wed, 18 Dec 2019 21:40:01 -0800
-Subject: [PATCH] Fixes definition error when the deprecated
- MBEDTLS_ZLIB_SUPPORT and ENABLE_ZLIB_SUPPORT macro are defined/enabled for
- zlib support in mbedtls
-
-100% tests passed, 0 tests failed out of 85
-
-https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1842
-
-https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1862
----
- library/ssl_tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/library/ssl_tls.c b/library/ssl_tls.c
-index 6cf7781f2a..51ae9da3c6 100644
---- a/library/ssl_tls.c
-+++ b/library/ssl_tls.c
-@@ -1880,7 +1880,7 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
- 
-     /* Allocate compression buffer */
- #if defined(MBEDTLS_ZLIB_SUPPORT)
--    if( session->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
-+    if( ssl->session_negotiate->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
-         ssl->compress_buf == NULL )
-     {
-         MBEDTLS_SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) );
diff --git a/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch b/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
deleted file mode 100644
index 4e39308ac5a7..000000000000
--- a/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From de35f31091b7e6cb20ebc8d8c0afc3b20bc57098 Mon Sep 17 00:00:00 2001
-From: Mihai Moldovan <ionic@ionic.de>
-Date: Thu, 16 Jan 2020 08:59:39 +0100
-Subject: [PATCH] Avoid overwriting tls headers in submodule mode
-
-When crypto is embedded as a submodule and the cmake build system is
-used, it would previously overwrite some header files installed by tls.
-Most of them are harmless (since they should be identical), but config.h
-is a special case.
-
-tls's and crypto's config.h files differ widely in scope and overwriting
-the more general, bigger config.h file from tls with crypto's smaller
-one will make a lot of features unavailable in programs using tls.
-
-Let's just avoid overwriting any tls header in submodule mode.
-
-Note that this will not fix the potential issue that crypto might be
-using a different configuration than tls in the submodule case.
-
-Fixes ARMmbed/mbedtls#2965
----
- include/CMakeLists.txt | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index 02f924df4..92229a221 100644
---- a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS)
-     file(GLOB headers "mbedtls/*.h")
-     file(GLOB psa_headers "psa/*.h")
- 
-+    if(USE_CRYPTO_SUBMODULE)
-+        # Don't overwrite mbedtls's header files!
-+        # config.h is supposed to be automatically checked for compatibility
-+        # in automatic builds, while the other files should not just be
-+        # compatible, but also identical in theory.
-+        # Practically, we don't check that in crypto but just assume that the
-+        # submodule configuration is sane and trust tls's headers.
-+        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
-+    endif(USE_CRYPTO_SUBMODULE)
-+
-     install(FILES ${headers}
-         DESTINATION include/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch b/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
deleted file mode 100644
index 73e870fa1e4b..000000000000
--- a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix https://bugs.gentoo.org/705038
-
-Thanks Greg Turner <gmt@be-evil.net>
-
-diff -urpN mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt
---- mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt	2020-01-26 09:01:50.324231295 -0800
-+++ mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt	2020-01-26 09:04:26.498880873 -0800
-@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS)
-     file(GLOB headers "mbedtls/*.h")
-     file(GLOB psa_headers "psa/*.h")
- 
-+    if(USE_CRYPTO_SUBMODULE)
-+        # Don't overwrite mbedtls's header files!
-+        # config.h is supposed to be automatically checked for compatibility
-+        # in automatic builds, while the other files should not just be
-+        # compatible, but also identical in theory.
-+        # Practically, we don't check that in crypto but just assume that the
-+        # submodule configuration is sane and trust tls's headers.
-+        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
-+    endif(USE_CRYPTO_SUBMODULE)
-+
-     install(FILES ${headers}
-         DESTINATION include/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-diff -urpN mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/include/CMakeLists.txt
---- mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt	2020-01-26 09:01:50.320231227 -0800
-+++ mbedtls-mbedtls-2.19.1/include/CMakeLists.txt	2020-01-26 09:03:45.761189288 -0800
-@@ -4,19 +4,6 @@ if(INSTALL_MBEDTLS_HEADERS)
- 
-     file(GLOB headers "mbedtls/*.h")
- 
--    if(USE_CRYPTO_SUBMODULE)
--        # Don't overwrite mbedtls's header files!
--        # config.h is supposed to be automatically checked for compatibility
--        # in automatic builds, while the other files should not just be
--        # compatible, but also identical in theory.
--        # Practically, we don't check that in crypto but just assume that the
--        # submodule configuration is sane and trust tls's headers.
--        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
--                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
--                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
--                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
--    endif(USE_CRYPTO_SUBMODULE)
--
-     install(FILES ${headers}
-         DESTINATION include/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
deleted file mode 100644
index f8d6153e9705..000000000000
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-CRYPTO_SUBMODULE="mbedcrypto-2.0.0"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
-	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-dont-overwrite-headers.patch
-	"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
-	"${FILESDIR}"/${PN}-2.19.1-zlib.patch #706112
-)
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	# pretend to be git submodule
-	rmdir "${S}"/crypto
-	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 317b96dc2ad0..483adb46fdd5 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,11 @@
 AUX nDPI-2.2-libcache-include.patch 819 BLAKE2B 5a0698bc19917ebfd737e886937d023e83452bfdd812010e2b2622461ca8eb6758533ecf5c1b01495eab21de72fd7f0608dd826d864336446f893d083b68ed55 SHA512 854b65c5dbdb19bd73040ed12740c945e0f31e50c51a0ebd32c646177043e28eee79e572747fe23580f7c2cca7cf59a22655f084e111bec3e146a4d4b6d941cc
 AUX nDPI-2.8-fix-pkgconfigdir.patch 248 BLAKE2B c5dcef9651cfcaf1a422903d1231584b7a29c07caba193ab016c380f3cf95887c29ba709ccebfd7649d1f6469bb7116b08f1e1fc384c7e3f00c2e2ae621a3934 SHA512 b461d43ba5673310b4dc0bc37ae772dc1940c5817a6d3817bdab6e6e4a4c86d9797163f458f07417aa3b707253bcc50428b021b6e042f52480597789b92ceffb
 AUX nDPI-2.8-relative-sym.patch 618 BLAKE2B 09a859edccfea2816bdb62e68fff04f11c414a39f6237f1a4606fd88761bb38462fde9ac042352bcccb49b5da713d6f18388e7ec8d4d9a9a351caa4966ac46a8 SHA512 bede4effffd351a2bfe87251ea512c0688f97b89a344f2a91ee0860a74e67535fb611ec11c162f91dd6d612e4a268ac2f551083e790e992f38f1e3173cbc4fc8
+AUX nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch 1041 BLAKE2B a513bcff2b9efb52a61e843c8f5d28558786db6dd3f38fc53d1c7461199ef5bfd81a4d30eb5c1279ef36979f585135c9511e4f59f93b015411cc3084fe1a7a75 SHA512 42f5efd626946ff7825be47ba9b2729216342213a1e886eb969f27a9c3757db1ac788d03592240156386c201de7457e1366df37a838da582b4f2afbc07f4f7a5
+AUX nDPI-3.2-0001-Added-fix-for-serialization-loop.patch 916 BLAKE2B 85c6f19146c2eb5b50fd524f6584566d9abe81e55b2c5d108f0022577201170ac48ee9f3240935416988cb37df90efeb12e38bc46b9428bd946da7c463d748bb SHA512 430881fcec23252aca4de4786b16abbc6845d879872560b268dcd6c5dc36b8d4f6ae6888103efcc7d4e4dd91f00c3e3e10dcf52ae5811b97e3877605ede41968
+AUX nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch 2643 BLAKE2B be3d1a9bd632d4b1837d22248af94179debd48e4c99715553839f1f630cd0aec2ce345953d8f8fa1d01c682b6a466f565e850343541bf3a1a92d49a55d912d5b SHA512 41d849d2a1e204c82779896f5561cdc20ed1a4aa62391255bf7ef862589e1260ddd77bb44c6a9462cb3cc80d9de0aca731c8f78e3c06ca69dbead66a09b26018
+AUX nDPI-3.2-0003-Fixed-invalid-allocation.patch 794 BLAKE2B 3f8814e0c836dd0d2f05f5516154c43624a9b9cbf4a24f63a47334e808cc9e28fdc3c51d31f743dfb62fc8ca13187ed21e66122d50a03fd4d6bdaff85f49069d SHA512 2b20d6b92497dd23f72d2c486f32b749dc2e2b86547443629b57dc00aa163155eebef2d5ea123386f257a582e437f886787421ce2232be0f7d35853b6997cd4d
+AUX nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch 6861 BLAKE2B a5e3c17b895167da57ec472444bb5933eca44120c4281a455e494c1ab62806619f3eb860ba1deaded8049a03c4953d2c4c8951187c1aabddfc3ae7d5e8bebc95 SHA512 173ff8a9568cf2e56e0ea1a271de0090f02fd2a0bc17be6e02b1bfed0327ddc78014fbe6f2fc5850eb5a2141f133cdc70f2ce614ff5f6e820cb577cfdb8d5513
 DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
 DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
 DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
@@ -11,6 +16,6 @@ EBUILD nDPI-2.2.ebuild 1013 BLAKE2B 4e5423411ded7c631b27615da56f8b1cd55ad0f66847
 EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7ba1dd651649840b39245cd470e72c16c5ca46393bc28120d52315a0685249e7a2aa7f04ded86798b69e62 SHA512 dcf8abb346221acf640f858165a5049522c20ce7919466e733f34839c943b487e9beba309e73f7ee1b7a89ffa3b95115e4c7eb51f48cb42e4c7b5430017ccbe9
 EBUILD nDPI-3.0-r1.ebuild 966 BLAKE2B c0b61a5243af862d1373a734ba8f0ffe8f95c40bb0ffac40dc72b1bca0a704eece2893d4c8d876744ee298a05243b21490f89218d9c493f7cdcd4ae4c3da2527 SHA512 8f0e6004fea392c1573477976b83de81e2bb3467bbcf4ffa18817f79c5b1cca00a6c35fbeccc753e41edbf7a8d15d1dd74bd68bd2af9d4726265c60bf8a3ebbe
 EBUILD nDPI-3.0-r2.ebuild 1176 BLAKE2B 57e01bdf62c55c2c69f1bd64599a1838eb050371ac0f18e5beca7d453840e1abee0aea3cce222ce044fb7f9a084e5030459164eac680af892b897fdc8f1c1d10 SHA512 c82c47552699b3feaff9e2007fa357c0eded3175b28fa5817d64c35283fed2e9ed7499a5ac0944664243a859fcee4e41db0d1382eb8c0cd52bafec3388702724
-EBUILD nDPI-3.2.ebuild 1340 BLAKE2B 4d4829ebbb8a0bc90e05a78969c5a96e924bea9602b4d885df3033c4838f4b768da28b299fca715b54dc735f29fceb547f72669252a2532e287e5e924f8fc873 SHA512 cfa71e603ad0cf9275ada9c9c477280e694195e511204fa0a04437e295ad178a45c4fee3d71fdc24585c00e848caa6ded5b759c1edbbac0c02bc99ac5eba4ed1
+EBUILD nDPI-3.2-r1.ebuild 1750 BLAKE2B efc6ab0d48a8d5db4237d1f8b59705c9e489cfc2fafd431339c9a2c7a90ae3e9a28c9ea17313f34ed1912f93be7c9d32ce2528ee40960fbf354e6fc807b3ab2b SHA512 cc1662b4a436d51e586ebc67b4c4c88440e85203586a2fddfcb6c9d6593969665a6890b4b6211e717b4bbf4cd80230834af0a1dd1a8f1c14e6df63799f0c507e
 EBUILD nDPI-9999.ebuild 1293 BLAKE2B d69406384a02ff5fa67aabcf6d97183b362b4fcf7bfb06fa4ba95e53469007305e197459e9250b4be800a89506a3542df3abf07ab60aef3d9aab93bcca5daa0d SHA512 6def195805ee8aff6339bb0a38a098048a95391b6aeed6319946d550e79aac36251d23d4401854b043e7f46003490d15736b67b1c3af044ffcc11b939bc38ff3
 MISC metadata.xml 292 BLAKE2B 387a2816be3615c7a1430ca3888546eecd1b5c679805b87cf7975cf7d4b59a224c8edea34ca354b8bf4d793457531f6388816cdf86641fcc3f6df89432848b46 SHA512 488fc61860f278d9f7be4a6cd246eb45bac7efafe57e777f1c46984a07f132a76dcca6170b4876edea4d720f4696549b85989ae012749a00d234a0137b98ec6f
diff --git a/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch b/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
new file mode 100644
index 000000000000..db26330d699f
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
@@ -0,0 +1,23 @@
+From 15bb7ae4339cc2a4a626a52fcf49abfb1d237d65 Mon Sep 17 00:00:00 2001
+From: Alfredo Cardigliano <alfredo.cardigliano@gmail.com>
+Date: Wed, 26 Feb 2020 09:55:24 +0100
+Subject: [PATCH] Check NULL strings in ndpi_serialize_string_string
+
+---
+ src/lib/ndpi_serializer.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
+index 05b346bb..9a3cd0bd 100644
+--- a/src/lib/ndpi_serializer.c
++++ b/src/lib/ndpi_serializer.c
+@@ -1270,7 +1270,8 @@ int ndpi_serialize_string_binary(ndpi_serializer *_serializer,
+ /* Key is a string, value is a string (strlen is used to compute the len) */
+ int ndpi_serialize_string_string(ndpi_serializer *_serializer,
+ 				 const char *key, const char *_value) {
+-  return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), _value, strlen(_value)));
++  const char *value = _value ? _value : "";
++  return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), value, strlen(value)));
+ }
+ 
+ /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch b/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
new file mode 100644
index 000000000000..c2fbf28383fa
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
@@ -0,0 +1,28 @@
+From 7b2f89ef25eafdd76e8b540f1d8ba1fdec185ef9 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+Date: Fri, 20 Mar 2020 18:05:52 +0100
+Subject: [PATCH] Added fix for serialization loop
+
+---
+ src/lib/ndpi_serializer.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
+index 9a3cd0bd..80221005 100644
+--- a/src/lib/ndpi_serializer.c
++++ b/src/lib/ndpi_serializer.c
+@@ -1054,8 +1054,12 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
+     */
+ 
+     return(ndpi_serialize_string_uint32(_serializer, key, value));
+-  } else
+-    return(ndpi_serialize_string_uint32_format(_serializer, key, value, format));
++  } else {
++    char buf[16];
++    
++    snprintf(buf, sizeof(buf), format, value);
++    return(ndpi_serialize_string_string(_serializer, key, buf));
++  }
+ }
+ 
+ /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch b/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
new file mode 100644
index 000000000000..69aa892d2d11
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
@@ -0,0 +1,74 @@
+From e4512dbcb9e1db0500290b712257e501d1440d71 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+Date: Tue, 24 Mar 2020 12:18:15 +0100
+Subject: [PATCH] Refresh of ndpi_netbios_name_interpret
+
+---
+ src/include/ndpi_main.h     |  2 +-
+ src/lib/protocols/netbios.c | 15 +++++++--------
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h
+index c909adc7..9335f215 100644
+--- a/src/include/ndpi_main.h
++++ b/src/include/ndpi_main.h
+@@ -132,7 +132,7 @@ extern "C" {
+ 					       u_int16_t** tcp_master_proto,
+ 					       u_int16_t** udp_master_proto);
+   #/* NDPI_PROTOCOL_NETBIOS */
+-  int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len);
++  int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len);
+   
+ #ifdef NDPI_ENABLE_DEBUG_MESSAGES
+   void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
+diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c
+index 19cffeb8..1c65b185 100644
+--- a/src/lib/protocols/netbios.c
++++ b/src/lib/protocols/netbios.c
+@@ -35,17 +35,17 @@ struct netbios_header {
+ };
+ 
+ /* The function below has been inherited by tcpdump */
+-int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
++int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len) {
+   int ret = 0, len;
+   char *b;
+-  
++
+   len = (*in++)/2;
+   b  = out;
+   *out = 0;
+ 
+-  if(len > (out_len-1) || len < 1)
+-    return(-1);  
+-  
++  if(len > (out_len-1) || len < 1 || 2*len > inlen)
++    return(-1);
++
+   while (len--) {
+     if(in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') {
+       *out = 0;
+@@ -53,7 +53,7 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
+     }
+ 
+     *out = ((in[0]-'A')<<4) + (in[1]-'A');
+-        
++
+     in += 2;
+ 
+     if(isprint(*out))
+@@ -69,13 +69,12 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
+   return(ret);
+ }
+ 
+-
+ static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
+ 					    *ndpi_struct, struct ndpi_flow_struct *flow) { 
+   char name[64];
+   u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14;
+   
+-  if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], name, sizeof(name)) > 0)
++  if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], flow->packet.payload_packet_len - off, name, sizeof(name)) > 0)
+     snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);    
+   
+   ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN);
diff --git a/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch b/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
new file mode 100644
index 000000000000..ba8353eef98f
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
@@ -0,0 +1,22 @@
+From cd4f8051ddfd1bae53393174462c823cf5e15ec0 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+Date: Tue, 24 Mar 2020 13:39:12 +0100
+Subject: [PATCH] Fixed invalid allocation
+
+---
+ src/lib/protocols/ssh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c
+index f3b50b60..6813b2a9 100644
+--- a/src/lib/protocols/ssh.c
++++ b/src/lib/protocols/ssh.c
+@@ -294,7 +294,7 @@ static void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct
+     ndpi_MD5_CTX ctx;
+ 
+     if(msgcode == 20 /* key exchange init */) {
+-      char *hassh_buf = calloc(packet->payload_packet_len, sizeof(char));
++      char *hassh_buf = ndpi_calloc(packet->payload_packet_len, sizeof(char));
+       u_int i, len;
+ 
+ #ifdef SSH_DEBUG
diff --git a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch b/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
new file mode 100644
index 000000000000..04f264d52ddd
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
@@ -0,0 +1,208 @@
+From 60e3ac6b39cb25c974785b8ccc49edaae458a891 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+Date: Fri, 3 Apr 2020 15:31:23 +0200
+Subject: [PATCH] Fix for serialization of strings where the first element is a
+ zero len string
+
+---
+ src/include/ndpi_typedefs.h | 10 ++++++----
+ src/lib/ndpi_serializer.c   | 36 +++++++++++++++++++++++++++++++-----
+ 2 files changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
+index 98b8ccf8..2c513e26 100644
+--- a/src/include/ndpi_typedefs.h
++++ b/src/include/ndpi_typedefs.h
+@@ -1446,10 +1446,12 @@ typedef enum {
+ #define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
+ #define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
+ 
+-#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
+-#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
+-#define NDPI_SERIALIZER_STATUS_EOR   (1 << 2)
+-#define NDPI_SERIALIZER_STATUS_SOB   (1 << 3)
++#define NDPI_SERIALIZER_STATUS_COMMA     (1 << 0)
++#define NDPI_SERIALIZER_STATUS_ARRAY     (1 << 1)
++#define NDPI_SERIALIZER_STATUS_EOR       (1 << 2)
++#define NDPI_SERIALIZER_STATUS_SOB       (1 << 3)
++#define NDPI_SERIALIZER_STATUS_NOT_EMPTY (1 << 4)
++
+ 
+ typedef struct {
+   u_int32_t flags;
+diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
+index 80221005..57c61604 100644
+--- a/src/lib/ndpi_serializer.c
++++ b/src/lib/ndpi_serializer.c
+@@ -43,6 +43,14 @@
+ 
+ /* ********************************** */
+ 
++static u_int8_t ndpi_serialize_is_not_empty(ndpi_serializer *_serializer) {
++  ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
++  
++  return(((serializer->status.flags & NDPI_SERIALIZER_STATUS_NOT_EMPTY) == NDPI_SERIALIZER_STATUS_NOT_EMPTY) ? 1 : 0);
++}
++
++/* ********************************** */
++
+ static u_int64_t ndpi_htonll(u_int64_t v) {
+   union { u_int32_t lv[2]; u_int64_t llv; } u;
+   
+@@ -442,14 +450,17 @@ int ndpi_serialize_end_of_record(ndpi_serializer *_serializer) {
+     if(!(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)) {
+       serializer->buffer[0] = '[';
+       serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used],
+-					buff_diff, "]");
++					       buff_diff, "]");
+     }
++    
+     serializer->status.flags |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR;
+     serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_COMMA;
+   } else {
+     serializer->buffer[serializer->status.size_used++] = ndpi_serialization_end_of_record;
+   }
+ 
++  serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_NOT_EMPTY;
++  
+   return(0);
+ }
+ 
+@@ -556,6 +567,7 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
+     serializer->buffer[type_offset] = type;
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -607,6 +619,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
+     }
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -660,6 +673,7 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
+     serializer->buffer[type_offset] = type;
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -713,6 +727,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
+     }
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -761,6 +776,7 @@ int ndpi_serialize_uint32_float(ndpi_serializer *_serializer,
+     serializer->buffer[type_offset] = type;
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -811,6 +827,7 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
+     serializer->buffer[type_offset] = type;
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -851,6 +868,7 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
+       value ? "true" : "false");
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -908,6 +926,8 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
+     }
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
++  
+   return(0);
+ }
+ 
+@@ -967,6 +987,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
+     }
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -1030,6 +1051,7 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
+     }
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -1056,7 +1078,7 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
+     return(ndpi_serialize_string_uint32(_serializer, key, value));
+   } else {
+     char buf[16];
+-    
++
+     snprintf(buf, sizeof(buf), format, value);
+     return(ndpi_serialize_string_string(_serializer, key, buf));
+   }
+@@ -1111,6 +1133,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
+     }
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -1174,6 +1197,7 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
+     ndpi_serialize_single_float(serializer, value);
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -1232,8 +1256,8 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
+     ndpi_serialize_json_post(_serializer);
+   } else if(serializer->fmt == ndpi_serialization_format_csv) {
+     serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
+-				      "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
+-				      value);
++					     "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
++					     value);
+   } else {
+     serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_string;
+ 
+@@ -1241,6 +1265,7 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
+     ndpi_serialize_single_string(serializer, value, vlen);
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
+@@ -1320,10 +1345,11 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
+     ndpi_serialize_json_post(_serializer);
+   } else if(serializer->fmt == ndpi_serialization_format_csv) {
+     serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
+-      "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
++      "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
+       value ? "true" : "false");
+   }
+ 
++  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+   return(0);
+ }
+ 
diff --git a/net-libs/nDPI/nDPI-3.2.ebuild b/net-libs/nDPI/nDPI-3.2-r1.ebuild
index 012aff2f4458..a83b9c1dce9c 100644
--- a/net-libs/nDPI/nDPI-3.2.ebuild
+++ b/net-libs/nDPI/nDPI-3.2-r1.ebuild
@@ -20,6 +20,13 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
+	"${FILESDIR}"/${PN}-3.2-0001-Added-fix-for-serialization-loop.patch
+	"${FILESDIR}"/${PN}-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
+	"${FILESDIR}"/${PN}-3.2-0003-Fixed-invalid-allocation.patch
+	"${FILESDIR}"/${PN}-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
+)
 
 src_prepare() {
 	eval $(grep '^NDPI_MAJOR=' autogen.sh)
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c258cbe30f0f..2541dff0552a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -7,22 +7,18 @@ DIST node-v10.20.1.tar.xz 21947588 BLAKE2B 6078e29a125fc1020de7b62c97174d82273af
 DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
 DIST node-v12.16.2.tar.xz 23654020 BLAKE2B aa4bb764a8731e32ce07d03d96d573632bbf9af79b127c2acec48fcf335c01ea0ea99532670a46befac42e2e1ce5a4dbd2e4cf0d068bac05749d87af59bb80fa SHA512 81688468bc6e20d83f7f58f0c15f9291a801eb2acc8ba7279e65d81f3eb4ea95e3b6cee0d09738c0d0fa35226ae3d52f2bad5da63a20a3edc9129197d42d000d
 DIST node-v12.16.3.tar.xz 23682432 BLAKE2B 91b97c0de9c76f33d080f3f12a42a15140be6e3f4d42022a55305dc2afc04de6a2b8364b9fc5df0dd71c9ec249eb9e4da8ff23f53be43a1f306d2a6fbc6d6bce SHA512 e5d2d1960972f19ef5acc667efb702d534eb436212dea9e0bfd817328c927b55734406f232b32bba366f05c2691e5085e3a6f8c1e2d959398745e60719e731b3
-DIST node-v13.13.0.tar.xz 32862040 BLAKE2B de2802543421049d225b9eab5f1edd3f3d483cf50839fd646cc5756f272b42baaf56c58c3c31c498cb79abf8ed678cd5dbe6c5622b6dd4564ed22dbde11ce1ae SHA512 344d364fd39c9497ff7d2829b271b572f3f997fc3eb01744c9ba533b4ba1e8a1fbd08ad28909e74504f4bf84de95d0197a0b5e8b9cf07180a1457fdd2e95775e
-DIST node-v13.14.0.tar.xz 32862504 BLAKE2B 2e74e1d8afd508aade66db2e4c251be18308932502db5c3f556a233ce863faaa5279b5fa758c9b4aa76b7fa0469b9440b696695787ca58092ad8fc0389b8a029 SHA512 c0da3e7742dddbead71c321157fdd5790de688a98c0c6016e06e6a26babea7347595d74cc8b9ac7e033daf8bd23d0306316e41f138e7b9220ce25b05403602d2
-DIST node-v14.0.0.tar.xz 32850900 BLAKE2B ef24e6559246f64d9a54d1e6c9ac390bb416af2ac494547f4171db014e2213cd0b11a482ab611865ca3f61a60a9d793207c53f1779d687a7ba7a32fc4d9f29cc SHA512 030dff2bc46594e5e86e0383185030980ae486bbdab2fd2cf65e591c80a9426cf4e6f16c384d36e6094b8a58e8511d7019bef379c44650507d1352a680505710
-DIST node-v14.1.0.tar.xz 32861052 BLAKE2B 34727e0c615b08941edf29da6cc88cfb039f25321b25ea2e544dc6b844520e9174572b5ada5719d73fdb55dbacc156726fdfb7a552defd02f2bfebd3a2cc3835 SHA512 90c981ea198dca59aa1e2b8e528d6e7ea0bf13066ae0d9ffdd9018d8923496e029f0e3ddc0bbf8e0eb67e1087a26a41e16101c83297e086b904a4a92865e7101
+DIST node-v12.17.0.tar.xz 23702040 BLAKE2B 4b35c6f7a3c16a7b737bc5b71f075fe6c66c9c4a5cd3ee240a0c1af9cfd4e10c61520d0489169a74354734083b7f7c68b97eefaa6f40e3320ec5b0126d36169f SHA512 0fc8483c6ae8994ff4f4b2465f1b8b1d3c620c90222fb270fe3d317d967294cc9e6bdcc50277fbe0ab28cb3ce9e73ec122c19adf8a686ecc95de3268b82ca4f7
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
+DIST node-v14.3.0.tar.xz 32985344 BLAKE2B 32ee357e109484422c3b22423ab9a593cd5d4611073c820f90c196dae4df2860573cdd06170879f675b738b01885eb2fe0f25c2328841838bf9367324cc981a7 SHA512 3afcc430bad57150baa8d1c0e5ef0f64691ef6549a052be654a86313fe28f31e7fdfeea4d2b3993798a7141bc6d7b1642747d1bc2636139e2f2fd79441580148
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 EBUILD nodejs-10.19.0.ebuild 6357 BLAKE2B b44a9661af496c8ba80b1ee680b2c511b3b6c2f7702d23710ff2876312e1f20016e579a36531083699a9881001e65150565c3b1fe6f5875b667aa9b79e87a665 SHA512 b290ea8a99c36e16fc0dcae001a3466a094c7ab6953c04f04a86ee0cef14b8ba861e86ad44e0a2b882636b16e95de6975afe40bb5d5e090791322bad6c276b8c
 EBUILD nodejs-10.20.1.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e
 EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
 EBUILD nodejs-12.16.2.ebuild 6203 BLAKE2B 013443da57ae66e7a58247e7ab3599d72fbfcb1a62f9bf6d06b4412a5bae1372eefd7e8cbc68aed2d97b72734c60ce3a38effb34b6961872c946bfa4c5bba4b6 SHA512 9b56e373305402bd499d09b04f748f555f6e1966bbc5c112ddb0e1a372615c89b58850bc802b86f9e0b06942d6707095f156a05b15ad9c01b55c4c23c1301d53
 EBUILD nodejs-12.16.3.ebuild 6203 BLAKE2B 244b4c61b0f6272b26e5664ddfbd67eb6bb8637af78b1e57b5a077d7ee978499875e7d4a8dacb29d93cfe6e589415c969fe52012b41d5dc718c78a25bc1d913f SHA512 19b19f7c108ae641833c1c8e1351de8ed511bf04b53a5003d5d6225b5aa59933857368ba8415afb88b2278d1daac8f4de9d57f3b755a3a27fa33b04a3f470a9e
-EBUILD nodejs-13.13.0.ebuild 6226 BLAKE2B 4877dfa461a9a820b9c6b3fe220c79feebceb83f38c0f3ebd2b2332321d1f9c25687c9b070fc193848240dfa7daf6e51bb6e70c5db3a32d321afbfdb15397ed8 SHA512 e217a858839e4e9230b386c6801d19fe92dcddeb400a7251c9349580a1288eb4d28d49f30bf37f5d7d1726d10e12561c268278b2f38e3916400532496f157d42
-EBUILD nodejs-13.14.0.ebuild 6226 BLAKE2B 21b75409b778d341aaf1774f28604ba07a1d417f0a5912c0f8e9f3d95d827754b123cdafd00e019f3fe4bdeab725b48e2cf8878ec3d8eca65f4a8b255aa06cbb SHA512 4a0f6a8fdd3070f3e7e93709a44b3252ab9314886b3a41e507aa41e982d0a26bd2a5d2435a9c040939c1f3ccfe32c5289a318c2c7a81d3a24c1b9ef4785244ac
-EBUILD nodejs-14.0.0.ebuild 6224 BLAKE2B 8ecb32a184e5235191b97e3d202ccc90d453ca6a9d4ca3f9f876ab999d71dae29df3f052468b48873aa94667ef357157511db4d92bc4bef4b59cd4223eaf0ce0 SHA512 4ee2d93280948622c2b8fe928e59701bda91da51f3c080b4ee9921d8985854b00316844fb270a937b2459ce008bbc9dc896ce6f901b752bfdd8852e3aa01a299
-EBUILD nodejs-14.1.0.ebuild 6224 BLAKE2B 8ecb32a184e5235191b97e3d202ccc90d453ca6a9d4ca3f9f876ab999d71dae29df3f052468b48873aa94667ef357157511db4d92bc4bef4b59cd4223eaf0ce0 SHA512 4ee2d93280948622c2b8fe928e59701bda91da51f3c080b4ee9921d8985854b00316844fb270a937b2459ce008bbc9dc896ce6f901b752bfdd8852e3aa01a299
-EBUILD nodejs-14.2.0.ebuild 6224 BLAKE2B 8ecb32a184e5235191b97e3d202ccc90d453ca6a9d4ca3f9f876ab999d71dae29df3f052468b48873aa94667ef357157511db4d92bc4bef4b59cd4223eaf0ce0 SHA512 4ee2d93280948622c2b8fe928e59701bda91da51f3c080b4ee9921d8985854b00316844fb270a937b2459ce008bbc9dc896ce6f901b752bfdd8852e3aa01a299
+EBUILD nodejs-12.17.0.ebuild 6203 BLAKE2B 79828e49fec7611daefdaf87a5153b97feb88495fdbf666c4c7dd61abc6189d98dd978bdc19f1bfb4049fbb6a4dcea29d4ced7feda206a5f2b58c2b3e568c469 SHA512 3f73c09dc1e215985423e217276478b7ac160d85e2aea53feee017fb03a81358382725972e4c039887c50674521f2c37927ceca3c23412bdc415ebd7c4e25cc0
+EBUILD nodejs-14.2.0.ebuild 5858 BLAKE2B a55c2d19e5aae5b1bccf69df37ed387465bb3adb10bfd7c0660f4a72cd3de20d1d5237c6c5bdc1332a7c983a77b923abbcc90c3c38cec6877910652af196f8d2 SHA512 9a220c64ff886b46f45a726b6c92049cc0eacb8fbc546a305c8d6292b6aed77f9bdbd13be7cb703cf17e5ff6ed095baf90f2249519f32fdd394b0663c2b0c273
+EBUILD nodejs-14.3.0.ebuild 5860 BLAKE2B f06c5967350ba2a80010fd7fbdde840cd1357e3c0144bc56120dc8a97db85950d27b1739e13da8cf9352d425a69bf5a583897e777f3506b324248882a0636106 SHA512 f62d937f362a16c3025ccc81c95e1f85d1a85bda1df86b1778faa1bc8da85f69f02f6cd80acd92bd670781690f66ae43c00bfa21f04dd74c3b161839ae367134
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
-EBUILD nodejs-99999999.ebuild 6142 BLAKE2B 41273a7cb4e6a77242201d3fcebfed64ce7720555502fafb5df7a0de16f13598f94dad73669180c778e3013876c5c9f9f61001ee03d23fb3cc32ffeb5c12a53a SHA512 3fdd9d6c46061a1bf9b7f149f20ec07f8ce30b3669efcc439bb778f0fd34dfa2a7e1c53799c162454127479e2a912a4b5dad9174903803cf079aa0c82598518e
+EBUILD nodejs-99999999.ebuild 5778 BLAKE2B 9b07315384b4d725acb2839907378a4354bce227f3f920147b295f0d49541da3bb92dc20a2d179d97c9f14e7217db1ee16005af17de09cb31a2744b278cc0cb3 SHA512 5d576f85135cf1ec0ca2c4f7723e9e0d349f5df8ae69b4dbb4183924ee6987c9da91764716e7ed287aa9d73e7d41fb0ce4ddd2e03fb6276c6628e50ec443afd3
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-14.1.0.ebuild b/net-libs/nodejs/nodejs-12.17.0.ebuild
index ddd7391838eb..8b860166ed51 100644
--- a/net-libs/nodejs/nodejs-14.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.17.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
@@ -25,22 +25,23 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.37.0:=
 	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-65:= )
+	icu? ( >=dev-libs/icu-64.2:= )
 	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
 "
 DEPEND="
 	${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
@@ -88,9 +89,6 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
 	default
 }
 
@@ -98,7 +96,11 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
@@ -133,6 +135,8 @@ src_configure() {
 }
 
 src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
 	emake -C out
 }
 
@@ -196,7 +200,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-13.13.0.ebuild b/net-libs/nodejs/nodejs-13.13.0.ebuild
deleted file mode 100644
index fa8994789329..000000000000
--- a/net-libs/nodejs/nodejs-13.13.0.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.35.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-66.1:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-13.14.0.ebuild b/net-libs/nodejs/nodejs-13.14.0.ebuild
deleted file mode 100644
index 625eb14589d5..000000000000
--- a/net-libs/nodejs/nodejs-13.14.0.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.37.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.1:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-14.2.0.ebuild b/net-libs/nodejs/nodejs-14.2.0.ebuild
index ddd7391838eb..c671beff662a 100644
--- a/net-libs/nodejs/nodejs-14.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -198,12 +198,3 @@ src_test() {
 	out/${BUILDTYPE}/cctest || die
 	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-14.0.0.ebuild b/net-libs/nodejs/nodejs-14.3.0.ebuild
index ddd7391838eb..b1523bbc10df 100644
--- a/net-libs/nodejs/nodejs-14.0.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.3.0.ebuild
@@ -198,12 +198,3 @@ src_test() {
 	out/${BUILDTYPE}/cctest || die
 	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index e7be7ae9d90d..4f9bf8953720 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -195,12 +195,3 @@ src_test() {
 	out/${BUILDTYPE}/cctest || die
 	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index f68208b120c3..edd6ef8f541b 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -18,6 +18,7 @@ DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe
 DIST bumpalo-2.6.0.crate 124915 BLAKE2B 567e4060019477006f3ca468cb0e087d90626e37d2cb13cecd6938162f78504c8ea9dfb6c571adf573d631c4a60055e5784ee27f2cbf22c769428899d774f107 SHA512 0a2f9c9dfd9ecfdb159228b03dc573d790d0aca777f43452e8e1d638f180dc855b2239779e321fd0b225cf976ac81817d4bb5fc85ac1e45377c863607bef9966
 DIST bumpalo-3.1.2.crate 118677 BLAKE2B 1d956397aa3ef73dc300e15179c270f0e9e5b8b3a8d4dac00bd775236ed024dba6738d6e526bcff9f04edc61d5ec28225bfc2e6383fbf82764bc7de75aa643bd SHA512 c7ca828139a621a0f3404455748486fd7b0dd4e51c1e8584f302ac682f87ebcc46a13ec4edbcbf67568b7d620ab31317835a9dfbeefedc66b729deeef31c1235
 DIST bumpalo-3.2.0.crate 118891 BLAKE2B 9ba8c0366c5d6f0503d780d07b86a4b469e3da186aaf684c3d6b399b081103e3e58fec5d2f74e1e997821460fd8eb9d898037b7cf8dae79793caf14ef2373609 SHA512 705c2ea7cfdf04d7eb9b8810e2fa4ec925ca664a3a5a488cd3405a87f2f7a1840c7ced575827464149a8a538dda515e75a22859403038637d33348ee0dc883ff
+DIST bumpalo-3.3.0.crate 122063 BLAKE2B 711fbbb9849204acaed4cce2f86ae901fca55ffdb91e9c22430cdd0cacd37e56af6e6c1a3eb883805d18f58962cb96db38169c1c9b8747014d4965b24796d28c SHA512 cfece4a184d583bd705409b4c44c257eddb98e35565cde70c530bf0dd6eaa7e3fee6bb968910d79fb065bb12a14832104d47a5450cb108ea0ef239c12befb192
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.2.crate 10318 BLAKE2B da2f8327bc3c2d884bcfaad9d4b2a79e009d060501be98cfe344598da66306940134c28f96eac39578ac98cfc26fd754b68707fa17adab233b371a79eda8a54e SHA512 7b0e860a3c6c809799a9fc733bb0303cff819bc2b884cf77e1517aa9824c819c259edda7793be2fa5fa6573de4f07c0ff95f90a03d0d38c5905260e291ff9786
@@ -25,10 +26,12 @@ DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cc-1.0.49.crate 49933 BLAKE2B 205a8622f1a85a1fb6816206378a63122d48ee69083932611064e41b22003715a0b3779a2052d015e39028f56599b82e0f56cec0bc77f04458c89c8b6bf83f5b SHA512 f78eaa1b81b8f84bb487889f27564f25630b6a83e89ff74dbd620bfc5080f85d74f6a6f4fc6b09e3a4918dc6998ac2087195850040d5ddcc1a1904976ab001ed
 DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cc-1.0.53.crate 51740 BLAKE2B 04d9d6d7e5999c9463dd86eaed965ec728c285ea0e642a02383b45ea820bcbb37c91116646b0fa2636e7176030bcff29612a72482df8c7a02a7262a805791e55 SHA512 8c7224b21a36d46afcdb7b2475686edb2d31b784e95e792f81acd5d5840b0065ca8869ca1c8c5a70cfb3e31dbe5c006360b054c1f11a92f0e1937e4e6d335229
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cmake-0.1.42.crate 14266 BLAKE2B eab3de3a5a482f58dcf72809f63109605d71e1376e4ae2695345abad556eab86fc946c080602671b748fc79e6757478b5b4398a9985128d6189d5fa13ba8a89d SHA512 eb91ecb665924e433369bac77060e44950cefe73eb250463b0e0346e58b6545114e39f995f24c8dea2bb663db2b177cb9f1a8646b286906b3060effd6691e4f7
+DIST cmake-0.1.43.crate 16149 BLAKE2B e7fc26d0c6ddaa5e670c39244b405654ff8541443e60cd8412805eeb1ac5eefccfe0aede18764e29781ee15aa28d51cb4dcb973c3eca1707b5de4c021c8d6a9e SHA512 27deca4e0f959893114601fd550834dfca70cdb158faf07b72944d81b3f259a2ed2949115bb304a9b66c5fb68435025df044618aeb7a9a23b5113259c81185a9
 DIST criterion-0.3.0.crate 87281 BLAKE2B 9c246cc4cb4a9007add5d73058ecbac64f8f9093d2272f21b311be2704ef129bbffe24717de10c4b061e0787febca2aab60b141b2bf94e81d3a45a7eb99a0f14 SHA512 d1110f0699493281013980dbeeccb93553e4147e138bde7ab4a6bffcd522385fb74e8f3f15c2bac32661c56fc720ba808e6483223ca4cae05b2a1da7307de620
 DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9
 DIST criterion-plot-0.4.0.crate 17204 BLAKE2B dbde14b2a7e3bcfc41886aade72c88f31835b0739dcc0d745233c4b936693cba3638ac5f60a47355f37f9caab2f6addd86c8ef1881c21899dfd43491b24dbeab SHA512 06e46dd31ebdd83621bab4b108892b366566ca6819db4a7832cb24fe5bb2155ce086ec97f282a6fb5aa1e1103de2c2d8a42a69b71af20cd62f49e51994c21864
@@ -74,11 +77,14 @@ DIST js-sys-0.3.27.crate 59423 BLAKE2B 19256c0ce8b33a134048d2ef68a2f87a183201ce4
 DIST js-sys-0.3.28.crate 60457 BLAKE2B 9dc982e95c8342597b94afd7ed2f0b41468634c43301f66b5c19be045dc8bce4b7cb4ee0cf46784ab76de8d3501ed40c58426fff8a7f2930600e8a8ddaa828ad SHA512 15036d58b01e4f616079d9155c2e8da387900a9f11dcda767415e85a65955f1106ff20b586f47e607acd2b915067f93fac320140aad789ca90c0792296914199
 DIST js-sys-0.3.35.crate 62149 BLAKE2B e0cdc501cbeef53d12b7ed25a976e4c0f7fa5d20b8741203994242c7e19a7db3ccce97e02c22dc537192dcf8926e16749e93703a8308d38193346ac50a004176 SHA512 d1181b01070d809a4f48be307e0ab8b30f383ade1f2ad19b7a95dda083008af98b01022f5c857d518ee1cbe28b70c67aaf32aa56e76c9f66d0186d49b7de581a
 DIST js-sys-0.3.36.crate 66941 BLAKE2B 37681d56a799833d4a897086594c9a2b394ef1c9d0f0a2a95f944a9b7855445a37deb86c6348d7e054a3a15325de21370629e927656cc58efbb333ea022d5ddf SHA512 811960047bbeac89ab654de2a7da237f2feffe287fc5c0a40484af1c52f73666d05d67a497827f2a55d5e244c2a3fd6ad8be0754330dd046e02ce51993697388
+DIST js-sys-0.3.39.crate 67247 BLAKE2B 3ca3dd7956ebf5ab383314568d3826f8ad4582ee4453cb375238a3f050e4ec387632ce29519151bf6c6e334c029aaff7aff0f9dbc407ee1070f1a2905edf7b9f SHA512 a56a52d0012e459ccbc8c1affb2922f3ac53f96c0563ea8bdf4dd2007995a048f7204705f04e064db11059d21571f423bef9ff022a807acebba9f620f61483bd
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 DIST libc-0.2.67.crate 458605 BLAKE2B a4c57d6f9917b10e6e7747f40d769f16b9ed599f4643b7e55f7f61ee9a8a447f6a0d50932bbf8d87e29af328da4ad467f88b81eca281d30719ad3133edc94478 SHA512 da1c5a8d996f7f82ff45fdf0872cc2fe731a64f8ed4996291b7a7acc866b61433515240ae0069dd4d6c19db33a94541238195d82dd9fd711c4010a0cb0c0b41e
+DIST libc-0.2.70.crate 472909 BLAKE2B bbc4b3ec2ebad2bed2a164e407e344ee4a70a7d83a00b8501d82d70a03dd76a3af40b5a494676d203c37683d602437737c8fd1cf1e7f513bfe5db2820ff29b39 SHA512 a543b972e73d5bf142988464cd62f4402b782796074aabf4ec9396e341050d545b83212c7e4c62c224d5e06de4d794c67fea91b83d605626df115b30d8f326de
+DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
@@ -88,8 +94,10 @@ DIST memoffset-0.5.1.crate 5958 BLAKE2B 2ac071da35c45d498889d38805223b46a0ec81b3
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
 DIST mio-0.6.21.crate 129233 BLAKE2B cb39ed9e9d3b5f456bee86e33d8f0a8cf4784bed826b7ee7f40dd66a98a12b1113fc150fa3d1ea98bf0eb2778caa367abe193dbbdcc0d82b96207ef8682ac982 SHA512 2bc68f6ff424d3ae2ef67a6a1a708b4c42b05f616cad1b0061dce3157c6a46d0666173e65c6f8b7960051e21b526ab5acbdc835833b5496fda280719ad139c77
+DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
 DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
+DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
 DIST num-traits-0.2.10.crate 41810 BLAKE2B b1968facdefb08c2ceae9ca6c3818f03e781e8524488fea26f1a992d3c40af38376d3e732d2dd75c6f666a38d15dce20d9590c432558d65e8fc585e33ea12d3e SHA512 5f945c8310a9b3e78d59a070639dcc1831a80ba682860bade38e738beb36b0496d268d50cde6623d3d20b8f5e68f6ada53d0f21554dab1c18fc225d397ef3761
@@ -98,23 +106,28 @@ DIST num-traits-0.2.8.crate 39965 BLAKE2B 58b2c432e8523efd95724e01ed80d61b2c4a79
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
 DIST num_cpus-1.11.1.crate 11798 BLAKE2B e395b63d0c7050e06d4e70dd9581c0c005a673a1534b49fd4a257c3a210d3f48a32fb467aa4f05c69e1324ba0c1e117f3d0802df2cb54080d27ebf9d31d2117f SHA512 c3a943f5ff82eccee6f2e8af73e12fc83a82590030381cfdfa52c79b2f53012012b246fe8fa682606b7ddc011892d72d5579bc17ed072498170b51060c7e7f5b
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
 DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.12.crate 35819 BLAKE2B b4207a6e1baa1a5bccbe61e898eb97f7ff874fa4db13cd4657def82d6120f65c151ffc4accc7036204dd32bbf4d065ebfc8b37675d99647b7b6782612656338d SHA512 4918cf60005aa322ad7afcdf2f6352f95414f5652a85742334bfd8f246a9f5438b5e4a1ae8d7f04fd07d2a1ac3eb18e118fc49367a91183778c74814704d5715
 DIST proc-macro2-1.0.3.crate 34868 BLAKE2B f97fa38afb8abca38d814673e0cc7d17e3bf623984afa7fc2601636508d8b32160fff4079d2e266e2d2e4519d0d8942e88cbabcde54a869dde0a7f0961d2afaa SHA512 ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e
 DIST proc-macro2-1.0.4.crate 35217 BLAKE2B 5d807f6dcc4ba372d76ca3227b2ed6c6710ebf78c3c4e6ad8bf6020717a262861d9b4017c27e338addba240ff568fbf4510b0c6cbc06bf66a4f38db746e63f91 SHA512 e81800f46b8f0805d10a614848603dbee19ad24339c67986496597fcfd501c528ec4eec081e166b38283b3e7d64a0c2bd972280407ad30e388610b2b81594f80
 DIST proc-macro2-1.0.7.crate 35588 BLAKE2B 8d9b4c1f73c0959a77ac4b5839cf8b1a12259ef83c17fafd773a81518cf3750b43bb05df83719f2966afd5a71982b4a681d76692b93941127a52459990d3a281 SHA512 282514c6d052896130c83f632962a54f6310bea35b5418b41bdb540e51fad73d91bdb1c5e9f83dbd265c1f3d0fc67cd119db5483b5697e34b1598735ea9246b3
 DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
+DIST qlog-0.2.0.crate 23145 BLAKE2B e29248ffe6ae947957df673933f860589279caaa5b30eaa1edbd08c19ae6963193b9ac8d7e5bd54b4653b0cc85fa26f25cab17f8e56c30ffd8d69887f788ebba SHA512 cc1c27ef5382ea0777ff0d4772211c3b26306f636feaa57d953dd3ea3f03857e51c919f928bf512648d0a698237f94b33e2a811ba635e6c69a6c9688a40c9b76
 DIST quiche-0.1.0.crate 4017747 BLAKE2B 2a78c68d418f70262bfd2916a44ccb2bebf76c4ace8b97b8898d3e04232dd3f48924b510c84080e4cd85642783c058e3514dad9f2ba0cc827cd24ecd2d47bc11 SHA512 9890d30017ce4363f1f7d0bb095c4050f9a5b57991ad740b6b484ba8086b2920b0e7a65760b9fcaabe37843f3cdd06e15ba7c0747dcec558823b4a6edfbfcf68
 DIST quiche-0.1.0_alpha4_p20190912.tar.gz 168349 BLAKE2B 7da7ca968c43ca065492a541e126909d3e884989d0f51775d7e78b1af1b2b7feeb7c913aa3adc99a6ad31bd3c043b79718a51b32fa9a38934b2bd5a2cb950c4d SHA512 7d2ca442efd83d6fc67fca3b3fd974400f76a1fd5b44b241079d386d9c94c8a0ef14f3f5ec17695dac04c42a8d441807bfbc2aa5fe155c7d80e1df01f1197dc8
 DIST quiche-0.2.0.crate 3588074 BLAKE2B e229a2e9b5030d348c847c5dee1add8376e9fecd15bc44551fdafdebfa52d815bfcc6f8289c5da31fb0fbe9fe3005be79734f3a8bf0017a72c296fea2bc3f43c SHA512 fc8220f50f4bb9bb44e7881737084cf07168a0e71a98574d6be9d030cee3f11d7814b882d7832a74b22a3db9abca28bf8a9f1469550917ed39a6e90366295ae4
 DIST quiche-0.3.0.crate 3521895 BLAKE2B 6c98bb0752b0aaa1284930ffcd30bc9378e58f75c2a43b566f75ddfcf17c5a42f749f3e02c3f879491e83d36100e9f73a7c27348f4d1e61897a71958b3afb081 SHA512 a10c54a54f4de4990c29121c6d14400a0385e884be79648a116a9a80d4abf8bf16145e5804a52bb5c556b437f0ac3b4a715af41c5fc1469139c52d46968f4681
+DIST quiche-0.4.0.crate 3575212 BLAKE2B 0d23f5ad24e3fd8fbaf973649c3845c561e6124e9df3dcc4903f06475cd51977184c9d7b4beec9161e6012f9a180b96b5c8515b1b161a9365c01320fae137c22 SHA512 19671d497337896d18d5c4d2da7302ca0ba478d8bdc5a136f529ae4541629cbdae456344b31f371d7d3a144fabe4b0b75ec16a486860fd72b9e5f4f309d9a4ba
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
+DIST quote-1.0.5.crate 23920 BLAKE2B 797e9de5cb7294b5efd5963bf957e4f51716a368a7300b620e51bfc60e6b4d8cce56bc3ad3f382784cbf13f33cf7c5fa0fe93897c56f6af674f91729b4a37bc0 SHA512 2f1b2b4272d1caf280dbc82a68f5e25a63c4a33260bdc53925ad7dfcdbd905198fc7f9f3d326f89c5991ab1318bd8877d38cbc7b091db86f58a576c82f700b63
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_os-0.2.2.crate 7975 BLAKE2B 281cc20f771956b5572f2eeeaee25e474be50abc58032f2381dc2512f02efdedf1cce6f9432d66f4d477cebfa78a1fda68ef054caf5861214533c8a8f1bac289 SHA512 7b7b9af819af1e53d941155c3042ecdbb33dfb58de8d0db05ac82eb12faf8986305d1c8b50c595612484c8ce754de20ffab60093ab92d32a8e4d09a622664b1e
 DIST rand_xoshiro-0.3.1.crate 15444 BLAKE2B 8e7ca59d27bf68ef8be1ff0d3b86cc9751c7506f4d2ab124de7832ae718d3f3f56c317a2106117d84071fd5c4603060d71e60e384d1f9a6551351c90c922af49 SHA512 3616554a4e2f781a62039420e24291511313be9965dc17a9b889dc6c92ae74a4ca9b4d7a24872781cb615dc321b4a31faac7359110ba279d28d718141c777175
@@ -129,12 +142,14 @@ DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST ring-0.16.11.crate 5334322 BLAKE2B 36b0b0905515c73071c074f78db00533481bf2753b357b4a7143bab2341a85d62e22a2fadc9f48e28cac13e3c2a1b09054782e178020cbe75878ef640c327a51 SHA512 12f9738f64b42fddc0815233a115a72a3b4347dec1cc6b995b7c93a8d8fe583902b45ed2a11e047abcedb2271b465b981cd2cf5296f489fbcbe72e31821d5bfa
+DIST ring-0.16.13.crate 5339691 BLAKE2B ac05a826fe706968951abbfef415775d1a73ae5a44c0623d4faf15959ec07e59a81f1de34685fa9681449b78ce4c6ea37a4d99cbf1718999b056df927b50bdf8 SHA512 9c36505b6066a62dff5d420de3432ba98354690d2c2a7647813843b40ed8985b24fdfd5fae41df17c39239caeaeae21aba2e96883c8924968af0becaa38f0da3
 DIST ring-0.16.9.crate 5319964 BLAKE2B b1f3807beecc2aefce36ae605c94cf056483ea47f5250b6125dca4445be450be32b3c4afcd4575108fecc2ed61b900ee311d25b50d2499cc24b6eb62ce29020b SHA512 461458276e868764f886016f2ddd3270c97028114003f3509bca59387c23e21b258ebec9f1720e14be4db0e8b722ac0d411e2920929de7d1d08935378c035fd3
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
 DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
+DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
@@ -144,16 +159,22 @@ DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96
 DIST serde-1.0.100.crate 73104 BLAKE2B d3557c4f170b31ca64ebd07bba8ee24eaf8e1ffbf192c97d5681dd2b18940c559c31b6fa9ab2e4d24d7b1ce9ec21c0953d37a1a5ee845b0d75d6bd1e870309a7 SHA512 bce506b4d30c9743f69a8c599eeb5bfde8e4951f1700901ce03eb9cd198e3725bcd625121f494f8d12e98200520899917794b5943b355acf8993f00d1ede4282
 DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
 DIST serde-1.0.104.crate 73258 BLAKE2B 98d63f91c61ac4693e17e0b137379cffd6608933b84d2211509be6b3b25b181592d5e907549fac6ae2e4a45255b8003e1bfd0db683429ac3e78d8ee097d3d79c SHA512 638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a
+DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
 DIST serde_derive-1.0.100.crate 49848 BLAKE2B cb81b18d0fd5579918699d2a6284e1c9626cf78673fd29ae279329b0860f89c8e99a1ae84ba6574dc09925c98ac5bd934c969cd35e84bda4cb6d5cdca943a2b1 SHA512 f47e62d3f30b15acf0e5435c5df939bb6089c060bf91e891a7cc0f9e7bb8243c5500a145ec41e6aba7fd1f5fb571e552dbc95eb78633d7a47ed08ed35f0b0848
 DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
 DIST serde_derive-1.0.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
+DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
 DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
+DIST serde_json-1.0.53.crate 73130 BLAKE2B 28f118648c77c8ada5a434416ec6b28615d8a9b677da7f34c8ba1104730087ac6d93e010a767199a98208ebe5dbde1203a47f28a2394a3ecb75b3d115a3b27b4 SHA512 8932a9f9f783b7124c7a41c9c3c0c1934c0e5b8b628fc9bab5ae0f78370231649f17de8015f9d6facf4ccd0305c68d8c648799e239bf32558c6be9bbe3819e22
+DIST serde_with-1.4.0.crate 25789 BLAKE2B d91f5fed9ef2f3a8b7a8973e69ffff0715bb0bc0e2c9e92b263139ff54f2c325926db9312d402ef6b47006ccce6d951835896893b1d27738f22f066e61e64260 SHA512 702034da0c16c57b8f66301619f9323bfdfcb4943b4a6c4df89508345b6ace57b1caa6b3b2d662eff9c9df6ddb313d2fb2ef85d7f8a79bdb986eb832cc716b89
+DIST serde_with_macros-1.1.0.crate 11235 BLAKE2B 46d45ef95ca4bf276abe5571671614927aef01c811b5eefd84801b50bf10d7ba562c42caf9ba901413962e4f7b4662e86ad3ab81e0fb4b442e3baa1a8a7f9c0c SHA512 36de2149a1a4da3162458d79518aa276517456c48cbfbcd564fb84d509b267566b2c2dcd707604b502cd9e152eeabea63234837cb1ad216fe4d9eb27c51cc288
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
 DIST smallvec-1.1.0.crate 23593 BLAKE2B f49a79a1c9c312559cb48acaa1ec2d414348c55f05ffc3c2e26da5e5c4ca260101a7f4857cc2d554b7d79391f2ce296df3f889bb1aa9aeb9b97c9be41845f8ab SHA512 78e1ce9b80f59254eec3d9b9788bcb7c4c63992dee0ba0da577c2862884e0c6b6fe7517f79cf3128527d7ec5d2d339de6fb79ce1fcdd4341dd2457d7dec7ea94
 DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
+DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST sourcefile-0.1.4.crate 3632 BLAKE2B 95a19fa0cd7f9f1a2085ca0f3eca4c083afc8923e29f3aa6b053209594df2ee9259d8d228d216acb6062f08ce1eb195dacf3ecc6c2b109893a61c1edd31be38e SHA512 f60c1c7e1c9acb5fad6d3c8343b4e3fde3569bb0c8da522968fc92b704f3eb1d5164fc17c482ea4fc4b78f33260ed3f51975ebf1f487e719d266cbd26c55f057
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.9.2.crate 9707 BLAKE2B e6f99a4292bdc2c83027b7686eb46b0524b8404949269f7fcd5d1af4c86d28422f3192d09512e8f20447b6361cc936b5cdd62a45d0ec513161677c87e37c23bf SHA512 2054444ea844a25f573219a4993986b69ff8c5dc0dfd2dd06fff638d596c8c5b5a1bedafc2bef3a1b9c146dd47a0769bbe039c54fd8e2a5d9894f29ab9f32838
@@ -161,6 +182,7 @@ DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750
 DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
 DIST syn-1.0.13.crate 195242 BLAKE2B c6889e24927ac5ebc1248be2d1dd1512b888e67ecad686dc67d29ff517aac2035cd4a8bf6dc87db54532eed72608f3a06ace41989bc7f47789c20041841a99e8 SHA512 234b470f432c1981f13e63e37334e200cd872d288f0ca10fb849281a5fe13c077eb9d41e75933a296f8c3d4e71ca8cce8724ef8c3d98bd9972146fab3d010663
 DIST syn-1.0.16.crate 198097 BLAKE2B cd09744c44726d755d4c3518dbda6bbd36f9bf0525fb2e4a04bae745b7dbef3a9d5eebca57c210af0da1a99cceb0ffc5540b3a1c148f87ffbcb5fdbfa57f586c SHA512 5960ce6d6d32eab252b480ba7a8603d45212e0823b5c96f4147f79173674391ddca82a17d95a8ba39e58d8849ee9c50168301e4e48f97517696e3d826e58915e
+DIST syn-1.0.21.crate 200233 BLAKE2B 79f9dfb39fdeea957465b9ebc85e948cf7725b52f6544880c7ed24c1fb193053dfb627f6df8631a9f7441bba583a599c12514c4a3431189d2473ce8f11a5e8c7 SHA512 0c329c82dcb4425da8800894da103da9656dad7abf07098b7c8752a6c35ad644956e78981b1d4dc0b4d26bb8e2e4866aef969da4e4e5e885c76e35c781862e6c
 DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
 DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
@@ -179,6 +201,7 @@ DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST untrusted-0.7.0.crate 7937 BLAKE2B b8b39b052e12135e93b4dd3f5566fff144f055836f3ac28d8e166ec53433dd8c7faf4660d4543d1d4711408680bdfad1248f5ac905a071998f956c4e5c5f2703 SHA512 8551775e5af867bf46e3c9bdf14a0cd394700e40eabd2f8f8494732176814dc40c3de4ac101035434ffcfc593d056559868f7372471a27e4f73dcc1979ec3aea
+DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
@@ -189,30 +212,37 @@ DIST wasm-bindgen-0.2.50.crate 144511 BLAKE2B 7778d05717281b6c295260f6ec47898e0c
 DIST wasm-bindgen-0.2.51.crate 147669 BLAKE2B c1221297c38e061da254cd2225d7788dee79c99c9303af3c25f867dd23693c6428ce1bc0c2a16f3843bebbd3f08df1ea43653a49cf069d9db8a50523eb19bbcb SHA512 d2f336335f61192da98750607b660a03d2e76c1808996a5a549b14205e76624f04f167bedb7fb0ccf371e49f1047688e5cb2289a92001d3b55caad3a8b6855d9
 DIST wasm-bindgen-0.2.58.crate 150537 BLAKE2B e958babff0b29d1c0b931abbbba924b2a2720704120e828c053fd0e06267c8d7a09dc45bd712978c6224ba479f3f61b83a74d2c3d5160913b9ec02becdddcc57 SHA512 c0fe39ec0f496babedf9e2754f3a71bf8da38cac469933ae708b4925ea660bf064c352ae67a0cb15a05328edc59ebe5cbeeb0f3035a6d7a674ebc0d271560667
 DIST wasm-bindgen-0.2.59.crate 152264 BLAKE2B aa52bdfc70c1098aac8506f8a071942a86da99e8ad489f9d0dabc297cf473bc4de215261c96c72d3f2f2a63bd0eb14c34b672a50265a8f54be44a01edf4a3d02 SHA512 f1fa396e6b1c67750f13f63618207b1b24e04d9b186f52a0fde2df4735a799507f23c577528c83fce37a294651d307882b7f4cbced0dfdfd98475968a95926c6
+DIST wasm-bindgen-0.2.62.crate 154556 BLAKE2B fd4d4c28e4bfb1f1ac076ea3621f08b37114fd7e3c75b4247e79d9941d88294cf8d537197458ed6570c8b4033ccf75baa5c1e7f906f7af5e0f308d640681be19 SHA512 40f1a2047f658b7608dfb4aed85a9c89b9d16aeca53aef88ded497511dff64bd5bde5658807e455b71f35958c942cb8bc1e3cf4e997f459d489506dca7d2f3bd
 DIST wasm-bindgen-backend-0.2.50.crate 21115 BLAKE2B 79f9322281636c6bec83c8c6aea5f4ceef360cc0b42ed28de667eb0b18f9b0772dd8f455df84933f43b5be0312cc03c02ebe8f11dc652a7aac3fccaa1d2e4cc7 SHA512 6e53da0259b5c3e167129ae67f8a45497973028af2f48d67964605f8924754a1c6ec6045fe0e3d30ab05902ea2962845a1944d3ed13ee4fc0fcdb6892dd35885
 DIST wasm-bindgen-backend-0.2.51.crate 21373 BLAKE2B 8641aea89deb10550b94a5e83e7b1d6309d3179c05b82f29536061f781dde9ac97449f892da06ddeac480426d9c18c1f4c322baff54dc1165a9f2ed8379a3ec1 SHA512 d0740d003e8dbb62494e6a12e41a7b10e0809877501d8a5f59979c797d08fe7ab57b172bc20ed9d2113ae57a2b1868ce923b68cc2413e1771fd8a4844eb58c06
 DIST wasm-bindgen-backend-0.2.58.crate 21479 BLAKE2B 101d311e32330a2d2d0cca325a9f544fb555bdb1d2b354f02cd16e6b3ec76e0a7056e189b1bde769e22e07a57b05174c6746cee9896141656fa095501518842f SHA512 b58388b94f0389bfa1a28fd975e3f239d05b57fa89aed7bf802ed4cf1065c016a925100eef3fd650d53a581990b9165f6431866ac64798bb11dce44897130417
 DIST wasm-bindgen-backend-0.2.59.crate 23306 BLAKE2B f963f5f7ef437da8c47493b0120ab1a2b1f6e14886e7f126ce2d125c010237437d782f988b6228b1191b3bad0cdf7c53255f5bd81ba23a059dbfe8d6288981a4 SHA512 466861080881dc16023e7c620d0b327a9587177cc608e3ab9652dc1857e8371a55720fb54c611498f70a42cfda8009879b5422b4dc385012c0fbceec96b25ad8
+DIST wasm-bindgen-backend-0.2.62.crate 23280 BLAKE2B 1a770f707c3b353e915633fa7597e1b6b4082d18249d6b2390bcee62fb653bf008cbfcbe49af8ded8d48977a186ad2fde9d1cdd2030df283a498b64bee0cf69c SHA512 bee6ba897eaadc1ffcb5404a5b95c77c9cdcc1833a163743fb413e0d02ce2c3274e6c81efb7c0541733a1563c17c4f92088d036a9328a2222e2a86fcad12cd7c
 DIST wasm-bindgen-macro-0.2.50.crate 10849 BLAKE2B b59e71d7f7ce427a60d0c48a5921b4c00f0b97472a8e3c79f9f2a0a3801c02131d0f6b6a249100eeef0e0d6d8fe616511422e70256cd74ccc9edbbe666b36097 SHA512 1d1c273f520c997c6c1b6d86c08ac99c4e25e04da12a25a6efb87e1b8a887618b8435129d6774a7ec2accded5c87c3561285dd8063d28efe19f60052e6d167c6
 DIST wasm-bindgen-macro-0.2.51.crate 11421 BLAKE2B 8bbb0a21d101fdf04db7d0ef31be58a24189c8e5a37593b272213ac4275117aed0caee7736a98f6263634186123ace9c5fb84593fd15fcdf21a4eb6f5293f3c9 SHA512 672a772952773566687ad167bbaa580463d7695d3e040a416263974a4941475b02554e334de5bbeed1f6d3951b1f647728f83055f8bb744a4782f58f8fbb22df
 DIST wasm-bindgen-macro-0.2.58.crate 11599 BLAKE2B 7ec50395addfbfdd40bc09820c73b56ea00bb22dbe835cd5572c0f44b86c862482a3fed5d85b285cdb4075f6a18010055f14baf068dcd52784799b33b8bfda82 SHA512 abc8731d6a6143adca93d7b0c24f3417191f9ceced08a1e2a7df3f8ec86ccf491bba84e94ffe5fdefc0897fe9b33a05355335f5771cda076ab9294d847d81e76
 DIST wasm-bindgen-macro-0.2.59.crate 11562 BLAKE2B b941e0e60eecf4dc043b956e2a0cc137a51a5d10693d2c0e0d7006b3a9cbf73c5145eb2a208e98a8a93bb49e43f9fe5a0614cebe86d6bb40a5bdcdab7155745d SHA512 ecc311c5fd134848e6b43431ead23a0e1616a1735a39f98d5ce91ad425bc4b8dd1ed8890f2ca534362ab1cce6c35d9b3274fc4007c96497d3277ee2a47afa55c
+DIST wasm-bindgen-macro-0.2.62.crate 11676 BLAKE2B f8ce4053c326458846796fc14fbc7755afbdf193827313df0e173eac6f38bedf228acf0862ada9cc4b81bb3a78931112e65603f792a84846c9d43e2df72758cf SHA512 c5182b2704ec141a5a7569d6daa4ed3dfd572bcd99551f55871670753ffe6602dda08880b9a75b301c418c23e130b94f755c271e213af3941951515fc861c6d5
 DIST wasm-bindgen-macro-support-0.2.50.crate 16461 BLAKE2B ae44dd17804d4c554b676d11136868958eed5b6d3dfe58a80fb113c7546e511d20b7cb8a92d53b0b3ff3fff02313d407f8d4e5089b558f0b936332c0a7a82436 SHA512 f855ad370334fc64ccba2d3d00ecff0dec2319ce644b337f60300d4f76c9d8323e2676dda52fdee3ef58e1d9f16ee378beccacb6b02cbda16c2d40f82526df91
 DIST wasm-bindgen-macro-support-0.2.51.crate 16476 BLAKE2B d726d89f063e01c2caeea38ff44d0f7584ebd92a37e139dd5720430a4be54774faec9a4edfecfbc2771adb4b1bbea37c11380c9d9a264663007ef204eb8abc67 SHA512 a53252f8276494a8d706c401e5a5a4b785749da91f7f171f1242268316de926f518e7e3d8c4f36f139e21e2ee3150a6e07ad416125d6f738aa5633f2337036df
 DIST wasm-bindgen-macro-support-0.2.58.crate 16510 BLAKE2B e75fce5858219d70278e5b78ff68e6611226926f8d8ed56a1fbbe0cb73909cdcbbca65b748e1cdb6f3efc0394390628c1fddf09356a22d773851093003cc3054 SHA512 fc8d2606fbd9507bb681a39be26cc01ba1776995a5230f54c3f8052107c9ca177c4680a1f4e8d326bece0285d7d39e04c4291875e5e903f7c45fc721cc3ea9b1
 DIST wasm-bindgen-macro-support-0.2.59.crate 16875 BLAKE2B a3b92c007ec37c774219fe720f6f52b21a0f26cc7dfbc63a274d44dfb3f2424b587f240924417c18f1235e590da798284cc3927f3f747d43f5dd48be1d2a453a SHA512 65b4cddeabe6b9031b1b513d1df95b3308db89b066686bb9427b2cf826101e5dca318db9d4736674ad672eb306b1306d0061b736725b6e52a8f34ea9b09ba89a
+DIST wasm-bindgen-macro-support-0.2.62.crate 17452 BLAKE2B 0472ed6d7f0ea1fb6f38c933ef8994447c369705b00d2021ad73bc2cbd9826c47be630798766e9b61abb2e6d141d4fec679cb2e941d65cf5b7fd7ee8f0d62c38 SHA512 f51f968b48f9b4919f4d0a9dbd82c29a2f06601e6d2fc63b1e2e4b57359bfdcf747d1c9d0bb89cef7da5d8add93b49b437ae4cb6f98949cbfe44995bde07d49b
 DIST wasm-bindgen-shared-0.2.50.crate 6727 BLAKE2B 9bd99d6f9441c748d1891c532bf42d60838919d3d100eae20b0be2cffc99bdd774a4172e106e121dbccb87130faa2c33e0c4598e43a6252647e63c1c490195ce SHA512 c1d327b1dcdb0abaf76f7121adff7e618691cc8efac5be3fe97e4375446003d9e0c41288288eb1b432e2bd49d1776be11b9cc4f675d42f78606456b711d4e877
 DIST wasm-bindgen-shared-0.2.51.crate 6721 BLAKE2B 651005f120d4d647c3a3db19bcc726ef0669577d2c072f6fe0cde64a7a94933ed51c7b9a5e4f87f41bfa6cc9b2d68e989345c71e4ce2ccbbb1869f0a1f179309 SHA512 29c36bcb531715457f1e2d4b017f505fbc81a685fa80c8137b3558f2448780357e93ca222c67214f32e248585888a58df3f3895b59246dbc59f47a7ddf7632e3
 DIST wasm-bindgen-shared-0.2.58.crate 6740 BLAKE2B f90364bb447cdc7409ea663f8df7d8b8d45df80d1acf1cce0ec0d3e9a1c3def8f93eb3537a69525d18941f71de04aa3e4824c15e34b396ec4462a46d8eff528a SHA512 970b60d8ed46cc86cef2b5954899e4bc4113e86f6d927e920b77194d078726213fe0d92e2f06e5ef6ca85b4379b002b43b798f7050573d68130e0099654b3f48
 DIST wasm-bindgen-shared-0.2.59.crate 6745 BLAKE2B a314206a48c0784d49080f0451a3ae64af6a5fadc1563f8a9d7b7fde805535c54961466df7759a236c2aa369c055ea990473fb6d7b13c018ba5d3069f1852dac SHA512 969e5c59b80bd83900affb82c5659bd1807014482a811828928fc34441e8d0c20b27aa838f401af75d488a70e8d272ef5429ad69c76a177c247a3083c698a3ae
+DIST wasm-bindgen-shared-0.2.62.crate 6745 BLAKE2B 235a121f4f15e81fcbeb305384aa9e2542a1690cd2cc690203e4199fecd95d2904a3b24954a9d2f607c896ef06129b58f8dc1cf1e04b0ab654438ed5e328b1a0 SHA512 595e810c89e2de9d16f1f131fa05a022b67b66c9b94550a046eba7b08019442442d4da996d9385c1f6035da429b99339d335a0891632395ebaddd21016ae1737
 DIST wasm-bindgen-webidl-0.2.50.crate 24182 BLAKE2B 276641836fc21b2a7513534867799527e56e158ed9f8678f0c8a370cb38fc2dc5eb023fc9aa04db5afae0e7c3f49e5031ab4650daac35dd543594ebc834e24f7 SHA512 a1af0dd9c31cdb8fc52ed55b6f27f1423218c5fa427d8b295b3989122fc3b01650f1c9174bc77f5b6883ad6e05ce6e90af0e1e40aeb236772cf782c63c2d6c20
 DIST wasm-bindgen-webidl-0.2.51.crate 24203 BLAKE2B 7b8f5cf4cc74f357e8c1193262f667551708fea51fed9b8fd38c3bce2ca0608c9af86f998d2a8716024a645c90c83b31dabb214f515783f332991da47710ae95 SHA512 b9dade093a8ed835aaa1be2ef5b989176887c57dccc4cc90cf9e608b54da489bb66bfa9fdaf4c9edc2df1ab2c71fb2018bdddcc502c52250d3d5a36ef354b554
 DIST wasm-bindgen-webidl-0.2.58.crate 23864 BLAKE2B 1d7ecae7c1dea10aaaf830676b502a0ec9fd607a87ab3f3863eddbdeb245d695c08edcf2c954519b753b5dac05593140c10b058a8e08a6a7e3113877cdf55d0c SHA512 3344b82063f4dbcbfe9b0777b9e071ca072b716c87142e7fc2ca043f0ce973477b4609fabb415ab43261bbb19bbe5ab7df3301c92cd9d159dc0ae6b85fb20a15
 DIST wasm-bindgen-webidl-0.2.59.crate 35711 BLAKE2B a95e203ccb1df906ced64b3052662c77103017f67dfd0364335e19dabab2718ef0683809a7f67af267abaa99187c301752f89f3186ae4a4a1259b3766065289a SHA512 975b71a144a11ee005451aafef72d6410bfa9663702cc788f5604a773c88d0c2fe36e4ff53ec7bc882935662590f3b2503f7530cdb1e014d729463341c3ff56e
+DIST wasm-bindgen-webidl-0.2.62.crate 35861 BLAKE2B 2828e0908a290ac433036229f7b8c7267310c804ff2eefd564427317252e2059560d458a694a345404f39b8dd0c783a8eb2c4bef063ce17dafd6a4a5d8e25301 SHA512 c6c7b26982dea90623c916716027fca2d84046f048f05d6721d3ab7ffbf2febdd89c649341c0626dabaf70706186f2ce6c56b956d96e6cce9e6e7f8743323aae
 DIST web-sys-0.3.27.crate 204250 BLAKE2B 73a067c079b3b3c5cf858adf185016f8be9cf02559c18b62b2f24628366df769e5e71010277718dee6a479191d38bc2f97dc42128b1327434dbc9f6c78d869c6 SHA512 906a16b5642a515dbaf996b4b4b42b4fc93ec1c614651fed476fd62ba3296f8e4d111a5f1f86bc0d3d565174e6a9da3a8f9b0a3b2dff827501b03bc734653b26
 DIST web-sys-0.3.28.crate 204077 BLAKE2B b8e7eb716e0eb6b20d2cd994cfe708964923be61c1d71ed303ff3b7a8210dfcb58858f608d28249f33bc6fb03f97ab497143e40fb2665523907b78dd122a1a50 SHA512 c26acca4493e3521feaeb081aea53a1c9be248bc547f42dbac7ef98a108e765e150678c37888de92cb06d97f1102ac96a5faebbf32621f9bd2bb74f668faadc4
 DIST web-sys-0.3.35.crate 204293 BLAKE2B 0f07e1da5ec23b286a1b7ac830050a0f0b48ecdffefb871f105647ccbefe8696d7c1e27498231b7d810ec9a9b73ad851eaad9ce9ed1fe87ecfc78b52b3e89388 SHA512 d9ba1d162030c07d3abb91f42c29f06162ad22952f7d55bff5b3f051de4be594eb1bd910b65d2e527c0faffaab2f731bff9e9f9573eb298e0392e918f7029195
 DIST web-sys-0.3.36.crate 615528 BLAKE2B 45dc9ae3227f04a9cba4c9c1cdc8d50f273e83ba83356d1fcd50f695559fbf36cb9c00a0ac5efc89d439c8ab213361cb6460798bd80f3864e45377c57262069d SHA512 203995e587c7ac9042587a79899834be4409dd1dc73fdb3a76545e206f0516093833d975db9fd2349d63e4262f50f6b22b3ef1e22cd556ebd377da73240e4761
+DIST web-sys-0.3.39.crate 629036 BLAKE2B b23333cab0275768e19533fdfa280015b50ea746100b0f1ce50e72fffdaca149baf96c9ab8ac11cde99404cdc7f9681cf4180500b1b24a4334107a6535cca912 SHA512 d0450c655a172ecf3f61c4d289cf5334334025910e08a8fb7e1604e48bac95d6baaae168132c72e85dcb642b2304df7e7ba39f57ffd0bd669d3f4000cdcc3dde
 DIST weedle-0.10.0.crate 34686 BLAKE2B 9592932b38543c700717dbc1ea2852acc4fc73cc9c6550e4abdec6d230c7e4a2e01663643222a5fe025767d83d0a802be74a9798fcb57083dd795b513a64ade2 SHA512 c7e5ca778af68d69284cc93556a67884adbc437aae32f85ef305bb9489a5181dd3b77ded68657c1d3a088386586ead4830707a8e6bc0c912c953e1a74ded49ad
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
@@ -227,5 +257,6 @@ EBUILD quiche-0.1.0-r1.ebuild 3996 BLAKE2B 8ecef4042ef3c4a64b53766d8f5ea42cedb51
 EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3779 BLAKE2B b8afe84ecfb336e4ebb13d9299ffac0b9deb4f0001d97c9ce0b0cda6dcc13343945a26819f2cf7b72510eecc3758402b775e94301fecede64cd6b07ba8868cf1 SHA512 a3ccf728e8a4795f64f6735df4a1d00c801b0021ab1b080de2ba2cc778db010f046eff9fe2a9afad187d04d5bc406431493206da0763906ad40064636f4f43e5
 EBUILD quiche-0.2.0.ebuild 4047 BLAKE2B b54703dd4bbeed70f436167eec0a09a8f4f21a22c2ce01ea9f0e0454a16ce46bd1fab238ed1ebce9e75e336d64964fe1ba6b9598a878b708d42ad84297961cbf SHA512 fcf9df5c6b6db64824b467201377b969da8fcfe474a75f11306d08d8d70111a3af2d7b93e72a95a24fe885d9bc8533db541d3723017c93dce4a74173bcd65cc1
 EBUILD quiche-0.3.0.ebuild 3645 BLAKE2B 404205e38ec6feaa2f674e1ed7cd5e300c63d2d53ebae265e6eda458b50df3ec3fd56db3193efe5ed1375b9b3f3c0f4155779765cc710648dd1a9844bf95eb56 SHA512 da5a2273d70175e2e4bb49221d9ef80b387672d80f6e80938ab3c1ebbe5318052c9399aeb04ed1e42b3d43e5fac42602e4748358c8d2f9af3658845a75857f06
-EBUILD quiche-9999.ebuild 3645 BLAKE2B 404205e38ec6feaa2f674e1ed7cd5e300c63d2d53ebae265e6eda458b50df3ec3fd56db3193efe5ed1375b9b3f3c0f4155779765cc710648dd1a9844bf95eb56 SHA512 da5a2273d70175e2e4bb49221d9ef80b387672d80f6e80938ab3c1ebbe5318052c9399aeb04ed1e42b3d43e5fac42602e4748358c8d2f9af3658845a75857f06
+EBUILD quiche-0.4.0.ebuild 3725 BLAKE2B d88407efe8b1ea50edcda4afe09627161f8953c0d01d830f1ff6c5e04f22b4f2a9301ff0f14da85a6db2d982aa0dada708f0c76164a5331264610c7a108e294b SHA512 9328e6f1e182a31bcbc210a2a541c0c7b3419b306748ac87df933f20dee1f829c0f7c9a4231a6104328ad812b56faedc1f646c232f545d8a9510025f89746915
+EBUILD quiche-9999.ebuild 3725 BLAKE2B d88407efe8b1ea50edcda4afe09627161f8953c0d01d830f1ff6c5e04f22b4f2a9301ff0f14da85a6db2d982aa0dada708f0c76164a5331264610c7a108e294b SHA512 9328e6f1e182a31bcbc210a2a541c0c7b3419b306748ac87df933f20dee1f829c0f7c9a4231a6104328ad812b56faedc1f646c232f545d8a9510025f89746915
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.4.0.ebuild b/net-libs/quiche/quiche-0.4.0.ebuild
new file mode 100644
index 000000000000..07d836c4c2e1
--- /dev/null
+++ b/net-libs/quiche/quiche-0.4.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bitflags-1.2.1
+bstr-0.2.12
+bumpalo-3.3.0
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.53
+cfg-if-0.1.10
+clap-2.33.0
+cmake-0.1.43
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+hermit-abi-0.1.8
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.5
+js-sys-0.3.39
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.70
+libm-0.2.1
+log-0.4.8
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+memoffset-0.5.3
+mio-0.6.22
+miow-0.2.1
+net2-0.2.34
+num-traits-0.2.11
+num_cpus-1.12.0
+once_cell-1.4.0
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.12
+qlog-0.2.0
+quote-1.0.5
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.3.5
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ring-0.16.13
+rustc_version-0.2.3
+ryu-1.0.4
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.110
+serde_derive-1.0.110
+serde_json-1.0.53
+serde_with-1.4.0
+serde_with_macros-1.1.0
+slab-0.4.2
+smallvec-1.4.0
+spin-0.5.2
+syn-1.0.21
+textwrap-0.11.0
+tinytemplate-1.0.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-width-0.1.7
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+untrusted-0.7.1
+url-1.7.2
+walkdir-2.3.1
+wasm-bindgen-0.2.62
+wasm-bindgen-backend-0.2.62
+wasm-bindgen-macro-0.2.62
+wasm-bindgen-macro-support-0.2.62
+wasm-bindgen-shared-0.2.62
+wasm-bindgen-webidl-0.2.62
+web-sys-0.3.39
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+	dev-lang/go
+	dev-lang/perl
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 174406e41944..07d836c4c2e1 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -13,13 +13,13 @@ backtrace-0.3.37
 backtrace-sys-0.1.31
 bitflags-1.2.1
 bstr-0.2.12
-bumpalo-3.2.0
+bumpalo-3.3.0
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.50
+cc-1.0.53
 cfg-if-0.1.10
 clap-2.33.0
-cmake-0.1.42
+cmake-0.1.43
 criterion-0.3.1
 criterion-plot-0.4.1
 crossbeam-deque-0.7.3
@@ -36,44 +36,49 @@ idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
 itoa-0.4.5
-js-sys-0.3.36
+js-sys-0.3.39
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.67
+libc-0.2.70
+libm-0.2.1
 log-0.4.8
 matches-0.1.8
 maybe-uninit-2.0.0
 memchr-2.3.3
 memoffset-0.5.3
-mio-0.6.21
+mio-0.6.22
 miow-0.2.1
-net2-0.2.33
+net2-0.2.34
 num-traits-0.2.11
 num_cpus-1.12.0
+once_cell-1.4.0
 oorandom-11.1.0
 percent-encoding-1.0.1
 plotters-0.2.12
-proc-macro2-1.0.9
-quote-1.0.3
+proc-macro2-1.0.12
+qlog-0.2.0
+quote-1.0.5
 rayon-1.3.0
 rayon-core-1.7.0
 regex-1.3.5
 regex-automata-0.1.9
 regex-syntax-0.6.17
-ring-0.16.11
+ring-0.16.13
 rustc_version-0.2.3
-ryu-1.0.3
+ryu-1.0.4
 same-file-1.0.6
 scopeguard-1.1.0
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.104
-serde_derive-1.0.104
-serde_json-1.0.48
+serde-1.0.110
+serde_derive-1.0.110
+serde_json-1.0.53
+serde_with-1.4.0
+serde_with_macros-1.1.0
 slab-0.4.2
-smallvec-1.2.0
+smallvec-1.4.0
 spin-0.5.2
-syn-1.0.16
+syn-1.0.21
 textwrap-0.11.0
 tinytemplate-1.0.3
 unicode-bidi-0.3.4
@@ -81,16 +86,16 @@ unicode-normalization-0.1.12
 unicode-width-0.1.7
 unicode-xid-0.1.0
 unicode-xid-0.2.0
-untrusted-0.7.0
+untrusted-0.7.1
 url-1.7.2
 walkdir-2.3.1
-wasm-bindgen-0.2.59
-wasm-bindgen-backend-0.2.59
-wasm-bindgen-macro-0.2.59
-wasm-bindgen-macro-support-0.2.59
-wasm-bindgen-shared-0.2.59
-wasm-bindgen-webidl-0.2.59
-web-sys-0.3.36
+wasm-bindgen-0.2.62
+wasm-bindgen-backend-0.2.62
+wasm-bindgen-macro-0.2.62
+wasm-bindgen-macro-support-0.2.62
+wasm-bindgen-shared-0.2.62
+wasm-bindgen-webidl-0.2.62
+web-sys-0.3.39
 winapi-0.2.8
 winapi-0.3.8
 winapi-build-0.1.1
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 5e5a6da7b04c..1be5dbbe503f 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,6 @@
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
 EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede
-EBUILD qxmpp-1.2.0.ebuild 1306 BLAKE2B b815077c61922b2d7eb87fdf76156c02252498e5d6b1970d1cc4357ff170b86db3d29aad2b69a3d3fa29bb075d006ef2018f88fa8a8e186b097368d9d7c40e24 SHA512 5ccc1c274df875fe028067a5ac36c068c91d7c069ba3d21fb77ccb75a578ec321e5739d6f60a9d9495a12606667c79b8059b6777cdd4d72b0446a0c4f7930f0e
+EBUILD qxmpp-1.2.0.ebuild 1305 BLAKE2B 46506d14b2e5a1f1fd297272fd56163f70e5a2fe3bb8e637a82dda32247ca5aa0157c40ac95a5ee8dbb5c90510b7a8f0e2c9127a4a8c0ecb498994ed09a20e14 SHA512 bf3df082bfbfb9add07cbc8e6e7e53cea9f66e5f57cf8b21e8bc7327477a8162421f09e3eedc0277a38e4472662d497ad9076f8dcd4153c76a2b00f2a7fe776b
 EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-1.2.0.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
index c9a44c3c89f1..05ba6ca7a0b0 100644
--- a/net-libs/qxmpp/qxmpp-1.2.0.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug doc opus +speex test theora vpx"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index e5d1200718fa..6711c01488e3 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,6 +1,5 @@
-AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
-EBUILD rpcsvc-proto-1.4.1-r1.ebuild 954 BLAKE2B 38ec166200ca7b5173de5c5be6782339ea52c55f9a3717cb1d9af091bd0ac9cecfcd45c6e1a767632b82b108d2549d7defa8946c88d0e95645f760c07344681a SHA512 e0be6fac36dd860fbb9f407ee37f5e2f81885ef70c330315976e223b669f38368d7622c9585b330b6509235b0ffea20b8196277f94e2b50fe8225a9aed9da609
+EBUILD rpcsvc-proto-1.4.1-r1.ebuild 946 BLAKE2B 91ece062544c6daaa92b52a52aeee51f0f007695c298043a31cc71eb56accf081a3ceeb9a3eb6672119a5c6d47c98741e279616648085b31c3d5a95a94909002 SHA512 7a207992ebe9c185b6044679e05f1bd9d3ad48c4bc50aa8a7c247886944338bfcfbab3a2291b18b051b1eaccc4023e7eac7ca932689c3ad01398d932b553a821
 EBUILD rpcsvc-proto-1.4.1.ebuild 739 BLAKE2B 36d56f5bc792dbcd995fe3181f0a1793c115141f9790edda01935a7bc0ff00cba7792485314448b9b4f0a36caec70990655df1898b92bc5275af85c0f66e0d2d SHA512 f8b0768a5b6cb398eb24cdb9c8841af7114bd1f3d4377ccd143b7199a1403d9e6724717579e9103aaccb200d97ac84d0c8c913cc5f9b55deb2eda6bc165b8b0b
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
deleted file mode 100644
index a5088735bbb1..000000000000
--- a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2527c37f956aa38408e251587556a6c8389af319 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 29 Dec 2019 23:38:28 +0000
-Subject: [PATCH] configure.ac: autodetect need for external libintl
-
-uclibc-ng and macos standard libraries don't provide libintl
-facilities. As a result build fails as
-(x86_64-gentoo-linux-uclibc example):
-
-```
-...
-gcc  -g -O2   -o rpcgen rpc_clntout.o rpc_cout.o rpc_hout.o rpc_main.o rpc_parse.o rpc_sample.o rpc_scan.o rpc_svcout.o rpc_tblout.o rpc_util.o
-/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: rpc_main.o: in function `usage':
-/root/rpcsvc-proto/rpcgen/rpc_main.c:1403: undefined reference to `libintl_gettext'
-/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: /root/rpcsvc-proto/rpcgen/rpc_main.c:1404: undefined reference to `libintl_gettext'
-...
-```
-
-The change is simple: add gettext m4 macros to detect need
-for libintl and link to an external library if needed.
-
-Tested on x86_64-glibc and x86_64-uclibc-ng.
-
-Reported-by: Anton
-Bug: https://bugs.gentoo.org/637084
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,4 +16,7 @@ AC_ISC_POSIX
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
-+AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_VERSION([0.18.1])
-+
- AC_OUTPUT([Makefile rpcgen/Makefile rpcsvc/Makefile])
---- a/rpcgen/Makefile.am
-+++ b/rpcgen/Makefile.am
-@@ -10,3 +10,4 @@ noinst_HEADERS = proto.h rpc_parse.h rpc_scan.h rpc_util.h
- rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
- 	rpc_parse.c rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c \
- 	rpc_util.c
-+rpcgen_LDADD = $(LIBINTL)
--- 
-2.24.1
-
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
index d7df5d09a441..9e60b7f9d8f7 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # sys-devel/gettext is only for libintl detection macros.
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 656fe57364b2..fa3dca673e72 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -3,6 +3,7 @@ AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc
 AUX serf-1.3.8-scons_variables.patch 3553 BLAKE2B 528a642abd693f4052f3af9d1580defde70fe1ea4ee9e3c117847249b270cb8928a63282d4be34ece1aa29b8230fe42393329f56b5286526f168097d184efcec SHA512 e492c5a9289700330e964a9b42da9002f1b992ed197a9aea54f188188264e8dc2047a3005c9724769ff5e845d5b9db31d622981e016284523fc65dec6a3c04bf
 AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
+AUX serf-1.3.9-libressl.patch 394 BLAKE2B aa1a15b09b64c55d52e87df9f9a069f0d8ae3be3dc399431d3429bf0a174e2df5151ba2f03eb47f8e8a6771a1c2581d29643f1a630efc385485a69aa937d33e8 SHA512 fc547b040a4e10243ab4dc7d8873e8197861c07b4442aeda939aa27ed963432402bd55d2895b86c5156638d9425dd6a5457b081e9d3c02283f9fc640579f181c
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
@@ -10,5 +11,6 @@ DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2a
 EBUILD serf-1.3.8-r1.ebuild 2069 BLAKE2B 65a5e2ff2eed6eec0119275ba9547ff4b7a3ce78dca38374e45a8c060f2ff265e0cf7afb504a3c26476866b6579d597785a919905b593aa04685299f91c412fe SHA512 363a3430963cc39cf7f88575c401186d83be1c92b226d2e1356d84c3ad60ce3624ec78c398f99144d67cc26736705b9028b1cbccfde0e8d005dbba4c6a481a89
 EBUILD serf-1.3.8.ebuild 1456 BLAKE2B 17382c17f6e9cfd9c86a7439b4bfb809044cc109e3cea1e9c0f072ba30fb5997edbcee40b46e55784feed6efca4d169329baec3ef9321e7f24cf0228c4427953 SHA512 a06af1e5c87bd64727f309b0d85ae7676b64d0847c0cca44a2389448cd092350f559e67b213cef130e72b38b0425ee0e4a297f717832f9e132e1213adc80ca33
 EBUILD serf-1.3.9-r1.ebuild 2054 BLAKE2B 6f7d698e7e77eda30d0725d1ac55662ef69262e4d2599e2b74a867911c6b24deb29dce5a82eb75d53a2e8be52c62c0e03ef09ff40d27a1f3808a7a9aac8e9cac SHA512 ca6e8e60e6c587e35fdeffe0d231db79354f929b79953633cc4348d1b16fb3f4dacf5f5ce49ce6f19f31d8e87b4a112dcd56e9ea53e66ce6a2c5288352bdd334
+EBUILD serf-1.3.9-r2.ebuild 2104 BLAKE2B 7a2161b1bc1ebaa27837e2285c9d8c0e89e4d7f836d1e03141b16914941210450e6d620b0e80ed21f9cb53796b2e07e3cd6ef41c9f872b9d475880317fcf217f SHA512 0ab048246a075b326d8d56db9bba3aaf75ea6f34712e25bb6e7013103e261fb8c6a5ab57279e2f80a963e7c7f4d351841e8d7e805f53279e77e491dcb60df7ad
 EBUILD serf-1.3.9.ebuild 2071 BLAKE2B 706481c2dd5e1f3150d04cb55bf33396010cbe9980480497fcbf5eb484cda2d06a6da58ce5d17a18587a7cf23c904e34f8d05217dbf827c7bc5ac6bd14d68077 SHA512 c05e6f9d6eb392836c80d553b3d56fd7e4b3b2df09b3365c2be48a4eefcd25ddad389b19aad6e8b82867bc796890240acfa081a1c581f75c3b6430fb8aaf4699
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch
new file mode 100644
index 000000000000..fe9319fffa86
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-libressl.patch
@@ -0,0 +1,13 @@
+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
+index b01e535..6fadb0c 100644
+--- a/buckets/ssl_buckets.c
++++ b/buckets/ssl_buckets.c
+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+         }
+ #endif
+ 
+-#ifdef USE_OPENSSL_1_1_API
++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
+         OPENSSL_malloc_init();
+ #else
+         CRYPTO_malloc_init();
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
new file mode 100644
index 000000000000..646928a7b050
--- /dev/null
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="https://serf.apache.org/"
+SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="kerberos static-libs libressl"
+RESTRICT="test"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/apr-util:1=
+	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-2.3.0"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch
+	"${FILESDIR}"/${PN}-1.3.8-openssl.patch
+	"${FILESDIR}"/${PN}-1.3.9-python3.patch
+	"${FILESDIR}"/${PN}-1.3.9-python3_byte.patch
+	"${FILESDIR}"/${PN}-1.3.9-libressl.patch )
+
+src_prepare() {
+	default
+
+	# https://code.google.com/p/serf/issues/detail?id=133
+	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+
+	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
+}
+
+src_compile() {
+	myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		# These config scripts are sent through a shell with an empty env
+		# which breaks the SYSROOT usage in them.  Set the vars inline to
+		# avoid that.
+		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
+		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
+		BUILD_STATIC=$(usex static-libs)
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+	)
+
+	if use kerberos; then
+		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
+	fi
+
+	escons "${myesconsargs[@]}"
+}
+
+src_test() {
+	escons check
+}
+
+src_install() {
+	escons install --install-sandbox="${D}"
+}
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 1be6a552804b..1eb9acc51d3f 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -4,6 +4,6 @@ DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
 EBUILD srt-1.3.2-r1.ebuild 1134 BLAKE2B 2d404965078d1e53c5ca23d9b6d864ea3937948fdfd60fa9f997b137235924ee413666fbcaf3c3d7f6c26060ac3fbdb743737f27d8423af3f8a96d754b609619 SHA512 4f9acfd1628531a3f3445498e0c01e1fd7625bdcfe054c41d81e4ce4719e1c6fd2f014a6c21a562a71a14b28db10bfb09094449d1bcfc8192ff61c887bcafaf2
 EBUILD srt-1.4.0-r1.ebuild 1146 BLAKE2B 8a932e5bfcea685d4cc80c8c845ed734552be15cdc433fc2abff80624fa384186965c7f77cb877529cf6c2be325ff23c35164ccfbec7743e59162981f2d7bc70 SHA512 a9db72f8162529b48fc64fbf67f86fdfeb153c74b2e3dd97699ba0ab0aaee65da8a99bfc5d7ce20b50b101c934a20648572f6ee2d9110f743622b66063b7011a
-EBUILD srt-1.4.1-r1.ebuild 1146 BLAKE2B 8a932e5bfcea685d4cc80c8c845ed734552be15cdc433fc2abff80624fa384186965c7f77cb877529cf6c2be325ff23c35164ccfbec7743e59162981f2d7bc70 SHA512 a9db72f8162529b48fc64fbf67f86fdfeb153c74b2e3dd97699ba0ab0aaee65da8a99bfc5d7ce20b50b101c934a20648572f6ee2d9110f743622b66063b7011a
+EBUILD srt-1.4.1-r1.ebuild 1140 BLAKE2B 643b796689df72bfcf0204f9d2d2d6188af0e41930694195077732029b509cd38be328e1ff06c275cf97f565173a1f3c131d53aeba0d1d0c3e1ce2e734914cb7 SHA512 fa989a6e99cd15746d51b9043038f0cf1c7b0623d0e51aeb3a6e1b94302267902c9b8b72991d30dd1299f33ed26aff68dc7787ca99b20d30e9845aa7dd7cd137
 EBUILD srt-9999.ebuild 1233 BLAKE2B 16dd649f1be2cd66e8890a31a745607a8dda568c8f3fce6901fb67011dc3760a60dd1843e14b99364b89112233e7ba670e2b981462113cbc70b2715566fed813 SHA512 f8a0cd2696a8b99e7ca375c151e98d69a35c93847cbd7f08b7a7e6ee581419820962b6d5af4fea1efe636c037bade749fb4ad079990dfaeebde820eceb12cad6
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.4.1-r1.ebuild b/net-libs/srt/srt-1.4.1-r1.ebuild
index 6ae97e60aff7..e426154810a7 100644
--- a/net-libs/srt/srt-1.4.1-r1.ebuild
+++ b/net-libs/srt/srt-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index 73b4575827fe..473fb5589c3e 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-logger-qt-17.09.0.tar.xz 93480 BLAKE2B f516ff58b64a59ba3b51c0daf0c871fd0e03b7860fa94f2139175cccb3e5ff4f108b09db22366bdc2e4031556ab06712d1d935b8db7b1ed9b08803f047c943c3 SHA512 1524673a7dcba0d65c57e49d6e0dafd1b826b6444faaabc1dc482b29f6515374a1beb09a9bbfb115097e10fc18722ffe0187dc1bff9be06dc56a95ef32d805e3
-EBUILD telepathy-logger-qt-17.09.0.ebuild 726 BLAKE2B e038a41a4ec353b148324fe0b6331551bccad2555ff9ef930fdc225dea93adf4bcba047da3e66b8f6ac32500044321f933a810f5ce197ebdb7759b025192572c SHA512 7157f2bb8a40054784e19d275924100a623e01e20c9247a025ffe8c156c1590641e3d8ce96984ea7f032665d3f8235ed606f93c3e04f993b2f6309afed47345a
+EBUILD telepathy-logger-qt-17.09.0.ebuild 732 BLAKE2B eba5b05710b784329890daec558e66b74a910a0c84fa8fc7689178fd3d46c276c5f18f751c04394ebf955f2eb978d4d9cdaba84bacae132cc5025db6217bc204 SHA512 b920e128e48bd6d7e5410e02c370503e60478be43c44e16f7639c2f44050e169d12624de0d8b11b4f324670c9baa7b57da37265b32fb9a843b93e8257f2194c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
index ae6c2429abc0..4e35bad1f858 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
@@ -8,7 +8,7 @@ QTMIN=5.12.3
 inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Qt bindings for the Telepathy logger"
-HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
+HOMEPAGE="https://invent.kde.org/network/telepathy-logger-qt"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz"
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index a8d09b43ed41..6d846a9e20cd 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -3,9 +3,11 @@ DIST wandio-4.0.0.tar.gz 385706 BLAKE2B 7f6e7855a06ae2c23138598c5cf16c9a38f57932
 DIST wandio-4.1.2.tar.gz 409755 BLAKE2B 90bf4cf9bdd6cdd87668614c91bbd5fd8dc7c526a8e985737d1dced760209be205052221ebfe9ebf92b7c05492298da275498aee1e3817d73235488da9ee2cc1 SHA512 0d74aec9fe2faf678d369fec420f56ae78eedc5f38b70b403034fb030a9c0d1d5a54225b111993ce59b79d8e02ad49a2b0ca4697c7910149f2ae54379d9e19c4
 DIST wandio-4.2.0.tar.gz 410273 BLAKE2B f133e783f6f47a6d55058684b4965d02816a0fe835bcce274292287492e53007ebfce3b447d6ac9f58d8d4626ba20b7b6a7e5e6ac3cc054ef49d70c843c0216f SHA512 befbca1479b32cca909c6125e54be0a061d1fecfc01d9bca7cbd54f86564d39a02714805c7583d9b50896bb553a197e0f86fd10d4424782f5e9798a0cb440923
 DIST wandio-4.2.1.tar.gz 15417543 BLAKE2B 704ed3846cda3755ad305bdb84febed75ba1f044d0380465041cab9f44dc16c1a7fc8bb5a8d4292d5f6c12d6783af45d93bdce70228afc5438bbe7d6f5714491 SHA512 eab9180e477f63e37b11d090b772037fc319554495e6f3656da66e34dcde25f47566e87b71255645d9bb5aaaff721f0dceace4d880cdca491c05a9de6852553b
+DIST wandio-4.2.3_p1.tar.gz 15418423 BLAKE2B 1274f10b87964e2dc87ed25a465991b1e4e9211b75fb5ac5a13a0aa535ff30ddfa69059b3d41de7dc758220bda8dd9d02ca7ed31b7c0ca2997641968cc729e48 SHA512 b4bfff9d33010c04826318c560592ee7f7aba9fccd0eba0f29c6294a636971bf4ac5105ffb9addfc22946e7b7234396dafa6c7e0a0d8de3ee1b7e586c069b438
 EBUILD wandio-1.0.5.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.0.0.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.1.2.ebuild 760 BLAKE2B 0882091040df94b87a0fd6fcd299ba996706dd57e69c6ba1f1661a77bd9f919e0d5cac8aded697073d79a3516f5937973467ae389b6c06c9939627728c81e8f8 SHA512 32a42584bf5d8a5366d51b24e8bc0a204ff94b9918dc13daaeb4fd33c729eae676b283eccca967cfe05bf16d5a34aed8b9af8728ca024c0d3525f992d8abbe22
 EBUILD wandio-4.2.0.ebuild 760 BLAKE2B ce10f3f5b9892f8d4559340d7bd658f6c81eb8386ac44cec033c92690b23e5aa7ba148cc3a17057ab0e80e1218639e2887886046a8aba22791e02cabccfac902 SHA512 2d65bb7cbf03be4bf7555d2f4af1f01d6c51e69b3fced3574604f90d695fe91b1d8f5ae05a990b8189d8b4d1b60bd4d6ade4e61c29de07a4aeb794c4f2e07d95
 EBUILD wandio-4.2.1.ebuild 939 BLAKE2B 5b655173042829fb5466eef3fb5517758e84674243b6f0c0bc3a4df8d183b251df5a8ec10f61f8f3050d6bd81dabab36f8733fda4ad3e8452c7e5fbfe48c8cb5 SHA512 428e577429bb6a3fdbcd569d003ad27828b384163097e2d1cd0a7f0e3e3dd5826529915b78c322be4d7e14b6b5aa2e8ed5b8bae709100c3478e2d46cb9b78870
+EBUILD wandio-4.2.3_p1-r1.ebuild 1037 BLAKE2B 635c179b9a94ab256124bb8a74322bd5eddb71d9147630248167c075ed104175ab24d46ac5be1ae0e1a34fd0020f7fef4aa6be4eee0ed90613167dd06bdeca8f SHA512 4ed8ff8a8e3259d85c4fecfbb8f9bd85881d845c35ef2f11249aa69f7d41e231836f18e66e78615a3166a38345637b0c063cece2468dac42a75954cf56f19e05
 MISC metadata.xml 325 BLAKE2B 83c3a11757f54887d9fa3ed48c2a9c5a5ababc6070875778a26157b04624c6411d406f810a1c9c02bdc6355675e41a130cb21cfd987aea39e1d2aac8d23c2895 SHA512 f6baf388df040729e65cf7b578f13650917d22989b89ba4adeaeba332fdc78fc8f3661fc37c238a495c75f4cc601c2642f13e2660e73b6e36da8db39dacb052a
diff --git a/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild b/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
new file mode 100644
index 000000000000..e0d614fcb241
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="C library for simple and efficient file IO"
+HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
+SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( app-arch/lzop )
+"
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with bzip2) \
+		$(use_with http) \
+		$(use_with lzma) \
+		$(use_with lzo) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	pushd test || die
+	sh do-basic-tests.sh
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 422209267314..0e623388230e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -9,10 +9,8 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
-DIST webkitgtk-2.28.1.tar.xz 21427628 BLAKE2B 58f19d68598ed1aee58f9f700c84e76c9c58980e39d7fe1883c3be991f575074db3156b9a7a041bb3d59130d87d37b1bdee9cf6c122c4f0b0ba6637d66534c32 SHA512 30cfe63d202673d1f0b0ab32e062eab225e51b993d9bb0f51c02d0497423e1591b5a2e943c30d1c9ee6d9073dfbd13b8ec24bca94f380fe8886019e8185628b8
 DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
 EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
 EBUILD webkit-gtk-2.26.4-r1.ebuild 8749 BLAKE2B f470ee46cd08ca1a210ac35c0dbbc7c8df2b62ba2cdd775a903c3d7289df8b556259c3b4456d4612efcd3e5ec6fa8d31b03221fbe1d9af4faf9bd7b283797435 SHA512 1e589c989cd9badd30b113550cd7d984b8e4a7da122c15c4df9c0e57de2076ea14ab3f4887981aaa43003c3a9960374f396b0ff5e920266ce724dc01179f1ae5
-EBUILD webkit-gtk-2.28.1.ebuild 8734 BLAKE2B e45a6631cb74a277f24c997b3076553735724ad3e3175a4a5c0d05049f7fc23faaa098866d5ff131ca5cd6444acad3f8fc8ef2166c54ad6058f5751692ea808c SHA512 f649ad4de4fa66baf48de88fd422b477050e90a69ebde01ede9e43a8d073fcd85151a1efc0b61e3e492a24cfc68c328bea40fce342143555dfc03c1fe67b6811
-EBUILD webkit-gtk-2.28.2.ebuild 9143 BLAKE2B 269c31e7fd6834128f1e789c94dc76141ff0ed37a2343e9269abe83f3d4abb28df5ab8ec897c77ebfc8fb91d564c2f8f2587b0486ff2e23074130893eef012a8 SHA512 acef484348d85c05ba25def22036a3692cb4adb9142825e055466fe243d2e624f3f1b899a6f5bd2b0fae893c2adfaf902f3e5f66d4cfc0a7f890ef3eaed03e2a
+EBUILD webkit-gtk-2.28.2.ebuild 9142 BLAKE2B 9a8478488a0bbf4c7247ecefdddd7454789bfeafd3e86b38f53ba49131ecdf7fffd4d6ad4a5ddbf6377d684152dd85a86b5f72ce246caf50cf8c66b2e26f4842 SHA512 3cd9026118609768b8584137bbf4ee47c8e60f1d678df653d7985e336d530af5767af819e34a5663ee4ee4d0fd9cdddc989489f217e469e92780ca3ded8b1e56
 MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
deleted file mode 100644
index 4780125bbb3f..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
-
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index 20fa81b568f9..bfb9e1492a69 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 1a34bf7d647a..0340e38c00ad 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -7,8 +7,10 @@ AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 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.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.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.1.ebuild b/net-libs/xrootd/xrootd-4.12.1.ebuild
new file mode 100644
index 000000000000..6acdc5a472ee
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.12.1.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
+}