gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-libs
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
189 files changed, 3052 insertions, 3012 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 17026c16f27d..8188f45880a1 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/biblesync/Manifest b/net-libs/biblesync/Manifest
index d0f8ac12c1e1..3862d93181d8 100644
--- a/net-libs/biblesync/Manifest
+++ b/net-libs/biblesync/Manifest
@@ -1,5 +1,7 @@
 DIST biblesync-1.1.2.tar.gz 86620 BLAKE2B 05ae9aa155a7cfd277e1f1a172ae3551c51a34cf09c7acae0821f08146179f4726173b8a26d4bac1a82aebab89f4ac105a73f7ef2a2d36b7939fe73d4e0749e1 SHA512 7725c8228e2dff79edaf065ff4d4816a6cf214d1d874817345cc4154142144bce479ca1ae871053886bff4f6610715a27bce81c25c2a636444d5873e93bfdc62
 DIST biblesync-2.0.1.tar.gz 89139 BLAKE2B 065b65d3f1f288b8a5160b5feff56f152db47eb5c03596c192b904f384e11e24a3846cc6b154d351400c6e252188f126d37281278acfbd8b47321cfc25e1b0f3 SHA512 92c86a503dbcc22542e6f15d5fe1b5c282f209b9d4208e82bcf5207b05ed7ca33b6223a496f50108d7c28eab6e14ee14a37ccada6d0b08315ea31c0aeeae2508
-EBUILD biblesync-1.1.2-r2.ebuild 584 BLAKE2B 3edb83280b94cd85dd377f53c2ba1a66af5ff84752ecf9abf15e9cffa2d8d61d97a3502fa645ed6d6b22ffadbff7090fecb6cb150afbaa07006e64e89ddff9db SHA512 ee210ca9e0f08ebce37d4b22e6f5018c34852dc451929582a04da1cc654604e0c0bbac8594a4d37f8502822a0f57ebb9d296d436d912a2ca6c8307dce8d08c2d
-EBUILD biblesync-2.0.1.ebuild 605 BLAKE2B de8ffb3cc278a7ad608ee78e1065e2cb3712b36029f62880e7c79bd6bd48c8babf811332fdf6feb6e7ee590075bf3ea6feb557f2640f18fadb05f108e695e595 SHA512 6a88528b892867a8cd17b95e67e57cb933240ddd0675dfd1bafa0d1816602548fefd88184fff8d8e07af05d16491d8944f6c5c4c0c6fd99e8bce44ec839de016
-MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
+DIST biblesync-2.1.0.tar.gz 87868 BLAKE2B 2a136e4840f6f3cb3f03aa127adc978f9f5f189d48be198e4cb5b0ec654ae4a28f3fac30a10640d6fd2b1c3555c6bd88527e51e34287424f953cd599c5915521 SHA512 c6637954c0d9cbe9ba03048d92288d52c3675eaa9770749690222bd76d45ec7f138d67a4e416c33dbf9864f623f919f117aea58b1bb35feed8bcf59daad94e8e
+EBUILD biblesync-1.1.2-r2.ebuild 610 BLAKE2B 5018274824eab67f8d066c05dc4964d54b0c3f1813bd43bfc645ec517c0ea0b0105165b1c92ee6be321b016a2c6bb779884eb6de0e4c74c09bab36395bb41b80 SHA512 d2d451f5b0014e29a80eb719bdb74ac092280c951fed07280da64160e5b0ff76449da8bad649f09a049f5a35379fb1c548287a43660bdd779fc62f6f04aeced1
+EBUILD biblesync-2.0.1.ebuild 595 BLAKE2B 0b483df4320c0cf251f29e20e8fe02a6a03ba133bf0f4b72935f267e9f03d6f9522c6eaf730d41c564550784955e6d1a2658af82a4a2039562f692c2786dbd3f SHA512 23a66d4acb098cd6d1605ff42685c196364d30852276e85bd877ef632246d43b59437adbd95f67f8b4c99665ae21470e6f88147b0ace2cb346e969b2242e5a7f
+EBUILD biblesync-2.1.0.ebuild 598 BLAKE2B 10f0f44a976f9390c7bc300467611f3cf902e2e809de31284432587f1558798791017f48dc813af1a1c76eb9a57c91e6f3b82100c68f91bf0e04cb8c017c11a1 SHA512 8c41e055267a6dcccd1cfe0941f8122cf81ceb2e2f4bf689192f795e550844646373b01ba933171de0d14484f4efdad3b0561c06e84e4f36a16bafbe592f2d36
+MISC metadata.xml 446 BLAKE2B 3518b88c0fd0f6318378d06fec9b17effe4345e097663847dec7aeabcb5bbe3c50e61c2120c20751eaae84b0fd0f45ea166be5143091f9c6e757504bf9ed6e69 SHA512 1290c95a6b91a71efcf56c8d70b4d5ea5948930e5e5ed6a8adf146f314c6b5e01f202485509d9bf7120431d9550844219e37be39b45d4bec853a78baa4ec8db6
diff --git a/net-libs/biblesync/biblesync-1.1.2-r2.ebuild b/net-libs/biblesync/biblesync-1.1.2-r2.ebuild
index 37d99d0fc627..88b12f465aaf 100644
--- a/net-libs/biblesync/biblesync-1.1.2-r2.ebuild
+++ b/net-libs/biblesync/biblesync-1.1.2-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
-HOMEPAGE="http://www.crosswire.org/wiki/BibleSync"
-SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+HOMEPAGE="https://wiki.crosswire.org/BibleSync"
+SRC_URI="https://github.com/karlkleinpaste/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/net-libs/biblesync/biblesync-2.0.1.ebuild b/net-libs/biblesync/biblesync-2.0.1.ebuild
index 9fae6d0f3c52..4dea0979995d 100644
--- a/net-libs/biblesync/biblesync-2.0.1.ebuild
+++ b/net-libs/biblesync/biblesync-2.0.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
-HOMEPAGE="http://www.crosswire.org/wiki/BibleSync"
-SRC_URI="https://github.com/karlkleinpaste/biblesync/releases/download/${PV}/${P}.tar.gz"
+HOMEPAGE="https://wiki.crosswire.org/BibleSync"
+SRC_URI="https://github.com/karlkleinpaste/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/net-libs/biblesync/biblesync-2.1.0.ebuild b/net-libs/biblesync/biblesync-2.1.0.ebuild
new file mode 100644
index 000000000000..b77fac3247e4
--- /dev/null
+++ b/net-libs/biblesync/biblesync-2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
+HOMEPAGE="https://wiki.crosswire.org/BibleSync"
+SRC_URI="https://github.com/karlkleinpaste/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static)
+		# To prevent multilib-strict violations
+		-DLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml
index 139d2b70ed62..d7dc3044bc9b 100644
--- a/net-libs/biblesync/metadata.xml
+++ b/net-libs/biblesync/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>theology@gentoo.org</email>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">gnomesword</remote-id>
+		<remote-id type="github">karlkleinpaste/biblesync</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index 7d1ba1b4ed15..8417feacd95a 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -3,5 +3,5 @@ AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428
 DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B 80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3 SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
 DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
 EBUILD cppzmq-0_pre150606.ebuild 664 BLAKE2B a782f9142c209224fde2b68505866e0901e7bed600cd0df3ff572aafd88b31b2aab08c9bc30ad2653d3ca1d61d56dc2b0912a85032370eadb48636b1502ce6d4 SHA512 9cc680f474dd763f3718d2d72d59f58215b8e058b7899fb3be2eb6bba79c05c5255f401407c1e97ac91a5bcb2ba7c7ee9ec5bd056a36b12993588f8f815445cc
-EBUILD cppzmq-4.6.0.ebuild 1019 BLAKE2B 1c212681016612e6f1376e7230fe76b7c4280a8b6f44ab89b9f66caeddfe045ad720c9ada41ab20314d06f6dcd123edcc0979a033a97f76bd37e4fcb06d8a860 SHA512 2f261e7c753a5b94767af3cbc411b641aede86b5b591c3a24e35c0f9fde858e49b69b941a8b913085979858c5ab901921ab97c2dd8ccf29bfc04011d8e2e9308
+EBUILD cppzmq-4.6.0.ebuild 1026 BLAKE2B 41388d982063f2ec061420edc3ca1e819881f3ce0cc6f46aa48e1d72cfc05519dc669c381c83374f1606a3e82d230293b7162a3e0e61904bbc435040cb55420c SHA512 8b815fe13b5835b9286c799b842bf669e7e75e4a128fdc158a79b7fdec9a80801c1bfbbebb35df6da8d360362d2d1aac4e0e9954757c7783259ad670ffdd8c5b
 MISC metadata.xml 341 BLAKE2B cebd14f5acb08924cfe8941e5ca4c5ff7894e2d52e5f8dbb9a9d648681b6dc7b68b6949e19497fdf34af84eff780e8b52e282d4b5eb48bc110e18f5538eee84c SHA512 20bc14d462ee04fe3bce142640dacf724ff8970bb23e71f97bad89a2837cd0184d77304f34faa8780436c1824d458433d4b0ad644150234d7b11be094963131b
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index a9d24c470685..9929c655b614 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 769dd980e819..9abc3bb24aaf 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -4,5 +4,5 @@ DIST czmq-3.0.2.tar.gz 818110 BLAKE2B da6da496f50374cdd7daf7978529baa1e1d3fbe51a
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
 EBUILD czmq-2.2.0-r2.ebuild 851 BLAKE2B 9c1d2e55956627e066c785d2a053c47b51a9978db6c1ba62b39b37cd94895d178f40f1b6457a0e911a58d5e76073e3030b7ca8773f010fbcb1d03d9026ea03aa SHA512 6205a1ad6bed9903a6c9f4702776cd71a7f2f61e8d27dd720f6f6fa731ed2119bcf7d73c053484c636b980f0037dd797a95bd2b71e1b8d7812b2ca3ffbc77d1e
 EBUILD czmq-3.0.2-r1.ebuild 1079 BLAKE2B 8127f13ec7c13caa5e8705036c5d504c7fe79c5871e6c588808f643d51ef42adc00440be0ef67d1ecc82df58afb655ecd054bb1eafcd2b81cd8a840860037518 SHA512 a2309b95dbbe8469bef2042bfde990e9df4ef6597158029be92f05880c23df6b5eb3c14b0dd252e1c16245b7b72760b2c32511b3df53227a9e6a567434384478
-EBUILD czmq-4.2.0.ebuild 1188 BLAKE2B 057ea78c656cfc4f6119a730a6ae52c317a2603c6656aaffb6e13f2ca338b11aabcb4de0adc38d435480b8640a39748e63601ca1232150d61d3f0c23e8267138 SHA512 8d6bc7d641b5cefd1f6d09b74d37e5b46b78df5e23bf5dc1ee6b06c1ba0522fcb5b2abd76dd041f16ffb75fff680f649bd9063c8b7ecaaa9ebef506d209369d1
-MISC metadata.xml 762 BLAKE2B 70c22120197d94a5d2530f89e677c7ea6cd26a7615bbfd5128ad57ec2f2d09aeb118dbf65870f0c50315f4a71cfe5e0c541fd00dc6a30d914ea0adacb608354d SHA512 6d3c401c144f61c7cfb45cdf9badc09b0af97f70f58d151825623b4ab2ad90df8e9cb9438901a9287f0a969090995a5c6302143540502a03a11a319931ad5ebd
+EBUILD czmq-4.2.0.ebuild 1186 BLAKE2B 6e116ec87c3df5fcf83af5acd1043f3d3e331235522e786db3558c68da63176a74f6249f6c66fad8d4900d92797c29fc266e4d172b946878c6994b126f0ffdce SHA512 d685be15cf56a07ab34674adec08bc0bbadfbb118b281a25593b06810938b350aac30e2eb7b654f5431115b636a73c7fb3f8ef300971fc7df5246535bac8faad
+MISC metadata.xml 685 BLAKE2B df8cf761a5f66beb5270526eb6494146b13730418bcfed63cf9f1e8c63ff5442b1c8c0556678a737d153729258bb1b79dfd910ac7e42ebd2f3f3d52ac40279ef SHA512 5711249c075704615125fb9208883beb4907a6a0e4fef865ef948ad6925399aae34efe03aa61f68d30a561fa12ebfb2f14795ce281defd597a164629e62451fc
diff --git a/net-libs/czmq/czmq-4.2.0.ebuild b/net-libs/czmq/czmq-4.2.0.ebuild
index 7c773f64fef2..9ae6087d185f 100644
--- a/net-libs/czmq/czmq-4.2.0.ebuild
+++ b/net-libs/czmq/czmq-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 hppa x86"
+KEYWORDS="amd64 arm ~arm64 hppa x86"
 IUSE="curl drafts http-client http-server lz4 static-libs systemd +uuid"
 
 BDEPEND="app-text/asciidoc
diff --git a/net-libs/czmq/metadata.xml b/net-libs/czmq/metadata.xml
index b25aa418bfb6..36dbc054dc47 100644
--- a/net-libs/czmq/metadata.xml
+++ b/net-libs/czmq/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="drafts">
 			Build draft API, which may change at any time without any
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index b22789c778ee..f4202af5a9cb 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,9 +1,5 @@
-DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
-DIST glib-networking-2.62.3.tar.xz 183996 BLAKE2B 3841a355fe485f30970ab571fbe7ae73c8351cdcdad5021809fcac4663bca31b309a0921d07b2551c428ac154da2290e377da0299e66b2b099dfb556f387d18b SHA512 6bcf7584a4d97745e980598eb9182ba2e416471455d9c3debc4cbaea07250e395f6d7001af544ce0114a26d726e71e9b420d9756508cda09499016e89f4a6da1
 DIST glib-networking-2.62.4.tar.xz 186004 BLAKE2B 0fbf41cc916a76d23382eb6ae84316e5328c682c4e440f304a978be897f81778e96a201a19dfdc4bd912c144d4013b4cb6344a2a0031fc2898f4af31ef0b43fa SHA512 cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a
 DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fba9d77a7057cc60ffc7bada0f55a7eff0bcc2388e8298792636c77252b9494a6a7d36bcfd227bdfbbf66e5d45cf77dfc1bb SHA512 01251f7f95d1c331e883d5ee7857bad0c0d6308991e437ff54ed63e718bb30a12e872755e0611e2bf6ccb2a01c52ba865fe0d94ac69dbab37d74afe063a0590d
-EBUILD glib-networking-2.60.4.ebuild 1740 BLAKE2B d65dee0b496a05fe5b2bd03832b468ee32d231bd52d3da7fc7edf4f1ac719ccb4c8b6a8c56bfae26da440183b811cf543063a48445cacaada5215b6aecf324c4 SHA512 69ac85ff2d13946cca07d72f7f11e882392e849dddd93a5742d60cb4a01db852cb47764a739a0865a6cafa9c313cc9ea1e4d6d19f137a6da104ae16ab0ca3b18
-EBUILD glib-networking-2.62.3.ebuild 1741 BLAKE2B 865829aa214cc59e38f8e4d97cdbee37451a5bf3498069a84a19455ea15c6a73cc5121fb58fc758b33891790becad8ac34e942974782132440822c1f6a4edd1b SHA512 b82e1d1e698d0ac5fec5ab569622dcf0fc63431fe8cd4167675f90ca82591b44f4277509e4bb59e6b8e645e4151bb51647666e442a303f6d7b112332f194de15
 EBUILD glib-networking-2.62.4.ebuild 1740 BLAKE2B ac40d8d2c90eb77fda52322bdf85449b5329f65bbac4f87330e1370eceb03bc0418a810deb32b86b816d3c31f32dab1a09f1d9521edfa4c74202d9dc4ee19deb SHA512 a7f8feaf0c269a4f4093da2d51f866199aad8ec5487ce6eb4b340674d26f7aaaf2db737faa7635e343a2e253b2b22f63b641e2505d603c784d8780df3fab9d44
-EBUILD glib-networking-2.64.3.ebuild 1749 BLAKE2B 1d4bd3b903527d8e6037faa1f3d1bfdc9d2b7a03e0e5752e3c13edadb70399b02c5a4bd4d66cd737704a5fb3cce87f7e80fb05d16321879389f1266cf8b8e4eb SHA512 ff8885a83761acb80e6089af3c85b29b5dcdd5c9dca0b1e5a7c8c71d7298c6d67d3aa772ab80eeae4f3bb2b0a57a90aa892f367e9a215831c2e04a7ac751f649
+EBUILD glib-networking-2.64.3.ebuild 1747 BLAKE2B aec83ed68210d0ee8db1d40489de6a1831e820387c46df0b0089ef3465cdee0c10ff2e1c1191a6d71dbbc9578d8c39b81269dded48aa0cb4ff35adf735099ea9 SHA512 d6902a8ed81ca0db91bdd36195a8a79b10b1e8a0f6984261f393aa36bad924baa4c25881ecb5089660c0f5dcccb158b2d8adcaa1232f69895869f499506ba344
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.60.4.ebuild b/net-libs/glib-networking/glib-networking-2.60.4.ebuild
deleted file mode 100644
index 3755ec84df2b..000000000000
--- a/net-libs/glib-networking/glib-networking-2.60.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson multilib-minimal xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}]
-	ssl? ( app-misc/ca-certificates )
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dgnutls=enabled
-		-Dopenssl=disabled
-		$(meson_feature libproxy)
-		$(meson_feature gnome gnome_proxy)
-		-Dinstalled_tests=false
-		-Dstatic_modules=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.62.3.ebuild b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
deleted file mode 100644
index 1bc616f05a71..000000000000
--- a/net-libs/glib-networking/glib-networking-2.62.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson multilib-minimal xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}]
-	ssl? ( app-misc/ca-certificates )
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dgnutls=enabled
-		-Dopenssl=disabled
-		$(meson_feature libproxy)
-		$(meson_feature gnome gnome_proxy)
-		-Dinstalled_tests=false
-		-Dstatic_modules=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.64.3.ebuild b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
index 133f9d9bc174..6db91129b7e7 100644
--- a/net-libs/glib-networking/glib-networking-2.64.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index d44be142cf5e..c120a2aad616 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-online-accounts-3.34.1.tar.xz 856288 BLAKE2B 99a6c242dd57acf009a2b4451287fff5bbc61b0aeb0396b13368b179d1b1604b413ff9dcb56bf4415c990cb4f2cb434a0fcf17b9381dcb5055a99985249af5d4 SHA512 233f1b15d4a7bdbee4ed85ba252ea0d9af2ac15a2edd3ce2b40d76434285fd093f07375313a599fa191f8df1551eb37f48c4784e389fcbaec0565bb3aba28426
-EBUILD gnome-online-accounts-3.34.1.ebuild 2059 BLAKE2B 89b20e5a0a5e155059747182e96b77b08ca73c06eb53808e7abce7de260314a1e99d5669f15b50e9d85814d0cba43a705b194f665f8ac871ff2eda51489e7dcc SHA512 580da9db2dd08cdc04e925d16a64463feb7f177b32cb5d3ff6bceaaa607e42264e6f8f04f36745ed8ee39a5376f1938d390a7766f9afc82d28b036cf4bb156c5
+DIST gnome-online-accounts-3.36.0.tar.xz 860472 BLAKE2B 921f2f5ed9ac3db07046507723d814fc41579aee76cd2437673cdc3612db1077627ab47586e719b56a5bce25afe75b8028477f69745791eeb774c82bf854863d SHA512 2d04ea016c1bace9a2cb6ef7a6539c7f878cfa9b309394b18ed692ef1b9b73bf5f93a3f9edcb74170f1be4823a5c9ac6cde3b4e7245906e1b4e130d33eeb1c81
+EBUILD gnome-online-accounts-3.34.1.ebuild 2047 BLAKE2B 793d38be2462edcac5bee0d9476cd21950a55a84feb681ebaf24ae9dedf1e886f42062a67eab7658abe74c9cca47f572b5df381ed8f90cf80f4367441f827524 SHA512 c8e1dd15ab4ee65accea210745fe2142ff3e23c2eba5c01988fd3d6f581e06b7eb89d14c393e88d053595d30b1c735cc3ec29c8a59044c18cca14d3af2dd130d
+EBUILD gnome-online-accounts-3.36.0.ebuild 2003 BLAKE2B 66023e42a0eff2a9b6230b2f15c6c594cdd9af69765da2c6ed35bbe9e72f58932b98d22bebb6e75f76e0a52288a87ae4a860da1a95a5e1304c333b12eb9da102 SHA512 7285b2dc2a309f247fdcd24228ac6ef946d01fd2f9a9b0a66b4d05f82856a73f456a58dddc5746026f567189bd12be9b8d4084b2634f512e0f9f4bc14181918a
 MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
index 8988b05aadfa..531d37f5595c 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
new file mode 100644
index 000000000000..46f94f562491
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="debug gnome +introspection kerberos +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	>=net-libs/webkit-gtk-2.12.0:4
+	>=x11-libs/gtk+-3.19.12:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=[gtk]
+		app-crypt/mit-krb5 )
+"
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.30.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-windows-live \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable kerberos) \
+		$(use_enable kerberos fedora) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index b4f5b097f2cf..ba94c14afeed 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -3,12 +3,16 @@ AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6
 AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
 AUX gsoap-2.8.91-shared_libs.patch 6463 BLAKE2B 7d31673c56e53b146b8cc8f1ed9403a574b1a1c16aca169e1811ad822a9f389693d7e93821920366c3fe41e01ae15282a87795c68a1176de07f76e8e55c5af38 SHA512 2fc865443e6da4d9426f2b6cbded9ce0d31b47df37bed6f0a12ac715d1a4e4de4d53bc4df612275d8f42d7fcc9ad00fbdee3109ec073edd8760af4676f792d09
 AUX gsoap-2.8.93-fix-parallel-build.patch 629 BLAKE2B 051ab18a14723ee9a88ff433c60ea71dc9af44d879ea671488d7c7cfcc1dcbae1615e11d49db404f29ceee2cc8713250e6035cb04532a85927318ce5f6009ea4 SHA512 d25ca2be186eb2be0c1e3b2b99f2fb4624806b736f3754d247fe680aa79e68871d7266f46b6c9a0ccb3b564fc481ef4277f1692c94d8f031828f528b1e167caa
+DIST gsoap_2.8.105.zip 32728935 BLAKE2B 2a72080566811e65dd3fbb45af40f308ab2950edd6b142359019fdb1b3f84bd4cb13d5e5a8d8ee4ca35fb685535752bed225982fa7861be9e7872be93ab9c155 SHA512 3b7b66ef738e9ba78f0c9d5ec141faab102dc2ed7c528e84358d530ec8cb913c559438bb86ae0f22e0736c4cd9be9e74f364a44257189ccaa1e6d001317f99de
+DIST gsoap_2.8.106.zip 32740371 BLAKE2B b4904290ec5d8ebfc326bfd8d2c99e68c88cc9a07440d97ed8a442331c9f74549f75118f3e237f0796eba060b988d521c3af2bb9485d06e8277c5f18ade8cd82 SHA512 c461870fc563f848bfbdbc492cc5a26fece0d0c9a56092cb06ca3139e88c340969f23865e72187e1141a8f707f14ab6806e6a0b739b3c531161deefd6fbe510a
 DIST gsoap_2.8.84.zip 32538551 BLAKE2B cab2b75ac931ee6063af47975665f45514cb94f5514fb1f76d17ccb2e71d64d4ebd43543cc004ff7f5c49982975ebaa38e555e3bc45dbc370aae991bc7639273 SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79
 DIST gsoap_2.8.87.zip 32545316 BLAKE2B c2d0f9fafdfa9de83ea35f8dfc88e23d9d80967a2e58c30d554d539fd93056d7a8eb00ea9c928c6cf786e4888eb9f942ba4574e343de0c0104fce8b270494d6a SHA512 638bf9b2b8aca5facba518f136ad5af5bda41f2b92ee345ee6989d73223a571ce5ddab23c0b65259e9fd524039250d861defc8cfc2fc0a366a578ce3629b9ca4
 DIST gsoap_2.8.91.zip 32553307 BLAKE2B 463c2d9c2d56c2a09fa8c9ebea7fa8059ed050cff81780b04a1a47ee1f016e385e6eb338ca740a40cd0c9483b4e10cf0963d02c52d6020863ce015e2f9cf2024 SHA512 ed99f1a20fd95edc7f24cf55454ee057b8c88d2e5b5b153b61c44c57bf4d92fb65ed557e9cb9ea89e3fa8939689c0e30791cebdb91b837482ec8ec13ae281abc
 DIST gsoap_2.8.93.zip 32559296 BLAKE2B 1c27a2d99eb529715f775392a6aeed803ef03f9b703caca49e56e7b4eeb6c9bf7b801d9853fb4009ab61ec138da1c23d54dc33c2f604d73f8134121a5ea2e975 SHA512 45965d04e1c46e06803467887f62d9bea5909fa2d4c4d9ffc935f9fced014efed9169a0171a555067c89ef47b2def9983b277eecee18eb9e70d7198bc72b1ece
-EBUILD gsoap-2.8.84.ebuild 1787 BLAKE2B b884b325f98f664ffe0955f35d818b323e50f33aa961720932b1e36512b97bd7e20006fc34eefb32c7d6f7b0b3e6fe8840c97ccc101deec93099d204aeaafaaa SHA512 890dd89c7b7eafde95caa5eb6a251801ce2a441bfbf6f392ba0cf6fcf2bb0cf17108c7cc57f14c66f070f490752bc85d00cbe7932ac3a00be98634569ddf7a02
-EBUILD gsoap-2.8.87.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
-EBUILD gsoap-2.8.91.ebuild 1789 BLAKE2B 7824109745720d612b99444bd4d1ce1b83f701575fd8948e73b96ad5706ad405e21087a09477af436959e2a404ed52e38ba34e31fe21534a3642bbb569277bb2 SHA512 1738a71853f66115688a6b3f2595c50091946a0936aff86840436b4ae7f7fe2283640da51d28562132e8f1e53d68e86f2379c82340623e34527255b25ba6e3b0
-EBUILD gsoap-2.8.93.ebuild 1799 BLAKE2B f39258d986a41d16c81e9879f92e260ecb8c697c2e4ae40b5b02a3be1106f4a83735ad153b8cf29e9f5306fc76140d2dab433e23d5ab4f391b030234e9d227d3 SHA512 39929acc6b04bc18af222b5f98aae0714734907fe072ee64c6595cf0a403e220983114861b91b959d7637e784b3efea6e82e79984450b5b4eb47f5ac6ba62048
+EBUILD gsoap-2.8.105.ebuild 1627 BLAKE2B 1eb3054e14740beb611a5692ca9f7df4c6557974b2f461a9c18ba71d348cb22ee467e68b0ceda5acc911edfb7597afef9188b21330399a87b389d1a1bce42d36 SHA512 ee5a74dcbb49716a9a1b98d8a73ae619f0a95bc60e9a6d1ff28482f72cf898946244346352819cf339856abb7d455f1075ff5d533faa38212bc59e3d24bd1e69
+EBUILD gsoap-2.8.106.ebuild 1627 BLAKE2B 1eb3054e14740beb611a5692ca9f7df4c6557974b2f461a9c18ba71d348cb22ee467e68b0ceda5acc911edfb7597afef9188b21330399a87b389d1a1bce42d36 SHA512 ee5a74dcbb49716a9a1b98d8a73ae619f0a95bc60e9a6d1ff28482f72cf898946244346352819cf339856abb7d455f1075ff5d533faa38212bc59e3d24bd1e69
+EBUILD gsoap-2.8.84.ebuild 1825 BLAKE2B bf2c7a14c55decfc7eef9af69a30bbba40909d32fa73ee0ca83a239482129a349163db257c173a7c955b2e2e3cfebf20dfce83812c1699fd448b731a75cb9185 SHA512 4f17a28bc48e16ab61dae9b937b6b9bf2b2dbb1758d33c8c4a782fbd5ddc991db91b5f66c882f46a27e2a5e5c39f4af5db058191302346026b32fbd830a5a166
+EBUILD gsoap-2.8.87.ebuild 1827 BLAKE2B 7f4cf18d1a854cd877ad694cc9b5ff3573baa5c287b0e591f3b16adeb099152ac013ddb2998b141f9fa97f7eb54850540e7cb319fcee23c2e1991d56fe50222f SHA512 25eac73fb04f76367217681744d3d04514f3a9337c3bd94da4b439a4f567f44b1e7a03f2fbab7aaf9c621a43ccbe062057ea023ab4846e0845c3071d2a979777
+EBUILD gsoap-2.8.91.ebuild 1827 BLAKE2B ca3b102a1dc03bbbb3ea48983f8f968110b3ed608a5956e86273e0d2e439ad696d3b025e85305d31ac81b8751fec3a43a05de3468c6b577d49a2b411fbd0379b SHA512 904cc2944cf62a51f328f2ac9cebf178d15e5fb7f5675fd7dbc2b907efa0cc1bf440d1ebfc3f74dea1d6fdb6f3e9d1078db1623d6e590853bead70921c608238
+EBUILD gsoap-2.8.93.ebuild 1837 BLAKE2B f43f6a887b88f3cdb6a0aaeaabcdc5209846355450faaed47d50d08261e7e9386b10213a0a78ed1ce4922f561830571371661065513093c5ecee730f55d1fb03 SHA512 2ca415e9e2e4829512299de62e7bbba946f1e845bc946bf261c3605ef0f9f5ae9c7af1f3e13846a759a23acd4471185af4d8a97ea8a9f678f54ff5841af05a5b
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.105.ebuild b/net-libs/gsoap/gsoap-2.8.105.ebuild
new file mode 100644
index 000000000000..9e8722cfcbe3
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.105.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 libressl gnutls +ssl"
+
+RDEPEND="
+	sys-libs/zlib
+	gnutls? ( net-libs/gnutls )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=(
+	# Fix Pre-ISO headers
+	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+	# enable shared libs https://bugs.gentoo.org/583398
+	"${FILESDIR}/${PN}-2.8.91-shared_libs.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# Don't include xlocale.h as it got removed in >=glibc-2.26
+		--disable-xlocale
+		$(use_enable debug)
+		$(use_enable gnutls)
+		$(usex ipv6 --enable-ipv6 '')
+		$(usex ssl '' --disable-ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# yes, we also install the license-file since
+	# it contains info about how to apply the licenses
+	dodoc *.txt
+
+	docinto html
+	dodoc changelog.md
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins -r gsoap/samples/*
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r gsoap/doc/*
+	fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.106.ebuild b/net-libs/gsoap/gsoap-2.8.106.ebuild
new file mode 100644
index 000000000000..9e8722cfcbe3
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.106.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 libressl gnutls +ssl"
+
+RDEPEND="
+	sys-libs/zlib
+	gnutls? ( net-libs/gnutls )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=(
+	# Fix Pre-ISO headers
+	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+	# enable shared libs https://bugs.gentoo.org/583398
+	"${FILESDIR}/${PN}-2.8.91-shared_libs.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# Don't include xlocale.h as it got removed in >=glibc-2.26
+		--disable-xlocale
+		$(use_enable debug)
+		$(use_enable gnutls)
+		$(usex ipv6 --enable-ipv6 '')
+		$(usex ssl '' --disable-ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# yes, we also install the license-file since
+	# it contains info about how to apply the licenses
+	dodoc *.txt
+
+	docinto html
+	dodoc changelog.md
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins -r gsoap/samples/*
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r gsoap/doc/*
+	fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.84.ebuild b/net-libs/gsoap/gsoap-2.8.84.ebuild
index 4f0782b21282..c89aa1caf3a0 100644
--- a/net-libs/gsoap/gsoap-2.8.84.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.84.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
@@ -11,7 +11,7 @@ DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web service
 HOMEPAGE="http://gsoap2.sourceforge.net"
 SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
-LICENSE="GPL-2 gSOAP"
+LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
diff --git a/net-libs/gsoap/gsoap-2.8.87.ebuild b/net-libs/gsoap/gsoap-2.8.87.ebuild
index a36f6c5466c9..1c78513704c2 100644
--- a/net-libs/gsoap/gsoap-2.8.87.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.87.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
@@ -11,7 +11,7 @@ DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web service
 HOMEPAGE="http://gsoap2.sourceforge.net"
 SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
-LICENSE="GPL-2 gSOAP"
+LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
diff --git a/net-libs/gsoap/gsoap-2.8.91.ebuild b/net-libs/gsoap/gsoap-2.8.91.ebuild
index edad97594bbc..b5e3c8611a09 100644
--- a/net-libs/gsoap/gsoap-2.8.91.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.91.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
@@ -11,7 +11,7 @@ DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web service
 HOMEPAGE="http://gsoap2.sourceforge.net"
 SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
-LICENSE="GPL-2 gSOAP"
+LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
diff --git a/net-libs/gsoap/gsoap-2.8.93.ebuild b/net-libs/gsoap/gsoap-2.8.93.ebuild
index 3dd945fab441..da0b0016f209 100644
--- a/net-libs/gsoap/gsoap-2.8.93.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.93.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
@@ -11,7 +11,7 @@ DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web service
 HOMEPAGE="http://gsoap2.sourceforge.net"
 SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
-LICENSE="GPL-2 gSOAP"
+LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 6aff8d390ee3..b102ed3e5f79 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,7 +1,5 @@
 AUX 1.0.0-honor-python-ver.patch 691 BLAKE2B 1e7954d6bc2feffa97ec429bb96f0d5b6ef4e04eef977731db75bfde4a00d4afab35944a595131b0088569b17f577c41f0ce63987ddbeba5187ae7591f5e9cb4 SHA512 ca5e2495a13a5bedd29dcdfba4c03f74a65d46f964d861adb7d2bcdf73813fe64c456ab52d0ccbb9fc913d6d5c0a76a9d199c114b1f3850d2184e3c7959412f9
-DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
 DIST gtk-vnc-1.0.0-patchset.tar.xz 9636 BLAKE2B 4f25fdf279e5a1718ea8dc42bdb59722630b363e4e289704b946ae788d593b5d95c56d0eb5315e30ff00c2eb4d3a9e5df366f74808f94e926a47c2f817b0f1ee SHA512 998771ceb28516f52bb083d872a1ad8aa22a7208c8a0ca94270f63d91cc7f7a0f99c4bb93f7a545d9a6c796fa063dd27b36a1cb9a3d7c9349a9d8372754ea929
 DIST gtk-vnc-1.0.0.tar.xz 215904 BLAKE2B 05ef0389c3ac307859228506adf55a5ed0f5d577078b82686ad97c9df180fc5c23d8dd030930c61f87b1bbd3cb6cee74c4485af4816b7b29fd53016c2d9b1d07 SHA512 63a40b9b284c4e46a92d5375ab3660b324ff27bfc572559d3b34d29fe4f7d24e976396b6688b8f3e3109d49dc5527075d128c43bb997507e68ddc0880b0ad148
-EBUILD gtk-vnc-0.9.0.ebuild 1695 BLAKE2B 88844526c4ff9ef740f82e349bd72e24fc3dcaca517b354d8764c282edeeb28683717d3f201f0da4c2b2232739ba0126114faa23cec74b3cb27ad5f1e2a7e779 SHA512 6f288b5d4b2e1149f15ed59657752ac2475b6c39be57a687d9ea17bb5fd6e0bc4dd9a98f7c099163f386705c2ef82a3bdd1f4a5b15b9a001e70a084328231376
 EBUILD gtk-vnc-1.0.0.ebuild 1852 BLAKE2B e9d1c8fcd4f050d58dd267118e26c23e1396e121f6fb660c4d7034185368674a8ac79b4ea41ac40b06dcf00d18a0719b510f95642fc11988854a58227b579625 SHA512 4f90d8b5de6ebf3d02a4c228924828f6143fd497ec3db1d87d31d8d69b94056d842824b510f646d5ff1e40f917d1d73cf54461b78a26fd4339795964174861c0
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
deleted file mode 100644
index fa167ec2bef9..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit vala gnome2 python-any-r1
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="examples +introspection pulseaudio sasl +vala"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2
-	>=dev-libs/libgcrypt-1.5.0:0=
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-3.1.18:0=
-	>=x11-libs/cairo-1.2
-	x11-libs/libX11
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with examples)
-		$(use_enable introspection)
-		$(use_with pulseaudio)
-		$(use_with sasl)
-		$(use_enable vala)
-		--with-coroutine=gthread
-		--without-libview
-		--disable-static
-		--with-gtk=3.0
-	)
-
-	gnome2_src_configure ${myconf[@]}
-}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 41a0f5131fea..aa608f7a84f7 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -2,7 +2,9 @@ AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d283
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
 DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588 SHA512 08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
 DIST gupnp-1.2.3.tar.xz 138428 BLAKE2B 23f7f677ee9d58c43ba69d6e707e26b17efa5b510f4b14b41006b332f196037fcb103b64e6b1f91260383232ad6d19872b1e8d856878b103c5c2612d3bafae63 SHA512 85caa68a4c6f4b1ccf21d910048a59b6db2b21e8bd728404b28eb0f00b588a1ab55f3ff3227e76199a20554b0708128680379e7ffa5fe162cccb4a1e3e322101
+DIST gupnp-1.2.4.tar.xz 139832 BLAKE2B a4d49ea8a3739a2233c9dd4a258a7d0d355ff651b0de85c5b7151f0ffca93b50248a303dd040c2d7e9fb215a0edb0627fa3a8a16835b55d90459c623faaad62b SHA512 cb787264b5a1bcb4f547f7a9d7a5e4e712f91ecbb593f12b2c51aed0607abd6fbfd43e5c42e261eb853d09358685637e172c78e3e9a6059bccdeb1176e6e4ef7
 EBUILD gupnp-1.0.4.ebuild 1936 BLAKE2B 0bd2a5783fe11eb5948b39ab91eae9b8055227add4186eb39f2c25291bb8979d807765d521e617d2cf1eed5621dea26eecd79f8b262b482efba6bd30eea0ee84 SHA512 4d5ca071142bcac84c1c907894d4f8b5c67d7a77c1ad58801ecbac4a4104711eda25cdc19394d51c10ace1d75bc18b3a2f68b35dd96b5c3452217a7d5b85338b
 EBUILD gupnp-1.2.2.ebuild 2382 BLAKE2B e0c3a459602fd8eda64aba8116369a3abb9db1f13c5b367ed4ecd2464f6cd3416a6c54696de17fc6c942c988704aca199c80087def6a5753b2e79f32445d87a4 SHA512 d33f989487371960f7e419d3f8bdd3b14687286aae6741238ae93dbacd14cef28e993c237a380ce7f39ed8d2c013a70f230b7a22c4e40fbc7d58eac78bb9112b
 EBUILD gupnp-1.2.3.ebuild 2272 BLAKE2B 51cdfcd0af4bcc7881d4b3485dbe6abcef5f824991f808722f69561a13d1e788193275536be99ca38a1a8e40a687ea3f772f3fdf43105c4f03881818e594a15d SHA512 3b6e400499d2ef3f026210d2d83a853a1b070237d86abece3d91af5c751913e8a06d4d97d0dcd1f84a455b51161d09b7adc3d5eb92ec2a0a706033124d31f705
+EBUILD gupnp-1.2.4.ebuild 2276 BLAKE2B ff89c5257db70b96078c653750f243f55ad546c3728399258bb769bbc88a79fa3824dfa3ff7a30be9dcdcefae5649f905b5c06a8003488128b8a476916998729 SHA512 66a9ea6ddd09feb0582dd3f3378ab6645d2a296c7a87dd80b6a18e88aa19ea039bb377d9951729009f8ac223f0c02785a9084daf390eef6190fa7a92883cea17
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.2.4.ebuild b/net-libs/gupnp/gupnp-1.2.4.ebuild
new file mode 100644
index 000000000000..04d38d445038
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.2.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.2.3:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.2 )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.2.3:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=system
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	local emesonargs=(
+		-Dcontext_manager=${backend}
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}
diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest
index f540b5c776fd..54d0d132abac 100644
--- a/net-libs/kdsoap-ws-discovery-client/Manifest
+++ b/net-libs/kdsoap-ws-discovery-client/Manifest
@@ -1,5 +1,5 @@
 AUX kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch 346 BLAKE2B 5b195b70196269ee1f09c7b92823d9b59303c7bb485c68f4352242eed1e1086159ad9f47c1963db9e1ed8fc1d03e31a6e480bb47abbeff4167638c1e46a62864 SHA512 cf0ba64983da5c8b18e4103bce0dd1afb2cd5292d3f37a52a29c93a5d19895c13ea244ad27433cc54be8ce419f3a67a1941e21e25a232a4230a0c9b56f020ace
 AUX kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch 467 BLAKE2B 1b972ba3ae3a6831d49c1c2986fae4ff75fa051964b1c39399b413d724c7c93fef6bc9e740a7e0f10860b64e228f1f18ad1f4836e887aec67d0b2addf7205892 SHA512 2370c1571dcee014b258f388a8a6401a331afc4a2ca0e3491e112ad686bc822cb780b155a1f74e4a8dbe315a65207cc22e088f2471ba621b645cc8e043829903
 DIST kdsoap-ws-discovery-client-0.2_pre20200317.tar.gz 37395 BLAKE2B 03bee2d6f87a3fb407e0cff7e84f9bd83814d742f714630b8c469b26a139062472ad39a0f743caac6f5de4ae2c8a55c42b56ee14c6afcd3a0a874c3f0d9978c5 SHA512 f99092e06e4d7496d6fe79e4cf78265c072476159da958c2a0ee7b852be00b16c89582a8c69c5cbe4160a6419435ee2d8bc71bce40ea9753eaf458c34df6f86b
-EBUILD kdsoap-ws-discovery-client-0.2_pre20200317.ebuild 1346 BLAKE2B eb6d793374712079a6da5aa54f29cc894388843fea79a2c52223cc2a3efc3747209cdae87ec5216fa1c6de71b7cd76b3b399082f919fc0986e697d1d7a6e5e9d SHA512 92781161ee6748449b6913f34a093ec960bf378286ab4f1f83a409561a8d70a850016aa3d8a0306b23fdd43a80da82ee0ec3964a7e7fabd7b6a30389239315b7
+EBUILD kdsoap-ws-discovery-client-0.2_pre20200317.ebuild 1348 BLAKE2B d153c9bfc270d825027ba02792bd55db19eb3b1cdc6b66acb84adbf2dadaa9be64c8950afe7e3632ff7972c0ddd8f2d7caace84c6f9aea75a7fa975120e96b73 SHA512 ad6e189b4204c724183f7c79c9d7bcfe20114ebd7d992912971f1d1abb720cbca6d98a97aeddd83417eb37b46bb3dbde08c140a15ce46768813a290b206e93d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
index d169237e5718..d9179fc30fc6 100644
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
@@ -10,7 +10,7 @@ inherit ecm
 if [[ ${PV} != *9999* ]]; then
 	COMMIT=14287e92e80a77aa4c0adee2871e6b87c9c3055e
 	SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}"
 else
 	EGIT_REPO_URI="https://gitlab.com/caspermeijn/${PN}.git"
diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index dd435a7a8146..6fef75345237 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,4 +1,4 @@
 DIST kdsoap-1.9.50_pre20200317-libkode-dfe0d565cb58cfb25da77853d9694097aa8e5882.tar.gz 50653 BLAKE2B a14145adcb1a9551c9fc70246bebe034db605e8d4056744856ff67a575ed192b90439a25b7ba6916d66b9830d7ffec1da82f2e12425b6e58801ebbe289cc09b7 SHA512 efe539888d25a527d43a83a6e3c38d75eec92bab3f09766890870f3fe6516cbd8349b049b42399c8764b28550291130b705350ae9d4d9947b839c03174b9b984
 DIST kdsoap-1.9.50_pre20200317.tar.gz 919821 BLAKE2B 8028e98a1d79800e9f8bbddcb50e0b3ebb2d71b2f87d4f2920c6689b8536d712f76fb9ff48dd16b3d68871e46d9b1d36198aadab3d1d645f2dc397beef3d596e SHA512 f00c960d442c6a2977d321441ddd0924b42422e2a4e974a7fabb2d896fdb7310813750154f7548758ccb01a5d312d9af74a8d34746e09d07aff7925ebb6c3b4c
-EBUILD kdsoap-1.9.50_pre20200317.ebuild 1342 BLAKE2B a2b4ffcf4589fd2d57d70b9ca8f3fa940a67124f631bf1905e04b6e8c657aa86f8a5321ecc949fae6ab1b1ab7239b3908a621374d8cc59ea4f910fc50765335f SHA512 909c1ba1b3388c4ead6ceac8e3a8cba05e53d97204cc3f192dc670af401b30cb475b0a93c118896b7544e135be6909ab30cbc8e8a52041939bc89d62f8fe1970
+EBUILD kdsoap-1.9.50_pre20200317.ebuild 1344 BLAKE2B f008cd03c3dd55f3901c7ad46bf837a6834b9a6d05bd663ebe5df1301eb258df052bb40b5d0bd58e29904e927391e73e88b6e9287edca13935382d3432b781c9 SHA512 fd37d66bfaa349125503603cd3695814d425da60b0bd2b52d1744451b62ec5834fa28e821541942a37b95e0a1488ee2b21999154b8d20c759e4c9dc742dffd9b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild b/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
index c8e045928534..789535021078 100644
--- a/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
+++ b/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} != *9999* ]]; then
 	LIBKODE_COMMIT=dfe0d565cb58cfb25da77853d9694097aa8e5882
 	SRC_URI="https://github.com/KDAB/KDSoap/archive/${KDSOAP_COMMIT}.tar.gz -> ${P}.tar.gz
 		https://github.com/cornelius/libkode/archive/${LIBKODE_COMMIT}.tar.gz -> ${P}-libkode-${LIBKODE_COMMIT}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/KDSoap-${KDSOAP_COMMIT}"
 else
 	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 5660c9829b37..65f391f2347f 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,10 +1,13 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
+DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
 DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
+DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59
 EBUILD libbitcoinconsensus-0.19.1.ebuild 2388 BLAKE2B 58146351171676bddb3744b2cc1dda21d552a0302e8007dc8f828fe1ac89430d4eed2189c8d945acb5f8f85ff080da1e08af1b8798532221d46b9380473950ac SHA512 54804c8e95c92b3b057a817d681a24211196f2f2b18eafa8defe159aa41ca71140a430edcd4c400fccb0d6656b1661ca9c7fafa6169aaa9c4664f50d2aba3b6b
 EBUILD libbitcoinconsensus-0.20.0.ebuild 2431 BLAKE2B caa4cc6dd6fb317b2710f59076e7da0a72617a08aa7b0154372a169447e9f87e0e02dba6d610047a124e1d266fc51eac04baf09dbb927aa39f56d3dedc5229a8 SHA512 317c2502ab76b070e4afb9f4708c3da46f89cfd4b2a7e1b3de5e51d18127bae34b53693596d7f7e9642d22e5d5524d43efe37d126b0b2043273970e602f6541c
+EBUILD libbitcoinconsensus-0.20.1.ebuild 2340 BLAKE2B 8d05a7a1fb621f3b7085054285dbaad5b5d4209bd3294f1dc2da66706d29e8f14fd4d203b3364d03137e8c8866cecb98283f8173c7bf9e788533fe8807a79490 SHA512 caa37420515e044147769cb4005ef45c1b7f4b5a164cde8a30b6e2f0fa15d8007cc5cc3da0b398d16a9817a078f81cc819a56d769c707f0e4eb3400bf8ffbd29
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
new file mode 100644
index 000000000000..a7db9996ea9b
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
+KNOTS_PV="${PV}.knots20200815"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots"
+
+DEPEND="
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-wallet
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 6e93ecbd8c16..a8ee8800fa7e 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,6 +1,6 @@
 DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
 EBUILD libbtbb-2018.08.1.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
-EBUILD libbtbb-2018.12.1.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
+EBUILD libbtbb-2018.12.1.ebuild 3638 BLAKE2B d4ca9721c0693baf0dc4198362ff1f2cc87348afd54c41a335b6f45de9ae54be69914e3754ebd66b8f29b246ef52059623a1c0b74c1170308e147a1f288cf543 SHA512 a2ef2004e44d42e371dc214bb9ac6e7d72cb9ef2cf53888629cddfe0590bffa488f29579b295c2df3990883f549037b1a94b492d09d852ae220ec37d1f390b0a
 EBUILD libbtbb-9999.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
 MISC metadata.xml 568 BLAKE2B 508af89d4b95fa71c32b5a610e1630938dc8bf7b83a98b5af981de1a3a70ec0775d694ba5e5514f83e9abdbcb229500080fc31225de40bb65ad347cb273f44a5 SHA512 a4425e207724117d83fcd21f2ed5f9bd52a945597c19ee253c1c55b1e62f0f3d14d71c546cf2e2d6c7ad7b48b0e88ef3d46fc2a172f86cb00c710ed87946430e
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index ee2dca3e96ce..b2017354f2a1 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -19,7 +19,7 @@ else
 	MY_PV=${MY_PV/./-R}
 	S=${WORKDIR}/${PN}-${MY_PV}
 	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-libs/libcrafter/Manifest b/net-libs/libcrafter/Manifest
index b2090e0a0cdd..890ec8f1ab9a 100644
--- a/net-libs/libcrafter/Manifest
+++ b/net-libs/libcrafter/Manifest
@@ -1,4 +1,9 @@
+AUX libcrafter-0.3_p20171019-libpcap.patch 1679 BLAKE2B a11d50715c98a087b5a858b3a2205fbef50762e1c553887e3e49e10bca39c88e82dff8110288e97eec3614e38cbfc839f1a2ef93de92495f859654b90daed96b SHA512 9d4e2eb90d74511ca9d192e855e72fa691a725af4db273cae9241d6c19b2340882a7e659c8eba62657ade5aa634f32a7aaa2e00a1ca43a2a1cde67c88743f9c2
 DIST libcrafter-0.3.tar.gz 104051 BLAKE2B 6349c260d32ab6f270c05c156dbcf7cf20e85808ce7b8df8747fa9d6e1d413f96c12ff55b3c227952b348f2654cde81b5ca73753da61a9593c3c1699ed96bd7d SHA512 7c396ba942b304dddfaa569adb44697f75568d3ef2ed48dda758e281f3b7c172439309033bbf5498069a4a61a952f93e41af99b129ce874ce76b5ec08da58116
+DIST libcrafter-0.3_p20171019.tar.xz 90152 BLAKE2B 4837a98a45ecdf924a63e916fd2cfdd481624c0cb5b673e0b43eaace328cbcb761ac2d09c50242602730ec2c69ceb8836b7092cbd286c887819db2095ceba749 SHA512 eb53ed641abbce3555f6b7bc3756bc9dc45068bf58320ba0f78dbcefc04cbfe669b12625c81a185fa377bf89e8453b52e0f9bef5c9e1ebfae34bc56eca090438
+DIST libcrafter-1.0.tar.gz 116514 BLAKE2B 6f7adee30b1f7be1bf03fedd39deb53ddc7284934f908ebb056726c31adcaa133405a13c06fa6d35b066992e5ccf24eb971d46a44dcad6932009c1d35fc0c0f7 SHA512 146f34831bf26047be06a0dea406ed0495990fd4256c598b5a4ddea4ab8cc6635dbbe98010cb73ada94ec6bd8be65cdcb3489de7dd9b961711707047f94fb48d
 EBUILD libcrafter-0.3.ebuild 663 BLAKE2B e05dd9b8312201e93436cb91ad135af32143bfa026fe29fe78ec4a2bf6f6c46f11e3beddf2fff850c585a2e52583b852840165390fe6e9d5291a224971cb10b8 SHA512 aeecf9713732f0a28ab57fe8592ba254b45e4fa92239bb6496d834fd6bf90aff672667da01f851698873751949f72eab3729429a7e1ecaafda3c73f8b7df771d
-EBUILD libcrafter-9999.ebuild 642 BLAKE2B faf88eeb20b297e2e835e68df5865dfcc957a09ba7cf1b07995acd72c7b3c6e58c18419659639c75d6f175c320936c6297c664dd6f63f17b803d700399c80d9a SHA512 fe00ffa1ac8a4905d3a71201e5412b74b19e025be2107ce9b5d3aa475d81cb5462504e0fbe58018b518d9796a48082b877b6c012b87294660c098b57e69ba230
+EBUILD libcrafter-0.3_p20171019.ebuild 680 BLAKE2B 6912dbdf074b622b8deec9a55ebfbbc92a2f54d0153bdda02247f3e28196c7b5ac59333d8a52feaf54ad5b350201613bba481fb54842b87231e884730d445ddb SHA512 663184cfc5ee58d3fd55279bd0ee32ab389c9e29006fb0a605fa98de7f0f1388d12d81091de4833d8e594fef1501819ecb6c6b2be73611383bf7ce576abf9c52
+EBUILD libcrafter-1.0.ebuild 786 BLAKE2B 8db66b1266e2ddd24954f0f0f45e7a3b08fcbb1b931411d272da8d248c2f32bd901cd24ee0e8d232357f64af79270f81154a2b580439f656bb0d23d2b05ebebb SHA512 82d315fceac37eb42a91d752939512d632ab5397337b8ed1f48c5c245fc423113dec8cac90e271abb2fd45425eb59dcaa0305ad6e1f7d7ed5d3537d9317f6fcf
+EBUILD libcrafter-9999.ebuild 714 BLAKE2B 76cbdfbeb1b4c767933d94cf485267911ca2cff473d1af72f235eb8bf2306c1a102986a1744932c12acebeebaf75c67a2805550fdf6afaaf2d9b52c095608422 SHA512 6e732a478998c07602e04053cc438fe46bb11c18b5684e442c061940c999366e4061233bc35e5a2e545fa0b40c6fd8b15619f3eb2d08eceae6c1e8a1be852b12
 MISC metadata.xml 1647 BLAKE2B d6ea5e5df1a27925827497df3022b86f82b0fa5c05e8dc87503b836ade2efb04e0e19b07ccf58b512528ba562caff2be6f14e1d56c5ea0f6040419c708287899 SHA512 6e1ee9e3402a26c3981552ff8fd7193f75dae388fb6d1e59739e1cc4e6f027c995cc68b1984fc13d39d56c152fee6b4b6ee82c9c79f6033627b5e9e0261bdc87
diff --git a/net-libs/libcrafter/files/libcrafter-0.3_p20171019-libpcap.patch b/net-libs/libcrafter/files/libcrafter-0.3_p20171019-libpcap.patch
new file mode 100644
index 000000000000..252a71db47c7
--- /dev/null
+++ b/net-libs/libcrafter/files/libcrafter-0.3_p20171019-libpcap.patch
@@ -0,0 +1,59 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,8 @@
+ AC_PROG_CXX
+ LT_INIT([disable-static])
+ 
++PKG_PROG_PKG_CONFIG
++
+ AC_CHECK_TYPE(u_int32_t, uint32_t)
+ AC_CHECK_TYPE(u_int64_t, uint64_t)
+ AC_CHECK_TYPE(u_int16_t, uint16_t)
+@@ -20,46 +22,7 @@
+ AC_CANONICAL_HOST
+ 
+ ## Checks for libpcap
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap,
+-[  --with-libpcap=DIR      use libpcap in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-	PCAPINC="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
+-     elif test -f $withval/include/pcap.h -a \
+-	       -f $withval/include/net/bpf.h -a \
+-	       -f $withval/lib/libpcap.a; then
+-	owd=`pwd`
+-	if cd $withval; then withval=`pwd`; cd $owd; fi
+-	PCAPINC="-I$withval/include"
+-	PCAPLIB="-L$withval/lib -lpcap"
+-     else
+-        AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f ${prefix}/include/pcap.h; then
+-     PCAPINC="-I${prefix}/include"
+-     PCAPLIB="-L${prefix}/lib -lpcap"
+-  elif test -f /usr/include/pcap/pcap.h; then
+-     PCAPINC="-I/usr/include/pcap"
+-     PCAPLIB="-lpcap"
+-  elif test -f /usr/include/pcap.h; then
+-     PCAPLIB="-lpcap"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libpcap not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
++PKG_CHECK_MODULES([PCAP], [libpcap], [PCAPINC="${PCAP_CFLAGS}"; PCAPLIB="${PCAP_LIBS}"],AC_MSG_ERROR([libpcap is required]))
+ AC_SUBST(PCAPINC)
+ AC_SUBST(PCAPLIB)
+ AC_CHECK_LIB([pcap], [pcap_set_immediate_mode],
diff --git a/net-libs/libcrafter/libcrafter-0.3_p20171019.ebuild b/net-libs/libcrafter/libcrafter-0.3_p20171019.ebuild
new file mode 100644
index 000000000000..e9f0d9bec4a9
--- /dev/null
+++ b/net-libs/libcrafter/libcrafter-0.3_p20171019.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A high level C++ network packet sniffing and crafting library"
+HOMEPAGE="https://github.com/pellegre/libcrafter"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+"
+S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libcrafter/libcrafter-1.0.ebuild b/net-libs/libcrafter/libcrafter-1.0.ebuild
new file mode 100644
index 000000000000..7b919920ad00
--- /dev/null
+++ b/net-libs/libcrafter/libcrafter-1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A high level C++ network packet sniffing and crafting library"
+HOMEPAGE="https://github.com/pellegre/libcrafter"
+SRC_URI="https://github.com/pellegre/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
+)
+S=${WORKDIR}/${PN}-version-${PV}/${PN}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	dodoc "${WORKDIR}"/${PN}-version-${PV}/README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libcrafter/libcrafter-9999.ebuild b/net-libs/libcrafter/libcrafter-9999.ebuild
index 1aac305c3cc0..16291e489096 100644
--- a/net-libs/libcrafter/libcrafter-9999.ebuild
+++ b/net-libs/libcrafter/libcrafter-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils git-r3 ltprune
+EAPI=7
+inherit autotools git-r3
 
-DESCRIPTION="a high level library for C++ designed to make easier the creation and decoding of network packets"
+DESCRIPTION="A high level C++ network packet sniffing and crafting library"
 HOMEPAGE="https://github.com/pellegre/libcrafter"
 EGIT_REPO_URI="https://github.com/pellegre/${PN}"
 
@@ -19,10 +19,13 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
+)
 S=${WORKDIR}/${P}/${PN}
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -33,5 +36,7 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files
+	dodoc "${WORKDIR}"/${P}/README
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index f6d62ec18ab5..d2199ed61db7 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,7 +1,7 @@
 DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
 DIST libdom-0.4.0-src.tar.gz 871499 BLAKE2B e0ab1a1cf14b532eec1bd68c3ee2557a720a984232ede2f9b0e1d4c68299cc8b39b3d83fa1ff77233d07b8148188ec3012dca64787cfe476b4eb6990f1c71629 SHA512 4d3acb6520619c6c28f20c9fef72b19a879070d0e65d896212c557ada44d35c1fcae4712b901db720ddeb3b1b90832005d63075dcafaddb5f4ba2088fa7a9eef
 DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
-EBUILD libdom-0.3.3-r1.ebuild 1219 BLAKE2B ee68ac1d36b1ab0949c4cde6b48f2401295a0511ee1a5cb3290a3e4dc6e9fdff9b0b046fbff6baac0716b62331fe43dd36864d555aa72a7083c0cca6deff45a8 SHA512 5866280d5f86a4ccfa9484093c32850476ebabc9c945902c398813e23869ee1f9291f07df48d5aa9ca57df1ff43053cfc0685ea9f9183b58cb60615a929d665b
-EBUILD libdom-0.4.0.ebuild 1201 BLAKE2B 1f326a228e12011d1a0bbb73b1f98dbe5a5728fe2cb7b5284151d07318c4da23e5964442f58d734f83d57bf223e8b18c3d6ee4efac1da275e43a8415529fb759 SHA512 477fdd247ba7a130992a0735c4a40a5c3a6baeb6d6880a3a82886ff9937b2fa561ae7dde3d95b7a54f245c917289d35c8ae6924565684f51b2bf82ca1a895abc
-EBUILD libdom-0.4.1.ebuild 1200 BLAKE2B f22cc4bba353a01f67c821d7cd0e0d2d82967aae2d2e5db4afec42823cd50d607ded0463597a619a02c6e447fc4e564e55b07239f0dd678f6932cec2feea571f SHA512 1b5ffc5789981f645c6850eb41ca22e3e49a5e7ed35e3bbea15f82d5b4f1d16f33dc15a890135059ba18fe86cb7880f5b591dbc2c04f57a2345fbe9ef92d4bad
+EBUILD libdom-0.3.3-r2.ebuild 1153 BLAKE2B 338308141873ed746da80039ef2d660440d5dd659b81ff3a749ad2332ec97500127d010e2c08dbb17518b08a2e87c967db3b9787185c761c5f7c63622168b339 SHA512 95fc72e00db9a7080847b3d5d9e56010756886c23ce4c0ece6dbeb33a35a94d261f3997913fb2ea9a4160ca6b8ad4070e2026baf4cbfdf1dc77a5e2d92bf31f9
+EBUILD libdom-0.4.0-r1.ebuild 1135 BLAKE2B d17f7e0a23a14782e2bd976b05b986ec1026461e9da8ab2130f186894daae94af3bada800ecbef521b5214a831348257681c41ef3f2e8626bfe369f2a089d086 SHA512 0a997f0b3dc5aa1e0880f9228be24db7fc502d51d2f7e9d375001e5c1e4c6eaa416f8694e11f59947bf95100b023dea8db77d07968b67ba25aad2e301cc8ef10
+EBUILD libdom-0.4.1-r1.ebuild 1135 BLAKE2B d17f7e0a23a14782e2bd976b05b986ec1026461e9da8ab2130f186894daae94af3bada800ecbef521b5214a831348257681c41ef3f2e8626bfe369f2a089d086 SHA512 0a997f0b3dc5aa1e0880f9228be24db7fc502d51d2f7e9d375001e5c1e4c6eaa416f8694e11f59947bf95100b023dea8db77d07968b67ba25aad2e301cc8ef10
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libdom/libdom-0.3.3-r1.ebuild b/net-libs/libdom/libdom-0.3.3-r2.ebuild
index 1a6947896f96..b5e782a5b834 100644
--- a/net-libs/libdom/libdom-0.3.3-r1.ebuild
+++ b/net-libs/libdom/libdom-0.3.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
@@ -35,7 +35,6 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="test? ( xml )"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
@@ -52,5 +51,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/net-libs/libdom/libdom-0.4.1.ebuild b/net-libs/libdom/libdom-0.4.0-r1.ebuild
index cdf28536a5dc..d5902a58630c 100644
--- a/net-libs/libdom/libdom-0.4.1.ebuild
+++ b/net-libs/libdom/libdom-0.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
@@ -37,7 +37,6 @@ BDEPEND="
 REQUIRED_USE="test? ( xml )"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
diff --git a/net-libs/libdom/libdom-0.4.0.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild
index e9cb215757f4..d5902a58630c 100644
--- a/net-libs/libdom/libdom-0.4.0.ebuild
+++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
@@ -37,7 +37,6 @@ BDEPEND="
 REQUIRED_USE="test? ( xml )"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
@@ -54,5 +53,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index f369daeab806..c605361377d7 100644
--- a/net-libs/libecap/Manifest
+++ b/net-libs/libecap/Manifest
@@ -1,3 +1,3 @@
 DIST libecap-1.0.0.tar.gz 343468 BLAKE2B 5a5a12365289daaee8b324016f42b6b56f5bf5b1f7893ae052517c8c20a792a798ebb31f4038c121b1c6eefd9d375562014050572e0285e3a9b91bbfb9989fa8 SHA512 7d34b5a9b6843d6b09efc4fa390c7a2d3dda7a2ae5e82d5021295e436ca9afb7c1f70bc6f25a68e4c430fb6e33ee9f602655c9c830fccd46a8f554774813b452
-EBUILD libecap-1.0.0.ebuild 613 BLAKE2B 86da4196e089f29e3469260bd980bd8026f83ace09e8feaaf5bb96dc1892ff797c19fac7332a2cfa13a2a6fd7cc8fed3c4137ae5c2a44e559e5c069a830f73e5 SHA512 e5fbe1f869d94e07ca00b76fd4ff9fef605a1dca3132182e236bbd18e98f3cdd91c6f614f5169b7dd1123e86b85fe36c1b5bc8a990a5395ff7ea715a3818ed78
+EBUILD libecap-1.0.0.ebuild 620 BLAKE2B 2d0bea056b2b5e0674af8b0cffba6e00e70f46bef578e56484683af9b15e56be1dbe3f00ddae86a71fa66d5d288a4c858d53b126407c535886120ce30e051636 SHA512 5daed092628ba4c634f0cdc9432e2a828996e904e0aee873b677b4594f8b17248c6f5e5e558f5e5bce593587c951b5004de159f1045f2dbef5f46640a2753d29
 MISC metadata.xml 415 BLAKE2B 20ae025b9259513bd01b05a6c2e52b905faecf97883367c4fed63970ef8a983ed93609ffce93e803c3cb9634d2a45ea0cb7daa7f9eb48ded8cb59e5d17565a0a SHA512 7f74e14bff83c5a8ccee44aac553502cb71e55e8d2da98967e8bba2fa44643be2508dbf0b8e47f6e3abb6e554cfc03f3ae53238f06987357dc7c3ea103aac394
diff --git a/net-libs/libecap/libecap-1.0.0.ebuild b/net-libs/libecap/libecap-1.0.0.ebuild
index a1335db926bd..1703ada24b90 100644
--- a/net-libs/libecap/libecap-1.0.0.ebuild
+++ b/net-libs/libecap/libecap-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.measurement-factory.com/tmp/ecap/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!net-libs/libecap:0
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 5deabb9abb2a..d80d092198a7 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,4 +1,5 @@
 AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
 EBUILD libesmtp-1.0.6-r3.ebuild 1045 BLAKE2B 3d7115c549a9303bec593f21af7c681c8191d9f52da09c5859012393e8f8fa9ae414b7eb24902afd8500ba6ef8ff4703e7ef181b9a54ecaca856d80ca836e881 SHA512 4753d7258f1c11f1bef1ff87437a37bbf2037180a55f6bac502eb2e5e456c6f0523417e0793b7610da94fdd397e482e768aa73a3de2af059b1986808611d289a
+EBUILD libesmtp-9999.ebuild 1013 BLAKE2B b1026503f0cef6187d7205ce432d3012a93db30ac00db42a6d5596169037a716f76beaea9120bb7012dc034ad1eefda565f9b37b5260799c7e32cc09bd035c63 SHA512 25913d9e0a030d29e12e897212966556d8a73d4de17d6a8ced8a8f61be14f4df9155afc4e318a391521b2ece2186cc2ff20ef5a656862358c880052bcec9d171
 MISC metadata.xml 245 BLAKE2B 8d60530acac96088463f7357d79430c34c12384bcda5df24a93a92789a40fb34014c14fb73ea1e80f7e96f5afb8e70a4600a651b46322af25c404bea3c75e004 SHA512 8f811f556e1fb3b6c4955a0815435a2b54897133a5a545d05fc3c47a6f8ad2448fcce4644e2f7f3d5b6835fdbfccba521a49a8c11629a89ab53770d6bc620c25
diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-9999.ebuild
new file mode 100644
index 000000000000..4f34d1424a76
--- /dev/null
+++ b/net-libs/libesmtp/libesmtp-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson
+
+DESCRIPTION="lib that implements the client side of the SMTP protocol"
+HOMEPAGE="https://libesmtp.github.io/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libesmtp/libESMTP.git"
+else
+	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+fi
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+IUSE="libressl ssl static-libs threads"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS docs/{bugreport,ChangeLog,faq}.md NEWS Notes README.md TODO )
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library="$(usex static-libs both shared)"
+		$(meson_feature ssl tls)
+		$(meson_feature threads pthreads)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index dd29d4562010..c02b05d473d9 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,9 +1,7 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
-AUX libetpan-1.9.3-missing-stddev_h.patch 989 BLAKE2B 49918148deeacc128bb33e8cf56c9f3a56de92fd7206becd5c6e6054979691e17fd1de008f42c0db64c0f72def07bd5fb10178b0eec9ee64c6d6b0f8749bdd56 SHA512 cc9ea9b4c641cbb3b2446252b8ab8b520814ad8584f7fccd3174e31726a59a8445a5af21b6086034891a883887cb69b1d2c38a07e7f8667c0fea518b40a0e058
+AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3c7e2717c8413e21e7ec5f425100fa7987248c60de34d7bb81eaabddd401e93498daf868d5f78f6b0a65f4940faf4fff6ba493 SHA512 00a1d56b2a01665f070dcfe13d9b24db9ba98ca0fd0f83594a095b980d13cae241e246fb3a477923fd871ead551d13d9d4651cfc07a4d333250c0956cbf58238
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
-DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.3.ebuild 2095 BLAKE2B 9cc94dacaf2e83581386ad57d3d35e8f60f7a7c123653e4dfa0c56ac72644e9ac928b43b9c7f27523ba0024df3a14547b774bac1eb5ca4da71af013943c4929b SHA512 92d72ac6d58e7c48efb3a8d398bfa0ba0af3246e155b4524f2c5da17b45af613407ce832f394ef0f6f28249dd033407ab14c6b3959f784ec1a2c385f5218d9fb
-EBUILD libetpan-1.9.4.ebuild 2198 BLAKE2B dffcda40ca003f71ccef117150da920bd3c0b0f498af9219d4192ff12e33614c91eef9b0129c1d7083f70264e6f8088fd1770e467c4ec2b159228b91a5cd6437 SHA512 f10e83dc9b8ec6961be171901e1238af7c8286f417125c7800e8407754d162be488197fd8d734dac681f43a1577846d3bb8200f5cfa9094c45151ae7d1fd1c5d
+EBUILD libetpan-1.9.4-r1.ebuild 2241 BLAKE2B 5fae2fefb926cb18683a4d25aed22388fcec0ec1984d7e53c1aae5c23a7535ed90e6ccc6ea9f456eabdb808147bb707797bd7a46a327c9137657056665121092 SHA512 392a8ebc34536dd94530e9a63d3591e7a4528e46f0887715f206ebdc549be7e4b7919ceb9f6b3479c0ac6c254040e0c34a447404dfac7f7a15a24829fa77609a
 MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch b/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
deleted file mode 100644
index 9d53f90190b0..000000000000
--- a/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit da9fd7839c9affea48f74a159a789fbb183b4be1
-Author: maxice8 <30738253+maxice8@users.noreply.github.com>
-Date:   Fri Feb 1 01:58:08 2019 -0200
-
-    add missing stddef.h include for 'NULL' (#322)
-    
-    clientid.c: In function 'mailimap_clientid':
-    clientid.c:66:38: error: 'NULL' undeclared (first use in this function)
-       if (mailimap_read_line(session) == NULL)
-                                          ^~~~
-    clientid.c:66:38: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
-    clientid.c:39:1:
-    +#include <stddef.h>
-    
-    clientid.c:66:38:
-       if (mailimap_read_line(session) == NULL)
-
-diff --git a/src/low-level/imap/clientid.c b/src/low-level/imap/clientid.c
-index 1c34637..38880dd 100644
---- a/src/low-level/imap/clientid.c
-+++ b/src/low-level/imap/clientid.c
-@@ -33,6 +33,8 @@
- #	include <config.h>
- #endif
- 
-+#include <stdlib.h>
-+
- #include "mailimap_sender.h"
- #include "clientid_sender.h"
- #include "clientid.h"
diff --git a/net-libs/libetpan/files/libetpan-1.9.4-CVE-2020-15953.patch b/net-libs/libetpan/files/libetpan-1.9.4-CVE-2020-15953.patch
new file mode 100644
index 000000000000..19e573569fad
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.4-CVE-2020-15953.patch
@@ -0,0 +1,86 @@
+From 1002a0121a8f5a9aee25357769807f2c519fa50b Mon Sep 17 00:00:00 2001
+From: Damian Poddebniak <duesee@users.noreply.github.com>
+Date: Fri, 24 Jul 2020 19:39:53 +0200
+Subject: [PATCH 1/2] Detect extra data after STARTTLS response and exit (#387)
+
+---
+ src/low-level/imap/mailimap.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/low-level/imap/mailimap.c b/src/low-level/imap/mailimap.c
+index bb17119..4ffcf55 100644
+--- a/src/low-level/imap/mailimap.c
++++ b/src/low-level/imap/mailimap.c
+@@ -2428,6 +2428,13 @@ int mailimap_starttls(mailimap * session)
+ 
+   mailimap_response_free(response);
+ 
++  // Detect if the server send extra data after the STARTTLS response.
++  // This *may* be a "response injection attack".
++  if (session->imap_stream->read_buffer_len != 0) {
++      // Since it is also an IMAP protocol violation, exit.
++      return MAILIMAP_ERROR_STARTTLS;
++  }
++
+   switch (error_code) {
+   case MAILIMAP_RESP_COND_STATE_OK:
+     return MAILIMAP_NO_ERROR;
+-- 
+2.28.0
+
+
+From 298460a2adaabd2f28f417a0f106cb3b68d27df9 Mon Sep 17 00:00:00 2001
+From: Fabian Ising <Murgeye@users.noreply.github.com>
+Date: Fri, 24 Jul 2020 19:40:48 +0200
+Subject: [PATCH 2/2] Detect extra data after STARTTLS responses in SMTP and
+ POP3 and exit (#388)
+
+* Detect extra data after STLS response and return error
+
+* Detect extra data after SMTP STARTTLS response and return error
+---
+ src/low-level/pop3/mailpop3.c | 8 ++++++++
+ src/low-level/smtp/mailsmtp.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/low-level/pop3/mailpop3.c b/src/low-level/pop3/mailpop3.c
+index ab9535b..e2124bf 100644
+--- a/src/low-level/pop3/mailpop3.c
++++ b/src/low-level/pop3/mailpop3.c
+@@ -959,6 +959,14 @@ int mailpop3_stls(mailpop3 * f)
+ 
+   if (r != RESPONSE_OK)
+     return MAILPOP3_ERROR_STLS_NOT_SUPPORTED;
++
++  // Detect if the server send extra data after the STLS response.
++  // This *may* be a "response injection attack".
++  if (f->pop3_stream->read_buffer_len != 0) {
++    // Since it is also protocol violation, exit.
++    // There is no error type for STARTTLS errors in POP3
++    return MAILPOP3_ERROR_SSL;
++  }
+   
+   return MAILPOP3_NO_ERROR;
+ }
+diff --git a/src/low-level/smtp/mailsmtp.c b/src/low-level/smtp/mailsmtp.c
+index b7fc459..3145cad 100644
+--- a/src/low-level/smtp/mailsmtp.c
++++ b/src/low-level/smtp/mailsmtp.c
+@@ -1111,6 +1111,14 @@ int mailesmtp_starttls(mailsmtp * session)
+     return MAILSMTP_ERROR_STREAM;
+   r = read_response(session);
+ 
++  // Detect if the server send extra data after the STARTTLS response.
++  // This *may* be a "response injection attack".
++  if (session->stream->read_buffer_len != 0) {
++    // Since it is also protocol violation, exit.
++    // There is no general error type for STARTTLS errors in SMTP
++    return MAILSMTP_ERROR_SSL;
++  }
++
+   switch (r) {
+   case 220:
+     return MAILSMTP_NO_ERROR;
+-- 
+2.28.0
+
diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
deleted file mode 100644
index 8fb6d3cd1d90..000000000000
--- a/net-libs/libetpan/libetpan-1.9.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
-HOMEPAGE="http://libetpan.sourceforge.net/"
-SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
-
-# BerkDB is only supported up to version 6.0
-DEPEND="sys-libs/zlib
-	!lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) )
-	lmdb? ( dev-db/lmdb )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	liblockfile? ( net-libs/liblockfile )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-nonnull.patch
-	"${FILESDIR}"/${PN}-1.9.3-missing-stddev_h.patch
-)
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
-		ewarn "No ssl support will be available in ${PN}."
-	fi
-
-	if use berkdb && use lmdb ; then
-		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
-		ewarn "Using lmdb as cache DB!"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
-	# libtool recognises it as valid shell (bug #300211)
-	use prefix && export CONFIG_SHELL=${BASH}
-	local myeconfargs=(
-		# --enable-debug simply injects "-O2 -g" into CFLAGS
-		--disable-debug
-		$(use_enable berkdb db)
-		$(use_enable ipv6)
-		$(use_enable liblockfile lockfile)
-		$(use_enable lmdb)
-		$(use_enable static-libs static)
-		$(use_with sasl)
-		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/net-libs/libetpan/libetpan-1.9.4.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
index 373a43129b37..ccf8dbd57368 100644
--- a/net-libs/libetpan/libetpan-1.9.4.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-nonnull.patch
 	"${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846
 	"${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch
+	"${FILESDIR}"/${P}-CVE-2020-15953.patch #734130
 )
 
 pkg_pretend() {
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index ca8227e968be..77a917c57616 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,4 +1,4 @@
 AUX libgsasl-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-EBUILD libgsasl-1.8.0-r1.ebuild 1304 BLAKE2B 9a799c5e0bc713bcf15d8a68adccc75fd18b4d9eada23410864683edf3b9c5912fe712cb038d5d963b11bf615707816e9b315823c6e685798c5c3c68b5707ec0 SHA512 8882b8c99a80171ab14275abfc964875ebe93400af89c5c0086dd78037f7feb16ad7a1c2209b6232f4820d380c0d8a6dd32af105d336115881859e81e7818b80
+EBUILD libgsasl-1.8.0-r1.ebuild 1305 BLAKE2B 38d44088ef08bdc061239172004216cf93c032ac1614c28891c77b4842a2451158c42611ab87bdfa635b3ad6f027733943898fc0f24d3485e5898a3ece29c04e SHA512 6659399dc66eac3c109429e88683196bb87b3e343a2eb675a02cbd02f8b56e709ab70fe82f8d1caebb66c6cffef3bd7bd4d9d88e220279c765e90c9c014798c3
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index ae6514019b49..5b146866adc3 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt:0 )
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 4b222bb56fd2..dddaa6fe09fb 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,5 +1,5 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
 DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
-EBUILD libhubbub-0.3.6-r1.ebuild 1287 BLAKE2B 04b4f3130806bd1f5fd2ff05712a48d682a6ece6df1e2550532dd0a3d09c5013bc68092fc18f99cf4c6fd91612b74049fd034067addf26e4026d80599aafc092 SHA512 b818bd53d6b7e64e3998153d6e4b710a5db8461351a20d85766236d0a2cf4145da45261fc78f1a9a3b200e09733068acb2a4c2cd4b56e90d6c9d974ae6c8ccd5
+EBUILD libhubbub-0.3.6-r2.ebuild 1222 BLAKE2B 44cab1f6dd0d4f8f0dd2146aa39556ce95237ed89059616e7f5e7593941df515daed7f4e0f0f9b9ca9cd32b85cc547b2bd47108a10f90e438a12ca069a5c415e SHA512 2d8fb1530149475142b1f256a4b191b7407609cd107a0aa19c33cf06e7d086e84d17c1d569ad8d4b9dd047eb237d2254c906dbbde62cb44dbf44e0f721d9ee0e
 EBUILD libhubbub-0.3.6.ebuild 1184 BLAKE2B 46be9c562a28e3ee7f93a54b108a745fdfe8ebdee68c1927a810a0016b8f68c2acae92b27953abee7251cc274c3d8513139e2faabb475b983d8d49f805963505 SHA512 bd94104437b4b4799115d15e2b36c3684c235773bc3bbd2b8b4fed74fc9ef987e0510a51e860ebbe99c292c2c54ceb2f7476e2ae4681299a7954540166f6288e
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
index e0afef19c3f2..37c534bcee47 100644
--- a/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic
+inherit netsurf flag-o-matic
 
 DESCRIPTION="HTML5 compliant parsing library, written in C"
 HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
@@ -35,7 +35,6 @@ src_prepare() {
 }
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	append-cflags -Wno-error
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index a3db203c8717..8d332b197f4a 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,4 +1,4 @@
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
-EBUILD libiscsi-1.18.0.ebuild 706 BLAKE2B 64583d2ddd95dbdc51b7e4ba16888c5eab6ec07f147bd1624a76142f6b40cf0024ec97bbe303a18409e06de2d1d06a962136206baec366d213d8508950224d3f SHA512 b50524315cf1a2504fa0da7ed1c4dfc9dcd737e36e7dc31f7f7f5c4ca6cd49f0002097e7252084d6823db039d7cce0daee50003f3d1d9167fede6e5e041443b8
+EBUILD libiscsi-1.18.0.ebuild 702 BLAKE2B 720d891d735ab26c8dfdfb214d3781eee4ea9cbdccb6b7e0ff933bdfbfbc5e6476df94dd40fd5cb9a0791a4500361be0bbf2e8df4e5527460f65619ce7926608 SHA512 88b67b61977325cedcd63ed0ff25592da7f17895e271ff08a1157d566d3b357cf5f7adafe816c6ae26898bbac8a5e61038b36a58a2dc82e6d9f3c905feffcc99
 EBUILD libiscsi-9999.ebuild 639 BLAKE2B 89eb8fb7186b731e920ac69ecdc0ac6ce3cfa9722d61e20f9b1fd5615f47274c303c99ed6e5b5d4f7c9f66aa2ee76f4945d4f5adc960df593f84188766df7063 SHA512 45c93c5fb0cfc20ba74c11777711308075fd9f658f2ba2e99421ea2002a159fd90bd0f9297a6bd0d43fdd0e768ec97fa0d52e7e85053b0b7524d6904592dad48
 MISC metadata.xml 247 BLAKE2B 3951ab56f9a5dd54a6da332a8f5a7c2b445ec812f8ba6ff6e8957e0ea605c197954b403c8da0d81fc02ee829ccbf807ee8fb929b05ff6d347e67bc22d8023c26 SHA512 8188eee6fd9f0b2bf471e9ceec1bb6459f1ef84ba7ef3dc372747043d3a6db6256dccd4e9e12596a07a04e778576e83fcb56350e59a7e5e09c43ac4dac789af9
diff --git a/net-libs/libiscsi/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
index cd88cec93baf..a493b1185913 100644
--- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/libgcrypt:0="
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index eddc25fbfa01..c10923ec6d03 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,7 +1,4 @@
-AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
-AUX libktorrent-2.1.1-fileops.patch 748 BLAKE2B 5c36ed8660b28b76ea2302801ffc2cd098f3743a80fbdc29ac15ce2afe00e0fe05717bbd8ad3375c0a95e4a1c9072b3d1257a572ef1392441393443ea35e764f SHA512 f07cfbbd135d8a726ddbc16a8263676126370438d219c49e23f2796321970dbf10c34a96df92b96da870f5a488b2832049579dab3aabf48370ebb787b30be104
-DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
+AUX libktorrent-2.2.0-fix-MultiFileCache.patch 905 BLAKE2B a82395415166f2bb3475703e0ba3a7a428cd968e1ae3bb2df401f08db5d3f91518da38a7aba694bb7d56e4f089370c0532def676ace5c502549e718693783950 SHA512 99cd120d2e03bb9a64413d66810f67160afff066d9c15f36da335c838ee7d38f32d88ba9a4c7df1d0bf92c79bf50a080c0ddfc1004973f6c711d5d0aa9200bb8
 DIST libktorrent-2.2.0.tar.xz 357364 BLAKE2B 66a91fc32dc11a680d22755468513896c9cea1cbaef8664c84633860b78efba85e5c9e47684fdaaf7fb6f03f624268f9158ee2b8c6fc3d14b0e70339c1f6903e SHA512 2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a
-EBUILD libktorrent-2.1.1.ebuild 1549 BLAKE2B b28f9f065dc542e90fb9ba9b74f3594446a5953ca760e7cce92129ed3af7b7f2910d771a4928c61729ef263042a09f6c8fa30bf2515fd0ee02201b555f3a04cc SHA512 23c283c72592ca9369187514a286ce2b6a1f0add2ae4ab99a79eba8428305fab30fa1b44ac55f214986b2fe816be52f9e0d1bc826ac1103c481d0e3aa66b36cb
-EBUILD libktorrent-2.2.0.ebuild 1498 BLAKE2B 6564bc13ed8debff400ce18e9b2b90645c3a59302c12ca7c6cad119a40d54f113de2d661fca10fe2a1e6cc7f2e9cd0818d8f082b4c4c29bcb372e93c086d7fa9 SHA512 6895485134172a9c0834367d04a5fc5fc8fae85d86bed4e5483739a722620c2af1c92c8aeb4290a4cf47591343d2d6aff6b7aa67bb0750394d58a714068306cb
+EBUILD libktorrent-2.2.0-r1.ebuild 1566 BLAKE2B 7cfb88beaab697d0d0ff3861213034fa06497964b94d521218954dc45ed2202552d7138244b2befd3e948840a9ba37ff94f484cef4e29d66534beea3b2267f28 SHA512 ccfece0c049cdad6f01adb2e26e6a5d17fd92358696de9db9bea9310b1b3826448fd2b6219da8735cf32190fedeb8d09e8ade66850d8d12f30b0422eae17e9ea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch b/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
deleted file mode 100644
index 636c59d1b065..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e7c4847d9bbdc5d7c7435039aa5088d276ca5bce Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-Date: Mon, 10 Jun 2019 13:27:29 +0100
-Subject: remove unused link to kcrash, it can be used by the apps which use
- libktorrent but it needs to be initialised not just arbitrarily linked to
-
----
- src/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d347e07..1578bf4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -235,7 +235,6 @@ PRIVATE
-     qca-qt5
- PUBLIC
-     KF5::Archive
--    KF5::Crash
-     KF5::KIOCore
-     KF5::KIOWidgets
-     KF5::Solid
--- 
-cgit v1.1
diff --git a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
deleted file mode 100644
index 87d25e26b7be..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1e8ce6e98d7ca0088624778964b9aed4696ce030 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 14 Nov 2019 14:19:42 +0100
-Subject: Fix build with XFS
-
-BUG: 414050
----
- src/util/fileops.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/fileops.cpp b/src/util/fileops.cpp
-index c76b0e3..cfe4d5e 100644
---- a/src/util/fileops.cpp
-+++ b/src/util/fileops.cpp
-@@ -366,7 +366,7 @@ namespace bt
- 
- 	bool XfsPreallocate(const QString & path, Uint64 size)
- 	{
--		int fd = ::open(QFile::encodeName(path), O_RDWR | O_LARGEFILE);
-+		int fd = ::open(QFile::encodeName(path).constData(), O_RDWR | O_LARGEFILE);
- 		if (fd < 0)
- 			throw Error(i18n("Cannot open %1: %2",path,strerror(errno)));
- 
--- 
-cgit v1.1
diff --git a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
new file mode 100644
index 000000000000..bafdbaffefa5
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
@@ -0,0 +1,26 @@
+From 5b0abf8378d497c5a8881771518df6a02404d031 Mon Sep 17 00:00:00 2001
+From: Alexander Trufanov <trufanovan@gmail.com>
+Date: Tue, 16 Jun 2020 13:47:42 +0300
+Subject: [PATCH] Fix a bug in MultiFileCache
+
+Differential Revision: https://phabricator.kde.org/D29852
+---
+ src/diskio/multifilecache.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/diskio/multifilecache.cpp b/src/diskio/multifilecache.cpp
+index 0a513ad..882630e 100644
+--- a/src/diskio/multifilecache.cpp
++++ b/src/diskio/multifilecache.cpp
+@@ -455,7 +455,7 @@ namespace bt
+ 			off = file_off + (piece_off - chunk_off);
+ 			len = piece_len;
+ 		}
+-		else if(piece_off >= chunk_off && piece_len < chunk_off + chunk_len)
++		else if(piece_off >= chunk_off && piece_off < chunk_off + chunk_len)
+ 		{
+ 			// The start of the piece lies partially in the current file
+ 			off = file_off + (piece_off - chunk_off);
+-- 
+GitLab
+
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
deleted file mode 100644
index a71a4a0418bc..000000000000
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent
-https://userbase.kde.org/KTorrent"
-SRC_URI="mirror://kde/stable/ktorrent/5.1.2/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	>=dev-libs/gmp-6.0.0a:0=
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-libs/botan[gmp(-)]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fileops.patch" # bug 700090
-	"${FILESDIR}/${PN}-2.1-unused-link.patch" # git master
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
-	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
-		CMakeLists.txt || die
-	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
-		KF5TorrentConfig.cmake.in || die
-}
-
-src_test() {
-	# failing network tests
-	local myctestargs=(
-		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
-	)
-
-	ecm_src_test
-}
diff --git a/net-libs/libktorrent/libktorrent-2.2.0.ebuild b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
index ea246055bc8d..dc2cd337b1ed 100644
--- a/net-libs/libktorrent/libktorrent-2.2.0.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
@@ -42,6 +42,8 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-libs/botan[gmp(-)]
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-MultiFileCache.patch" ) # 2.2 branch
+
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index ae8dcce552e6..028846615393 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -6,6 +6,6 @@ DIST libmicrohttpd-0.9.71.tar.gz 1894695 BLAKE2B 46bee477972a1bf791f9edaa7451790
 EBUILD libmicrohttpd-0.9.65.ebuild 1292 BLAKE2B d0be1dcbb538eda2814e853c153df3121e5c9ccd64e5f422754a636c0078e4a701b08ccbc69103c1780b76dd8839b20bbda79125e4029e30594ad4cda8166362 SHA512 fde791d2ac45759eb1f0170607ee84dcddb26230b3721f54a95c3adca12c65a0361446d95fd7e73e33479eefef6a9b4082e3b1041034f8db166aaa6c54c7faaf
 EBUILD libmicrohttpd-0.9.68.ebuild 1279 BLAKE2B 03e4684290e50bf89b3270c7916bdbc72da590b747aac3e7cf6e72f98331c2abeffa61de886b3a87dfc49e941f33ab165e77c24e186a1631d21ff0c3b51a77a4 SHA512 82ab3db6aae947b5aca12ce0c4fb5728f77d95db4bf5b04feab81b0ce89cc58840bb1bcd1c7f7459a8a3db9182442f92b777ba232e890ad0f7620cd022dd98c3
 EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
-EBUILD libmicrohttpd-0.9.70.ebuild 1278 BLAKE2B 6b1d265d34688cd121d62a2012b96891678452919b29c70edc562b7f242268bee3d34aa1815abe2b17f089e5a855b15aa87e80333dc4ec3040112ebd61ad6998 SHA512 8cd603b0ad8138110595cffd82dddb5676abda5e8725fd26e428b51154b1e8c2f2f9d385d46f644bacc4e929da1a4fe673c379604d5765bd05f4893815b309a1
+EBUILD libmicrohttpd-0.9.70.ebuild 1277 BLAKE2B 3f5f6a39d2e9208f923b58be1f834fd7eb295d3f94c03551a496f7314fd09443c5d3df131c957162e2c222f9e7ffab9cef54bb79a55edbb56b2af53e0602d251 SHA512 9ec04957a5b5cd23b26f2e345e8c9d1982e52ed3eb6a8d307d225f711bf02c471cd3d872814ba47cb18bfd876d2de5ca3f75833806c20f436f8d806a3a85655a
 EBUILD libmicrohttpd-0.9.71.ebuild 1285 BLAKE2B 57cc4ca3b7701b4a5d84cc671069840e980cdca2918e524a656b89c7bceda0bb36349f7c869fd83076f0541a1079f587c43e491e6750898dad0ef56f593b7de3 SHA512 b576aa126f50138ad3471c1ff90a3f3409f8aae194968064df4b9f198129f43280900d629ce9841f3f30dcf056efa2801d323dbdc76a20b3212fe9ce6a6acc38
 MISC metadata.xml 458 BLAKE2B 3b4d5cbe9453997287bdd1ce08b3a23422076d27c5a0fa7d18c936a7a81651cfe109f7531386871cba45f756c6f09dbc98c4987c17f8ec7b151421bbb82ac146 SHA512 2e775d144e0469c6c7467674da543bc72966ee6641fcf4072703d990eeb6f4903c6a4c2368d299b96afa77a1328319f88848b9c12df8b889c3265128d49e3ea9
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
index 7a7b2aa8a74a..4268ba30d811 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index c6b3a80222fe..0a3251e0a8cb 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -8,5 +8,6 @@ EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac86
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
 EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B f0a32d76a4cc25ccb33e16c1f9b0544f4b94da741fb335f7978ecffcb7e3289a42917773b293dcf383b77a72840d5a65cb21f21b502bba0c4f846309600d346e SHA512 dd42cb3ea1475d8f39034a7365c90f7e976f3cbc6f11020ccc7915c0d8bd27fe04dd2f7d784c1d08a8abaab02045119c705d10a802f3ff9a736a098fa6d5d615
 EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
-EBUILD libnftnl-1.1.7.ebuild 1200 BLAKE2B 6d0bb8f977e3a2910288ab3a5a3e7576b18f523c2c94172fdab12dfc5e4ce7604374da769ed66077dddef9cbe616695163ddb24f5e0f403d0e7a070a019b7377 SHA512 416d4570ac5dcb1d147e9ad0d7fd2c75dfe38ad7a2841cd99199723cdbf896abc68c4e5f551f8dd1f6745a999ff68724c15570b96d1bdea2cab41463c7be2ec9
+EBUILD libnftnl-1.1.7.ebuild 1195 BLAKE2B 5e377c853ca587d38e69f878bf0995e77aa8952bbf0e577fb334fcd58ea609bb36d9e9a6a39180557c26d80265afc385e85087546effbca01eb503326b61d469 SHA512 813d19028f467dc7e913632f0f14687807cc1dd1ad16e02d4c275237b3d5fdd6476301836952c436fc4581a27a37f8c48b4c53e95faba3851532b6da36522fad
+EBUILD libnftnl-9999.ebuild 1379 BLAKE2B fb6bcbbefa618ef5175256ca380a636085c561f188d366597c7d9b3d4ae89102d2b56703732deb7cb5398dba880e0f48eea23b38f8d972e4249e5c93d74ffba2 SHA512 63d0e7972a2a3e3bb92fec82afbf2b72de4b68d622b5ae71f2dd948f2897f077ba76e9b96e45698120127b6da935c6a505a1b7fb32440a3f4fb3b41c19061ee5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.7.ebuild b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
index 992fe51d51ef..b513b7c6303d 100644
--- a/net-libs/libnftnl/libnftnl-1.1.7.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild
new file mode 100644
index 000000000000..ee2ad5f135b6
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.4"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 1faafd52e029..62509fa00c0c 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -3,5 +3,5 @@ DIST libnma-1.8.28.tar.xz 1366584 BLAKE2B 598c2d310844930a5ed8b8d4b8bc0ae91193a8
 DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107
 EBUILD libnma-1.8.24.ebuild 585 BLAKE2B 14955a958ecb2ef65e729f46dc4cabbedf020ca1ede426efd0291101fed11d8dc5ef70051143c4ea5f638cc1a08aeca5426f09595fcdc67d8127228c98af247e SHA512 e67925f59d07a5cba47cb44ec50721e8c365b5ec9d73882b31c2ddfa82ee5daee1241e152a7f2fe7a7f4035a8aa9ea563594d8722ed3e0bc340c9c8fe8e15c95
 EBUILD libnma-1.8.28.ebuild 1689 BLAKE2B 6da4564ecf1a70c90ffd4b9f46b67a062eefc031961ff05b702465065f6637da500ac4dc6bd41590d975c953ccac5fb2650068fc53d9334d43248ab37ad2e727 SHA512 194b9f092912f8a5df01b0f64962f87ca9b613984fe2b8ff8abde42e525dadd2c35411ee0311cccdb40d84486e5f1b2e2170d79dbd1a12c0b952dc8b9d83f4de
-EBUILD libnma-1.8.30.ebuild 1633 BLAKE2B 1ecc8236daeb550e3c445b1118fb6608b4eff69ced19d0c12579173f115e04e5672ce1a63cc2e81498087d01d6cf17f624f7b7b49f6433cc10e30c7b3462218f SHA512 23297c553458cc8fde7aca34ee355ae1f4edb5c5f1b65ec0dcc2d3c573dd76c214e9bd831cec7cf20ad532b7689ee493a538e185b25f5ebee26f80e80e38b969
+EBUILD libnma-1.8.30.ebuild 1631 BLAKE2B 5cfe9d797202d6316215ec891ad1f5bf6e55124427f65f8fee090645e5ae25b1aaadb85e1f3367a6fdb7fea00be48f3bbdf2e106adbd0761774a927a1cecb561 SHA512 45ae9e208cbb0808e8c57d2e67de0d2841669be47490c17e5e7e3fa5f35c00400f9fd0719d0dacc7d22d5c940c6bb168ccb36bf3502000343031bcc30d9ab7be
 MISC metadata.xml 372 BLAKE2B e55e51eff966d0806e416c520f700ab28219271b0b92cbab359e9b894813e0cf48b978279a4c3d0b460fe5477e12bd016cf2d401b22134c609432284d1e01ff3 SHA512 b644f5bbd965ea13b9097aec503e0d9448bd013feb1abc24cc2bf9b2b4612a984a4ec6b36b67bf0c8b920c82c812e79afcc9dceccde4b37652a61e71c6cdf16e
diff --git a/net-libs/libnma/libnma-1.8.30.ebuild b/net-libs/libnma/libnma-1.8.30.ebuild
index dac7e9407e80..fed0d7b63798 100644
--- a/net-libs/libnma/libnma-1.8.30.ebuild
+++ b/net-libs/libnma/libnma-1.8.30.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	app-text/iso-codes
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index d584ea02ec35..ebecf49328d8 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,4 +1,7 @@
+AUX libnsl-1.3.0-rpath.patch 479 BLAKE2B e500165f8ad8af21f64eb570286d8eefe51547e56e07ab70dbdc7a6824cefd010edf99c6c0b8fdf9f00ffe5e0feffab01cecc6a96dc7444536371adac7157eaa SHA512 37457cae1ed15dbfc9d72bdd6701e20abb027da1e01e48a5202ac209654a014a0f7352701790a643aa7ff12b7be0abff998596a5e09afb6f1f76eb5458f600e2
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
+DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55
 EBUILD libnsl-0-r1.ebuild 564 BLAKE2B 20dd0a9847b571117f74664778ef7b21906c5f7b822af15f05644789e41cc33b7fd924b5dc6bb76e98811148d8d592da75d805ff6610d712ed898ecb1662de19 SHA512 c243edc4f9f9ed5e7a98b7063dc8401495e5f9f821b5ae13008ce05cebdc4ffb79f5ed1a8dd8b0a13dd55e74f62f18c9566e74a3a09418647c2285c2519fb707
-EBUILD libnsl-1.2.0.ebuild 913 BLAKE2B 08008eda655addd24960dff1e696c186a11cd428594e4b71c68bb3e48494a84eda582e5857d4578fb7cf50fb20c1e7840db47ac991934740f7efd27a8b985fd3 SHA512 1883e47e564865ba5018fe8fa905c641b389d35c4da3323319be151c778aac9abf25e97695ca6aaa5901412950b50a18abe313e7bc94fe757612cef11df980f6
+EBUILD libnsl-1.2.0.ebuild 910 BLAKE2B c79c866bbcee794929c8fb4c596f5db45da92fb62e888b761afe95665f67be12402fdae74e973901ad89b38743c7fbbad7a763e4e7b9dd0c492025119c3d3bf1 SHA512 45259a766144a673674f01bbcec425952b7aa3cff3a4556564843a560c59c0f9f436055b046cd893fa8f1c5eac9ef9d10abdbb920a1edcbcba5ee9d28ee734bd
+EBUILD libnsl-1.3.0-r1.ebuild 919 BLAKE2B 6fce877a68e4d75edd80ce7ad34dd7adc499a6c780f7374ed8f90572ecebfd6631cda5351ef311e72e0c9f18daada1cc27e648ad15172bbff9f0619074e6e517 SHA512 e954e1a9b76a4865656eb7083c178f640c75ef17d155ece248e6b829b06c1469f4be384b43a38595a27162640837aa99495d3a6877caef341f83e37cd36235a1
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/files/libnsl-1.3.0-rpath.patch b/net-libs/libnsl/files/libnsl-1.3.0-rpath.patch
new file mode 100644
index 000000000000..1189dae37cfa
--- /dev/null
+++ b/net-libs/libnsl/files/libnsl-1.3.0-rpath.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/732100
+
+Remove invalid shell from config.rpath.
+--- a/config.rpath
++++ b/config.rpath
+@@ -216,9 +216,7 @@ if test "$with_gnu_ld" = yes; then
+       ;;
+     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-        if $libdir == /usr/lib | $libdir == /usr/lib64; then
+-		     hardcode_libdir_flag_spec=""
+-	     fi
++        :
+       else
+         ld_shlibs=no
+       fi
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 6a446af1826e..9e55d5d548d0 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE=""
 
 DEPEND="
-	>=net-libs/libtirpc-1.0.2-r1[${MULTILIB_USEDEP}]
+	>=net-libs/libtirpc-1.2.0[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	!<sys-libs/glibc-2.26
diff --git a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..5a5cdfc6f771
--- /dev/null
+++ b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
+HOMEPAGE="https://github.com/thkukuk/libnsl"
+SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+SLOT="0/2"
+LICENSE="LGPL-2.1+"
+
+# Stabilize together with glibc-2.26!
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+DEPEND="
+	>=net-libs/libtirpc-1.2.0[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	!<sys-libs/glibc-2.26
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-rpath.patch
+)
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-shared
+		--disable-static
+	)
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index 4b3d29d0edbd..32f3d50df0f0 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
-DIST libntlm-1.4.tar.gz 568414 BLAKE2B 2a622cd2d7b944128e29503845a3c9789efc9d14a93935ea24f9001d10b279969a8869f7ca68e6e36728638a32ce1ef693a5e8c28ab3bcaf702e114d4bf21dd3 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274
-EBUILD libntlm-1.4.ebuild 437 BLAKE2B 4f3e4b2031c0544d72ad7340f9dfb889ade96eb4cba802ce1ee18671abb0fb046a7e39f37f49fbbd6f96980efe57a96a96dfe15dc09e960bead08b74b071c0a1 SHA512 8ef0c469349c51602859efeeea760da35cfdb6b79cfbac5943bd03f2b0789c52734227e51218fc6f2f140ec0572ecff1f6d9282c1866215bc1ee959a8955f043
+DIST libntlm-1.6.tar.gz 688608 BLAKE2B 8e545619b1fb00d778bbebf6ab9748005928a2669dab8c3d9c6285127b551c1bf039e1748a710e5eb551e7cbcb1a8775b57c21b163ca2a0206a4b9948b11df8a SHA512 d68bc6b5cd7f5f70385ba78275a810fa46e60f761f0949f2262eef35ae052661739ef17ce3fc4ab75f7e8cfc788b1ccd7766d4ff0ee78db08ea4de3e224653f2
+EBUILD libntlm-1.6.ebuild 545 BLAKE2B 0193445155b7133abd68e64277c00d60b3949b03b034050aed32e2286c62f7fbb16f8ef849bca140ca59919cb53cc717895f37157819b606d6f7ffbfc4a2a804 SHA512 33f5e4f62a3b9c38de69e9eb69b59871036617f9241064c6062f31b924c7abed01a690b6cab6af85ca25d4806017889e8dacd8b6b976ced95ce43bedf4f83c81
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.4.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild
index deeacd482920..0c0220891886 100644
--- a/net-libs/libntlm/libntlm-1.4.ebuild
+++ b/net-libs/libntlm/libntlm-1.6.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="Microsoft's NTLM authentication (libntlm) library"
 HOMEPAGE="http://www.nongnu.org/libntlm/"
@@ -12,3 +11,13 @@ SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index e66460aa7358..041af64b9c60 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,8 +3,7 @@ AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73c
 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
-EBUILD libpcap-1.9.1-r2.ebuild 1867 BLAKE2B 32e905fdcb957e8c7687bfb90e3434b02dd65aae3f43d4995ec9b6950cdbc1b60e741ed383423701e6d7081500f2d39f2f170d8a05a3925da9c15e38dceb007f SHA512 27f5ce94122fff4e77b2a5bd74e24952e855e84cdb3e36b3dce1e3585813821ec9cce21d53c28983d5e2765ef118fddbaee2aa57250f6b40b4f792a696627f4d
-EBUILD libpcap-1.9.1-r3.ebuild 1897 BLAKE2B 24d4703df09d11f9458848a734558012d01d954cf4b0f403c08117a7ec96fc5598ff96d3accf1a19f61409ed582b9bcff6b1aa863ba966077d81f8aecb1ae67a SHA512 10a0cf19c9f76e5a421d7360e93e1efe6972a0bf1006b47b3d4ff26bbff92b0be1868eaa62bc8542318c354187c663fa82b05d81c8158c9f87729afed55aa156
+EBUILD libpcap-1.9.1-r3.ebuild 1915 BLAKE2B 07c0a1f8b90631cea3b1feb04a9b1c67cea39e5c994370f652c0e9fbcdb8f778631e74048cfe6dc9d7d1daf726b3d1ea96de6c0e0b767244056a145d7fb3deb0 SHA512 b77569c6ff1a51967507e8f722c40f8ee4473ae294bf80cb6af74e7300dcaff848be08305f77e35627dda12c919b625ccef510b245343cc7a7a71bdbb4c1ac5b
 EBUILD libpcap-1.9.1.ebuild 1740 BLAKE2B fe8f2ffdb8548719fa379514c6deb9753c7f9d49b26fbdd2f54ec3f922c7b2ae166449883bd85695dd1b397bacdf108b3996e20d4c62a3bf336dcbd1c09c6cf0 SHA512 12b202747893fdf2170caf1ef1355046dd388162bec8790fa638e6ecc7f6819bb19b1d41b5246899cb28214ee8cfa50e799d0d51457a857e32f1daaef5022d91
-EBUILD libpcap-9999.ebuild 1669 BLAKE2B 20026176a3a00d3a6aeeff34b8e42d9d3ff2c5309fbec222bafd73d9b8191eef1164a482f1a439c78c3edb255fbc6446ccc41933ea6d905d6c3a36c63d7a131b SHA512 1d26c8816891fbd0031e45a56cb648a6dbd7d675adfebb3225dbe2be58431128d3b72faba7d6883689dfc255aab9ec536ca797642767614350742482c51ecedd
+EBUILD libpcap-9999.ebuild 1681 BLAKE2B 61f14972b19ff6acf3e11fa251b1fb3871537eb562e891ecf28b36446d077e76c2794e26afd802c41496fdcd01daeecee23a0f6991ab783710475d553a58dc70 SHA512 9bd65255fd37e834d05799fcb580c48f104f117e7eeb19e86aa559ee5e9f8235a19c0945c68e7b933d61f92a4c26097eb4638eac0fca596e0f81260971a1645e
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
deleted file mode 100644
index 89890d0941fb..000000000000
--- a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${PN}-${P/_}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable remote) \
-		$(use_enable usb) \
-		$(use_enable yydebug) \
-		$(use_with netlink libnl) \
-		--disable-rdma \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index 7412b63170a1..2e669584a72c 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
@@ -27,6 +27,8 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig )
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 5ad21ee77a4e..53f9d5815924 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -25,6 +25,8 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig )
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 3fb0f8ae4f9a..0692fc2dd120 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -2,5 +2,5 @@ AUX libpri-1.4.13-multilib.patch 2541 BLAKE2B 082b9e44d102ddac090faa2efebb9047ed
 AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e706b7fd6043ca8012a74c79b900b00f9a98414812d50b5a6b26acee1bc5b382831ed11bf5636ec6fb4807163017d62f687e9c SHA512 3d057a8bc1401e4580dcdbb401c697cc25117b8ab9fc4feedba39bd980dc9745423eae7cc75fe48c3684b07459d0f5de11717020d3e7726ca89de7c6a8a3861d
 AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
 DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
-EBUILD libpri-1.6.0.ebuild 734 BLAKE2B 71e6d9b61b87df3ec13166d8a217a4f7ae9a5fd8b3d5144b2e6a2e45f47ecd51e20025a91d79390f55893fb96aa73ed62519f617d9f4e959db5a0525e0989715 SHA512 7cffae1730136be08fb3757a6d60ce5e8f3898c84aaa0f8b85f8b4b708af03e4b257c0a59cea0f409ce8b928e108dd7509b537fdec18eb0af39c352d435f2006
+EBUILD libpri-1.6.0.ebuild 746 BLAKE2B 028f857458573225c5eddb50f1db4c42b3a1b922087de1fcd1fc91fb1fb3c4555cc3998db1ae4cb8152421a211c62f0d6d873f533c5f544a08520c0d55d3514f SHA512 12792947d821171592025f5d252c1ee76a04c7c8895bb243372a11142cd60d266c6b856d70b2de42ff7f8ffcb4482c247ffef4ee9d79c3ed003d528042502b64
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libpri/libpri-1.6.0.ebuild b/net-libs/libpri/libpri-1.6.0.ebuild
index 6a62a8d9467e..aff3b4dccc25 100644
--- a/net-libs/libpri/libpri-1.6.0.ebuild
+++ b/net-libs/libpri/libpri-1.6.0.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="6"
@@ -14,7 +14,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 13de7c9a8519..b2b3e2541ba7 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,3 +1,5 @@
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
-EBUILD libpsl-0.21.0.ebuild 1471 BLAKE2B e47eecfd4d43860a67c74646a52eb91e065bcbd40dcb5904a469dac61cce5a174053cb0cd35b6c494ad39c2d5aec6e824a6e77b24a14e14949e40dadaebfae43 SHA512 8ca2066bce3f979d9d63a175fb1fdf75b66ef222051b868f09d0e7ee08719231169bb16ce04e500e4cd95dbc3f1ac19370e062b22c9a4d12930f823705a7d44f
+DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
+EBUILD libpsl-0.21.0.ebuild 1477 BLAKE2B 9daf618050814bc285f0f0d3fffd83df06a3976881f1eb218db49300725e9d975b8cec288915f6a184e59d0c2a1c4079a26ee74067654380deb8c1ada8e20fb6 SHA512 6ba438b27e054eddca44a9d233f39ccb584f8f84791b2e01f21bcec64cb5e127e30c3105a650169bdb6d11d7aa4fde44cc2cd1c87620c684a7d6091ffc2c03e7
+EBUILD libpsl-0.21.1.ebuild 1487 BLAKE2B aaf2af0a6f3dc074fdc859a3dc91961d7a99036701541a01fde1b9c035e6909f7bc922f4e16ae96e5e71ae10e53a3acc4699132644cd60abac77376d5f698331 SHA512 20c55514cbb7d39528cf0607da8d080aee842f4f6c1113b6f06b9bd8bf58d78476e00375c83a7041522d48ab97fe473c3f4b650e014aee8292925fb6672b6a4d
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 2db775b91e56..8470caabd80a 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -42,6 +42,7 @@ multilib_src_configure() {
 		--disable-asan
 		--disable-cfi
 		--disable-ubsan
+		--disable-static
 		$(use_enable man)
 	)
 
@@ -66,5 +67,5 @@ multilib_src_configure() {
 multilib_src_install() {
 	default
 
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
new file mode 100644
index 000000000000..16b8ab704fb1
--- /dev/null
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6,7,8})
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="C library for the Public Suffix List"
+HOMEPAGE="https://github.com/rockdaboot/libpsl"
+SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="icu +idn +man"
+
+RDEPEND="
+	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
+	idn? (
+		dev-libs/libunistring[${MULTILIB_USEDEP}]
+		net-dns/libidn2:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	man? ( dev-libs/libxslt )
+"
+
+pkg_pretend() {
+	if use icu && use idn ; then
+		ewarn "\"icu\" and \"idn\" USE flags are enabled."
+		ewarn "Using \"idn\"."
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-asan
+		--disable-cfi
+		--disable-ubsan
+		--disable-static
+		$(use_enable man)
+	)
+
+	# Prefer idn even if icu is in USE as well
+	if use idn ; then
+		myeconfargs+=(
+			--enable-builtin=libidn2
+			--enable-runtime=libidn2
+		)
+	elif use icu ; then
+		myeconfargs+=(
+			--enable-builtin=libicu
+			--enable-runtime=libicu
+		)
+	else
+		myeconfargs+=( --disable-runtime )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index ebf15fe55621..68c79e004015 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,5 +1,5 @@
 DIST libsearpc-3.0.8.tar.gz 48740 BLAKE2B c2743d7f03001dd971821ef72f403ad2c26aa8e2e8350e2c751e7aa3ffc2be2bcdec0adc75ef5dd23b12b31a866ff9b590f8a279616a5f5c76db0eacf225b2f2 SHA512 1f2cf9a15a004b6ddf8fc0b6a436a5db09a514cea4cec94ce9fa6ce973cd71dfc4a112e948a36ab0be61d736f1021622e46429d07de70b23c25b886d1e51c02a
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
 EBUILD libsearpc-3.0.8-r3.ebuild 972 BLAKE2B c9c8ea665ac2dce2090982e10d755b9addf8c950d94ca01543aa73fef832cb765f9ee019eaf6904c6cd9209239d3680f6970c90dd1d3d7111d71ab9adc98f37c SHA512 9b6f516b7f9911f133e18b9017a2baa1b4adce76b02a53ed1804808f6822a3c44e2ede4945cbdabe45e7308cc1cdee86be6978b5d283b5cf704d8daabe4e681a
-EBUILD libsearpc-3.2.0-r1.ebuild 892 BLAKE2B edf92e0e49f00e23faf417c512cb2a37950f56c9f9603201e72c1d5e291e1e9ddae67daa7fdcccf43413e9733c329c18e1658f1847897d0a1a959d4c31b30004 SHA512 d1f78e33fcf2ba923d90405145a60958f2c678d86970dabbb5f6a8a5a192c398c8fffe5d1ab8b6f8a92014a8b1c036596f3d03b2a2bb4cb23df792ad40ec9d3b
+EBUILD libsearpc-3.2.0-r1.ebuild 886 BLAKE2B 2caa94cc7263c828db647057a4d57e6011ae4045234a293bffc9b8c816cc202eab634de78b9a9cf977277636a8bc99c1d5351d7f9ef659eb8dff4d7c99d5d89d SHA512 f0acfe1e1a026335c319fb1bcb512e810fd7fac670a1c06d76f22cd157c77c97ee2ef6baadfa54d2ea12addceb7a074a2f5c100eacc396ae87b9217b982b4d90
 MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index 5ae50cbad5a9..69f45d332ed7 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 WANT_AUTOMAKE=1.16
 
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 918e109ba74d..a1281f0da813 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -1,6 +1,6 @@
 DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d
 DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf983611d353616d418f308711665aae287ff86697f7586f20f2c52ac028f9e5ad8b6d39c80876b263654c620a541812917b4f44 SHA512 19d892e13fac32022658de5eaf1db8cec3226f5f3f37a4c1c33bfa9653126ecbc6350a1ab5624025f909803c2277b86321dbea7f64e9932883cae57b65f58112
-EBUILD libsignal-protocol-c-2.3.2.ebuild 337 BLAKE2B 921030fa5ecb79d358ce7b22a0215c2ad5770992f137e5eaf74d48db831439eaf0d2e3a259c774b8b0bb29514a27455d43b7279c4b606bca137c5934441ffdee SHA512 cea773d9026592c18a255f242e19ada938372400bf112225d23fb5a8315cb90ec5fb3c63086fc69628b6358e0aa2ffb5a92b8aa78eab735277907626006fb71f
-EBUILD libsignal-protocol-c-2.3.3.ebuild 337 BLAKE2B 921030fa5ecb79d358ce7b22a0215c2ad5770992f137e5eaf74d48db831439eaf0d2e3a259c774b8b0bb29514a27455d43b7279c4b606bca137c5934441ffdee SHA512 cea773d9026592c18a255f242e19ada938372400bf112225d23fb5a8315cb90ec5fb3c63086fc69628b6358e0aa2ffb5a92b8aa78eab735277907626006fb71f
+EBUILD libsignal-protocol-c-2.3.2.ebuild 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
+EBUILD libsignal-protocol-c-2.3.3.ebuild 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
 EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
 MISC metadata.xml 740 BLAKE2B a55ff6046cc360d761f3df397be99bb31c8b8ce41f947cd1ed18c8d96e8474fe4aed9718bb0c7b2541cec2bad46e2caf0448585afea85ca8376b4cfd9053a01c SHA512 92abe5f5a1b810e92d06099d8f59d248ec69c44ea4ec8dfbec8e637a0f58e272d32b6f1024492c010418d796991232b561131cc50a6fbf46f39b55e4c7b6f32b
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
index ac7ba3a8418a..9c40ea1f66c9 100644
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
 SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
index ac7ba3a8418a..9c40ea1f66c9 100644
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
 SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index a8ef17bb8106..914c5b39a150 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,3 +1,3 @@
-DIST libslirp-4.3.0.tar.gz 126721 BLAKE2B 407e9b29c107edefd9c8609a16d763e159c2e8624469e49a7408c4edb8fe07940bfce748bd8e4ac2a92ed09a0be283f75337d12475c06ad778b4bb5cc56df180 SHA512 24c5a6c60e0a08674353db1050a6a6b6cd7633e7cb691a3380b7acc6f0bb65d8aa52a076623d4615f63c7b5e96e600b99b56d2f14772fafe132afb1f0102a993
-EBUILD libslirp-4.3.0.ebuild 612 BLAKE2B b49953205e42924c91aa82bd1f0b45b7f24f16abd5365caad7de84bf7de284cf981a4cb0be3e08366d60aa393a75b89465007dfbafde9bccf0e36aaff96ab740 SHA512 6adcfcf2e57c4ab3021bf57e3deadd53f23c1e93e0f1620d79aa9b0e6515612a093edb00df1d1b736d78090211ffe4fb41cae82940539ea1b612fd20d06693b3
+DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
+EBUILD libslirp-4.3.1.ebuild 726 BLAKE2B 9d775e7fd7ebcfcc42d8618ef8e3756d0ef5434eb10dd681bc98138e424053de9f33895b8cabd7ad92f96b4f95b295a46524b517494a9c36cbaa9745c7f2da0e SHA512 84b25b253c88959f0ad1c226d5869a6b0e633042c488e6bea9f7e64dc549fba2d2259eae43f2f3156f065272f6b1c8461ff1c78e51c402693148ef8756d4dd19
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.3.0.ebuild b/net-libs/libslirp/libslirp-4.3.1.ebuild
index 011abdb103be..5883ba4bc271 100644
--- a/net-libs/libslirp/libslirp-4.3.0.ebuild
+++ b/net-libs/libslirp/libslirp-4.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
@@ -23,4 +23,5 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	default
 	echo "${PV}" > .tarball-version || die
+	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
 }
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 789f55adeb3b..51778ae5aeac 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,6 +1,6 @@
 AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c886328c5f0e167a68f38d68a170809a63b63439ca99b0e23e6f3b548cb99a518651e93236072de300001c453a5de6f23059709 SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.4.8-r1.ebuild 973 BLAKE2B bb6b4b30486cf1315aaee7c418998b66d69e182e49e1402b458c82c38020f4c1173448f511c3fb1c5ff53707dbc7e39ed661eb9f3371b14971144b978f618924 SHA512 486b4b01c94e44cabdcb144d32a3172e857b469397c0330f15089af181eb7b80be7db8e01d1cd137340c61022b4f4d67376656352a6129bfcd820761c1dab0b1
-EBUILD libsmi-0.5.0.ebuild 890 BLAKE2B ed6636cebb4b291b8dc69616bddc78b790a602b416bf84f1576ced1958d97c58ebcd4efe35e3179783fa03f2be45fc7010c8156171d061013daf47e2cb8d7e46 SHA512 6eea1eba1ca4fc90bb4f549f40b43ee7bf754da6c3b45634b9b5ed9eefd8d4199d935b39e1ed488fdc149bacbef9ecb051b11fe2dfe03095059674642ad2735c
+EBUILD libsmi-0.4.8-r1.ebuild 989 BLAKE2B c0e313ce7f28a9f4bd7154a65ca5a595b8ecb22bd90e4c8e13661813acc257fee594fb737aabed99b1b3cf231e5172177ef4b3e6f487aa8413adcf54f2cadbc8 SHA512 dc7aa0631fb98736d7bc2e9931780584843d4739a1a45aa293ca8c9afddaa2619f46301e127133d48387b787d354fc947368d92e64f25c8d770a936beb60b66e
+EBUILD libsmi-0.5.0-r1.ebuild 906 BLAKE2B e988d297362fb886b53d1f235d4d15533c41621835764ce988aef72fcd0bcf298ca57ae3400028acaf4d2c4823b11110a38efed09b0266623c082064c627ced0 SHA512 64780231b4a57d297fed70d8d19ccbed7d69453cb0faa894128474076e0598639196ab44d8d010fd6ed179f0578b294348b948528023657d4981d413081ba1cf
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 0892ae6d97c8..f5b1fb46e092 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
+RESTRICT="test"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-CVE-2010-2891.patch
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index 22f53d929ec0..6dfe3c8358ec 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="A Library to Access SMI MIB Information"
 HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
@@ -12,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
+RESTRICT="test"
 
 src_configure() {
 	econf $(use_enable static-libs static)
@@ -26,7 +26,9 @@ src_test() {
 
 src_install() {
 	default
-	dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
-		doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
-	prune_libtool_files
+
+	dodoc ANNOUNCE ChangeLog README THANKS TODO \
+		doc/{*.txt,smi.dia,smi.dtd,smi.xsd} smi.conf-example
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index a9bd4785779c..5fb6702e1470 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,10 +1,4 @@
-AUX 2.66.2-meson-ntlm_auth-fix.patch 873 BLAKE2B ea7f36d5cb7d9df048b6f9ecf8cf0ab24424fae6bc918a3130ae6bac8b7c03fc8b69e7c2288e9c7dae2115ecaf48e1ed1c75c2abdc704faf0bdb093f2adde17f SHA512 227015874f95e759eb8850fc139d8340cff1bb05024585d7a8fa2af60f09aca17e497e43ca2a78a15c9ce71c90c7855e5235c1abc9b41e734a922e499a44edab
-AUX 2.66.2-vala-0.46-compat.patch 767 BLAKE2B ff124c8ab2897b2cdbe02e3a4c90e1584f856f9254e320a828daf1d6966c87060fb654d233baa7086e740086935b49640670f2b76ed65204bdc76b66bc2924a6 SHA512 ff218cdd450130fe12e95c3c93f8762ed891444c0a8f9b1d2c77a580717fec96a856b65ff54485ed7353d9fa3e9620acfae87fd77a096f76b647c70b8d74dbfb
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
-DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
-DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
-EBUILD libsoup-2.62.3.ebuild 2890 BLAKE2B 9d9c0060aa274b1d5e67abea2b35a24fb07bbd4b30a629cb81c4e1a77ac386ead50cdb3df7b0cdd18b94a21a40b3249701bada618d59b0e53e4e768f20cdad15 SHA512 73eadf836142720a6c10a9dc0ceb6ec69e2f6ca74d0bc7e0cb40e64e97fbce029f0f09e37a834616d883d9b10434c8aea716f4497afa78fd96360fb4c5bc2c4a
-EBUILD libsoup-2.66.4.ebuild 2749 BLAKE2B d7fbea04e4fc751be302bdfb40c653ef81fcb7cdbe2b07feeaeb217d408b95695946456db1d3a14671ae856c547daf9c9caf1dea275d6b5324f7d1eadcc25ef6 SHA512 7cab373bd4c67b4014207b02ca57be02fdd2b070cdeb646aa26b8826487dee7a992837e81839ca9755584a3a9add95b0c2650586f34e653799b26de34f8066d8
-EBUILD libsoup-2.70.0.ebuild 3001 BLAKE2B 0fcd4079ca32abd96900a964a05b0cc842ce3871081f022d144c680d593dee02b4e5ed3568ddbd05ba72557f096c15c2418bb3ffdda417374d5fab6f8d262eb7 SHA512 fdd5a70067ec1e47073e84ad384f1793e643627ef22ce5e8272b9e1761d54abe0043350be527c90af8ac200052a1e9a9d84d6a26d4e57939ec5092594a4515a7
+EBUILD libsoup-2.70.0.ebuild 3000 BLAKE2B 6896ff81e8d0eb822357c8c198e0774a9e563e239433033049e1b89214df733edec33e3f59eaa966978f9c224ca51afeeee821dae29c544e030c0b0fe44a949e SHA512 fe281bafa2b5ad22f69e55ec6631b05a28382a0cb067dcb2f0f480c04616f712458b7504599a95066ba95730ac0cf1306dc12109b2f7c536a3c52088d8facdec
 MISC metadata.xml 467 BLAKE2B d794fe938763955e050add0d57db197ff4445a7b9d6467cdf0f47ab46ca26e1b9cf4fcebbe0e90df798ab08c8a4d7cdc5b547b347e6caa2f5c83f9be698d0396 SHA512 287cf2cc758d653374e5b58aeab4a96fa45ee0846e902cbc5c7f051e31a6b9300aa4e27814b4a2eb27d6386a2bf0a57cf7032dcac081749141bac1f98851487c
diff --git a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
deleted file mode 100644
index 04c9cccfeec0..000000000000
--- a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ecd64363f82eb9d6cea07674f49c2d2869e5b62b Mon Sep 17 00:00:00 2001
-From: Claudio Saavedra <csaavedra@igalia.com>
-Date: Tue, 20 Aug 2019 16:04:06 +0300
-Subject: [PATCH] NTLM: Fix build with ntlm enabled
-
-Just realized that build with NTLM enabled was broken (!?)
-
-(cherry picked from commit bab0db142d508e92e72970db72cbbce3c13a526a)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index f0e34cb0..346ed2fd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -271,7 +271,7 @@ if host_machine.system() != 'windows'
- 
-     if ntlm_auth.found()
-       add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
--      add_project_arguments('-DNTLM_AUTH=' + ntlm_auth.path(), language : 'c')
-+      add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c')
-     endif
-   endif
- endif
--- 
-2.20.1
-
diff --git a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
deleted file mode 100644
index ce0e1dc9b620..000000000000
--- a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 28 May 2019 09:08:35 +0200
-Subject: [PATCH] gir: soup_auth_new is not a constructor
-
----
- libsoup/Soup-2.4.metadata | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata
-index c0056ec8..1f107eda 100644
---- a/libsoup/Soup-2.4.metadata
-+++ b/libsoup/Soup-2.4.metadata
-@@ -18,6 +18,9 @@ ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
- 
- // Report upstream
- add_* skip=false type="unowned GLib.TimeoutSource"
-+Auth
-+	// Factory method
-+	.new symbol_type="function"
- AuthDomain
- 	.accepts#method name="accepts_authorization"
- AuthDomainBasic.new skip=false
--- 
-2.20.1
-
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
deleted file mode 100644
index d55643d5a8f3..000000000000
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal python-any-r1 vala
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-
-IUSE="debug gssapi +introspection samba ssl test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
-	vala? ( $(vala_depend) )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# FIXME: workaround upstream not respecting --without-apache-httpd
-	sed -e '/check: start-httpd/d' \
-		-i tests/Makefile.am tests/Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(usex debug --enable-debug=yes ' ') \
-		$(multilib_native_use_with gssapi) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable vala) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
deleted file mode 100644
index c26cf2bfb52c..000000000000
--- a/net-libs/libsoup/libsoup-2.66.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson multilib-minimal vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.4"
-
-IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	"${FILESDIR}"/disable-apache-tests.patch
-	# Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2
-	"${FILESDIR}"/2.66.2-vala-0.46-compat.patch
-	"${FILESDIR}"/2.66.2-meson-ntlm_auth-fix.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	# But necessary while apache tests are disabled
-	#addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_use samba ntlm)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		-Dgnome=false
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
index 9d39df972428..55d0bc8ab39e 100644
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest
index 2927c6937a29..261b559dfada 100644
--- a/net-libs/libtelnet/Manifest
+++ b/net-libs/libtelnet/Manifest
@@ -1,4 +1,7 @@
+AUX libtelnet-9999-doc.patch 1317 BLAKE2B 07293a3658b80cccb147a75279ae7f6b9843101a0414233db33d8e4a2b6fd47283dd35a69942aff2f52775c359b5acf67f739434d5161ba13ed84eca62c95c45 SHA512 de7aef7504a3243fe01bcc11a78bc274f8662dc6fa472a1b6ab8fb84a1a518491d2343e4dd9817e6dbb0ba67fbd68406fd85ce4d1ae6e4e6469b3f71c3594d99
 DIST libtelnet-0.21.tar.gz 240486 BLAKE2B 24765fde2344f11050c17d14721c5dd2513b3f4c7f3a3494acf068d9c6b799464f07eb0c26330c9ceea962347c626cd88746f22289c04b4ec5d555d635322b35 SHA512 69dc0ac4741c81d932136cd736b48a11a05cd2738da6255d6050844f50a2f16c575c747e5c758bbdbc6b1e3309ce02e4979f0002b40fed32a3711aa8f22e04f1
-EBUILD libtelnet-0.21.ebuild 758 BLAKE2B 877975783f890d5dbbfae396756750df0aaa7a76d03b64635abd0454b88e03a3fc71ad2f38ddc5e74a63db88d933419e0216f8ef59472e5c3646cd7ce8696173 SHA512 3fc52ee5aa7db6ec297ffda19d2242311385459cf79ebf6fb419c4b1cb8036e9b44df4109298cc3d9248fdb8a3a1f762e0b0e179362b8587f44942b0e69aa43b
-EBUILD libtelnet-9999.ebuild 606 BLAKE2B d4a9f01961fe74418f5920b2b26081e2691f40eca1a58acce94af37afaf441117a4ea9c696c76e6bad58ad30019a81c107761a01e54a8b908444bc2b8fdb5551 SHA512 1f75e3f1c4592e87624f73e96d401e4663b0fea3f9dca018aaed94b613893d7acf03de988ad46879ef27b4f1ea82b545057a6c8f6031bc1a1f4e7631d7afdb0e
+DIST libtelnet-0.23.tar.gz 241922 BLAKE2B 0436c3eb2085c0fc4262f30c86f634af33679a2381a54dbfe92e6f6196b825b100c9c35f78505191b7fea5360a16d9b960e35ff145cd177aaab50968b2fbe946 SHA512 da16a97d04bc6bb5959f431e0aaa03d08ac38e45ba870d7fe6161551ecfdbd5c37a2209cfb40a0f574e6ea0b5c2866c7461cc91d940d5bb5de09fe1584eeb780
+EBUILD libtelnet-0.21.ebuild 640 BLAKE2B 59300116081387118b5dace72ece43f654588e95003bee96c040a6169c50a1c5f41d8c1cfa8aecb2a8ad3b001d9bd43aec65bd61db70eea0d46afbcb2599191c SHA512 7877506c4ba6671f497c77dd15acf7a0f16d42bd843b27b509193007285d9ccdbb3776f889d243ea040999d2fb37349588661ce56f19e29a98d15fc24bf58775
+EBUILD libtelnet-0.23.ebuild 525 BLAKE2B 29c0e2acc438660d3316afc8978575ba453fcb274f7fba788690ae16154e8eef50ee33e44204e6df847363c670faab9567b7acde201e9f2f1fcf0704d4f743d6 SHA512 86b5b05952832d2852a7be52ee039195a8d0952b11be32ebdb152817777173e4676f25ca16c787a28955d662fba79e800d929c90c11792b0378bff2f0a0a437b
+EBUILD libtelnet-9999.ebuild 670 BLAKE2B 8548e2c2c2d138c94586f3b1874a047cad412522456678674595b659ab0cdb54a5cec709e4516da1c3f53628b30c05adcbd528f4f1fef147934288e600f590a5 SHA512 a680d12564f83bcbbb7e7ffa1bf6c14a2ce80465c1cd7a4db658b05ddf6987184ae68599fd64dbf9fc6cb7b4ddd67793058f4fe7b1c2c91e734823306d9d1c1a
 MISC metadata.xml 352 BLAKE2B 35d61ac47c3cbe79d89b33487dc05c167799f4352f2a339ba47054c0f27a135745bd6f24d6b77fe13491395775c1f05878958f7aec11c7d70286f74370e714eb SHA512 8e0b4ff5329576c1b209652dee6e5ad1717ae7d2c9938c570d12641e9d1eea9769050539f73b5d6074290e6a95f87de96c054b5a3bff830ef237e5e6b1208f3b
diff --git a/net-libs/libtelnet/files/libtelnet-9999-doc.patch b/net-libs/libtelnet/files/libtelnet-9999-doc.patch
new file mode 100644
index 000000000000..c88f6cc3977b
--- /dev/null
+++ b/net-libs/libtelnet/files/libtelnet-9999-doc.patch
@@ -0,0 +1,39 @@
+From 4691956375fae84dcfaeb96c1a204a113d8e5a99 Mon Sep 17 00:00:00 2001
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Tue, 18 Aug 2020 13:22:52 +0200
+Subject: [PATCH] doc: install manpages in standard directory
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ doc/man/man1/CMakeLists.txt | 4 ++--
+ doc/man/man3/CMakeLists.txt | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/man/man1/CMakeLists.txt b/doc/man/man1/CMakeLists.txt
+index 053dc42..0da441c 100644
+--- a/doc/man/man1/CMakeLists.txt
++++ b/doc/man/man1/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ install(
+     FILES telnet-chatd.1 telnet-client.1 telnet-proxy.1
+-    DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
+-)
+\ No newline at end of file
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
++)
+diff --git a/doc/man/man3/CMakeLists.txt b/doc/man/man3/CMakeLists.txt
+index b126fea..af40a92 100644
+--- a/doc/man/man3/CMakeLists.txt
++++ b/doc/man/man3/CMakeLists.txt
+@@ -14,5 +14,5 @@ install(
+         ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_zmp_t.3
+         ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_mssp_t.3
+         ${CMAKE_CURRENT_BINARY_DIR}/telnet_telopt_t.3
+-    DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3
+-)
+\ No newline at end of file
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man3
++)
+-- 
+2.26.2
+
diff --git a/net-libs/libtelnet/libtelnet-0.21.ebuild b/net-libs/libtelnet/libtelnet-0.21.ebuild
index a607c506fd69..758f7e176b20 100644
--- a/net-libs/libtelnet/libtelnet-0.21.ebuild
+++ b/net-libs/libtelnet/libtelnet-0.21.ebuild
@@ -1,28 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools
+
+inherit autotools eutils
+
 DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
 HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+SRC_URI="https://github.com/seanmiddleditch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/seanmiddleditch/${PN}.git"
-	inherit git-2
-	DEPEND="dev-vcs/git"
-	S="${WORKDIR}/${PN}-master"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/seanmiddleditch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 WANT_AUTOMAKE=1.11
 DEPEND="${DEPEND} sys-devel/automake:${WANT_AUTOMAKE}"
-LICENSE="public-domain"
-SLOT="0"
-IUSE=""
-RDEPEND=""
 
 src_prepare() {
 	_elibtoolize
@@ -31,3 +23,8 @@ src_prepare() {
 	eautoheader
 	eautomake
 }
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.a' -delete || die
+}
diff --git a/net-libs/libtelnet/libtelnet-0.23.ebuild b/net-libs/libtelnet/libtelnet-0.23.ebuild
new file mode 100644
index 000000000000..f497242059f6
--- /dev/null
+++ b/net-libs/libtelnet/libtelnet-0.23.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
+HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.a' -delete || die
+}
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild
index 957f6345e21a..44e62916c511 100644
--- a/net-libs/libtelnet/libtelnet-9999.ebuild
+++ b/net-libs/libtelnet/libtelnet-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -18,7 +18,11 @@ HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE=""
 
 # needed unconditionally for man pages
-DEPEND="app-doc/doxygen"
+BDEPEND="app-doc/doxygen"
+
+PATCHES=(
+	# https://bugs.gentoo.org/737886
+	"${FILESDIR}/${P}-doc.patch"
+)
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index eedc34ea1ff4..e215dadcaf32 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -4,5 +4,5 @@ DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96
 DIST libtirpc-1.2.6.tar.bz2 513150 BLAKE2B 81ca8d1897b84897b31bd81c17e446213b798e00de80f03736f73eaf6b2e9e436b1569243bf9a8c5ad22de7da51339432decd2a8d3f1b8135151fd7e0f703e54 SHA512 bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.2.5.ebuild 1645 BLAKE2B de2dec6ee157550e17fe25cf3e45fd3837c956753f7ec6c19d562ccaf014411959c3e7706582383d63fbe970c6e41e6cdde06fe687193681f0930853c7e3cd69 SHA512 c8cbe135c3ed50e0e77b59a6a7c93019fabccbc0105d941abe42c75e3313c47f990d64d83167603c8c4fdab7bf989bf1868ed9aa312c12bbd14f77ec98f5aac5
-EBUILD libtirpc-1.2.6.ebuild 1502 BLAKE2B 9753af0afa16b59eae8ab760084398a43d08ca23bf0fd2ff9b238fcd5f47079de41878e014d3cff2642dd24f557df4350da0c92ad1abf9a798d7205dca7b5741 SHA512 353ad95d991a705bd37c759dfc253aad64bb5f461c80473c129f34dbc877155d1280ee4c9f65e0bc67f3acde992376f5a906f68e61d5142f85767871ce85b6d9
+EBUILD libtirpc-1.2.6.ebuild 1495 BLAKE2B 6ccfd69cdedffa56d5b165a58fa3e85ce1c3ca13a7e1f21f38ba31f7a74bb5bb5db11dc47281adce0a7144daa587b0f1db7069a33fdd82915986629d00f4cae1 SHA512 a60effb5039fdaa0eeb1525bead4385fc10db627a9bb85ee6a75b0ad707dbe02fa4928f83796eee0351068fe6729199b6af4b56688f8258632fb7cf06027c8ed
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.2.6.ebuild b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
index b10ca76d3ce2..ff2ac457a4d5 100644
--- a/net-libs/libtirpc/libtirpc-1.2.6.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 860b99ea95c1..f3a3d0361f49 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,9 @@
+DIST libtorrent-1.2.8.tar.gz 3583174 BLAKE2B ead7e28f7c29422526f8eab5611d98ba9a6d3827edf45c3819951a7ffb6f360debb818083bf0fa46e573005c3b9df3d3b4b3515c0498515449708b166e181705 SHA512 2a36412fb399f066de9768f4afd87ddbfc10fcd2a0b3a8be0a43bec6914497e71d9d4ffe4ff8ccc5544a048f799ccba6ce086ab6199f4dee66d1341f02d73f9a
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
 DIST libtorrent-rasterbar-1.2.7.tar.gz 4105179 BLAKE2B 126bb0b287c0573f755e918b3cf32a0a98c14b3b41f676d7842ea58deecc141b046b4bc18579cb9c20b324fb1361794ee6afedeff64d0b76f1bb6a95b82e10f7 SHA512 60dfb31b1300b3aa2219227b3a263ba73aedb54a90aa940c117027651779cb972d6e1badf9519f6ad7947233b54df608b829bab34493ceda9e4cb8913041a752
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2331 BLAKE2B a127a6db0a7266fc6f8ac0797693166aaf0104f2fa22b964d3630e1f09a0a2713e2e6b0bb089e8589033113432fdb0ec17e526e973bc224ee3c81b59984d88fe SHA512 dad2f1bfc68595be30c72a67eddc439e07bc394567144e6d81da407f5b3c115f0885815dcf5e4081264aa97a1161fb5c762285b3eee1e54ba8809adfc58ce6ac
 EBUILD libtorrent-rasterbar-1.2.6.ebuild 2516 BLAKE2B 62917b73acec8bdb2b7112402dece5f50ebb888d4bddb581e124eb03b2da7e72f245e27cdfb542fba80e8a48ef9a99f02cee7fff0741733fa1914af5c760cf79 SHA512 9e762812c7f09fc129e3309c9883c24e8ea425daf938e8a0b3a88fddbd729980330b515a372eb016e0d711b67c862fefa315402f024836b4529a3deb9a033c2c
 EBUILD libtorrent-rasterbar-1.2.7.ebuild 2454 BLAKE2B fc6c9d855dc9fa56ee0fec1ca77d0e31cf19e749004617046d67835d537107621342a8d854a6d58ef86d33269d823ec7236b8d178feaae937e1fe04ab489a501 SHA512 780ff64b582acdb7d39698d08fd22f3a80739afd917698571a441b7599b6f24a21075315233dbbbaa588a0da577f8bd3700a3edd072a1e7bf59fd52e29a95064
+EBUILD libtorrent-rasterbar-1.2.8.ebuild 2489 BLAKE2B 53bec76310e46e9e3e01cb58ff079e4c415b30116638431f2568e7e645841772e92b2abd3123a58b13ddc6cbeca7a0d6aa1d65c8a4e057c32d197069b61cc978 SHA512 7368f58d563d1af074049d7fa9a534b2fdf5fa8b8d06e0d49f15ffa5ae0a208783a941d9dc2ce0f4ea6a6c3f0913c568b1ff7395b082e5daf4d917a0032d9d64
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.8.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.8.ebuild
new file mode 100644
index 000000000000..ffb200fbe91e
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.8.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/libtorrent-libtorrent-${PV}"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	mkdir -p "${S}"/build-aux || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-boost="${EPREFIX}/usr"
+		--with-libiconv
+		--enable-logging
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 217664ca086c..ae8c90541919 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -7,5 +7,5 @@ DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a400
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
 EBUILD libtorrent-0.13.7-r1.ebuild 2020 BLAKE2B f056eafd05cb65f4877743b426aa001960c483eec3357b9ac7c02f7c09a4ae959f8e46ea0e273cde7a2f15fed9ea09b19bde73b3d87b31cf917438f7a33c961a SHA512 f9578efa3392717a62f39ee1abcea311e246d6fec17f2ebb05c0c22a9c5681b7aab2c44b002b7660516ae6a8898ac5d826354566e64338498948932191d80b68
 EBUILD libtorrent-0.13.7.ebuild 1884 BLAKE2B 8357e08ff7e17dcd6bf461f18597cf460d8a8fdc4dff32466400d327ad9e7a4bcc8084643ff7ffa7853a2d0e87fbf4ba3dce34f6ba0c183cfbe155f04de074fe SHA512 2f017af1252a06111834a459c984a5ec34452e3fed0711c3ed83a2dac56fc1062be03de4a97a9d9ae80e3e8b6ca27d87dffb4048812bbd76cf9972708ca1d7c6
-EBUILD libtorrent-0.13.8.ebuild 1727 BLAKE2B a7c442eb8a51ccf31678bb38a7eb685a5a072326f87e0958812df531acd3588169b4699ea3b02b6c37e8bcbba3b50db6f298d1a1b18b0a3099134ede96ff96fb SHA512 1a95159100675c6a199a61da25aecf134b5054ac4aa3a96a38840220e70d933eaaf5cfc59ca1a462ff3524a5d445c6c2264d973474f663911d585f2ae5245484
+EBUILD libtorrent-0.13.8.ebuild 1734 BLAKE2B 863390fe2c93e1df280a069ef1133e7245d62329034f798b0c43ae5b8c96c8af940c2c85f946fbf33e358686583efff3a7cf3aa01258517ae84c68e5dfa49c18 SHA512 eeb7a4693fc4ef7d46a6e0e5f7e7ff53198ec910a5fee4f0be9d3bc1e473dc7d8fc0395bbbdb698d22c1af452ecd450bc12bacfa4470ac8ec9b6e747e94e3286
 MISC metadata.xml 443 BLAKE2B 2a25f3804cf9c29cd16835e22dd67e7a94fe2dbce0c7c4a85e0a9042a79f798349a55f1282d6c92b19afbb10120d9e9b5a30e03f082d90b622593ee7d8fa5e67 SHA512 32c9f1b9d21fb99768d60d842a49a80a844f8a6ea94c012a97fa94369916a2fd6df0965dbb394e0de2360c79c01355f8a4872b2d0032b3eef5c6a4490c53ef82
diff --git a/net-libs/libtorrent/libtorrent-0.13.8.ebuild b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
index 158a5198f27a..2b97d26f6f9a 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 00850d0b25bc..fc5560b904b8 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -6,9 +6,11 @@ DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498
 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
+DIST libtrace-4.0.14_p1.tar.gz 1891628 BLAKE2B 5c30d48b34ab98fc53419a1ec7a205ec9dd97f7d162c1ea6ffcb30246ed1dde16332936d9ea3dafa32dc7a0eb991c3b384690e5f95f3646a85456d8ff28db70a SHA512 ac9031d168656c22a6113938c91b297d78a67a03d0809443345e1501f63c68812298af2760b34ce5bfa69e8d0968185bd3b6eabb838a94130ebad22bd2ecc488
 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-4.0.14_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.14_p1.ebuild b/net-libs/libtrace/libtrace-4.0.14_p1.ebuild
new file mode 100644
index 000000000000..9cd5b1a63f43
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.14_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/libupnp/Manifest b/net-libs/libupnp/Manifest
index 3b8a6c85d2bf..f7c278462d05 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,10 +1,12 @@
 AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
 DIST libupnp-1.12.1.tar.gz 786818 BLAKE2B e44847dda5a7aeabb22a5b76cdc48d1dc69e70f7ecac85824199bf8d6e9b802cb717f2959f70690cc00babf1b554a0cb031995f80c28246b9eec670ebe7aaa90 SHA512 e4741f9245378529a15b8be7acec5af52d802ce84b82f110dab44c30da65fc2514d51d3bee6311643eb28146ea90bb3c97f44f800edb4f3ccccc1681f3e70f80
+DIST libupnp-1.14.0.tar.gz 788668 BLAKE2B 8e77f49c6eacbaff2d4194f281f73e882d282b1af400b2d8e08111b7cb0b89305f3f06b8e0ebdf8eab35de39bcd2cd30be3ecb575d560c652e96bd7831eade40 SHA512 d7cf50e168aff2ef3ad08b4c383108d5044e4c9d2923088bb93423ee5fc555c32f0254f307cb86ea7c18197612cf2d2c6c681f82d99a6f01a68f86a21c6eecb7
 DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.7.tar.gz 786079 BLAKE2B 5f7764c1392f881f420f27e21084f5c98a6fce711f82a3e83dd21e22bf01f25348cbea377b2fae2d69133e4926ae3f8bffcd870e31c4f29b0fe20214842765d5 SHA512 c02b82e33e4c4d85257f0d282e3c4fc1b14a9f42eebdf12318ce6fb75e620bb0c103f9531e87be744fe70898aae9f67db4b5a187a23bcace33427a5fe7d3293d
 EBUILD libupnp-1.12.1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
+EBUILD libupnp-1.14.0.ebuild 1025 BLAKE2B f5e4b37576f658b94afcbc5c3376f976ed460a3a3d96fcc94b466a962f29183b16a965978129b630d1e0d76d3cb01cbf5dc6c82fe192d803d2f9891d01b092c5 SHA512 fba199e78cbcb6ba2709267cd84a6245478e7a64e5d452cbdfa63095f26b51842f860f159581685ac0373810e49e631ebd68f1b0ae6db8c8628345fedc01b27a
 EBUILD libupnp-1.6.21.ebuild 1044 BLAKE2B c83d4cf4eb687836b5f77b61aa7544f1fc1efb7b0ee751874801b0ec5ce0d521c7fca9f994d921e50d6d521017e0cce5dd90c39efc7facbed09b913bab2992f0 SHA512 c00b0d9075ef638590f7bd88a7fca1ddaeea7b551be515fd8795ef31075ae420fd07452c51712b0a4af7b1141d019a646ced3e67fb9badbebed6e35b0d215b4d
 EBUILD libupnp-1.6.25.ebuild 1045 BLAKE2B fec4de0cd91eb2621093f2e781c69a156a80c31cb84d625f2ff11cb9ae0ec7ae3f50d21e9a43d617c2ea9d89839feea1cc7b14559fbe87039f1d646793d3a144 SHA512 ed91708822c127df4d44ae12c48e7865cfee01baed2065ef86be50e3dce31c4a1ae83de0477f743a63c112139943a018b16a66f8c48d49765e78b2dc85a5ee18
 EBUILD libupnp-1.8.7.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
diff --git a/net-libs/libupnp/libupnp-1.14.0.ebuild b/net-libs/libupnp/libupnp-1.14.0.ebuild
new file mode 100644
index 000000000000..79c4ade3f905
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.14.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic autotools vcs-snapshot
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
+
+DOCS="ChangeLog"
+
+src_prepare() {
+	default
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use x86-fbsd &&	append-flags -O1
+	# w/o docdir to avoid sandbox violations
+	econf $(use_enable debug) \
+		$(use_enable blocking-tcp blocking-tcp-connections) \
+		$(use_enable ipv6) \
+		$(use_enable reuseaddr) \
+		$(use_enable static-libs static) \
+		$(use_enable samples)
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 63111e9d79e9..7db31371d170 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,7 +1,7 @@
 AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
 AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
 DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
-DIST libwebsockets-4.0.16.tar.gz 12342950 BLAKE2B 980f3fad78f9bd2eaed3e43f71477bbe846c8ee6e26c6a66d0cb363148b81c1b16866fcbf4c91f72c61380c6503d3b4ee1f22a068223fc43bad028db87a58bd2 SHA512 aef67d622669e2efbe0f6e8a2b4be5552b3cde7281c74c9e743fc5b8c8e23243756ec8f119420a790cacd2620bcb49612ac84e0d935ef85d7f1472bc6fa97486
+DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6fdee32ac6d57f4afe3fb42cd662202c290c21a28e9c107d61cd3b2ddb25478f93b56008dc939ced28cd1c5abd6314fb1b32 SHA512 b2ab19623557b67abf157aed0317fb2305304e72c7e40c202c0bc855a499bbef64978e9187adcfdd2ef251497144db4a9fbaebaf37a320c7190720e9d194b67a
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.16.ebuild 2360 BLAKE2B fea0001ac14096d18610bde57aa7f3badbb977552aa7acfdb0ce7441d835570ad59f78e1bf0d5e065a0b5af2e6a7f5a3c068f2ca5608560845a718b3ebd1f8bb SHA512 3beda55b9097b8a6726331fb58fb8063adfadd1b9a018e50922e6635453d583b66cdd3dd56647a7339a2b26039e00b51c8fe0f1fc26c087b47d6b876b4848877
+EBUILD libwebsockets-4.0.20.ebuild 2360 BLAKE2B fea0001ac14096d18610bde57aa7f3badbb977552aa7acfdb0ce7441d835570ad59f78e1bf0d5e065a0b5af2e6a7f5a3c068f2ca5608560845a718b3ebd1f8bb SHA512 3beda55b9097b8a6726331fb58fb8063adfadd1b9a018e50922e6635453d583b66cdd3dd56647a7339a2b26039e00b51c8fe0f1fc26c087b47d6b876b4848877
 MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.16.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
index 6bc4ebdb3917..6bc4ebdb3917 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.16.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
diff --git a/net-libs/libzapojit/Manifest b/net-libs/libzapojit/Manifest
index ef5dde5b0afc..d613061f49e8 100644
--- a/net-libs/libzapojit/Manifest
+++ b/net-libs/libzapojit/Manifest
@@ -1,3 +1,3 @@
 DIST libzapojit-0.0.3.tar.xz 272108 BLAKE2B 7bd606b01cb9b92c844a35d4229e52347c5193033c4fe483eb2fcf5bf76c9773cc26741d7eed8d52c1352767c65055088335ffb0779d390988292956b367584f SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3
-EBUILD libzapojit-0.0.3.ebuild 837 BLAKE2B 26095429bdb74a2c3ff64045ec52d1d1582113bd28924f0adcafd733b268845826deb8c1e0988e700700b70d0345ed291a58f0eeb89cfdf0b31278ea94d79ff6 SHA512 3a43299a066ae69e70c5011b4137bd10001a5bcbcdc4d533bb674cf3599a4f46567559fee2e124081505e409cda30cef1a897178c0834a9c4d2eb4f5cf980f5c
+EBUILD libzapojit-0.0.3.ebuild 825 BLAKE2B 0f1531022dbc28ba0d6c110fa1caae04de8a08556bb4938b70e491fd14466b9127d98b4746ceb7e46db9ccfddc4a5c9febbccf4593b9b06706efb55928493823 SHA512 5969780d24996f33477c0d6ab1b87246dc682289506e96cf3b877d131ad1df5c1f1b110321b331254e25f24541c62f18bdfd17d01a8fbda6edb379d77223bf50
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
index 5cf2bbcbcbc5..22052543e795 100644
--- a/net-libs/libzapojit/libzapojit-0.0.3.ebuild
+++ b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/libzapojit"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index cb252bc5c3e0..1e4e025f2738 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -3,7 +3,7 @@ DIST mbedtls-2.16.7.tar.gz 2658294 BLAKE2B cb53ac0c8896ce0dcc2b54edf4964267bf270
 DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09
 DIST mbedtls-2.23.0.tar.gz 3877508 BLAKE2B 501aee4ec19d9b52f4c3e56b821a00ff592c28ed188f9f192e83a6cd777428eafdc6b2cba3eef20bff5e1b9dc3abd43fbd4f102529ef920e11663703799f4626 SHA512 c2a04f659bf63522f10f6660c2d196d7f39a057ff5a382734ba3b839f463ead4e5c9bc0d21fb909d56fcd2ee4c711248be14861f388cd383385484d364247634
 EBUILD mbedtls-2.16.6.ebuild 2466 BLAKE2B a385e37e1c506efbd1894af6a8b08643000a1561640c46fa602f29c50f19ac2fef9ff6351070c63ed8d3bce0b57c2804e947670f5d935abd1376edb6a0006d4e SHA512 0ffc68758eb5aeb0223a284308d531cb74b627290133e6ccbd517f14bc2d47fa189b1100f658c7c3998e91dca6e0265e944d27a5501bbb7410318ed408d9a5be
-EBUILD mbedtls-2.16.7.ebuild 2436 BLAKE2B 51dc6f16c29d499f26aa58efed37d8f027cbcad3332d1a87566b4ff0d9ed9211d28628171b86c21e3c936b9466a07d7bcc802c58df47953e817ca64063e8f2a4 SHA512 3dea70fa72746e07382445983a0167c51f8802223bbc4eb17e199867f73cf37a0398066ccef6e9d6131a053e723782444a6aaa5306f14b715cb0b8782c34fa27
+EBUILD mbedtls-2.16.7-r1.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
 EBUILD mbedtls-2.22.0-r1.ebuild 2466 BLAKE2B 90da7d7d549d86b4e1d4c8f2ea81cbe1264e3da6feff6f1c6278ca55c66f3ffe877a98b878873466479df551af1cbe87578572ffea7caa7949ba2951b6d4b582 SHA512 cb69ae5bb9eb99cbaa73f51d31fd253566f5d0bfd1bc55ca5abbc61f13ffb0d834ddbc8c8f8915e34bbaafda381c22e9349f8474c2547a6f2546d3762cf111cd
-EBUILD mbedtls-2.23.0.ebuild 2436 BLAKE2B a4516bbbe99912b9172532a088ce8bdd7baf9ecccb480a7d4d0a315e8056f25627847207f3ba0b1cb1115886bdfa8754420b1bc8df31d6b9db3bf63dd2261e67 SHA512 4ebe122c5312764f736b132fc96eb9dee2d050eaeee2e691fb2f8fc5819fc1502bae01ebaf70ce36f5d3d41b632f048b4151cc71bb8249b99d5a5fc056e4dff1
+EBUILD mbedtls-2.23.0-r1.ebuild 2498 BLAKE2B 2e536e115ce4d55d5dd2e7561d7e1c742ae7a085872bad0a26267f1fda01f00d09ba34abf0bde576d516313ec0f8f8af96618610c45adefbb1a059873a8936c1 SHA512 46a61cb276f8fe028d5a7ee341f0063d5d721f1737f8807953586438572678fd83c1cedfb792343d5b648f61a29ed8c38446397d627fd1c89b80ff1f453652fe
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.7.ebuild b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
index 709a2ee290ba..6114da3d948f 100644
--- a/net-libs/mbedtls/mbedtls-2.16.7.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
 S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/mbedtls/mbedtls-2.23.0.ebuild b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
index 0a512228e15e..d8a0317d15fe 100644
--- a/net-libs/mbedtls/mbedtls-2.23.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.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"
+SLOT="0/5.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 483adb46fdd5..549fc31059bf 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -6,6 +6,7 @@ AUX nDPI-3.2-0001-Added-fix-for-serialization-loop.patch 916 BLAKE2B 85c6f19146c
 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
+AUX nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch 1063 BLAKE2B 75774a72b8d9b6814cf5a7b9f68bdabd07ec1703805807f6e4c46bc1392d0044b7513019e35a04b0209bcc34088bdb49b98f1c6eba72162a7c5665d14c3397a2 SHA512 68f17871e32de9abb1f5fa1e73d5ffbf29e906ee8088d28c764d140833c64ab41ec1fe97f0b8a6d5ccdc65c9f7beac31500508303f74dedf5ab84327a2a56c86
 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
@@ -17,5 +18,6 @@ EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7b
 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-r1.ebuild 1750 BLAKE2B efc6ab0d48a8d5db4237d1f8b59705c9e489cfc2fafd431339c9a2c7a90ae3e9a28c9ea17313f34ed1912f93be7c9d32ce2528ee40960fbf354e6fc807b3ab2b SHA512 cc1662b4a436d51e586ebc67b4c4c88440e85203586a2fddfcb6c9d6593969665a6890b4b6211e717b4bbf4cd80230834af0a1dd1a8f1c14e6df63799f0c507e
+EBUILD nDPI-3.2-r2.ebuild 1816 BLAKE2B 1ff85ae67f95fc476ee4ec7c72d68b22f5bc559ac4e791297b3daff664f7fc2c85a8e432f69e6d7e107accc5dea99183600233f65bd2f641decd40d69697208a SHA512 a014ffa4d3507fa55fadf149b832a1f02adbb3ce8b148b24c46cec186a680f2c04c7a79b78c4e5cdddbf13d3e9be68acbadd428c15a07c185e389375e6792028
 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-0005-Fix-oob-in-kerberos-dissector.patch b/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch
new file mode 100644
index 000000000000..cd34875890cd
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch
@@ -0,0 +1,23 @@
+From 6735bb35c65c60a777557c3277546d5801729995 Mon Sep 17 00:00:00 2001
+From: Alfredo Cardigliano <alfredo.cardigliano@gmail.com>
+Date: Tue, 21 Jul 2020 00:46:37 +0200
+Subject: [PATCH] Fix oob in kerberos dissector
+
+---
+ src/lib/protocols/kerberos.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c
+index 2bacbf51..2ed824fa 100644
+--- a/src/lib/protocols/kerberos.c
++++ b/src/lib/protocols/kerberos.c
+@@ -185,7 +185,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct,
+ 
+ 	      body_offset = koffsetp + 1 + pad_len;
+ 
+-	      for(i=0; i<10; i++) if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
++              for(i=0; i<10 && body_offset < packet->payload_packet_len; i++)
++                if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
+ #ifdef KERBEROS_DEBUG
+ 	      printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]);
+ #endif
diff --git a/net-libs/nDPI/nDPI-3.2-r2.ebuild b/net-libs/nDPI/nDPI-3.2-r2.ebuild
new file mode 100644
index 000000000000..12a23bb316ae
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.2-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	dev-libs/json-c:=
+	net-libs/libpcap
+"
+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
+	"${FILESDIR}"/${PN}-3.2-0005-Fix-oob-in-kerberos-dissector.patch
+)
+
+src_prepare() {
+	eval $(grep '^NDPI_MAJOR=' autogen.sh)
+	eval $(grep '^NDPI_MINOR=' autogen.sh)
+	eval $(grep '^NDPI_PATCH=' autogen.sh)
+	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
+
+	sed \
+		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
+		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
+		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
+		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
+		< "${S}/configure.seed" \
+		> "${S}/configure.ac" || die
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	default
+	eautoreconf
+
+	# Taken from autogen.sh (bug #704074):
+	sed -i \
+		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+		-e "s/#define VERSION/#define NDPI_VERSION/g" \
+		configure || die
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 5bda44bf28e4..676be53e9a66 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,4 +1,4 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
-EBUILD nghttp2-1.41.0.ebuild 1969 BLAKE2B 559beb9693a6fb4df96d19a57fae0884776a53673c8721b8502a72f0854133167ce42f136fdf3ad0a6366f3996f17b8b168d9f44f43d4584f6400a4c9d975e27 SHA512 6caec7f67d01715604b67a1ca1bf668490ae28e0c4b8d5d8a4606e8a92b212288e63279b04ee7fe49e44752e63a8f2965a62319f4511df505c9804b0595b501f
-EBUILD nghttp2-9999.ebuild 1978 BLAKE2B 3681270a1343a533630adecc2b1edb7b32cef71368da48df558e5587d3ac85364a5e556409a920b9a0c695667b0e3bac9da1410ad1319e69d832d8a21a3fd13c SHA512 99ca054a9bf82567ce3620831b7eb42e6283545c62f8c333a5c876962fbf6f1a5b7b4acc1d9decf9307d2a6bcc25ddaaeee83b5c3f25e51a256ee3a4a2df3eed
+EBUILD nghttp2-1.41.0.ebuild 1978 BLAKE2B 9396ab56fd1c4d55efc308cfecf99cee154265a2a5c09234072d55d443e6b86871d22f71cbeb2ded297bb6285e5606758356d5db5741becc9a77c61c33588a30 SHA512 254d2af22098f1d55bb9e8730c9ae02b6588f7a1b34e3125cdb5c9abfe9320d286b6e61e0882790ff221a1259d388c9e1bd328158521d7d6a8407ebdadca9af3
+EBUILD nghttp2-9999.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
index c0d775bb37c8..e18ea823126d 100644
--- a/net-libs/nghttp2/nghttp2-1.41.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
@@ -43,8 +43,8 @@ RDEPEND="
 	)
 	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index a740e69ea79b..b43a0d325068 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -43,8 +43,8 @@ RDEPEND="
 	)
 	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index bd7dfe2af678..5af098d8b874 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -13,6 +13,9 @@ DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f
 DIST node-v14.3.0.tar.xz 32985344 BLAKE2B 32ee357e109484422c3b22423ab9a593cd5d4611073c820f90c196dae4df2860573cdd06170879f675b738b01885eb2fe0f25c2328841838bf9367324cc981a7 SHA512 3afcc430bad57150baa8d1c0e5ef0f64691ef6549a052be654a86313fe28f31e7fdfeea4d2b3993798a7141bc6d7b1642747d1bc2636139e2f2fd79441580148
 DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
 DIST node-v14.5.0.tar.xz 33141456 BLAKE2B ff268f44d0a4133a0efe091bec3cac945c656f355b19d8d577ba239aa65c07bf909d6f1b3d7db4f2f5c3c856e3125fe31f9e9e39ca7772f34f47521d5106a101 SHA512 8bcd3d72f294fff60a59815137a193b465b3a901a59fcf08a4840507e2cfc74ee165d7ae0ca6388662dc218213376f559a6c872a92062691c7413351a2ec2b5f
+DIST node-v14.6.0.tar.xz 33282140 BLAKE2B 0a7dbc290578ecc8ba008a1f2633df986b24b6d111a3cb9aed136f1160c319fc7b82d8aed7abf071e8ccc0918eb0c1369acb73b233e731d621396b06094b25eb SHA512 2189876d3e60bffbac7089c51b4a9ec78dd94f00dcc38bd0fe0d9a42b7de9b714c46468e3bb0513b60296dfaa6a474d80d14a8fa86a9e977b1ea76a0de02bda2
+DIST node-v14.7.0.tar.xz 33317268 BLAKE2B 470dd42338a2b9e7d6f29ccee544c7b3a5a55615556110fc1d12accfae79929f3a44186bd1c8c245d217ba67dcab22d1fd8b158e6595a7fefd2aa342f027961b SHA512 275875f2062d91617705b211fd254cdde61694c6a7ff657b66931f0d507220a9fde5a5f5c9e0e562ce80d531a87050b034d4e11bc3cfc4cf04d26ed15d1e0142
+DIST node-v14.8.0.tar.xz 33342288 BLAKE2B 4f8129beb16ece09f14c234395b29bc53e84896fdd9877821a27c80d88a0740d42ea4dcf65a0a5c52a98129262be236207f4c07d81f76cc5e4471f21227083e9 SHA512 ebb20f7163e20e8074dd9cc5d3ee7f3cbc536c55a7753d39c482ea90e9314d8fdfe1a88203be7f250f6d77b9f13da04d32d99770d300c2ab0dfdee3d7582f068
 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
@@ -25,6 +28,9 @@ EBUILD nodejs-14.2.0.ebuild 5854 BLAKE2B b738a893013811417c3dfbc5b9a51541193c215
 EBUILD nodejs-14.3.0.ebuild 5860 BLAKE2B f06c5967350ba2a80010fd7fbdde840cd1357e3c0144bc56120dc8a97db85950d27b1739e13da8cf9352d425a69bf5a583897e777f3506b324248882a0636106 SHA512 f62d937f362a16c3025ccc81c95e1f85d1a85bda1df86b1778faa1bc8da85f69f02f6cd80acd92bd670781690f66ae43c00bfa21f04dd74c3b161839ae367134
 EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 668d26dfe8d4c274274851f8b96e8d77dc69205dccdce38b188776ec3f72488f92790f4132a0e3da624b20a52763a67b50bf0b73804339b6a6713e4de23a5dfe SHA512 054656d522edaa005c1cf3efedf29c0cbcbd41ea2ee94aa7000b87b219ececaf4e2d0dc53f728a945b0028fcaac9c38467327f48c23e4d360c2a69a40e7bb7ba
 EBUILD nodejs-14.5.0.ebuild 5864 BLAKE2B d80c80ee1a0ed50bfd2592c7dec998e8114a5cb25a0e991388e6caea78c6619bc614bac753b4f80fe6af584a28d52d1be269291b0148fea03a62460628957cbc SHA512 92f6b920d7c98dfd3febb5f8457bccff14ed6105e811354e3e1394d46fd8227be7b07caed0a186dcbbb13c943aca4a44097dad18a104c7cd3a19b9c5775e627a
+EBUILD nodejs-14.6.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
+EBUILD nodejs-14.7.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
+EBUILD nodejs-14.8.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
 EBUILD nodejs-99999999.ebuild 5782 BLAKE2B 91b3e65a9809f00405872d40032d9411b655d00c6e498050efe303e578a723a0e3245d846fd84e4ed9ce91cd677df71d744bbbc956017d869a93e5c19d2113e3 SHA512 051a3e32e82faf388137f4be8be8df4d95fa9f1ec39ebed2ddea41c1f445262bdc6fe4538d9109d8dab60bc793e0e6fe178e79c5571ebc1e366cf240c7111d43
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-14.6.0.ebuild b/net-libs/nodejs/nodejs-14.6.0.ebuild
new file mode 100644
index 000000000000..9d912667e480
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.6.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.38.1:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-14.7.0.ebuild b/net-libs/nodejs/nodejs-14.7.0.ebuild
new file mode 100644
index 000000000000..9d912667e480
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.7.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.38.1:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-14.8.0.ebuild b/net-libs/nodejs/nodejs-14.8.0.ebuild
new file mode 100644
index 000000000000..9d912667e480
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.8.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.38.1:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 969140a9dddc..5ef7bd18eebb 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,9 +1,9 @@
-DIST ntirpc-1.7.1.tar.gz 373327 BLAKE2B 55d71932e35b844e382409593b5dead30246d0cbaa27d3d49ad94d09435acb8abb34b945ba90ab7ba9733a955b4184ad839ba202aa82f97eeecbcc502cb88bf0 SHA512 9a98d83db94b4775940584cd08a1105b79263412d44309f91d1e86c609e6d56a482ac239efaaa73ccc1c2f4cabb8b597ccb8931514f33b8b2fd5c2a11b731106
 DIST ntirpc-1.7.4.tar.gz 373897 BLAKE2B 7354c5d6114947c8d66dcbc4fb933ab38237dd70eeb318278a658946fa4ec354bcaf7e90ac210f39f76b6d8e60f865c0c63ecbf7cbd8ee1e8defa0d7622cfb51 SHA512 076d789edc3fdf0ddb75437196b72b1aef78780d579ae4db0bcc116a1a92ac861fc77e1611070f2d3df003bfec7883ab20653a3c2f2255c685aaed8e7c22ce0f
-DIST ntirpc-3.0.tar.gz 386738 BLAKE2B 123c8f31ea532f6a01b4544d4f19d503c6e44ec8f3923f3f053f1ccc2ff5c5dc62da6464373b25a1881f69749a4c62395838be4451f3281ed9e7446eb8380255 SHA512 a7e9fdfcdaa2e85d4631094874bd72dce6c2e93924f6099f6bc20c98a1792839559ffb028b100aa3c5ec0140c10e090b32155439846276f918e9ba017271e14b
+DIST ntirpc-1.8.1.tar.gz 375019 BLAKE2B 3c774dbb762759f920e4159aaf5e4942c13837413bf72ab17298298a15278bc92332f8835701e0895f252596c21ba0d750c5f7f8afcf9104b8118745208fb1ec SHA512 a20749afb6d1f6216d6f5b6c9c29f6d988064d9cda8d3bfd855e62ba0ef88c7b47026d79c77be815c21eb91af0fcc6566af85df2401b5cef20c7ddfa5c5525b1
 DIST ntirpc-3.2.tar.gz 386961 BLAKE2B 920917b7ec08e2d4147785e1753596f035de684ffd92fb55fdf553bb4e19160e40fb829bd867d5a3a43f36568f731f71c31f135b6fe07fea2a6088f27ee3c6ff SHA512 8e9b5b3e607e28c4033c5986dbbc248d0edfeda6138b3ff51cc0760dccfb1cf4a14ff6bbec4330421b1175c3b1b04a34a43f314c97be2758fe0331b775f86021
-EBUILD ntirpc-1.7.1.ebuild 768 BLAKE2B 991c49a2c88cb8459f947ec4de91d46cd7935ca5d868a362acffc42ac135f921f895a653a9bb9701e4d091b72d875ea4bb78c9480ce8096a8822efd59cfe0fe2 SHA512 258f6102ef485cfbd40d03f12c342316904d39d7e82f4c9b8e1d44ce90980e16029a00485a516ed3b102d7bba0544eeb165772458b425930dfe05f288a4628d4
-EBUILD ntirpc-1.7.4.ebuild 766 BLAKE2B 1f0d4c49179f54e224348fb7131a8f91eb11611f3ac79495a69a281017c370f4f0088bf2eb8703de0d93a1e1a1e48c80181fd50297489a1f32e2ec1be7ca81fb SHA512 8d704f4ea19eff1dd3b13f9dc8aa33679c9711eba909dc6683992356c29f94cf7b90b6f6db5df0ab84e30cb57de8a9286ea6062ec4bef771119751b507be7459
-EBUILD ntirpc-3.0.ebuild 796 BLAKE2B bdc1af534de852b497f9162e0802ddbfd6168b7e599198db3351a67e5d5fa2cfbe962ebe109007245f5711b6462eb8fd3acd8f752b1d62bfac3b0e8e1eb5e161 SHA512 ff8c7111faad2e0d582b3f3dfcea4feb26b4a5e9dcbdb561ce55e678f9b2436e8b45c7dd7f466df18e023aae233a85f11edd2335e1ad2f48f88bd71cee68524d
-EBUILD ntirpc-3.2.ebuild 796 BLAKE2B 436b858e3c2226a248f4865238387bc4bf400d69e696b35ef5ac297d97af91d95551a4658af768788c7411f774a8f77ec1485df03d1629c549339c44709a8a04 SHA512 f5096de5126ab2b269b4a7680d75537131992b23215daef0f103ee908b1dc2e587405788a3dc1351dea3fcf918b988339fec61556d272678d1a654efac6c99c3
+DIST ntirpc-3.3.tar.gz 387212 BLAKE2B ee656510cadaa041b4ea389710f667021e07697744dd60ce71f4e856ed91339cc5373bba771ba6bcc09d86e32502339bce7fb1c7e8ae411ec38ebade87cdb735 SHA512 c5586be51960c682f719dc0aae21846cb1af6bab10c1d3b946570508947d281f776595e2f0d12edddd9d0289e737fc2fb823ed5060dba6b6e5c6b01f28c84cde
+EBUILD ntirpc-1.7.4.ebuild 742 BLAKE2B 93c4145127a2f983cc2b191c6b44efa9e41341ba5302ee64c2677e5f890c55490e10f95b9b0e42b736d882519c934c2901b98eaceb7c717183167fdab0653fcf SHA512 3fa5703d9a040e0ac6d7a39238a883c78d571a8a13c0a6ced4bea0d680062300e3e65a3ee2d0d39ff49621c76dd8a70403a6da815b35ac0200c8cb957866b9d4
+EBUILD ntirpc-1.8.1.ebuild 729 BLAKE2B f6091c215b71993ce7bf0f2e98883b8ff46a6e2ff01b11a558cde8a969089d23160e4175029ba96621e3c6bbd9c0b40db1280d91ed4e1c0f591ee6ea6cb66d23 SHA512 a044725c4b0b359f304e3a6e27e9b8c4d228adee6da442384a4b79b6cb30b9d109b4925f819f44db2219d96a8fc4ccd48f715a6083cb324d4b4f2f72cbffbd73
+EBUILD ntirpc-3.2.ebuild 772 BLAKE2B 95943668a81b6c31748a2b31d28ef1519db8439b75deba668f79fd7c1a71f18cacfdbe99e675c4f5f1d5849b4f49b06acaed9cd65bbb90c55350798f5b839a4d SHA512 958676bc8a9cf9641aab4a51b7328aac659b92771e59bea9861b8769dc069de76b5f630c33aedc4acc14c3b82d5d9eedb9ac312b5dadf9b415562d84466d39cf
+EBUILD ntirpc-3.3.ebuild 735 BLAKE2B fda86f45c8b96b14197e772659e34b779b3c2813ad47468ff2b57eaf0608e9d7ef7bed29850cabf8abf378c84f77fe8e9b1bd8b0445d47f1158a5b2bd7fe9f56 SHA512 49d1d92954d8c4f6fafe04a55fdd680358b31fe5405951ac821348097f2c6ee6732f2dc301a1b78f8b00600c0406a7d09ce13cd2338590fd2d640261487bf491
 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c
diff --git a/net-libs/ntirpc/ntirpc-1.7.4.ebuild b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
index 97b6f9397aba..bded25ea259b 100644
--- a/net-libs/ntirpc/ntirpc-1.7.4.ebuild
+++ b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -21,10 +21,10 @@ RDEPEND="app-crypt/mit-krb5
 	rdma? ( sys-fabric/librdmacm )"
 DEPEND="${RDEPEND}"
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/ntirpc/ntirpc-1.7.1.ebuild b/net-libs/ntirpc/ntirpc-1.8.1.ebuild
index 888c3fea1167..7ec7709e46d4 100644
--- a/net-libs/ntirpc/ntirpc-1.7.1.ebuild
+++ b/net-libs/ntirpc/ntirpc-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -16,15 +16,14 @@ IUSE="gssapi rdma"
 
 # Since the GSS option only controls some extra files to be enabled,
 # there's nothing to list in the depend string for it.
-RDEPEND="app-crypt/mit-krb5
-	net-libs/libnsl
+RDEPEND="dev-libs/userspace-rcu
 	rdma? ( sys-fabric/librdmacm )"
 DEPEND="${RDEPEND}"
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/ntirpc/ntirpc-3.2.ebuild b/net-libs/ntirpc/ntirpc-3.2.ebuild
index 590f6fe9b48d..7027d1cf5ede 100644
--- a/net-libs/ntirpc/ntirpc-3.2.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -26,10 +26,10 @@ DEPEND="
 	${RDEPEND}
 "
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/ntirpc/ntirpc-3.0.ebuild b/net-libs/ntirpc/ntirpc-3.3.ebuild
index 660a94304bdd..6e63e824706b 100644
--- a/net-libs/ntirpc/ntirpc-3.0.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -17,19 +17,17 @@ IUSE="gssapi rdma"
 # Since the GSS option only controls some extra files to be enabled,
 # there's nothing to list in the depend string for it.
 RDEPEND="
-	app-crypt/mit-krb5
 	dev-libs/userspace-rcu
-	net-libs/libnsl
 	rdma? ( sys-fabric/librdmacm )
 "
 DEPEND="
 	${RDEPEND}
 "
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest
deleted file mode 100644
index 45cc5cb07876..000000000000
--- a/net-libs/osptoolkit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX osptoolkit-4.13.0-gcc5.patch 768 BLAKE2B 778d117c7bf5d4bd6ccb3690c341d5cc828edf67c84160beba7c910ac957fc3fbe507ff4ccfca9a6283b6a47ee05dbcc1eaa901382c3d1a63cc5608adbaf6590 SHA512 4f2d11e32b958ca5621321ed0258d3b8544528c16bb9418eb5ddd7c1929b24d42ec0ec6d714c658905df249a8356efb4cc13309a0ccc70521425faad306136fd
-DIST OSPToolkit-4.13.0.tar.gz 422064 BLAKE2B 13afe4d30a96b7cd59cf4be6116f35f5edf30b70046a7a203e89140bd0b7f338b8d1478fe6a90a7a17b6f93b0c6a8579f43b209119a8c6fdb08dff26e5c13262 SHA512 35e54350cdecf0367af47986a7c3eddfcdf924b0d6e7c52ccccdecd96d3d64ba7f8d8d266cc4d26708f0741e40eeff80db4690272702c35d4e5bafba745776bf
-EBUILD osptoolkit-4.13.0.ebuild 2720 BLAKE2B 7f63e5fded0891e0aba284175ba1152604ccdc4f56252f6a48bb2f0c8db074e20c04012e1dfd7d41b47963485ec732838bb6f4a7fecb9d318ad2aa58211f2c41 SHA512 bdee9975b225101cd0712cbbadac13d43ded13d99c319e3592b81637156d644c7cae31cee6bdd29e8d8244eba95275073dcc42762ad627dbe7d851c3d6ccaa7c
-MISC metadata.xml 336 BLAKE2B e499cd7595c1fa197432bd158c3a7f08a7d9d99496ac9911e38702918a9b35a9088a8168c6a7222acbec3134005674dff3040dd0c2b5177e7df72167f1c1fd84 SHA512 09152b4aecb17930c71dfe645780e61205a9f13c6ade1fd8f16298a7f982e36d802f2b8744a9de95c48b41a28ebafbc8e76a7f0262721c5fa41a61bffef5a5dc
diff --git a/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch b/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch
deleted file mode 100644
index a06ffeecc91a..000000000000
--- a/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Starting with GCC 5, the __builtin_isnan() fucntion requires proper overloaded types, even in C:
-* osptransapi.c:1040:13: error: non-floating-point argument in call to function ‘__builtin_isnan’
-*              OSPM_ISNAN(metrics.mean, tnisnan);
-See also:
-https://bugs.gentoo.org/show_bug.cgi?id=581058
-
---- a/src/osptransapi.c
-+++ b/src/osptransapi.c
-@@ -983,7 +983,7 @@
-             /* sample mean - have to cast Samples to a float to get some precision on the mean */
-             mean = ((metrics.mean * currnumber) + (ospvMean * ospvSamples)) / (float)metrics.samples;
- 
--            OSPM_ISNAN(metrics.mean, tnisnan);
-+            OSPM_ISNAN((double)metrics.mean, tnisnan);
- 
-             if (tnisnan) {
-                 errcode = OSPC_ERR_TRAN_INVALID_CALC;
diff --git a/net-libs/osptoolkit/metadata.xml b/net-libs/osptoolkit/metadata.xml
deleted file mode 100644
index 8e8837dfca6a..000000000000
--- a/net-libs/osptoolkit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">osp-toolkit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild b/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild
deleted file mode 100644
index 2c1dd1459dbf..000000000000
--- a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-S_DATE="20161107"
-
-DESCRIPTION="Open Settlement Protocol development kit"
-HOMEPAGE="http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/OSP%20Toolkit%20Documents.htm"
-SRC_URI="mirror://sourceforge/osp-toolkit/OSPToolkit-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/TK-${PV//./_}-${S_DATE}
-
-# TODO:
-# generate a shared lib
-
-# NOTES:
-# osptest isn't a test that can be used for src_test, it's part of the toolkit
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.13.0-gcc5.patch
-)
-
-src_prepare() {
-	default
-
-	# remove -O and use users CFLAGS, see bug 241034
-	sed -i -e "s/ -O//" -e "s/^CFLAGS =/CFLAGS +=/" src/Makefile test/Makefile \
-		enroll/Makefile || die "patching Makefiles failed"
-
-	# use users LDFLAGS
-	sed -i -e "s:LFLAGS:LDFLAGS:" test/Makefile \
-		|| die "patching test/Makefile failed"
-	sed -i -e "s:\(\$(LIBS\):\$(LDFLAGS) \1:" enroll/Makefile \
-		|| die "patching enroll/Makefile failed"
-
-	# change lib dir to $(get_libdir)
-	sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/$(get_libdir):" \
-		src/Makefile || die "patching src/Makefile failed"
-
-	# test.cfg is located in /etc/${PN}/test.cfg
-	sed -i -e \
-		"s:\(^#define CONFIG_FILENAME.*\"\).*\(test.cfg\"\):\1/etc/${PN}/\2:" \
-		test/test_app.c || die "patching test/test_app.c failed"
-
-	# configure enroll.sh
-	sed -i -e "s:^\(OPENSSL_CONF\).*:\1=/etc/${PN}/openssl.cnf:" \
-		-e "s:^\(RANDFILE\).*:\1=\/etc/${PN}/.rnd:" \
-		bin/enroll.sh || die "patching bin/enroll.sh failed"
-
-	# change enroll path
-	sed -i -e "s:^\(enroll\):/usr/lib/${PN}/\1:" \
-		bin/enroll.sh || die "patching bin/enroll.sh failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C src build
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C enroll linux
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C test linux
-}
-
-src_install() {
-	emake -C src INSTALL_PATH="${ED%/}"/usr install
-
-	local DOCS=( README.txt RELNOTES.txt )
-	einstalldocs
-
-	insinto /etc/${PN}
-	doins bin/test.cfg bin/.rnd bin/openssl.cnf
-
-	# install enroll and enroll.sh in lib dir to prevent executing them
-	local ospdir=/usr/$(get_libdir)/${PN}
-	dodir ${ospdir}
-	exeinto ${ospdir}
-	doexe bin/enroll bin/enroll.sh
-
-	# use the symlink to execute enroll.sh
-	dosym ${ospdir}/enroll.sh /usr/bin/ospenroll
-
-	newbin bin/test_app osptest
-}
-
-pkg_postinst() {
-	elog "OSP test application is now available with 'osptest' command"
-	elog "OSP enroll application is now available with 'ospenroll' command"
-	elog "ospenroll is using /etc/${PN}/openssl.cnf as an openssl configuration"
-}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index e5510b8c693a..b02b3732a2a7 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -8,5 +8,5 @@ DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
 EBUILD pjproject-2.7.1-r1.ebuild 2618 BLAKE2B 607df084017b04a906260d066fb28ff0a0ee11aa73430e40723c53ad87fee8298bfee203f231d4fe4fe7160521c5bcd47eff85a13a7d02c6790d42e4d29505b8 SHA512 08cfc90ac6007da1ba37c2b58417f9b71064982d818f1bf04c325501486ad8b3382d85347ddd6419ce5195539ad3c77575846eaf52ca9c92628b9bd79fa46670
 EBUILD pjproject-2.7.2-r2.ebuild 2754 BLAKE2B e26d384028d5a0211c48963100f55daa7df626b39d4d64d25d7c60adc33b2925c1f4c61af822699977a8c07cb437c227990e33a53f98eabeb058cfc111b37557 SHA512 1c1b9856f09f6bae89f3da0ed8b5a622a84402bb3f663b8fc1e9d4f435700e157511ae120fb074fa7bf02df6b031cce138c1c288649751bbc84263e39cf36361
-EBUILD pjproject-2.9-r2.ebuild 3038 BLAKE2B 819df44be36c4446a20439019e1a46d05d60c129a9957630ba417174892240539b6c22397f227b8a91587c3e0773ab9b505582ad4adc9cc9ee8cdc05bd774ed8 SHA512 f2ff0153d06d2cca2ceed40919878ec6b94a02ab5c83b1d5c90b80f9d7f9e55599750fcf2e381ffdfef440faed78c203620d2fecd53b962db83aa40486716d85
+EBUILD pjproject-2.9-r2.ebuild 3101 BLAKE2B 40662dd056224a0ad87b3ef9620f7499910afa912657aba99d157ec89fa9d9581aca7e49f418c5a7c09c1996f4c084f44a077b80b3492b5901da93dde3786cd4 SHA512 6b48d1dec7b04ded7a6a28b6ba10e418f4daf9f06550d1a29db52e7b9a4feed3ce28e66fe797f169fc5d0c7370baa82435d3c6e98b693027cce9d20bd0fea009
 MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index da65c7055080..14cf482e2630 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
 SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -78,7 +78,7 @@ src_configure() {
 
 	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
 
-	econf \
+	LD="$(tc-getCC)" econf \
 		--enable-shared \
 		--with-external-srtp \
 		${videnable} \
@@ -101,8 +101,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake dep
-	emake
+	emake dep LD="$(tc-getCC)"
+	emake LD="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index edd6ef8f541b..fc20d5cba9a1 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -1,262 +1,104 @@
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
 DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
-DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
-DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
-DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
-DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
-DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST boringssl-f18bd55240b229a65df48e7905da98fff18cbf59.tar.gz 17909647 BLAKE2B c14a9559eab74c400c412fbf62cc3642eff3811e7d93b57bcb286fbe15689ab799c524d2f843e027581fda04919c8fd52defd073da2acd3326eade166423eec6 SHA512 83cd2fb9cec52f97e046c5773741359f4bcea9dad38c346123348187af725011a5ade06a0e3c28609660b00ad1003d3e395b03af6cdeced8a850cd9bebc27e59
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
-DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
-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 bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST cast-0.2.2.crate 10318 BLAKE2B da2f8327bc3c2d884bcfaad9d4b2a79e009d060501be98cfe344598da66306940134c28f96eac39578ac98cfc26fd754b68707fa17adab233b371a79eda8a54e SHA512 7b0e860a3c6c809799a9fc733bb0303cff819bc2b884cf77e1517aa9824c819c259edda7793be2fa5fa6573de4f07c0ff95f90a03d0d38c5905260e291ff9786
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
-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 cc-1.0.58.crate 52896 BLAKE2B 118619bbe306aef5cb83350ea04a7660a4af2c365a5f0c30d045cdca73f7d68d6646889295590dff29cbf003b44f9b00d5eab22fcde8a57483aec615278dfbb8 SHA512 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7
 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 cmake-0.1.44.crate 14377 BLAKE2B 5922b7dd8618e7982064fd754b1ee54941a4555961bbc832da6fb149afa1317951e4ab710f2a13856aee6af18bfd9612514dc56e795a013c8d4094c8be1fca11 SHA512 7adeb6289fb1072aa739b4f6bbe91f612fbab730c3ea67b6024a31ebfe3fadb2da798495ddabd5cbaaa1106bc4ae185b350f618eca3a72de4ea0a4d526664657
 DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9
-DIST criterion-plot-0.4.0.crate 17204 BLAKE2B dbde14b2a7e3bcfc41886aade72c88f31835b0739dcc0d745233c4b936693cba3638ac5f60a47355f37f9caab2f6addd86c8ef1881c21899dfd43491b24dbeab SHA512 06e46dd31ebdd83621bab4b108892b366566ca6819db4a7832cb24fe5bb2155ce086ec97f282a6fb5aa1e1103de2c2d8a42a69b71af20cd62f49e51994c21864
 DIST criterion-plot-0.4.1.crate 17185 BLAKE2B 106f956a32ab2a0f274882e2cf5707c9763e16ca9e98d2bda2ac92520a9dbff46ff4748f4b14417ccbc288b48fc527ffb9810c3cbcd50c1744975ed2e998c148 SHA512 910ee12c373b2003be314a495d162eeec2b6c5d54fa80f3cd31f5b5ef4a5c1c32181ff0744dccd522ca2e5e501a88cf4c56b231f8eb9b2f2732707eb82f98c39
-DIST crossbeam-deque-0.7.1.crate 19407 BLAKE2B e2fa467b88ef0d6c7f6656bd87ade1306665bb5b56b1e494ed3a7bc59050ebf847de4c57c5dcc5d63688b60edd3645300cf4b3a2020280dcf0e47f434a9f3221 SHA512 6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2
-DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
 DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
-DIST crossbeam-epoch-0.7.2.crate 38134 BLAKE2B 1a71b24f507e95c9552a3d5906bdfa77add4723144e1f5275dad65a5de7cd82305eb2c4ad0d99b3f08a06ce050dbcfefff08790a4a65744f4d578c7106abc671 SHA512 672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8
-DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
 DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
-DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
 DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
-DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
-DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
-DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
-DIST csv-1.1.2.crate 890778 BLAKE2B ac04af5edff7054c557f50c5fca153286fe6f9045cf12733bebbd377a7dea22e8a916eebfd72e17e0b8a4ce1446488572bcceffd28259635796e587c73cdcde5 SHA512 51c3309b3e4ea6b9c20881fd871dd26fbabc579dd06d714e979357a6073622781434a9f89b9cafc04f8528c9a058c3464516329f7db54b8b0f1c469b50e4cbb4
 DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
-DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
-DIST docopt-1.1.0.crate 39021 BLAKE2B 54a0543879a68cafd91eb61f836426ed5c8b9e02e1fff6dbb9747c44bdf03a45237087e6f094687ccfac4b82aef07c4f8e35acaf994c4afec57f227bd891ccbe SHA512 f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81
-DIST either-1.5.2.crate 12124 BLAKE2B 514fca1a11697b952d83b2058bfa21b9dac963921d35e055ddd5b132d8035a652b5c76d356a5c221f8eabb8e420ed727a84bf8077a9d4d4534faabee45f468be SHA512 88b4ad9854281d6748177b8e18a1cb1a9ac8948d2de8ebadbad94e72bf8b825361b142d890b6264106069af48328bb9844afd248f64b5469d2d2cb81d0ce5187
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
-DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
-DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
-DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
-DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST hermit-abi-0.1.6.crate 6907 BLAKE2B a2c11ec832ea0110421f6be2fa0a5591e5908a74c68c5079f034908c216d6776ef0f4363b809699e58dafd98deb9ff19ee8b06b704d3159448d1b4376fc2537e SHA512 a557402a7529387832ba4014ee1a626d849eb64f873f69eaf53506362340c8f24c7456a8a04653f4ead9043768d06042aeca2aa8d95898dee37d367674854741
 DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
-DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
-DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
-DIST itertools-0.8.0.crate 78917 BLAKE2B 4b519303380c421b5ec9af7b5c97575a39899ed77b0ff462d5c5db65a70f9c1f56959254aa7d20db3fc4f8af033340a96fbcebb189f4d92a2e09f887c736a898 SHA512 ce1dd1f52f6792a6f5303e15f74063d50c11b75312cb807eeddaae7811686347c390426956cbe87b827b970b14b6e4d57fb4ac0f288632766218ff8661feb610
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
-DIST js-sys-0.3.27.crate 59423 BLAKE2B 19256c0ce8b33a134048d2ef68a2f87a183201ce44f95ddef57405cd5f0fb1e9c82af2b8e97d10f5284017dd8a3eb935e9f04e5bf9cb2e09dc62d4d93fcb24e6 SHA512 1bff1b24ab99243e5d789ad9f729b3157241b159b5520529a3a8bd152c60c4df416afe9ac0c054933406f69cf48f49da4c51d7c90e05e915c1e19af47735835c
-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 itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST js-sys-0.3.42.crate 67017 BLAKE2B a5db2a97a9cc4738d698e3db36c0a1024fc3d60a23dbd0ec4ddd7f887d04a7860b1641729ea4ac24669d98aafaff78d0a3d8a3211f8523e104cd668a11ce2af0 SHA512 5193b77f58741a7cb59ab871d5e66a2629e56c8a036bbe0cd7619e1115e9925e19a5f01f6b0f4854c22f36fcc3c1a335779f5f6923dbd6c617e850247a3c85b5
 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 libc-0.2.72.crate 478292 BLAKE2B 23914e92f9ae57a023bbb9bd9cd823cf535ba14ce8d01f171d3223cd227bb9d3884f7596dc2f74c690f7de813da4783e277204dfa690fc1e4f26ee566f1fe32b SHA512 f59caec272f24b8cc29d421baa4ee4145afea8eb9e4a83d8c245602f6bd8de3c91c04008a9920f7f70c9967a3392cc44d8df141c83c6c18d1f14893b21ae4ea0
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
-DIST memoffset-0.5.1.crate 5958 BLAKE2B 2ac071da35c45d498889d38805223b46a0ec81b3fcd95da85ffc0f4512ca45f1eaa9fcffa8931e92fd11d16806a887d62d8bf15d2f3f759cf9c27695595d0881 SHA512 8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e
 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
 DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
-DIST num-traits-0.2.8.crate 39965 BLAKE2B 58b2c432e8523efd95724e01ed80d61b2c4a798fc451e1c7257a392f78617d0ecbab9b1c1d799dde8593cc69f1dbf30d2e966330766992ebd43d8626926f12ee SHA512 a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534
-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
-DIST rayon-1.2.0.crate 144769 BLAKE2B 9614fb6db62dec788da66305bd84a5bc2d3793921ca343a924443abc97ab9e5e113b50506d65f5e219a64bda4759b8f6eca901796746b026b03a1761c80451e4 SHA512 351f7ddd2600001ef9655f290b743034402a56dcb04a25ac25afeaa549da5e399a8be72cd318d3d4a558d1a190bca7ce03386f3320e9909db48d9d1152154a52
+DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
+DIST qlog-0.3.0.crate 23295 BLAKE2B 1a4216fee65e73f72a85a4227a1765883fd121fe4d0216d28755501b104aeb80dbe5bbe493991c0a2dd635351224f345b283e18e6db2206556b7cf0f3a884c7f SHA512 76a234231b2f4ab7af9ede41525679595083b5faafb3e0e516e08968ee9294f4a0cc74b81df69041b8dcafabdb09494f9cad9a73cbbd1aac3388667d8366dbf7
+DIST quiche-0.5.1.crate 3265682 BLAKE2B 1d404317e48a62ac2cb3759aae51f0b91eb87d9c9694333331db528b79cc19a72f0f8da2b0785469ae81237c8b8afa760a4f00b039895330aa8b6e3b3d356ca3 SHA512 7f9af3f104aa788076cf7be2f643c823264cb616dbc9dbafb21afbbdfde4d74edff9e48ef79828ee47e3185215a3177131dec9b48a65e96e8ab4b6214b409fc5
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
-DIST rayon-core-1.6.0.crate 62221 BLAKE2B a7cca9fa19d0af21752458b58e22268dae9d8078d338714e30eec59e6b53dfbb717af9a919795828a165b42c8545414aa969875d216021632b7435304b8d72ad SHA512 78f231633fb2382fd38a89b967f5a2f38e611293a19db342039e63fd0c7cffd33a78d18b8f0788089b157373ebf20eae0c88365be9668f48abc3a390130be36c
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
-DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
 DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
-DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-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 ring-0.16.15.crate 5279241 BLAKE2B 1de5d0f5117246e344a04b6958a678d067a93083dfba74b057a48dfe6922bc8b980ecadc94fbf76ef996dfd7ff3cc7b2da6a4c7c9ae31fb6dc334a3b7a377533 SHA512 17c72ba204cdbc80856bc588dea220d2475a2dd1e2990ec9bf76fe4c0acae8a91a8fd532127e2ce679b43be0a52bc05dcda309744876d8faf0c50de0bb8c399a
 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 ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-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-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
+DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
+DIST serde_json-1.0.56.crate 114541 BLAKE2B 1e393b296983b55d6f516f87ac0b3222956e3ecd7e088955f430c0957642ba59f6d7e927bd924b30f8ca989a04f611078b5c05690d8b1195a0e8b0d11f1b6412 SHA512 ee937a1449701235984a71c9e92035251019d922eccf29e1dc95cdfa008e9bae614650949d8536a5a42ae7b8decfb419b75ec5285b1f85618750efbad24cb11f
 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
-DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-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
+DIST syn-1.0.34.crate 205051 BLAKE2B 3d609502637038d6c2d96b11a99dc96a232ad9d68e94571838cca727dc41450148047509108d6ec3cbcf15f146286dc54023db8ac394b2443a37f55c269a630c SHA512 4aaae0369c08f9f505acc62e9c603d3f5c531f2da42308665cb3c656fb7828ec8c46dc2ee2ef0cbe6ed20c8d7482f66118e4c949f3bff3eb67ae1c93fbbc90b4
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST tinytemplate-1.0.2.crate 24614 BLAKE2B 503faf7917be09f1b061f23375cfc4f0d819aaec54ae8c9873d0f9afbd8598229639690260e81d4298f9873890405091821776e78ea904eb6c0684dc49e9c0df SHA512 e6bfc944f3174d4162bf27a80fff2c1e83aca0c9d936fe469c39077b02ede8c9b7e41d145a048cf2cc68d1efbacc919ad1a0708757b7a49bff4dfe4d51675ecf
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
+DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.11.crate 91048 BLAKE2B 2dd12260a77d9ec10af73bc46178cd49144a8c5206fbd7240c6bd933eb9cb854efedb947b63af165cec51e1677671ddcf2924bb55c4b759dfd2d0939db09f290 SHA512 bee8fd546d4d1ad1179b31790fb5a087daece8a0435d8ba85def9c1d1827a8ce1ca643924863f01515e8fa6f78a47041e1bcda644a33427c65a50c4eb47d5d81
-DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
-DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
-DIST unicode-segmentation-1.3.0.crate 90567 BLAKE2B 2bfce62b981b6b8d41be760f0663c3301f974fa9c975e7859c6cac6778cecafa2ee5dbe2e4368959b4fc2f0dee3d93cdab236dde593665b76740d07009051cb2 SHA512 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 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 unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 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
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wasm-bindgen-0.2.50.crate 144511 BLAKE2B 7778d05717281b6c295260f6ec47898e0c565bb107d0c1f6f64f5de9e9208eecfa49cfd6c83eb3cd6eb6c698f5af74fe59ba3a86ec4f6d02439a55dcacfb4022 SHA512 d2c4ddc0d88864539b0f25511770edba61f54cd13a1f1a08c298dbb9433356a2617b24e3f0a1bd2e37eb418976c97ff11780df9ff809f566524462d965c35b53
-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 wasm-bindgen-0.2.65.crate 156753 BLAKE2B 4b68313c60c6bf1ccdde58c05cf736e1806e1115271172b2751e256eeff83b93e65d00306ff18529f02c7e5c47df89a2784334d8cf44e09ab4d4465cf85dbe3f SHA512 6fdbc50e06c0db49833b2e5a638d1dc2444b326a4ef19f640316fdbbcb83704a79a6fe0f47818bc69d271bd3791ea6945194960a5d005a3e4a823300023a35c2
+DIST wasm-bindgen-backend-0.2.65.crate 23551 BLAKE2B 4aa556cd36d2b7742cc8397eab0c1e3c9e0c24433e82a516aa71dbd3a32cfa760bfba93fc4311e9b69f527dffcd39be6dd7fe81f0fcbae30ebe6fc21c5e632e9 SHA512 7043f525453da6060574cab9926023b65e1e402d10c042804ab90ada78981300fcfabb97f3a661acc9c685bbc65a29c7c5c6ac446f11705bc85b8c9488985bb5
+DIST wasm-bindgen-macro-0.2.65.crate 11624 BLAKE2B 010ec37dd315fa9053745978a4bbe2758904f5599c3c05195e0fab0c6bc40e671eb6f025e48afe8a0376933eadf550c1ee5b61fddee0d82f3e8f6216e4615e25 SHA512 a5a1071cd09548b2ec2bd0dce4713f00d72ede2c2be8c8e4b3a852e5b2f0456a1e87996f31604523e3e1f226b14d8e4d6e263af86bdde78df830f65fa1a37244
+DIST wasm-bindgen-macro-support-0.2.65.crate 17801 BLAKE2B 1c54484f3d04e4da5b5d9c0f30935420f04a3db9389190f1dfb051c283a274a9f3c37685db6e3f40f836f022c92f9613f5b1570b47d53ca1f15418c4b6e02e95 SHA512 7c12ac36a8e7295e66dc3bdddb26ba2ccef73d1d47dddc98d7416f387963a3def8e86e07dd1464703e9f06132ad1353d54f6d220fcebd2d96bb85dcf10d1f84b
+DIST wasm-bindgen-shared-0.2.65.crate 6745 BLAKE2B 3881c8e3db5968f51490676cdfa5a06f8def5e8d6417e41ad592f506291299863342fb59984249ab2484ce6135f67df4545f1ab896bc99dc8cd60ef318223e90 SHA512 32aba8419c42b6798ebeeb57cb562251db6d37bff84b4e2f29264b5f910e8e1fc76c8989f82bd8e224dff978d1e7c25ac19e646f93474f7dd53a85ad2a05d284
+DIST wasm-bindgen-webidl-0.2.65.crate 35843 BLAKE2B 444b0c2d46d6971b7bd06f9ed80fb2088818524a58aefe4b0dac7ca4be40bb3480228883feeacadae3be1b3e6c30b7d5642cdae6fd23c11212991eb26a3a9e5e SHA512 3ee204a0e7588f02b19e03c83843f773b179a07815b1c17bb814fb78e5a430ee0d3c8a58b626465709a6f62efadd9467ea9869f5d44c22e3bda2142e96a38267
+DIST web-sys-0.3.42.crate 628615 BLAKE2B 7fa7c50c8e71c6b9ac43e056f70a03ddd9532b756fda50ce2183a7f24bbf3b2ad6fbca29f10f955e0032d21aa20b966c2a292f24defc00ad9021af86c0115006 SHA512 6e0af1c1f2ba0ea63033b67c25d45ec550086ba864eea532175e4424a7073f7c2a9d006f19702cbd3369eea80bce08bc25a014911ea1d7ffcc9e3c007e711a4b
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-EBUILD quiche-0.1.0-r1.ebuild 3996 BLAKE2B 8ecef4042ef3c4a64b53766d8f5ea42cedb516bdb90392874a48e4269c3c7fd827b24976f4610d310317175d1805f5cd6434a7b4e6b2c6119c07459969926e5b SHA512 07a99f0d6787777907d4482efca69eaf85b0ae4abefae4a41d69a5fee7f262fa5cfe9fb9f37fdeae4a4d3b9cc7763c995093dea60cc667f7995659456f55053d
-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-0.4.0.ebuild 3725 BLAKE2B d88407efe8b1ea50edcda4afe09627161f8953c0d01d830f1ff6c5e04f22b4f2a9301ff0f14da85a6db2d982aa0dada708f0c76164a5331264610c7a108e294b SHA512 9328e6f1e182a31bcbc210a2a541c0c7b3419b306748ac87df933f20dee1f829c0f7c9a4231a6104328ad812b56faedc1f646c232f545d8a9510025f89746915
-EBUILD quiche-9999.ebuild 3725 BLAKE2B d88407efe8b1ea50edcda4afe09627161f8953c0d01d830f1ff6c5e04f22b4f2a9301ff0f14da85a6db2d982aa0dada708f0c76164a5331264610c7a108e294b SHA512 9328e6f1e182a31bcbc210a2a541c0c7b3419b306748ac87df933f20dee1f829c0f7c9a4231a6104328ad812b56faedc1f646c232f545d8a9510025f89746915
+EBUILD quiche-0.5.1.ebuild 3902 BLAKE2B ddf0e620c3cee6e8d1e952881cf400168558634cd264809e72731d92cce3981c8926d3f570f717358474a7b0111d93e981857aabba544ad85aa574abdb71b224 SHA512 877d10e0b406507f867c8817db7583ab8e72d4a199b35384f4302d6efce2372bd75f73063124ba197a3f4cf3c66c68fb678d19f0ce0df5c1b1b7e1d83730e30c
+EBUILD quiche-9999.ebuild 3897 BLAKE2B 8b94983f87b46bd7d202764679ae6160365960779a8784a59702123465eb7d71cc775b0d1df9ea5f1dc11bb2df386832fda6370d4b21d9f5f6eac978872694cb SHA512 d2b27e811d50254ebdb93315cb6b3d1f2bc5b89b44c58863b16631727017dca00a885aebd07f00cc4e3aafec1ce4becb59713041a8fedef3a69bc92ce17e9ce6
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
deleted file mode 100644
index 2d3ee90704c6..000000000000
--- a/net-libs/quiche/quiche-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-arrayvec-0.4.11
-atty-0.2.13
-autocfg-0.1.6
-backtrace-0.3.38
-backtrace-sys-0.1.31
-bitflags-1.2.0
-bstr-0.2.8
-bumpalo-2.6.0
-byteorder-1.3.2
-cast-0.2.2
-cc-1.0.45
-cfg-if-0.1.10
-clap-2.33.0
-cmake-0.1.42
-criterion-0.3.0
-criterion-plot-0.4.0
-crossbeam-deque-0.7.1
-crossbeam-epoch-0.7.2
-crossbeam-queue-0.1.2
-crossbeam-utils-0.6.6
-csv-1.1.1
-csv-core-0.1.6
-docopt-1.1.0
-either-1.5.3
-env_logger-0.6.2
-failure-0.1.5
-failure_derive-0.1.5
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-getrandom-0.1.12
-heck-0.3.1
-humantime-1.3.0
-idna-0.1.5
-iovec-0.1.2
-itertools-0.8.0
-itoa-0.4.4
-js-sys-0.3.28
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-libc-0.2.62
-log-0.4.8
-matches-0.1.8
-memchr-2.2.1
-memoffset-0.5.1
-mio-0.6.19
-miow-0.2.1
-net2-0.2.33
-nodrop-0.1.13
-nom-4.2.3
-num-traits-0.2.8
-num_cpus-1.10.1
-percent-encoding-1.0.1
-proc-macro2-0.4.30
-proc-macro2-1.0.4
-quick-error-1.2.2
-quote-0.6.13
-quote-1.0.2
-rand_core-0.5.1
-rand_os-0.2.2
-rand_xoshiro-0.3.1
-rayon-1.2.0
-rayon-core-1.6.0
-regex-1.3.1
-regex-automata-0.1.8
-regex-syntax-0.6.12
-ring-0.16.9
-rustc-demangle-0.1.16
-rustc_version-0.2.3
-ryu-1.0.0
-same-file-1.0.5
-scopeguard-1.0.0
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.101
-serde_derive-1.0.101
-serde_json-1.0.40
-slab-0.4.2
-smallvec-0.6.10
-sourcefile-0.1.4
-spin-0.5.2
-strsim-0.9.2
-syn-0.15.44
-syn-1.0.5
-synstructure-0.10.2
-termcolor-1.0.5
-textwrap-0.11.0
-thread_local-0.3.6
-tinytemplate-1.0.2
-unicode-bidi-0.3.4
-unicode-normalization-0.1.8
-unicode-segmentation-1.3.0
-unicode-width-0.1.6
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-untrusted-0.7.0
-url-1.7.2
-version_check-0.1.5
-walkdir-2.2.9
-wasi-0.7.0
-wasm-bindgen-0.2.51
-wasm-bindgen-backend-0.2.51
-wasm-bindgen-macro-0.2.51
-wasm-bindgen-macro-support-0.2.51
-wasm-bindgen-shared-0.2.51
-wasm-bindgen-webidl-0.2.51
-web-sys-0.3.28
-weedle-0.10.0
-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.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.2
-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.38.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-0.1.0_alpha4_p20190912.ebuild b/net-libs/quiche/quiche-0.1.0_alpha4_p20190912.ebuild
deleted file mode 100644
index ccfee7706aa4..000000000000
--- a/net-libs/quiche/quiche-0.1.0_alpha4_p20190912.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-arrayvec-0.4.11
-atty-0.2.13
-autocfg-0.1.6
-backtrace-0.3.37
-backtrace-sys-0.1.31
-bitflags-1.1.0
-bstr-0.2.8
-bumpalo-2.6.0
-byteorder-1.3.2
-cast-0.2.2
-cc-1.0.45
-cfg-if-0.1.9
-clap-2.33.0
-cmake-0.1.42
-criterion-0.3.0
-criterion-plot-0.4.0
-crossbeam-deque-0.7.1
-crossbeam-epoch-0.7.2
-crossbeam-queue-0.1.2
-crossbeam-utils-0.6.6
-csv-1.1.1
-csv-core-0.1.6
-docopt-1.1.0
-either-1.5.2
-env_logger-0.6.2
-failure-0.1.5
-failure_derive-0.1.5
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-getrandom-0.1.12
-heck-0.3.1
-humantime-1.3.0
-idna-0.1.5
-iovec-0.1.2
-itertools-0.8.0
-itoa-0.4.4
-js-sys-0.3.27
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-libc-0.2.62
-log-0.4.8
-matches-0.1.8
-memchr-2.2.1
-memoffset-0.5.1
-mio-0.6.19
-miow-0.2.1
-net2-0.2.33
-nodrop-0.1.13
-nom-4.2.3
-num-traits-0.2.8
-num_cpus-1.10.1
-percent-encoding-1.0.1
-proc-macro2-0.4.30
-proc-macro2-1.0.3
-quick-error-1.2.2
-quote-0.6.13
-quote-1.0.2
-rand_core-0.5.1
-rand_os-0.2.2
-rand_xoshiro-0.3.1
-rayon-1.2.0
-rayon-core-1.6.0
-regex-1.3.1
-regex-automata-0.1.8
-regex-syntax-0.6.12
-ring-0.16.9
-rustc-demangle-0.1.16
-rustc_version-0.2.3
-ryu-1.0.0
-same-file-1.0.5
-scopeguard-1.0.0
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.100
-serde_derive-1.0.100
-serde_json-1.0.40
-slab-0.4.2
-smallvec-0.6.10
-sourcefile-0.1.4
-spin-0.5.2
-strsim-0.9.2
-syn-0.15.44
-syn-1.0.5
-synstructure-0.10.2
-termcolor-1.0.5
-textwrap-0.11.0
-thread_local-0.3.6
-tinytemplate-1.0.2
-unicode-bidi-0.3.4
-unicode-normalization-0.1.8
-unicode-segmentation-1.3.0
-unicode-width-0.1.6
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-untrusted-0.7.0
-url-1.7.2
-version_check-0.1.5
-walkdir-2.2.9
-wasi-0.7.0
-wasm-bindgen-0.2.50
-wasm-bindgen-backend-0.2.50
-wasm-bindgen-macro-0.2.50
-wasm-bindgen-macro-support-0.2.50
-wasm-bindgen-shared-0.2.50
-wasm-bindgen-webidl-0.2.50
-web-sys-0.3.27
-weedle-0.10.0
-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.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.2
-ws2_32-sys-0.2.1
-"
-
-inherit cargo multilib-minimal
-
-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
-	GIT_COMMIT="89d0317ffb5b12080a41aea2743272aac887eecd"
-	BORINGSSL_COMMIT="f18bd55240b229a65df48e7905da98fff18cbf59"
-	SRC_URI="https://github.com/cloudflare/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
-		https://github.com/google/boringssl/archive/${BORINGSSL_COMMIT}.tar.gz -> boringssl-${BORINGSSL_COMMIT}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-	SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64"
-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.35.0
-	dev-util/cmake
-	dev-lang/go
-"
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-		tar -xf "${DISTDIR}/boringssl-${BORINGSSL_COMMIT}.tar.gz" --strip-components=1 -C "${S}/deps/boringssl" || die
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	cargo_src_compile --features pkg-config-meta
-}
-
-multilib_src_test() {
-	cargo_src_test
-}
-
-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/release/libquiche.so
-}
diff --git a/net-libs/quiche/quiche-0.2.0.ebuild b/net-libs/quiche/quiche-0.2.0.ebuild
deleted file mode 100644
index c739b541cea7..000000000000
--- a/net-libs/quiche/quiche-0.2.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# 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-0.1.7
-backtrace-0.3.37
-backtrace-sys-0.1.31
-bitflags-1.2.1
-bstr-0.2.8
-bumpalo-3.1.2
-byteorder-1.3.2
-cast-0.2.3
-cc-1.0.49
-cfg-if-0.1.10
-clap-2.33.0
-cmake-0.1.42
-criterion-0.3.0
-criterion-plot-0.4.0
-crossbeam-deque-0.7.2
-crossbeam-epoch-0.8.0
-crossbeam-queue-0.2.1
-crossbeam-utils-0.7.0
-csv-1.1.2
-csv-core-0.1.6
-docopt-1.1.0
-either-1.5.3
-env_logger-0.6.2
-failure-0.1.5
-failure_derive-0.1.5
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-getrandom-0.1.14
-heck-0.3.1
-hermit-abi-0.1.6
-humantime-1.3.0
-idna-0.1.5
-iovec-0.1.4
-itertools-0.8.2
-itoa-0.4.4
-js-sys-0.3.35
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-libc-0.2.66
-log-0.4.8
-matches-0.1.8
-memchr-2.2.1
-memoffset-0.5.3
-mio-0.6.21
-miow-0.2.1
-net2-0.2.33
-nodrop-0.1.13
-nom-4.2.3
-num-traits-0.2.10
-num_cpus-1.11.1
-percent-encoding-1.0.1
-proc-macro2-0.4.30
-proc-macro2-1.0.7
-quick-error-1.2.3
-quote-0.6.13
-quote-1.0.2
-rand_core-0.5.1
-rand_os-0.2.2
-rand_xoshiro-0.3.1
-rayon-1.3.0
-rayon-core-1.7.0
-regex-1.3.1
-regex-automata-0.1.8
-regex-syntax-0.6.12
-ring-0.16.9
-rustc-demangle-0.1.16
-rustc_version-0.2.3
-ryu-1.0.2
-same-file-1.0.5
-scopeguard-1.0.0
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.104
-serde_derive-1.0.104
-serde_json-1.0.44
-slab-0.4.2
-smallvec-1.1.0
-sourcefile-0.1.4
-spin-0.5.2
-strsim-0.9.3
-syn-0.15.44
-syn-1.0.13
-synstructure-0.10.2
-termcolor-1.0.5
-textwrap-0.11.0
-thread_local-0.3.6
-tinytemplate-1.0.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.11
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-untrusted-0.7.0
-url-1.7.2
-version_check-0.1.5
-walkdir-2.2.9
-wasi-0.9.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.58
-wasm-bindgen-backend-0.2.58
-wasm-bindgen-macro-0.2.58
-wasm-bindgen-macro-support-0.2.58
-wasm-bindgen-shared-0.2.58
-wasm-bindgen-webidl-0.2.58
-web-sys-0.3.35
-weedle-0.10.0
-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.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.2
-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"
-	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-0.3.0.ebuild b/net-libs/quiche/quiche-0.3.0.ebuild
deleted file mode 100644
index 174406e41944..000000000000
--- a/net-libs/quiche/quiche-0.3.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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.2.0
-byteorder-1.3.4
-cast-0.2.3
-cc-1.0.50
-cfg-if-0.1.10
-clap-2.33.0
-cmake-0.1.42
-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.36
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-libc-0.2.67
-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
-miow-0.2.1
-net2-0.2.33
-num-traits-0.2.11
-num_cpus-1.12.0
-oorandom-11.1.0
-percent-encoding-1.0.1
-plotters-0.2.12
-proc-macro2-1.0.9
-quote-1.0.3
-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
-rustc_version-0.2.3
-ryu-1.0.3
-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
-slab-0.4.2
-smallvec-1.2.0
-spin-0.5.2
-syn-1.0.16
-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.0
-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
-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-0.4.0.ebuild b/net-libs/quiche/quiche-0.5.1.ebuild
index 07d836c4c2e1..2f16f911407a 100644
--- a/net-libs/quiche/quiche-0.4.0.ebuild
+++ b/net-libs/quiche/quiche-0.5.1.ebuild
@@ -13,13 +13,13 @@ backtrace-0.3.37
 backtrace-sys-0.1.31
 bitflags-1.2.1
 bstr-0.2.12
-bumpalo-3.3.0
+bumpalo-3.4.0
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.53
+cc-1.0.58
 cfg-if-0.1.10
 clap-2.33.0
-cmake-0.1.43
+cmake-0.1.44
 criterion-0.3.1
 criterion-plot-0.4.1
 crossbeam-deque-0.7.3
@@ -35,13 +35,13 @@ 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
+itoa-0.4.6
+js-sys-0.3.42
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.70
+libc-0.2.72
 libm-0.2.1
-log-0.4.8
+log-0.4.11
 matches-0.1.8
 maybe-uninit-2.0.0
 memchr-2.3.3
@@ -55,49 +55,50 @@ 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
+proc-macro2-1.0.18
+qlog-0.3.0
+quote-1.0.7
 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
+ring-0.16.15
 rustc_version-0.2.3
-ryu-1.0.4
+ryu-1.0.5
 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-1.0.114
+serde_derive-1.0.114
+serde_json-1.0.56
 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
+syn-1.0.34
 textwrap-0.11.0
 tinytemplate-1.0.3
+tinyvec-0.3.3
 unicode-bidi-0.3.4
-unicode-normalization-0.1.12
+unicode-normalization-0.1.13
 unicode-width-0.1.7
 unicode-xid-0.1.0
-unicode-xid-0.2.0
+unicode-xid-0.2.1
 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
+wasm-bindgen-0.2.65
+wasm-bindgen-backend-0.2.65
+wasm-bindgen-macro-0.2.65
+wasm-bindgen-macro-support-0.2.65
+wasm-bindgen-shared-0.2.65
+wasm-bindgen-webidl-0.2.65
+web-sys-0.3.42
 winapi-0.2.8
-winapi-0.3.8
+winapi-0.3.9
 winapi-build-0.1.1
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-util-0.1.3
@@ -116,7 +117,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
@@ -136,8 +137,6 @@ DOCS=( CODEOWNERS  COPYING README.md )
 BDEPEND="
 	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
-	dev-lang/go
-	dev-lang/perl
 "
 DEPEND=""
 RDEPEND=""
@@ -184,4 +183,7 @@ multilib_src_install() {
 	doins target/release/quiche.pc
 	doheader -r include/*
 	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+
 }
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 07d836c4c2e1..c17fa125a0c2 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.3.0
+bumpalo-3.4.0
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.53
+cc-1.0.58
 cfg-if-0.1.10
 clap-2.33.0
-cmake-0.1.43
+cmake-0.1.44
 criterion-0.3.1
 criterion-plot-0.4.1
 crossbeam-deque-0.7.3
@@ -35,13 +35,13 @@ 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
+itoa-0.4.6
+js-sys-0.3.42
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.70
+libc-0.2.72
 libm-0.2.1
-log-0.4.8
+log-0.4.11
 matches-0.1.8
 maybe-uninit-2.0.0
 memchr-2.3.3
@@ -55,49 +55,50 @@ 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
+proc-macro2-1.0.18
+qlog-0.3.0
+quote-1.0.7
 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
+ring-0.16.15
 rustc_version-0.2.3
-ryu-1.0.4
+ryu-1.0.5
 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-1.0.114
+serde_derive-1.0.114
+serde_json-1.0.56
 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
+syn-1.0.34
 textwrap-0.11.0
 tinytemplate-1.0.3
+tinyvec-0.3.3
 unicode-bidi-0.3.4
-unicode-normalization-0.1.12
+unicode-normalization-0.1.13
 unicode-width-0.1.7
 unicode-xid-0.1.0
-unicode-xid-0.2.0
+unicode-xid-0.2.1
 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
+wasm-bindgen-0.2.65
+wasm-bindgen-backend-0.2.65
+wasm-bindgen-macro-0.2.65
+wasm-bindgen-macro-support-0.2.65
+wasm-bindgen-shared-0.2.65
+wasm-bindgen-webidl-0.2.65
+web-sys-0.3.42
 winapi-0.2.8
-winapi-0.3.8
+winapi-0.3.9
 winapi-build-0.1.1
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-util-0.1.3
@@ -136,8 +137,6 @@ DOCS=( CODEOWNERS  COPYING README.md )
 BDEPEND="
 	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
-	dev-lang/go
-	dev-lang/perl
 "
 DEPEND=""
 RDEPEND=""
@@ -184,4 +183,7 @@ multilib_src_install() {
 	doins target/release/quiche.pc
 	doheader -r include/*
 	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+
 }
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index d9124ac2a8d4..32c1099d9528 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -2,5 +2,5 @@ DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f145
 DIST rpcsvc-proto-1.4.2.tar.gz 61788 BLAKE2B e941fa86088d690e3e80a501beb5169a51ff77b60d618f54db9d9fd5fb96c2b2a4277ab8d847dcdb29dadd2f6947d155b15cd8b6af1f1420e023da8637d555c0 SHA512 6769f9439e3f187eebdeef4ee8d54f8a6fee6f410e3137d0c1b26e61b705873932890856faff55b68c39aa702e456b36fe9410b85baf1ef9b20ee97f2158971a
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
 EBUILD rpcsvc-proto-1.4.1-r1.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
-EBUILD rpcsvc-proto-1.4.2.ebuild 954 BLAKE2B 38ec166200ca7b5173de5c5be6782339ea52c55f9a3717cb1d9af091bd0ac9cecfcd45c6e1a767632b82b108d2549d7defa8946c88d0e95645f760c07344681a SHA512 e0be6fac36dd860fbb9f407ee37f5e2f81885ef70c330315976e223b669f38368d7622c9585b330b6509235b0ffea20b8196277f94e2b50fe8225a9aed9da609
+EBUILD rpcsvc-proto-1.4.2.ebuild 947 BLAKE2B b1644fbc2f2a2ca354b0d70828fe3dc5b2ebf35931ac18812dffef7abd231d2eeac6054ddc3beae738dc328ca752b34c786afb6ac81c7c3478bd2cd6298707da SHA512 5bdeab38f781826d7d5c39c07918b32502f52a5bdb9c69e48cdf6b03ac026ed1a806e7cbfafa48836a9d90bc5b682e3c1d1108a145cb8408659a933cc2c03ba4
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
index d7df5d09a441..1da47c6a5bb8 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.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/shairplay/Manifest b/net-libs/shairplay/Manifest
index 4ead37251abd..a4c92eae4bb7 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,7 +1,7 @@
 DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b
 DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6
 EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d44b70c3b4283852643a9fa1b313538fb48f0900e254faed5ac100e480d7021dca2a776056ab30f977b9dd915314e0b32eb SHA512 3ce15525ded41e9ffd2d6ac3134a73a8bc0a8bea1d018d3e93f42c5aa35a9b983e3848806fad8089f20e9ca7fdaab1c1ba7ad7697423872b1a9f4c89be48018e
-EBUILD shairplay-0_pre20180824-r1.ebuild 933 BLAKE2B 8ce683912ef9cc24024e7e6015e0b892d97c2b969a753f21bc72c8c17b4d26d9728de165bfa612cbc631b2f954f313fdfe4ee087db76517a2ebfef6518ee3bdc SHA512 5adcda50568ffd1d6fb351526625a53517cd51aaff83124cb0c1486785e79233c45b746d56f3fbae21d99aa3171516ac9c6919f30c309368279953ff3ec392af
+EBUILD shairplay-0_pre20180824-r1.ebuild 938 BLAKE2B 45a699b980d2136775f98302a1c9d5bda050c2ecd5f4b27662aa5f724c65107b1d2e6ab3be1602892b9fec0001c1f476d90e7194ea4d816e592d82626eff73c6 SHA512 199b58876e1d6e2a0957ee102d118a8ad35ca65c2921c1e4140fa5e626dbbbed1e671164c8485370d97f74c08452b75014bcd9beb2e3bc5b3865a2602d48e8ac
 EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
 EBUILD shairplay-9999.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
 MISC metadata.xml 806 BLAKE2B 54e0d86fcf821eb4c29502f75a44b7a5dc53747e6e594e4a8bfcc558cef8362b136b17e827a10f617b6115a29f3dda5528555e09c2c6fb1fe43b2132d1a8a177 SHA512 fe0e689e3b0cd7bf95bab72137b10b04d7006b63917142293bca72a58a90c485d3e5735f6036828de714a89180021785361aa8862fcf7405815e0bb57f476329
diff --git a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
index 393ad57ec1fc..5d5d13d39018 100644
--- a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
+++ b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
@@ -12,7 +12,7 @@ else
 	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
 	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Apple airplay and raop protocol server"
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index 1c1bec61a476..eeda1e3f1c1b 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -7,5 +7,5 @@ EBUILD stem-1.5.4.ebuild 1273 BLAKE2B 84c053e28a46142740b0e842d90b240b69ad0bb792
 EBUILD stem-1.6.0.ebuild 1273 BLAKE2B 84c053e28a46142740b0e842d90b240b69ad0bb7921aaf939f186ee5c7a03f388e38a8a1719ec9e69f004356ecc3ae527ba99cefd44491ae32529bacc47aa435 SHA512 55719fee3ec3e61489019272a2e2b48e392b3142f7ea5c1d5f5ca8cf8b37159ad086554e447bb7a5d2ba824295e842940bc2468d7f86a6a37404682db13ec00f
 EBUILD stem-1.7.0.ebuild 1374 BLAKE2B 35cdb0469f371c54567ff80cfec32004c25528d9d0700abe383d4607bfa6e6ac34c45975a532017c5b986aad6d1632e8008ac414902bb14014e015e36e56f517 SHA512 2ffdda0ce1900d247774a0bd372f61a0e68c357b57c560e612c99f1e9348c8148c4152c25b5ba7101eec62d1351e5b5f664d1f6b0f4be03b0332fdbc8a5bb946
 EBUILD stem-1.7.1.ebuild 1374 BLAKE2B 35cdb0469f371c54567ff80cfec32004c25528d9d0700abe383d4607bfa6e6ac34c45975a532017c5b986aad6d1632e8008ac414902bb14014e015e36e56f517 SHA512 2ffdda0ce1900d247774a0bd372f61a0e68c357b57c560e612c99f1e9348c8148c4152c25b5ba7101eec62d1351e5b5f664d1f6b0f4be03b0332fdbc8a5bb946
-EBUILD stem-1.8.0-r1.ebuild 1395 BLAKE2B 4afe6611c452370d883502c030839ef0ef0ad2e73f5bd3a8cf754618311a02e8546b34d1fe400f1d0337b970f7bbaec9105c4bc85e01824a392a9350873d8fb1 SHA512 23f123595f9d164944db326b3d1f0077ff7096357d39a8446daa243d556ba79f4552a3235d9f21f83ed64a552765c775c8da9ce9bbf6aef416558f19f2054bf1
+EBUILD stem-1.8.0-r1.ebuild 1397 BLAKE2B adcaa869e7e1c002562ef9b9116598a187f9781968bd16ff95cb6960d90434c8b9f6c1a5deb0b3fcff6b5cb8ceb1f942ba0debf9ccd5730df74777182a0fb328 SHA512 5b157f9155cd83826c334c7bbee90d0cfc11e58d0c66bde0e516d6edcd7c6134fc9e069bdf8b473410d6b88695e94c0c9a49cdebfab0c575ee1a812dabaaa722
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.8.0-r1.ebuild b/net-libs/stem/stem-1.8.0-r1.ebuild
index d24b6703b468..04b29dfda34c 100644
--- a/net-libs/stem/stem-1.8.0-r1.ebuild
+++ b/net-libs/stem/stem-1.8.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{6,7,8} pypy3)
+PYTHON_COMPAT=(python3_{6,7,8,9} pypy3)
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index fb1daf41d10c..feb1eab1f3d0 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.8.ebuild 1467 BLAKE2B bec28b1b700900200632854620eba4948b546472eac720af3a2f72e7051dfcb77a298be6d40289992c878978dbdb95d7978945de1888cfcba426cd78032e4f56 SHA512 42effa89fbc610d03646549005151324f61f3b632e62924a080fef3f8b00c35114fe847affe4870bc374c327bc4b54393271ebc73c0073b926427e83edd33479
-EBUILD telepathy-qt-9999.ebuild 1595 BLAKE2B fba8fae8f79b5f74704dca13130427fa81b039257bbc369e2aa43972bb8fb508b0163e9a9747e76a5bb8bec72322e962489270e25b87e49ba3e7f2d64572bfe7 SHA512 389a5a74c5064b95018f6d1f0353b759748099d01daaf01c1f7b4335f0b086ef7960a39a5514aca6a7d18f007af557ba8c73df780e2103cbebb904426672b7d4
+EBUILD telepathy-qt-0.9.8.ebuild 1499 BLAKE2B d6bef151f23c1b567c2be6c1b1a9a947874c5cf67a42a8d110be2153df688a9da06379ba99d12a9361d9a2612410aa8938db971d1f6c59b10b11d81d41f410be SHA512 4187ee5851b9726319abd5f44b1ced861dc59569a11a9f5f87434d88b6691e27ce76c149a51e686479116ba2b212d10b137a096a0d47295f0963a306a181518f
+EBUILD telepathy-qt-9999.ebuild 1627 BLAKE2B 40204d9df84e51fca902c110515047f6bf61283939554455c1b47e722016ea395a3b9e77dcf81644598cbff4a779c597bf84652dec419f768711b6b5f070a70f SHA512 1f11ecc8ed3d82d38be52cc1cccfa21c95e26469c45705902639acc7a2eb2e5784348cf48dca5751dd31d831a3e3ea47df6e66d57aed6977d7fabeb9f963491c
 MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
index 021e7a634ee6..03ba4e008414 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -66,9 +66,9 @@ src_configure() {
 }
 
 src_test() {
-	# some tests require D-Bus
+	# some tests require D-Bus, bug #732110
 	local myctestargs=(
-		-E "(BaseConnectionManager|BaseProtocol)"
+		-E "(BaseConnectionManager|BaseProtocol|StreamTubeHandlers)"
 	)
 	pushd "${BUILD_DIR}" > /dev/null || die
 	virtx cmake_src_test
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 6b31f2462dc0..8abc149f66ee 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -72,9 +72,9 @@ src_configure() {
 }
 
 src_test() {
-	# some tests require D-Bus
+	# some tests require D-Bus, bug #732110
 	local myctestargs=(
-		-E "(BaseConnectionManager|BaseProtocol)"
+		-E "(BaseConnectionManager|BaseProtocol|StreamTubeHandlers)"
 	)
 	pushd "${BUILD_DIR}" > /dev/null || die
 	virtx cmake_src_test
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index c52821c4953a..4131db447fef 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -6,7 +6,7 @@ DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d
 DIST c-toxcore-0.2.11.tar.gz 507476 BLAKE2B 67e86a5e5c8da1c387a319e6726eaccec28608f165f0b165d12e379cc7d8080baf9b89f438804ab8e59a8690a11bebba7f2ef689554800312fe039da77e70cac SHA512 616b30423a170463b4445f6940e038fd9af820946c970260fcf72cc54d08d2615364b9f086869180e3ae26154ea92fea6e9a602366306bc40c3e1575e86350df
 DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8
 EBUILD tox-0.2.10.ebuild 3119 BLAKE2B 4eb4584d7ebc7dcb4e365ef3baff2a2bff5546c37051511f36987abf38f0b2c9b82937d9f33f0efc99697e7c84195eb94f6eb6bf1f57747a80fe386308d636e4 SHA512 bc52cd62f1165d7659adad3e46bf79d7caa708495cc9695205048a16a831cda41cd9799056edef2c7f459b3f33109ae648f36c9f1b7eece3dc5e6c82519975d9
-EBUILD tox-0.2.11.ebuild 3184 BLAKE2B f213fcb5a4cfffe7efadf895951ccd2b7b2bc61ba8ae6bec0e67045a2f6689add9a73c2838d5fddc8c8d329be39ba1576f01e18e90291a8369f98e1ea055015e SHA512 0429a7b2068410291b44bc1588565b8ac6037bf32319c591af927a8f1b935cfef5ed752386930ce6154f92295371108707ab726e0216264b3e26a55b58214920
+EBUILD tox-0.2.11.ebuild 3183 BLAKE2B dfadd25086119764477120fefcd81f3d1277223de61d223961cc9fa424e5109beb2aecd6401f5d46949927f2fa96839cf68237e0ee0eb7662fee2f9d853ff0cf SHA512 f170e0826c4e077b0c0b8936a8ea787e0f0ea851e278a3a49399d524040493b7fe0bdfffd3bccdce9e08c724a36c3d543944317d3cbb64e47f431619d75ea5f8
 EBUILD tox-0.2.12.ebuild 2844 BLAKE2B 6a7a2ea6a10b3750c095937ab6e9b9ecd4fe6202281d1b6610b16a452a57f879131d5133654df3713f6e38bfbf2bb012344501f8ef08a810e357af167863aad2 SHA512 995e516b90b21e943fbc5b5731a14b533e180e13becd887bf3de590953df2b0d3279267b03cef62f7ccc67a1df6ecc2a3856d2839b83fb19f7a79c294c3176c2
 EBUILD tox-9999.ebuild 3060 BLAKE2B ee68a7b8141408b59296d0ad7c14ea69d082ae31a736ea4405d10c35414ae91146ac8442dc242a86ee4aa79aa2652dee975d79f9905dd420263d670ee39981af SHA512 3f45c8b5d5e16c9fb52a895b15ba65036bbcae0e8086eac804aa6dd8cbdea4cb1dc3b2402e69c960444dd0ecedae28c2bf3cab716d9867ab97403e976eae1ec3
 MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
diff --git a/net-libs/tox/tox-0.2.11.ebuild b/net-libs/tox/tox-0.2.11.ebuild
index 909de96781a7..bd541befcf1b 100644
--- a/net-libs/tox/tox-0.2.11.ebuild
+++ b/net-libs/tox/tox-0.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1d7c7e35f003..bac8c0e92908 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,16 +1,7 @@
-AUX 2.26.2-fix-arm-non-unified-build.patch 982 BLAKE2B b2f4ab56030fffdf2504f213f2713117537095b66c6862377051687a4a798e0540dca95774275b5a7c1ac0fdd5a2927e07a6af8b7a992b8710d2edb05be272e2 SHA512 95ab575a4de13036b11691a4d9cb1b4338b118e5983352d66c4ad639104cce564c4a946349347ac461515bd5bef7359f8193a84d7b02f2d1345cba7969fcfcf6
-AUX 2.26.3-fix-gtk-doc.patch 1302 BLAKE2B 4a0b71a93dc137b5540df0aebc31186b510dfe68dd7b354f763f9a7a93e5df0ed24b12970d801a145eb9b36cde7711029c93c174146c91622a8264380cac08a8 SHA512 f3dbbff5ce65918bf3e889d3139bd7e7b3b7d17adf5f0c22b135abbbd0c8d7ebdf5bb8b126ec9ad2b345c4163da7e862ffe36e521b09eb4024330dbe67b0d7a4
-AUX 2.28.2-fix-ppc64-JSC.patch 2236 BLAKE2B e225370c443a3d3cb7160b342dd29243df9b0470094c108088bc2baf2fa053a9e5ba1b9f2d86f180d8f5fdab7df46c47114e90af8dc5f7507bec0449b98773aa SHA512 fa435bd130fa7f289e7b8971a5dd3205bfde45665422f6aba0c3382985632243f5b11ad641133c27419b9f7b34fbc3db78ac60fe0056902c75aa6a0a30f81b84
-AUX 2.28.2-fix-yelp-desktopless-build.patch 1767 BLAKE2B 75352a5f5632b1d351e22557ce51c977befa6d51251f850aebccd09433f5b11768c9f6078abffdf13fdaa514c767c2ec00810f173842570155187a84b54a6f23 SHA512 81627bc7e7c8a807bd4a0ccb2e667bae179b5f48f9ba81add2f7c072f77918a738fd0cca74f82f43d783f5fa7c0e63deef8f2eb3f30a43d4a1353a30a19d7017
 AUX 2.28.2-non-jumbo-fix.patch 1675 BLAKE2B 13541ce6392f921663dd8af6d8093e9de8b02e7d9e82cc7e06b7126e36d9c060f2342b57985bc7a5d1fa52c4d2203cdf7164a87af60ad9872bc6d12b7e14b435 SHA512 51da3680d873e7ee435a4a4bf0d23171a4ecf80fc3ea5ce60c71a55db2cf090754a4ed0c0a5297995f3729928d31541bab9528695c557c0c309338a7a75439b6
 AUX 2.28.2-opengl-without-X-fixes.patch 1656 BLAKE2B 85b825f0138a40f6647ceba693dccf644a1f86b9c57cda2ee8d6999830ad0bad13456aadf32c6789dafe7531b53f63644d5214b275159c3fce103b262a950461 SHA512 93cbbf092d9953c176bdcfc384e83ec276af35aa9c7645088a56d5c18934712d93aeee7e4c6111e1eb816b54d290ae6b23030683f81bde0f91c3ba3ff440f85b
-AUX 2.28.2-use-gst-audiointerleave.patch 2489 BLAKE2B 37e233512a532c8ea263b6dcb8f384e4adf426e1e76ccd55d79d11be9b1db7abf4bcedf9cbd997b20f4a417f26931447c0e39a79938763474ec45dbbced13f7e SHA512 215fec6f3dc5d35109164ef380095e31aa41b007a2e383cf328b2ef736f9b5160a2490117183c5610696cea1ae358888aab14548e2d3146fffc2e213bafa2f41
+AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1b1b3aa257181f026ceb6b6dfd602679d1add974d6930ba2033643cd9cf8bbb3fea0bf87ec85f769d55de5635d6828 SHA512 78c1426f34dacb65090356157963ae0be4a59c4c7905cfb9a59cc5cde766d2931b68872cb55369a74a871f88f4244f3db8ef8d30ee74d8e75acaaa8893ce7989
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
-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.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
-EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
-EBUILD webkit-gtk-2.26.4-r1.ebuild 8749 BLAKE2B f470ee46cd08ca1a210ac35c0dbbc7c8df2b62ba2cdd775a903c3d7289df8b556259c3b4456d4612efcd3e5ec6fa8d31b03221fbe1d9af4faf9bd7b283797435 SHA512 1e589c989cd9badd30b113550cd7d984b8e4a7da122c15c4df9c0e57de2076ea14ab3f4887981aaa43003c3a9960374f396b0ff5e920266ce724dc01179f1ae5
-EBUILD webkit-gtk-2.28.2.ebuild 9147 BLAKE2B 05dc2471e1b80aafa769e3d3252b3fe96490212f8420ad02a5d77532387145bff45fca06a4233e4ae9048a7d7dc34d0aae957af7bb327881ee91e0a073d103c5 SHA512 2c02215bf2697cc35b49bd02d069af8fa376357f69060335977a5eabd46d1e889f74af32461f02cca3fe9a84963b002db01e9ce0cbf5623472a1e5f0dd5e0e99
-MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
+DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
+EBUILD webkit-gtk-2.28.4.ebuild 8915 BLAKE2B 7e326805f4a7e26f0dcd8ce407921644fe2ce2ee98ea9d0567c73324a9e631221062b940c110eeae1f175b57f2835099f6c6ff2490aeafa0a9d7bec47c07be83 SHA512 70fb22670660db11e1ba1502cd07ee4a273dce7c0c775e1dbea6ea96cf1c9e2fe84f91abcddd0d94f6b895d1121c7a25db406717d0cbd59a48ad79f936aea833
+MISC metadata.xml 482 BLAKE2B 4ddea1fc3fdb0a18e8b6d04197bf34d93b596661d2b3ba563ea0bcf72f1a7db6529caf75f9ff301fb8d21037ebe44541294888f9a5b1d3b00b6fa5950a0c7243 SHA512 c0c614c5141d24a8b280973aa56364a8b451c88b35b4fadff111c232a6b7cad11e9273658db655d68cccc9fc59bb1158e98f806ab02d13896a67aab31a5b43e3
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
deleted file mode 100644
index 0f0959900df2..000000000000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add missing headers required during non-unified build.
-
-Unified build happens to get them included by the other sources unified
-into same source file, thus didn't fail.
-
-diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
---- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-@@ -30,6 +30,7 @@
- 
- #include "BuiltinNames.h"
- #include "BytecodeGenerator.h"
-+#include "BytecodeStructs.h"
- #include "CallFrame.h"
- #include "JIT.h"
- #include "JSCInlines.h"
-diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
---- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -23,6 +23,7 @@
- #include "MachineStackMarker.h"
- 
- #include "ConservativeRoots.h"
-+#include "CPU.h"
- #include "MachineContext.h"
- #include <setjmp.h>
- #include <stdlib.h>
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
deleted file mode 100644
index 85328be1a5ca..000000000000
--- a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this,
-but it looks like it's not enough with older perl-based gtk-doc.
-Keep this extra patch only until we can't depend on a newer gtk-doc version, which
-should be retested whether this patch is unnecessary then.
-
-Upstream extra reference for the above reference commit:
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-index 023b14c33f4..657b1febf5d 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
-      * WebKitSettings:enable-media:
-      *
-      * Enable or disable support for media playback on pages. This setting is enabled by
--     * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have
-+     * default. Disabling it means audio, track and video elements will have
-      * playback support disabled.
-      *
-      * Since: 2.26
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch b/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch
deleted file mode 100644
index 96e4d7d0aa2c..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 46c7d3ea88dd77223f25c48ce4a8688db71c489b Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Thu, 7 May 2020 19:30:28 +0000
-Subject: [PATCH] REGRESSION(r251875): Crash in JSC::StructureIDTable::get on
- ppc64le: gcSafeMemcpy broken on JSVALUE64 platforms other than x86_64 and
- aarch64 https://bugs.webkit.org/show_bug.cgi?id=210685
-
-Patch by Daniel Kolesa <daniel@octaforge.org> on 2020-05-07
-Reviewed by Michael Catanzaro.
-
-Fix gcSafeMemcpy on non-x86_64/aarch64 64-bit architectures.
-
-We were hitting an incorrect x86_64 assertion on values larger than
-mediumCutoff on JSVALUE64 architectures other than x86_64 and aarch64,
-as the control flow is wrong.
-
-* heap/GCMemoryOperations.h:
-(JSC::gcSafeMemcpy):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/JavaScriptCore/heap/GCMemoryOperations.h | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Source/JavaScriptCore/heap/GCMemoryOperations.h b/Source/JavaScriptCore/heap/GCMemoryOperations.h
-index f2b9e385bc9..ff66071db20 100644
---- a/Source/JavaScriptCore/heap/GCMemoryOperations.h
-+++ b/Source/JavaScriptCore/heap/GCMemoryOperations.h
-@@ -53,7 +53,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-             bitwise_cast<volatile uint64_t*>(dst)[i] = bitwise_cast<volatile uint64_t*>(src)[i];
-     };
- 
--#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64)
-+#if COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
-     if (bytes <= smallCutoff)
-         slowPathForwardMemcpy();
-     else if (isARM64() || bytes <= mediumCutoff) {
-@@ -121,8 +121,6 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-             :
-             : "d0", "d1", "memory"
-         );
--#else
--    slowPathForwardMemcpy();
- #endif // CPU(X86_64)
-     } else {
-         RELEASE_ASSERT(isX86_64());
-@@ -139,7 +137,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-     }
- #else
-     slowPathForwardMemcpy();
--#endif // COMPILER(GCC_COMPATIBLE)
-+#endif // COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
- #else
-     memcpy(dst, src, bytes);
- #endif // USE(JSVALUE64)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch b/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch
deleted file mode 100644
index fdf9d7d4d20b..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9cd4011a12bf658aad3776251792bacdc894643a Mon Sep 17 00:00:00 2001
-From: "berto@igalia.com"
- <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Mon, 27 Apr 2020 11:52:10 +0000
-Subject: [PATCH] [GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set
- https://bugs.webkit.org/show_bug.cgi?id=209431
-
-Reviewed by Carlos Garcia Campos.
-
-Don't create a PlatformDisplayLibWPE as a fallback when using
-Wayland or X11.
-
-* platform/graphics/PlatformDisplay.cpp:
-(WebCore::PlatformDisplay::createPlatformDisplay):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260750 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebCore/platform/graphics/PlatformDisplay.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-index 8bb47ca2b77..f9547b3af69 100644
---- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-@@ -98,12 +98,6 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
-     }
- #endif // PLATFORM(GTK)
- 
--#if USE(WPE_RENDERER)
--    return PlatformDisplayLibWPE::create();
--#elif PLATFORM(WIN)
--    return PlatformDisplayWin::create();
--#endif
--
- #if PLATFORM(WAYLAND)
-     if (auto platformDisplay = PlatformDisplayWayland::create())
-         return platformDisplay;
-@@ -121,6 +115,12 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
-     return PlatformDisplayX11::create(nullptr);
- #endif
- 
-+#if USE(WPE_RENDERER)
-+    return PlatformDisplayLibWPE::create();
-+#elif PLATFORM(WIN)
-+    return PlatformDisplayWin::create();
-+#endif
-+
-     RELEASE_ASSERT_NOT_REACHED();
- }
- 
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch b/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch
deleted file mode 100644
index f4bc7291a809..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 43686247013a1230d47b46d637f928eb47c99609 Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Wed, 29 Apr 2020 08:14:06 +0000
-Subject: [PATCH] [GStreamer] Switch to audiointerleave
- https://bugs.webkit.org/show_bug.cgi?id=211124
-
-Patch by Philippe Normand <pnormand@igalia.com> on 2020-04-29
-Reviewed by Xabier Rodriguez-Calvar.
-
-The audiointerleave element is a drop-in replacement of
-interleave. It should behave a bit better in live.
-
-No new tests, existing webaudio tests cover this change.
-
-* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
-(webKitWebAudioSrcConstructed):
-(webKitWebAudioSrcChangeState):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- .../audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp     | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-index 2f937f677cc..ea134b7b1b2 100644
---- a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-+++ b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-@@ -211,10 +211,10 @@ static void webKitWebAudioSrcConstructed(GObject* object)
-     ASSERT(priv->provider);
-     ASSERT(priv->sampleRate);
- 
--    priv->interleave = gst_element_factory_make("interleave", nullptr);
-+    priv->interleave = gst_element_factory_make("audiointerleave", nullptr);
- 
-     if (!priv->interleave) {
--        GST_ERROR_OBJECT(src, "Failed to create interleave");
-+        GST_ERROR_OBJECT(src, "Failed to create audiointerleave");
-         return;
-     }
- 
-@@ -398,8 +398,8 @@ static GstStateChangeReturn webKitWebAudioSrcChangeState(GstElement* element, Gs
-     switch (transition) {
-     case GST_STATE_CHANGE_NULL_TO_READY:
-         if (!src->priv->interleave) {
--            gst_element_post_message(element, gst_missing_element_message_new(element, "interleave"));
--            GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no interleave"));
-+            gst_element_post_message(element, gst_missing_element_message_new(element, "audiointerleave"));
-+            GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no audiointerleave"));
-             return GST_STATE_CHANGE_FAILURE;
-         }
-         src->priv->numberOfSamples = 0;
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
new file mode 100644
index 000000000000..d7bc379d2b15
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
@@ -0,0 +1,31 @@
+From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 11 Jul 2020 15:28:05 +0300
+Subject: [PATCH] Try to fix another apparent non-unified build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42:   required from here
+/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
+   79 |  static_assert(sizeof(_Tp)>0,
+      |                ^~~~~~~~~~~
+---
+ Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+index 55d9e34df61..12a7a83cc61 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include "ImageBuffer.h"
+ #include "RenderSVGResourceContainer.h"
+ #include "SVGClipPathElement.h"
+ #include "SVGUnitTypes.h"
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
deleted file mode 100644
index 475c9851e637..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 4 Oct 2019 22:17:11 +0200
-Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
-
----
- Source/WTF/wtf/URLHelpers.cpp   |  2 +-
- Source/WebCore/dom/Document.cpp |  6 +++---
- 4 files changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
-index 18e7f13cd61..c584f1a0cb7 100644
---- a/Source/WTF/wtf/URLHelpers.cpp
-+++ b/Source/WTF/wtf/URLHelpers.cpp
-@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
-     Optional<UChar32> previousCodePoint;
-     while (i < length) {
-         UChar32 c;
--        U16_NEXT(buffer, i, length, c)
-+        U16_NEXT(buffer, i, length, c);
-         UErrorCode error = U_ZERO_ERROR;
-         UScriptCode script = uscript_getScript(c, &error);
-         if (error != U_ZERO_ERROR) {
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 0fd0fa090bf..01f76850f3d 100644
---- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
- 
-     for (unsigned i = 0; i < length; ) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon)
-                 return Exception { InvalidCharacterError };
--- 
-2.23.0
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 27c7a387561f..24e8c4e03393 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -6,12 +6,8 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="coverage">Enable code coverage support</flag>
 	<flag name="egl">Enable EGL support</flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
-	<flag name="gles2">Enable GLESv2 support</flag>
 	<flag name="jumbo-build">Combine source files to speed up build process</flag>
-	<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
-	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
deleted file mode 100644
index 430f780b0e2c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ /dev/null
@@ -1,283 +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"
-
-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="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	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 OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-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: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.48: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.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=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? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# 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/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	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 ) )
-
-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++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) 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}/${P}-icu-65.patch" # bug 698596
-	eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	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
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "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?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-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_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
deleted file mode 100644
index b9b0a863feac..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ /dev/null
@@ -1,286 +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? (
-		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=gles-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.2-fix-arm-non-unified-build.patch # bug 704194
-	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-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.4.ebuild
index d8c2b014eb30..27ed996c0ab0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -119,7 +119,7 @@ DEPEND="${RDEPEND}
 	virtual/perl-Carp
 	virtual/perl-JSON-PP
 
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
 	geolocation? ( dev-util/gdbus-codegen )
 "
 #	test? (
@@ -167,12 +167,9 @@ 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
-	eapply "${FILESDIR}"/${PV}-fix-yelp-desktopless-build.patch
-	eapply "${FILESDIR}"/${PV}-use-gst-audiointerleave.patch
-	eapply "${FILESDIR}"/${PV}-fix-ppc64-JSC.patch
-	eapply "${FILESDIR}"/${PV}-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/${PV}-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 16ef13db6e38..4a5c2999076e 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -3,10 +3,12 @@ AUX wvstreams-4.6.1-autoconf.patch 701 BLAKE2B 1d76fab4056d78be9491439166c6c2563
 AUX wvstreams-4.6.1-gcc47.patch 1308 BLAKE2B 4c49bb694eb50452f3d158ef9e8c80978614c94d9e482e55434ab3aa9ec62468b7fa87c737d2812f56c8acd6a221234f80548ccae65f20e46d7e7ba2b1ad3748 SHA512 cfac44a0c80d58e67d4a3be17cca3008f6c7bba02b434701fcf07a1209220edf93b4d0dc1f478456e07e28f9e39ab9d19a52a07ad1f9ecd09028ef5446cebfa5
 AUX wvstreams-4.6.1-parallel-make.patch 1882 BLAKE2B 03c40c90d63c72065ad29dcb7436a37e5d5037595c285671a5c7c1b76a74723e63ac7eba024326e7452b4c9af507b2925609faed0496c384c04980044dea28b6 SHA512 d7fffbd7940495f2e34d3317b8f0066f6caa98e213df00bf31e3f42fa6821c9fd017e3052f7ff98303a8d8bb61d9b24a14b87ddd18199038e083e42cf253c17e
 AUX wvstreams-4.6.1_p14-libressl.patch 3457 BLAKE2B f5c1a3ee44007fc3ca7c08be91ed9fbee84939bb09a02d699a2da7aa60238762a0d38fd8be5e7bb3aab891fa8b99f4c0de2a206e6db58fdc12c5adeaebf18700 SHA512 5561021c6ebeb9fc8255eb42be799dc23d32e368cb2662cbb78e5f5258392983bd9b5174954f1262062be1fe5638941255bd612760d1373d5682c139dcaf3ee4
+AUX wvstreams-4.6.1_p14-llvm.patch 11598 BLAKE2B a7f4019da421702ecfedc461079ad39a4b3776b3fb570ae50ddff64c0d2f9d4bd3752050daf1143d7bf86e62c33cb823f4a4f5b76c618f3b51908ff706dd1b9a SHA512 db0856afd7c0bcf976ef697c300817efbb2d4cf22f4c0832e87011025c9b43f7aab64ee335de2acee2dda7a59412a138e44ca89bb8b6df010b871bde427d16e3
+AUX wvstreams-4.6.1_p14-xplc-module.patch 806 BLAKE2B 066262f3e42617dbae0ff982af21933b1567f23119f9f83152afb1f8da8ea79fdc09f6b01a01ecb03626c7007b70d52f921f1f637089a9813d061dcc9de3dc9c SHA512 e1b74f6481cc55b1f6750d08c2f4ae4d11575e99cfd94b5bcc658f54ac4756e885dac98a82eb7f2b6e02d33f1b4ac75b91087640e3195deff8887d752ee2e0c0
 AUX wvstreams-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a570194a93d64142ce6e96f81c141cdb4ae33c6e785fe863278347e2b7903df13a5390305a18568fca9880c2ac45534458671ec SHA512 a8b90e1bbda676ba4303c7a31fc896955c3a0aea0ba4d8a69514210a4baa1cc4228de43b648788cfca2e6b607040daaa520568c7d15b258d04b803bba6375637
 AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
 DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea569fd0a81cd2c2411daca25e6042dcbe78792bafc4b13f1c1fffddb6cd66273f11c62f54b415c975cbea0af052b18ff0955d1 SHA512 93ea7c4fbab542bd552d6e91ae0c49a27ad8aded177ae6474943acb08d204ab31eac49b3f416b4d90a38ea697f3641c09651a64f9c40d12543d454aadf2ad9e4
 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
-EBUILD wvstreams-4.6.1_p14-r1.ebuild 2188 BLAKE2B 11f2844a2643c0baabfe21bf735730fb3e659e5371fbf723ec3054dcbc79df471242c7135ecf579eb9fabd0ee64474f7ab464c236fab16e37dbc7ac248254d8b SHA512 e2fbfbbcdcd637cbb02f524cf5cd064f5d606fc259c9fb58c006d5a1eeec531bbf0db17cb2c555a4a937a977b6fe17d51c5100a6915d532c2108429ca099a739
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2279 BLAKE2B e0eaac5509b28f0fe5091ff87bae959eb5e23e312e22ba67fd938e3a9f30eace1fc3bc95bc162a8187f61814c9b3f3c2a78f5c5f60363b0dd83e724aee581c54 SHA512 714dff120d673caa3f93a6db3ea3946c5c15b29ee6f087a397bf055b4898481fb71429ee8b727259d1fab485756a10e7ac2b1d417ee6802d912aa5cc1156e100
 EBUILD wvstreams-99999.ebuild 1994 BLAKE2B e18ee55f383342113ea3e7015a209bb1ba13baa8dd300f9393c463c379a5d656a595ba3a3efc1fc19fdbc05b18adc03b95c9002c06f8a29b69bee2eb3de8d15f SHA512 a6346862fd514dc5d320c233c85f1ae90111d285ad6e2593546c69f91aeb65b8d753ccbdf8b663e9787a98a81c0e560ef2709cfb5a7c91ea156c96475e704445
 MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1_p14-llvm.patch b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-llvm.patch
new file mode 100644
index 000000000000..156d198a440c
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-llvm.patch
@@ -0,0 +1,412 @@
+--- a/include/uniconf.h
++++ b/include/uniconf.h
+@@ -434,7 +434,7 @@
+  */
+ class UniConf::Iter : public UniConf::IterBase
+ {
+-    UniConfGen::Iter *it;
++    IUniConfGen::Iter *it;
+     
+ public:
+     /** Creates an iterator over the direct children of a branch. */
+@@ -465,7 +465,7 @@
+  */
+ class UniConf::RecursiveIter : public UniConf::IterBase
+ {
+-    UniConfGen::Iter *it;
++    IUniConfGen::Iter *it;
+ 
+ public:
+     /** Creates a recursive iterator over a branch. */
+--- a/include/uniconfgen.h
++++ b/include/uniconfgen.h
+@@ -153,8 +153,50 @@
+      */
+     virtual bool haschildren(const UniConfKey &key) = 0;
+ 
+-    /** The abstract iterator type (see below) */
+-    class Iter;
++    /**
++     * An abstract iterator over keys and values in a generator.
++     *
++     * Unlike other WvStreams iterators, this one declares virtual methods so
++     * that UniConfGen implementations can supply the right behaviour
++     * through a common interface that does not depend on static typing.
++     *
++     * The precise traversal sequence is defined by the iterator implementation.
++     *
++     * The iterator need not support concurrent modifications of the underlying
++     * data structures.
++     * 
++     * TODO: Consider changing this rule depending on observed usage patterns.
++     */
++    class Iter
++    {
++    public:
++        /** Destroys the iterator. */
++        virtual ~Iter() { }
++
++        /**
++         * Rewinds the iterator.
++         * Must be called prior to the first invocation of next().
++         */
++        virtual void rewind() = 0;
++
++        /**
++         * Seeks to the next element in the sequence.
++         * Returns true if that element exists.
++         * Must be called prior to the first invocation of key().
++         */
++        virtual bool next() = 0;
++
++        /** Returns the current key. */
++        virtual UniConfKey key() const = 0;
++        
++        /** 
++         * Returns the value of the current key.  You could just do a get(),
++         * but maybe your generator has a more efficient way.
++         */
++        virtual WvString value() const = 0;
++    };
++
++
+ 
+     /** A concrete null iterator type (see below) */
+     class NullIter;
+@@ -214,7 +256,7 @@
+ public:
+     /** Destroys the UniConfGen and may discard uncommitted data. */
+     virtual ~UniConfGen();
+-
++    
+     /***** Notification API *****/
+     
+     /**
+@@ -300,70 +342,28 @@
+ protected:
+     // A naive implementation of setv() that uses only set().
+     void setv_naive(const UniConfPairList &pairs);
+-};
+-
+-DeclareWvList(IUniConfGen);
+-DeclareWvList2(UniConfGenList, IUniConfGen);
+-
+ 
+-/**
+- * An abstract iterator over keys and values in a generator.
+- *
+- * Unlike other WvStreams iterators, this one declares virtual methods so
+- * that UniConfGen implementations can supply the right behaviour
+- * through a common interface that does not depend on static typing.
+- *
+- * The precise traversal sequence is defined by the iterator implementation.
+- *
+- * The iterator need not support concurrent modifications of the underlying
+- * data structures.
+- * 
+- * TODO: Consider changing this rule depending on observed usage patterns.
+- */
+-class UniConfGen::Iter
+-{
+ public:
+-    /** Destroys the iterator. */
+-    virtual ~Iter() { }
+-
+-    /**
+-     * Rewinds the iterator.
+-     * Must be called prior to the first invocation of next().
+-     */
+-    virtual void rewind() = 0;
+-
+     /**
+-     * Seeks to the next element in the sequence.
+-     * Returns true if that element exists.
+-     * Must be called prior to the first invocation of key().
+-     */
+-    virtual bool next() = 0;
+-
+-    /** Returns the current key. */
+-    virtual UniConfKey key() const = 0;
+-    
+-    /** 
+-     * Returns the value of the current key.  You could just do a get(),
+-     * but maybe your generator has a more efficient way.
++     * An iterator that's always empty.
++     * This is handy if you don't have anything good to iterate over.
+      */
+-    virtual WvString value() const = 0;
++    class NullIter : public UniConfGen::Iter
++    {
++    public:
++        /***** Overridden members *****/
++        
++        virtual void rewind() { }
++        virtual bool next() { return false; }
++        virtual UniConfKey key() const { return UniConfKey::EMPTY; }
++        virtual WvString value() const { return WvString(); }
++    };
+ };
+ 
++DeclareWvList(IUniConfGen);
++DeclareWvList2(UniConfGenList, IUniConfGen);
++
+ 
+-/**
+- * An iterator that's always empty.
+- * This is handy if you don't have anything good to iterate over.
+- */
+-class UniConfGen::NullIter : public UniConfGen::Iter
+-{
+-public:
+-    /***** Overridden members *****/
+-    
+-    virtual void rewind() { }
+-    virtual bool next() { return false; }
+-    virtual UniConfKey key() const { return UniConfKey::EMPTY; }
+-    virtual WvString value() const { return WvString(); }
+-};
+ 
+ 
+ #endif // __UNICONFGEN_H
+--- a/include/unifastregetgen.h
++++ b/include/unifastregetgen.h
+@@ -42,7 +42,6 @@
+     virtual bool haschildren(const UniConfKey &key);
+ 
+ private:
+-    IUniConfGen *inner;
+     UniConfValueTree *tree;
+     
+ protected:
+--- a/include/unifiltergen.h
++++ b/include/unifiltergen.h
+@@ -68,8 +68,8 @@
+     virtual bool exists(const UniConfKey &key);
+     virtual bool haschildren(const UniConfKey &key);
+     virtual bool isok();
+-    virtual Iter *iterator(const UniConfKey &key);
+-    virtual Iter *recursiveiterator(const UniConfKey &key);
++    virtual IUniConfGen::Iter *iterator(const UniConfKey &key);
++    virtual IUniConfGen::Iter *recursiveiterator(const UniConfKey &key);
+ 
+ protected:
+     /**
+--- a/include/unihashtree.h
++++ b/include/unihashtree.h
+@@ -62,10 +62,11 @@
+     UniHashTreeBase *xparent; /*!< the parent of this subtree */
+     Container *xchildren; /*!< the hash table of children */
+ 
+-private:
+     void _setparent(UniHashTreeBase *parent);
+     UniHashTreeBase *_root() const;
+ 
++private:
++
+     /** Called by a child to link itself to this node. */
+     void link(UniHashTreeBase *node);
+ 
+--- a/include/unimountgen.h
++++ b/include/unimountgen.h
+@@ -103,8 +103,8 @@
+     virtual void commit();
+     virtual bool refresh();
+     virtual void flush_buffers() { }
+-    virtual Iter *iterator(const UniConfKey &key);
+-    virtual Iter *recursiveiterator(const UniConfKey &key);
++    virtual IUniConfGen::Iter *iterator(const UniConfKey &key);
++    virtual IUniConfGen::Iter *recursiveiterator(const UniConfKey &key);
+ 
+ private:
+     /** Find the active generator for a given key. */
+--- a/include/wvmoniker.h
++++ b/include/wvmoniker.h
+@@ -72,7 +72,7 @@
+ 	// from IObject, which is very important. The 'for' avoids a
+ 	// warning.
+ 	for(IObject *silly = (T *)NULL; silly; )
+-            ;
++            silly = (T *)NULL;
+     };
+ };
+ 
+--- a/include/wvpushdir.h
++++ b/include/wvpushdir.h
+@@ -27,12 +27,11 @@
+ 
+     WvPushDir(WvStringParm new_dir)
+     {
+-#ifdef MACOS
+-       old_dir = static_cast<char *>(calloc(PATH_MAX, sizeof(char *)));
+-       getcwd(old_dir, PATH_MAX);;
+-#else
+-       old_dir = get_current_dir_name();
+-#endif
++        old_dir = new char[2048];
++        if (!getcwd(old_dir, 2048)) {
++            errnum = errno;
++            return;
++        }
+        dir_handle = opendir(old_dir);
+        if (chdir(new_dir) == -1)
+           errnum = errno;
+--- a/include/wvscatterhash.h
++++ b/include/wvscatterhash.h
+@@ -183,7 +183,7 @@
+         Iter(WvScatterHash &_table) : IterBase(_table) { }
+         Iter(const Iter &other) : IterBase(other) { }
+ 
+-        unsigned char *getstatus() { return &xstatus[index-1]; }
++        unsigned char *getstatus() { return &this->xstatus[index-1]; }
+ 
+         T *ptr() const
+             { return (T *)(get()); }
+--- a/include/wvserialize.h
++++ b/include/wvserialize.h
+@@ -60,6 +60,7 @@
+     return htons(i);
+ }
+ 
++#ifndef ntohll
+ /**
+  * Helper functions to convert 64 bit ints to and from host byteorder
+  */
+@@ -80,6 +81,7 @@
+     return (((uint64_t)htonl(n)) << 32) | htonl(n >> 32);
+ #endif
+ }
++#endif
+ 
+ /**
+  * A helper function that serializes different types of integers.  Since
+--- a/include/wvtask.h
++++ b/include/wvtask.h
+@@ -24,6 +24,7 @@
+ #include "wvstreamsdebugger.h"
+ #include "wvstringlist.h"
+ #include "setjmp.h"
++#define _XOPEN_SOURCE
+ #include <ucontext.h>
+ 
+ #define WVTASK_MAGIC 0x123678
+--- a/uniconf/unicachegen.cc
++++ b/uniconf/unicachegen.cc
+@@ -69,7 +69,7 @@
+ 
+ void UniCacheGen::loadtree(const UniConfKey &key)
+ {
+-    UniConfGen::Iter *i = inner->recursiveiterator(key);
++    IUniConfGen::Iter *i = inner->recursiveiterator(key);
+     if (!i) return;
+ 
+     //assert(false);
+--- a/uniconf/uniconfgen.cc
++++ b/uniconf/uniconfgen.cc
+@@ -104,7 +104,7 @@
+     
+     hold_delta();
+     
+-    Iter *it = iterator(key);
++    IUniConfGen::Iter *it = iterator(key);
+     if (it)
+     {
+ 	it->rewind();
+@@ -257,7 +257,7 @@
+ };
+ 
+ 
+-UniConfGen::Iter *UniConfGen::recursiveiterator(const UniConfKey &key)
++IUniConfGen::Iter *UniConfGen::recursiveiterator(const UniConfKey &key)
+ {
+     return new _UniConfGenRecursiveIter(this, key);
+ }
+--- a/uniconf/unifiltergen.cc
++++ b/uniconf/unifiltergen.cc
+@@ -134,7 +134,7 @@
+ }
+ 
+ 
+-UniConfGen::Iter *UniFilterGen::iterator(const UniConfKey &key)
++IUniConfGen::Iter *UniFilterGen::iterator(const UniConfKey &key)
+ {
+     UniConfKey mapped_key;
+     if (xinner && keymap(key, mapped_key))
+@@ -144,7 +144,7 @@
+ }
+ 
+ 
+-UniConfGen::Iter *UniFilterGen::recursiveiterator(const UniConfKey &key)
++IUniConfGen::Iter *UniFilterGen::recursiveiterator(const UniConfKey &key)
+ {
+     UniConfKey mapped_key;
+     if (xinner && keymap(key, mapped_key))
+--- a/uniconf/unifstreegen.cc
++++ b/uniconf/unifstreegen.cc
+@@ -62,7 +62,7 @@
+ 	log("Key '%s' not found.\n", key);
+     }
+     
+-    virtual Iter *recursiveiterator(const UniConfKey &key)
++    virtual IUniConfGen::Iter *recursiveiterator(const UniConfKey &key)
+     {
+ 	// don't try to optimize this like UniMountGen does, because we're
+ 	// going to mount things *as* we iterate through them, not sooner.
+--- a/uniconf/unimountgen.cc
++++ b/uniconf/unimountgen.cc
+@@ -305,7 +305,7 @@
+     return strcmp(*l, *r);
+ }
+ 
+-UniMountGen::Iter *UniMountGen::iterator(const UniConfKey &key)
++IUniConfGen::Iter *UniMountGen::iterator(const UniConfKey &key)
+ {
+     UniGenMount *found = findmount(key);
+     if (found)
+@@ -345,7 +345,7 @@
+ // FIXME: this function will be rather slow if you try to iterate over multiple
+ // generators and the latency level is high (as is the case with e.g.: the tcp generator). 
+ // the fast path will only kick in if you iterate over a single generator.
+-UniMountGen::Iter *UniMountGen::recursiveiterator(const UniConfKey &key)
++IUniConfGen::Iter *UniMountGen::recursiveiterator(const UniConfKey &key)
+ {
+     UniGenMount *found = findmountunder(key);
+     if (found)
+--- a/utils/t/wvpushdir.t.cc
++++ b/utils/t/wvpushdir.t.cc
+@@ -15,14 +15,9 @@
+ 
+     WVPASS(newpushdir.isok());
+ 
+-#ifdef MACOS
+-    char *pwd = static_cast<char *>(calloc(PATH_MAX,sizeof(char *)));
+-    getcwd(pwd,PATH_MAX);
+-#else
+-    char *pwd =  get_current_dir_name();
+-#endif
++    char pwd[1024] = "";
++    getcwd(pwd, sizeof(pwd));
+     WVPASSEQ(pwd, dir);
+-    free(pwd);
+ 
+     unlink(dir);
+ }
+--- a/utils/wvpam.cc
++++ b/utils/wvpam.cc
+@@ -5,6 +5,7 @@
+  * A WvStream that authenticates with PAM before allowing any reading or
+  * writing.  See wvpam.h.
+  */
++#include <pwd.h>
+ #include "wvlog.h"
+ #include "wvpam.h"
+ #include "wvautoconf.h"
+--- a/xplc/modulemgr.cc
++++ b/xplc/modulemgr.cc
+@@ -23,6 +23,7 @@
+ #include <assert.h>
+ #include "modulemgr.h"
+ #include <xplc/IModuleLoader.h>
++#include <unistd.h>
+ 
+ #include "config.h"
+ 
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1_p14-xplc-module.patch b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-xplc-module.patch
new file mode 100644
index 000000000000..a7d931c3d814
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-xplc-module.patch
@@ -0,0 +1,25 @@
+--- a/include/xplc/module.h
++++ b/include/xplc/module.h
+@@ -100,19 +100,19 @@
+    * XPLC module magic number. This is to ensure that it is in fact a
+    * valid XPLC module that has been loaded.
+    */
+-  unsigned long magic;
++  signed long magic;
+   /**
+    * The XPLC module ABI version that this module conforms to. This
+    * should always be the first member of the XPLC_ModuleInfo
+    * structure, as the meaning of the following members depend on it.
+    */
+-  unsigned int version_major;
++  signed int version_major;
+   /**
+    * The XPLC module ABI sub-version that this module conforms
+    * to. This is used for optional and backward-compatible changes in
+    * the module ABI.
+    */
+-  unsigned int version_minor;
++  signed int version_minor;
+ 
+   /**
+    * Description string for the module.
diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
index 69bea4fae032..06f36322819b 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -43,6 +43,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.6.1-gcc47.patch
 	"${FILESDIR}"/${PN}-4.6.1-parallel-make.patch
 	"${FILESDIR}"/${PN}-4.6.1-_DEFAULT_SOURCE.patch
+	"${FILESDIR}"/${PN}-4.6.1_p14-xplc-module.patch
+	"${FILESDIR}"/${PN}-4.6.1_p14-llvm.patch
 )
 S=${WORKDIR}/${P/_p*}
 
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 2e72a75c26ac..824b76b605c7 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,5 +1,9 @@
 DIST xrootd-ceph-4.12.0.tar.gz 80601 BLAKE2B 05e31ec3a03d50f36f7ef368705ca8ad064d1d9da4fc3815aaf96ce358da07348aaea264d82884da2782cf7c1069b584269fff9f2a3140057b2d4d2929639f77 SHA512 de55cc923bad3629de6428dbc4e7c7e2cb802512f03f49bcfc79f12221828cd9702f1c9a1bc28b599dce801c937146cf381dfd589c85f4f5721c4fbf13f6ad34
 DIST xrootd-ceph-4.12.3.tar.gz 80615 BLAKE2B d7040be47fe3f9283036f1d56f509860c6a56f29f68835d1469f3ee48377dd90e1c76b28c65b1dab24b64e00083368e1242bd4988f15b6b9df50a0c7715d9f00 SHA512 8df64c33b97cb9d92bc0a962c34c82d789551d76a3450b56125f2924357ee46c51513f992809357a217890d1d261144a92ee1b95f075b2c8081d4646402467b0
+DIST xrootd-ceph-5.0.0.tar.gz 80615 BLAKE2B dd37dd2c76d59c8e1fe672fd9a573af8197f0f93a64e1ea1a2b02fca6be66c163c54f999089d397715135d0e209cc0b570f6d381b9f3c472a1e7316e22a03d46 SHA512 12215876bd73d59217909390595d128d03e12eed82d130ccec3b88c02620dbeb3e028e4d8101121778df5a804de1cc66bc485aa3073455ab5ef88d8ac158550f
+DIST xrootd-ceph-5.0.1.tar.gz 80620 BLAKE2B e36e07a5dd8cc5035986774e76a231734c7d8e0584cecc941cc41045dddedde75173d83f9a55525069f83fefd50af9bab93d038a40c19f06b158ca45cbfa3a1e SHA512 8e00cba70b2cea1a5a83041df1b5c18ba3ec9dc801bdffd5cb14dbdffd02a3230b58603523a2ae0995a4685343bcb3d1ad8afbdf9a345104c7e29de3717509a2
 EBUILD xrootd-ceph-4.12.0.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
 EBUILD xrootd-ceph-4.12.3.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
+EBUILD xrootd-ceph-5.0.0.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
+EBUILD xrootd-ceph-5.0.1.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.0.ebuild
new file mode 100644
index 000000000000..f38a421f4865
--- /dev/null
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=net-libs/xrootd-5.0.0
+	sys-cluster/ceph"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/cppunit )"
+
+# 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.*/libXrdCeph.*-$(ver_cut 1)\.so
+	/usr/lib.*/libXrdCephTests\.so"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		# As of 5.0.0 the default plug-in version is still 4.
+		-DPLUGIN_VERSION=$(ver_cut 1)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.1.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.1.ebuild
new file mode 100644
index 000000000000..f38a421f4865
--- /dev/null
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=net-libs/xrootd-5.0.0
+	sys-cluster/ceph"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/cppunit )"
+
+# 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.*/libXrdCeph.*-$(ver_cut 1)\.so
+	/usr/lib.*/libXrdCephTests\.so"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		# As of 5.0.0 the default plug-in version is still 4.
+		-DPLUGIN_VERSION=$(ver_cut 1)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index dcedf026979d..5da466876d0c 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -6,6 +6,10 @@ AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
 DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d
-EBUILD xrootd-4.12.0.ebuild 2527 BLAKE2B a48f6d68fa7926aee485c8f56a4a33d7d661e633c2875271acc35e7fbac66132ce8fcb999d8ba58dc561ba59da3bad5d08e9ff0284dec4f5c58a5b675ec6caf6 SHA512 e401d9e3a10f2c28be18243cd64132de5f079ca5c9db9f18df5c179560b47b9ea3e0bf471a7257f3f15956e4d552a5442b2ad02f969808c1643721fb0e7f2c2c
+DIST xrootd-5.0.0.tar.gz 2754256 BLAKE2B c80a38ede3263ae669181f2173f6ee2bb0a347dc973cecc9dedf00867041190f7bceb7f475696e8cd3921c57d4c197b73ee57b29c9e78a027393ca61dca1b6d3 SHA512 75b69d3da2a6e477edbf5588afd943a91a2e1e86fcc98afc34d964c9231fc0224b4eec82336e9a7d5bd8bd0cd5c20e442ee37b8f6239f417b05efdf39038d93c
+DIST xrootd-5.0.1.tar.gz 2759931 BLAKE2B 2bc76f660f7fb3c9202c37dc10f099f2bd06868b00c43e6015ebb0d9cf3edf8ac777f76c1f71d0f1f4b252cedd62c9aa74a449cb5f369492a5ee63813bb7924f SHA512 95e0fe97f66a320999d4c2dd2ac5be4e2ba7779f220aa521e4882925d5e9262c34991f0ecbd3c2449b97977ff4cdbdcd9477ed780d1a6dbf8fbd3f547b4932ba
+EBUILD xrootd-4.12.0.ebuild 2517 BLAKE2B 80d5848ae7082e174e89e877d468929fb95ffd8663a74d1aec792ecbc533c7d3fbebd8405e78b2987aa055345dea02a4d6d60cd34657ed72b2eba0509adfd003 SHA512 56e62ed7a09bdd941a01bcac483e852cdb6fb12f241266af3e004361729bbda789299b32077bfe48116e69f9b87bebdec4ccea79bf4ae2f017f43c705d3c524d
 EBUILD xrootd-4.12.3.ebuild 2519 BLAKE2B 395695d7458e091905988112f84008e6b6ec67cd5ebd5ea76cdf04ff7f2ffdbcf3ae35b7a94aec178fdecddbb8eb2e9db984a017cc73eaad59cd42fa3e006e4c SHA512 4fea5f8371f05507a25c20472600b0b4fe085442e81b0acec0dea3fbe65483836da1ffca4fa70f639f81aba336aaf83b7e0467b7a7dd879bdd98da2ac99907e0
+EBUILD xrootd-5.0.0.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
+EBUILD xrootd-5.0.1.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-4.12.0.ebuild b/net-libs/xrootd/xrootd-4.12.0.ebuild
index 414f5edd4dc1..3974f5488b24 100644
--- a/net-libs/xrootd/xrootd-4.12.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/net-libs/xrootd/xrootd-5.0.0.ebuild b/net-libs/xrootd/xrootd-5.0.0.ebuild
new file mode 100644
index 000000000000..b96f560be940
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.0.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+# Upstream does not support the building of Python bindings
+# via CMake for more than one implementation at a time.
+inherit cmake 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
+	/usr/lib.*/libXrdClTests\.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_src_configure
+}
+
+src_compile() {
+	cmake_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_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
+}
diff --git a/net-libs/xrootd/xrootd-5.0.1.ebuild b/net-libs/xrootd/xrootd-5.0.1.ebuild
new file mode 100644
index 000000000000..b96f560be940
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.0.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+# Upstream does not support the building of Python bindings
+# via CMake for more than one implementation at a time.
+inherit cmake 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
+	/usr/lib.*/libXrdClTests\.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_src_configure
+}
+
+src_compile() {
+	cmake_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_src_install
+	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+	# base configs
+	insinto /etc/xrootd
+	doins packaging/common/*.cfg
+
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
+
+	local i
+	for i in cmsd frm_purged frm_xfrd xrootd; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+	done
+	# all daemons MUST use single master config file
+	newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+	if use python; then
+		python_optimize "${D}/$(python_get_sitedir)"
+
+		if use doc; then
+			docinto python
+			docompress -x "/usr/share/doc/${PF}/python/html"
+			dodoc -r bindings/python/docs/build/html
+		fi
+		if use examples; then
+			docinto python
+			dodoc -r bindings/python/examples
+		fi
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-libs
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)