gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-libs
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
213 files changed, 3149 insertions, 2972 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9eef92448395..4d953729117e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
index 1a24d71a55dd..802d8df1a2bb 100644
--- a/net-libs/accounts-qml/Manifest
+++ b/net-libs/accounts-qml/Manifest
@@ -1,4 +1,4 @@
 AUX accounts-qml-0.7-no-tests.patch 307 BLAKE2B 2faefed0d6de1d0f271aece811b5fa064bf67017a8964ad4cd83d2b618e30cce6fabc0272ba3fa5949da1229255602a4b86191dd9e27a91c9f95fd20cffb26e1 SHA512 d0b199098bd7993178084b795138fc87282015525d11e14913056fbaa1b0954fd37d2ad6bb56855513d900fa0ea7a4a4beb31de6bdd4338785bcba9eb1df2eba
 DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1
-EBUILD accounts-qml-0.7-r1.ebuild 941 BLAKE2B 7e5a5649b875365c11192e0167fbf69e5a52ac4c33104e0a51f4752d22abe7b3ca54dbf6e7e9c94b1c07782216a0dbb887089d27939e227d76c9a0ad6ad323ef SHA512 2572a2dcd978400307954c71608ed1e44654959128d2089492c5dbc7e939a15f279cc7ad8c31e124d709e88ad58b34b64fb2efa6ea84bea1183bd092ad47e564
+EBUILD accounts-qml-0.7-r1.ebuild 950 BLAKE2B 93ca277c37af7f038abfe0713fbd4817d9efee5fda7284776c5df557e375478d00da1e8334f49226391416facc440def49aa741ed540eded891e96c8fea5543d SHA512 69464f8a6e33658b4e730cf0742c4131348a311b996dbe64220f74071d8ec78d3eed7de0351a955cfaead2d02f17ae897a69c7a7679a67fc0ced4b5d8fda6e43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
index 7bdabd41a8ef..275e673dde18 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-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
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index fb41596b01e8..5863f03dcc63 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,8 +1,5 @@
-AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
-DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
-EBUILD glib-networking-2.58.0.ebuild 1957 BLAKE2B 6ad5a0626dd10c4873d7542eb66a2b73dd85fa33a07cbad6432052a99e8ffdf569c51b71fd3a7017ffa57f19e6eed53a32ea60769200ca8516312dfe1377d432 SHA512 96d76192155ec43464d04df7ebdd19f6eeee5112bdc7812faaca211aef15b9fb88ba994d73e5f1fe5066eee1f7c20ec1bb2585c8924bd3de01d6cac44596c713
-EBUILD glib-networking-2.60.3.ebuild 1770 BLAKE2B efcc58a1e29857deeda29f1aa72bde1c2728d86907f9b6a74cb3150365a1aca1e4b0e9bc51a6188c3e0e9706d25b1c6dda4fcdfa4565261e04347060046ac331 SHA512 d63448bb31a095ddb67d3680f3948da49360d99833be7a2ee533e0ca6c8bc8d05a29ecc3b297ae84b023469288ca2c92ce2799e2ff1494c1a13f33b0fe1016ca
+EBUILD glib-networking-2.60.3.ebuild 1769 BLAKE2B fecd9867d1fa1964a8dbb23150682931d1ea195897d3d93c3f2303505f4b2ab97025413c36bdffe677b10e95c709a1ed6bb4ca8439351ea517a4f5c39e849b6d SHA512 67bef7c6e15116b927a42463bd86a319c8a70964eb9544698163d7fa8fad5706824a4a61f5517c90cf3dfbce4e0f822e37e1276b3569bc5495f89de3ec0b9136
 EBUILD glib-networking-2.60.4.ebuild 1780 BLAKE2B a32b7d6c7ab3a32d8d182ff4c9da4d6db43de26d3c9a0c57cafd6b61c1c254f9b19880931580e78b2c323e6b271e7e937660a08f281241f4b303401f8d0dd47e SHA512 0169e55c4053938fdf226d0a8d04ffb80652b5ee729b1abf9b883dab08e45bacfae18ec486d680d6e580d7af2b8f9ba35674e2f0f87fdd02a1280c66231186e9
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch b/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
deleted file mode 100644
index c3802392e3b5..000000000000
--- a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7fd8c24182ea054d6d890b6f6325e63458a10392 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 17 Jan 2019 21:03:06 +0200
-Subject: [PATCH] tests: Disable test that fails with gnutls-3.6 (or in
- general)
-
-Tests for TLS 1.3 are still problematic on 2.58.x releases; should
-be better once 2.60 comes out, but the changes are still being worked
-on and would cause regressions for real world programs right now if
-backported.
----
- tls/tests/connection.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 6087efc..accca78 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -2017,14 +2017,10 @@ main (int   argc,
-               setup_connection, test_client_auth_connection, teardown_connection);
-   g_test_add ("/tls/connection/client-auth-rehandshake", TestConnection, NULL,
-               setup_connection, test_client_auth_rehandshake, teardown_connection);
--  g_test_add ("/tls/connection/client-auth-failure", TestConnection, NULL,
--              setup_connection, test_client_auth_failure, teardown_connection);
-   g_test_add ("/tls/connection/client-auth-fail-missing-client-private-key", TestConnection, NULL,
-               setup_connection, test_client_auth_fail_missing_client_private_key, teardown_connection);
-   g_test_add ("/tls/connection/client-auth-request-cert", TestConnection, NULL,
-               setup_connection, test_client_auth_request_cert, teardown_connection);
--  g_test_add ("/tls/connection/client-auth-request-fail", TestConnection, NULL,
--              setup_connection, test_client_auth_request_fail, teardown_connection);
-   g_test_add ("/tls/connection/no-database", TestConnection, NULL,
-               setup_connection, test_connection_no_database, teardown_connection);
-   g_test_add ("/tls/connection/failed", TestConnection, NULL,
--- 
-2.17.0
-
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
deleted file mode 100644
index 7111b4ab1667..000000000000
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~sh 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:=[${MULTILIB_USEDEP}]
-	ssl? ( app-misc/ca-certificates )
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/meson-0.46
-	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-disable-failing-tests.patch # shouldn't be needed with 2.60
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use libproxy libproxy_support)
-		$(meson_use gnome gnome_proxy_support)
-		-Dpkcs11_support=false # deprecated, functionality should be available without it; removed in next version
-		-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.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 56e52d93134e..0ccd2dcbcbfd 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.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
@@ -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 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 354d575760a3..a745438cf23e 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-accounts-3.30.2.tar.xz 921284 BLAKE2B 9dc503f73ddda64411f73ac865a0355f318ad13789fac0cf7e7a91d16e53b03dee33acca6752060ce54936cfd5050adb8fadfd121158c0496a3f516e35e8fa45 SHA512 3555421adbfec0e7da1c8f3a47415f6c5bc3eaf8b246cf08eb6ee420286a4b40d11bc6e2514bca937b022b95068c9862438fa632d3385503aba2647a4a57976b
 DIST gnome-online-accounts-3.32.1.tar.xz 863252 BLAKE2B 69345a5e7a9ccfef231cb012a1e3240a31db898f32b654f6275fd18e027eebe5cda07b4a0f8fea1447ca33ac120d8476aea7d2c824238b327c0c207009fcae7c SHA512 548e6c983899bc1f4093fcf0b7b08819f2803182f52c2cdfb4cffa8bfb00e513322973fdfce2aeadeb52b0cd43c7c1e3941cff187927577cefb4fba51f4fda5b
-EBUILD gnome-online-accounts-3.30.2.ebuild 2093 BLAKE2B 1238f709ef5744af1025bab7db217bfcacb9e08ea475a54127ad738bfcaea28d188e152e9b73e1819836eccf323b21d4736272d14627945fccbae6cc673cea23 SHA512 14b614b2a71046c3229a19745e492c01b373983eb10098ee24b70e8894fe3d0162fbad2c62046c66cb7b0830d243577536d0d1ea6d431af77f7dcea4c324be0a
 EBUILD gnome-online-accounts-3.32.1.ebuild 2072 BLAKE2B bac9a62f53a529c293150b5e8e39f5fcd4dd73a219794696b61f894c8ebfd8154a633491a10aa2ed6a2d7c879f5cd89b00b76057f80dbaa677749fc2343566a0 SHA512 c0c577d896ea31d6eca8a1bfb7ce3eed02310ddf6caefda8aede69852d08553076ae4c27e14c4ddb4d83064a8042f6774ea86c4728d4ceb4a2661f8d1db2092c
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
deleted file mode 100644
index b514430f0387..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	>=net-libs/webkit-gtk-2.12.0:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-todoist \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index eb1cc0f8f285..4243bccd530b 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -6,4 +6,4 @@ EBUILD gnutls-3.6.10-r1.ebuild 4016 BLAKE2B 161ea3056a5368688f2fad8be7cb2aa04da9
 EBUILD gnutls-3.6.11-r1.ebuild 3998 BLAKE2B a142d3cba3f4df0daa1300be72e0ac81f1938cb2ef1ce6b7f9dbc9434fda44b3e2f98e0253e039c85f7befa77ac423df08b881f2c2a3eb861f8e269f3d29f0dd SHA512 fa259b5cabc58aceb9c12a76a69a0fa79b0ee2a3bd11970e398c68bfb4edb491d1396d7e41f841914ea6fcb7c8bb54f7478cb59adbb914d8ace98e27f3a505fb
 EBUILD gnutls-3.6.11.1-r1.ebuild 3998 BLAKE2B a142d3cba3f4df0daa1300be72e0ac81f1938cb2ef1ce6b7f9dbc9434fda44b3e2f98e0253e039c85f7befa77ac423df08b881f2c2a3eb861f8e269f3d29f0dd SHA512 fa259b5cabc58aceb9c12a76a69a0fa79b0ee2a3bd11970e398c68bfb4edb491d1396d7e41f841914ea6fcb7c8bb54f7478cb59adbb914d8ace98e27f3a505fb
 EBUILD gnutls-3.6.7-r1.ebuild 3996 BLAKE2B 8b3d8104ace6c4fb9feeee846330425e234d7aef901d938d85b8759170e4b471e15f206508627962b428d54b4b447954639bad5a926adce4649164b4f8ec01dd SHA512 3d71ee2df60845ab0bf09b1cafbaf6cede2fe67a230af6057004c668aa23b94162b81ee5d4f6406ffcd3e51c4381f2c13f9939cba15b38890989744f6c665a7d
-MISC metadata.xml 1277 BLAKE2B 08fd439ce197f1ce2b1fd5bdedf6e409410aeb45a473b2b81ab9316ef32b367d44d0c65f3e768fae9edba1a03f572417e3f7dd23ee73b700dd0798e3dca30292 SHA512 dc4e4e3a72732012cf37d21b881e44933d5e3720ee1f3dc2c5d88ae97e7e2cea79628282bebd7d58048db7edd0bb7be80ffca23d126f333600172f16473341f5
+MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 20e6efaa6651..34baa89cc669 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
+    <email>base-system@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="dane">
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index c6f78b2531bb..c897f8a5dfa1 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -18,6 +18,7 @@ DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b
 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
 DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
 DIST grpc-1.25.0.tar.gz 16460163 BLAKE2B a581b1db459468e7c01af579da39cc111825931eee21d9af13833b1d65e448ee2024d86edb95e7acb705ad427f793d7911d6fb66418155e75f5e1f0e6116578a SHA512 7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92
+DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
 EBUILD grpc-1.16.1.ebuild 2405 BLAKE2B 1f3e8e9383fcb1f4eb371abde99377f653aeac44dba6e268dcf760b3e2cf20015d08965f9a8b3a2ed1fc31626326239634977d6ecfea893b9e2ca5de2e2d6034 SHA512 695ea5cbd96bb1b49cd562677911d43cfdc78f9ca95240b9103e09f8027f75eb1effbf755adb0487f8a833cbd41d4b1c0ec2de31fe9069be049198b9c526c2d0
 EBUILD grpc-1.17.1.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
 EBUILD grpc-1.18.0.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
@@ -28,4 +29,5 @@ EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
 EBUILD grpc-1.25.0.ebuild 2546 BLAKE2B c821d0232ec9ab111eafe4f5227fe694aac651459aa3acf17770482ef89931bb4779b2e1e4ca2e28da930f41b3754a28f814e10ef400d93dc87b024bdb56d620 SHA512 b8620d5390348ccf26637edd08f7f2b3d81d66d4fb8328d9c19d5dd58a213fbbec969325df7ac0693368bf06cc8803cf261fae3da9c6b23bdc0c978906f58c50
+EBUILD grpc-1.26.0.ebuild 2546 BLAKE2B c821d0232ec9ab111eafe4f5227fe694aac651459aa3acf17770482ef89931bb4779b2e1e4ca2e28da930f41b3754a28f814e10ef400d93dc87b024bdb56d620 SHA512 b8620d5390348ccf26637edd08f7f2b3d81d66d4fb8328d9c19d5dd58a213fbbec969325df7ac0693368bf06cc8803cf261fae3da9c6b23bdc0c978906f58c50
 MISC metadata.xml 737 BLAKE2B de7262f1cccfe21d55f3ae0f744e067d54912995520b46b9fd3107abfed3c057082f91854f4bc4c399606a31200f0f2da468218b1d677de1aca1155532395d60 SHA512 dbc3dc0370c809f0ea1ad5f88dcef44b0ca5a2bbde47606acf85ec6149892f19990608da9b5fd4417e77a5b565a34fc481a9c7b27b00e11a5c0015ef04800a7c
diff --git a/net-libs/grpc/grpc-1.26.0.ebuild b/net-libs/grpc/grpc-1.26.0.ebuild
new file mode 100644
index 000000000000..0a1213a0a715
--- /dev/null
+++ b/net-libs/grpc/grpc-1.26.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.8.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 2fd8c86ca0e2..f24c016fd5e0 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
-EBUILD gtk-vnc-0.9.0.ebuild 1697 BLAKE2B 3f159afc1e9503d53807e940b3a0b4aac9452cfd2f5b3e9347cc7143baeb4017ecaa690987f02a539a6b559f412de364abb92d1b63a84ee204615d5acf471539 SHA512 e06812a659baf2ac69da7280fe196b953753a30cff19d91ed98bbcf544576acd8b874d908887b97ec3e5da1aac1fe7fadd17c7912480642da4e03668534c1741
+EBUILD gtk-vnc-0.9.0.ebuild 1695 BLAKE2B 88844526c4ff9ef740f82e349bd72e24fc3dcaca517b354d8764c282edeeb28683717d3f201f0da4c2b2232739ba0126114faa23cec74b3cb27ad5f1e2a7e779 SHA512 6f288b5d4b2e1149f15ed59657752ac2475b6c39be57a687d9ea17bb5fd6e0bc4dd9a98f7c099163f386705c2ef82a3bdd1f4a5b15b9a001e70a084328231376
 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
index d60e56b36ee4..fa167ec2bef9 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 5f9e80a2136c..f955755cddc8 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,5 +1,3 @@
-DIST gupnp-1.0.3.tar.xz 422912 BLAKE2B 900a2a81982a50239b26ddd5df3f57caac1ee66103e857b9014db7dc694e303c1eaa0633cb467887f3370e97058abc221bd0175c9df11ca4af31e3f802145a66 SHA512 f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
-EBUILD gupnp-1.0.3.ebuild 1948 BLAKE2B c7515e47821d5e385d21f507a241f15b320645d88d94e3bb8cfd91574c40dcff36d52b412663723cfce4d59324034fd60de31175b0dbd878a41d0d184fc25c1a SHA512 495086fb7212e0f4bb864eefe84e6d895d9dba1939bf43f9a001deacb5389eb4dea136ccc39a469683d6a36e8e0b98d05ecece38e825ff1a395ac829ba84635d
-EBUILD gupnp-1.0.4.ebuild 1949 BLAKE2B 00b66628c3d84b53aea5fa55ff6f82d5b8dbe7dfe8da9221c3535cec7d3984de72ce3a29d43a621d73d419d0222620a0e99d616c1bdc88c066befe927c3de14a SHA512 2c693f2150a66047cc0b32526e6c6355863d671cd3b834544c3f2dbecbe91e009d1dc3fdc0f924b269de46e6ffc3ce842c1d606283c6212c73c2dcd93e3980a3
+EBUILD gupnp-1.0.4.ebuild 1944 BLAKE2B afe621fe5e42a61db2c38156adc1018c0171e95b0a25535f44f0afd3e7d7543eaf15e120c63d63cfbb410725eb30d1eb3cebe0c5dec3335a8174d52cba288ba6 SHA512 7298438379023f729d3d20bbdbb20aad25c159a08fe787bdde804f8ad9295708ebf8b336f1541860b10467f90787044b1e6b1910a77ce2657584f8f2457eb39b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.3.ebuild b/net-libs/gupnp/gupnp-1.0.3.ebuild
deleted file mode 100644
index f4b45b131fa4..000000000000
--- a/net-libs/gupnp/gupnp-1.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 multilib-minimal python-single-r1 vala
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman +introspection kernel_linux networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=net-libs/gssdp-0.14.15:0=[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${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.36:=
-			$(vala_depend) )
-	connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=unix
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		--disable-static \
-		--with-context-manager=${backend}
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool
-}
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
index 432a781ef7b2..a559d480cc22 100644
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.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="6"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 multilib-minimal python-single-r1 vala
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="connman +introspection kernel_linux networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 549e8ef2276b..29f6b8ec213f 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -2,7 +2,7 @@ DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108d
 DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
 DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
 EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
-EBUILD http-parser-2.9.1.ebuild 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
-EBUILD http-parser-2.9.2.ebuild 985 BLAKE2B 027de308c6275c5ecb747f12b2d266bdfa33b21fe9ef5872ab3635f4e27360cc74bae06b8d2e835e4fbcc569ae5e65f75c8aeea201538838f41fae9be280b084 SHA512 a60847368bffec4c352257265015249a5b0807557e24247aacdfb6c99b9c3594f7c89b79c0fc49b9ba7cb3fedb96e3227ff77a9e986b398d9dde1bea46b99df9
-EBUILD http-parser-99999.ebuild 848 BLAKE2B a34ef61acb4072b1b51e13f4381fc6076b8b5e2693a281d1d41a0a15455ec29532aa7c69e474ecaad23b2230ff0d9894d02302e6940148ae19dafc080b508761 SHA512 b74380f265418b2956102b0d56c34ebbe8a439eb81dfd75f91b80eb266094d19940f29af59d50c894f832499af6aca11710ba14631b6111f5a9ea2c4ff4d1735
+EBUILD http-parser-2.9.1.ebuild 1014 BLAKE2B 303409bf197182a0a4afa540e5c522abb4ecbbb677a5d79b5419a94b44dfc10ef2e08a24518961aa425817751cdf2c207fe50721be016ce912af524a1b16f45f SHA512 ed2453a71d655e2b2f5ac9157d7d056a8ed73272f2ca8405a079782be1fd2ac92a640649ee2b078b20b375e5be512889fcbd5c56df3f067dae294f34c538b283
+EBUILD http-parser-2.9.2.ebuild 1011 BLAKE2B dfa48329f6c92622c5368b939fad36e1cc5eb1411a088eb3040e62bc6cfb2804a1a216ce8e12041b807068446aeaf6d7d3470f0cdaf4ddd66eb27a7b9729b100 SHA512 ff635a86de6ceaee6a71fc7b501ec9e133b9b46531db0b1fae4f424098570bb8f29c06a1bf5e9a47b458c810fc790dcbe64a79361f797418b4c2b808a85f4f39
+EBUILD http-parser-99999.ebuild 874 BLAKE2B 7ca6132687ff6da292034c94565f29c11ab2c32e2391daa1b984463828b7254fc3f3b9399063a2f37b344969520ba00fd3f8617c111a691e72eaff9731ef9c11 SHA512 9ff2b79fc825ffb0d5c047c02381a03ad8b42c24bb2e3c1bc5feace6f751f91910d66b259d2ad66b704d868e08086c6de2b1aa89f6508d99de7ee497d39832f9
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.9.1.ebuild b/net-libs/http-parser/http-parser-2.9.1.ebuild
index 2abe7cff69f8..9cd3d2ec8f6f 100644
--- a/net-libs/http-parser/http-parser-2.9.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.1.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="HTTP request/response parser for C"
 HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2.9.0"
diff --git a/net-libs/http-parser/http-parser-2.9.2.ebuild b/net-libs/http-parser/http-parser-2.9.2.ebuild
index e2628e93d41e..49ac5fb62f6a 100644
--- a/net-libs/http-parser/http-parser-2.9.2.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.2.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="HTTP request/response parser for C"
 HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2.9.0"
diff --git a/net-libs/http-parser/http-parser-99999.ebuild b/net-libs/http-parser/http-parser-99999.ebuild
index 08127047fc39..864957ee3347 100644
--- a/net-libs/http-parser/http-parser-99999.ebuild
+++ b/net-libs/http-parser/http-parser-99999.ebuild
@@ -6,7 +6,7 @@ inherit git-r3 toolchain-funcs multilib-minimal
 
 DESCRIPTION="HTTP request/response parser for C"
 HOMEPAGE="https://github.com/nodejs/http-parser"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/nodejs/http-parser"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
index d4a0bb44ea2d..a19eacd71ff6 100644
--- a/net-libs/jreen/Manifest
+++ b/net-libs/jreen/Manifest
@@ -1,3 +1,3 @@
 DIST jreen-1.3.0.tar.gz 287827 BLAKE2B 93204ed95d93377be6515ef2f1cf5eaba7194d168a3dda3ceee036693fead1db36c2e34c94aca7ba46dd859f6a29646719f867582a381b730c527cfc7e877474 SHA512 7b8267aa7d0e18c28dfeb6a1c7c0495d87bd2712fe10a0c6283f0cf89b72d2c67f98f97a812c9f34496af43eb00ddd94b7e60e942634fb03d0119f94a3d08464
-EBUILD jreen-1.3.0-r1.ebuild 718 BLAKE2B 98ed0b87677c71ac63b20e74dcd68413a898acfa573141a2dce5d0803534b80c0e9ebe56125028927cb497fe68831ab1e73c5cd1cc240d641cc9510c69483c18 SHA512 1f14857c77693a144a2246164db06c3473671cd863689c55821263bc41722f80a99e9765be8b2c82b389d5029620f13ee039536aadb9bf3d666ff915472f0ca6
+EBUILD jreen-1.3.0-r1.ebuild 706 BLAKE2B 1986142a8899fd35cd608c9afda892e0d282e109253ef7880923ac11ba237f7f7abeae3e6fb9ab158a5069b0d98324d2750212197c4655a6f9b9a15bd6fae5a8 SHA512 163b050cbd15e90711889bf70a07f10f0555c25b51a85090b404b7ffc643a0d6f8e804c8dd5b13ea08146ee48a670cdd098e9bace8665ba3ebed71fe2e7418bf
 MISC metadata.xml 331 BLAKE2B 7b2a944d9d2af106a11e08cf6a7840acb1ef2a0464d43f56a32148c9edbace174b4b9cedcd4b58a442f6c99fb2a3a45d0e75c33ed7e900b424f0d4c7256163ea SHA512 0fdd8e27d2048fc9430b7f0e079794298095dc3987fe7bfedb81dbc6fb85490fd0642f6f7b1d669a00b2a657b64b0b7b0f155d9787f5082954ad2c840355d301
diff --git a/net-libs/jreen/jreen-1.3.0-r1.ebuild b/net-libs/jreen/jreen-1.3.0-r1.ebuild
index c004a9cffb9e..b0175ce32225 100644
--- a/net-libs/jreen/jreen-1.3.0-r1.ebuild
+++ b/net-libs/jreen/jreen-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ else
 	EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git"
 fi
 
-inherit cmake-utils ${GIT_ECLASS}
+inherit cmake ${GIT_ECLASS}
 
 DESCRIPTION="Qt XMPP library"
 HOMEPAGE="https://github.com/euroelessar/jreen"
@@ -33,5 +33,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DJREEN_FORCE_QT4=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 63f5adb9d242..f246e3a36f9a 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -4,6 +4,5 @@ AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.0-r2.ebuild 2243 BLAKE2B 94561febec20f04fc09a302128ffbedc2f513cb6213abb23337ac379f52b5457de24b91111640db37210db1d5f62eb816af219428608d1db00c4eeb2380b5df6 SHA512 32d49de2d194fd9e4b7de5689e4680c412dfe4b5cbd00216b3ac4f10a4421914652f35cf006d4ca9829571eed6c91a0714218a774e81ecfe35886fb3d51e8300
-EBUILD ldns-1.7.1-r1.ebuild 2756 BLAKE2B acc8c5366d2ed7cd315650f19b31c0a7a6a79e4c381d1bc791d4283260461df133276f9e50cb64ec1ca9c513175623116403216ac81ed0faae6aff7e7fa9c974 SHA512 25949ac065e8c734d3ae7fea6ab025104c009699a81acc806027a28d1309fb1157a52ce647490704cf3dc02de8d6f0549bd2f5acdba28fa60374bf68a30a788e
-EBUILD ldns-1.7.1.ebuild 2792 BLAKE2B 1834ed95664a2425d4f3706a7fdbed93951dadfa5424ef393c87528b9304b6546bde06dc268989e5d5714b9ba7d2455ff4d768f407563935afffbbc24f9dfc55 SHA512 23bd2aefe462744bd9b1e6db9ef3a1727e10eb3a0023e402eb242a282366f74418708c2a83ed15f4b914c15992592d706e803fc9b9e7c28db4ea1878b1a6cc2e
+EBUILD ldns-1.7.1-r1.ebuild 2754 BLAKE2B f687038d2ccc75792ffadef332b45a0195c819edf2d89f36e9422bfa804da3cca53338ec7ec76b448ada9317219f7e1e93bcda1907ff376bf332dc3abd68aa6e SHA512 11a66754492ed884682f0706aa5e2d175d8e949dd094f592ece054ab974e16b816edcec3b5acec9758ea87ed3b9769ce5ee2e7ad635f9c19f9628195ab553627
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 119fd33b2256..84f58b7f4d90 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit eutils multilib-minimal python-single-r1
 
 DESCRIPTION="a library with the aim to simplify DNS programming in C"
diff --git a/net-libs/ldns/ldns-1.7.1.ebuild b/net-libs/ldns/ldns-1.7.1.ebuild
deleted file mode 100644
index dc73bf8b91f8..000000000000
--- a/net-libs/ldns/ldns-1.7.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit eutils multilib-minimal python-single-r1
-
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
-	)
-	ed25519? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] )
-	)
-	ed448? (
-		!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0"; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable dane) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--with-ssl="${EPREFIX}"/usr \
-		--enable-sha2 \
-		--without-drill \
-		--without-examples \
-		$dane_ta_usage \
-		--disable-rpath
-}
-
-src_prepare() {
-	default
-	#epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch"
-	#epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch"
-	# remove non-existing dependency for target packaging/libldns.pc
-	sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-
-	einfo
-	elog "Install net-dns/ldns-utils if you want drill and examples"
-	einfo
-}
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
index 056c80b45f06..99f80443ddfa 100644
--- a/net-libs/libblkmaker/Manifest
+++ b/net-libs/libblkmaker/Manifest
@@ -12,4 +12,4 @@ EBUILD libblkmaker-0.5.0.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072
 EBUILD libblkmaker-0.5.1.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
 EBUILD libblkmaker-0.5.2.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
 EBUILD libblkmaker-0.5.3.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
-MISC metadata.xml 571 BLAKE2B 5bb22d3c7b3d5512ddc761b4557e6261cbafa8d06d9a5f487ac654b0453cdb909ebcb20ca48867ce6f650c8091eea2cb4cec89b20965d76c4b6e5df9e3a9873a SHA512 efdfe85835a576ce80fd8c82642834b607525d32a771e272088ea78899049c686d3fe144cee6ea1d38b136d135378673842bd27ca4ff2052368fbb355bbb2996
+MISC metadata.xml 458 BLAKE2B 6b0af9ae636522bc685b709e618ccf90343d3639211c2cd660de7f32934e04d672f0202c239dfcf91b10a27189a3f26694471007f7ad73adbfa5f1bf7a85af7c SHA512 55bf903c89e214eb664da1995053dbfc0dfd896c1cda51ec7ba38c0f8bcc20e9aa4142702c201ac57aec1a132ceb338c8137deaad9c8502e275ca517a63eebab
diff --git a/net-libs/libblkmaker/metadata.xml b/net-libs/libblkmaker/metadata.xml
index bd88e505296a..50b1253d5629 100644
--- a/net-libs/libblkmaker/metadata.xml
+++ b/net-libs/libblkmaker/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 0dfc3bce897c..3a6ebac7e87a 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,5 +1,3 @@
-DIST libhtp-0.5.22.tar.gz 5773159 BLAKE2B ae3b759624ce7c6063013810142fbc12544d60cfaa482ad82114b65374923871bb732c86051822fe78a539efbe5e139f480117a28fd4ba2fac9201a46b8eb99f SHA512 3daf7241e8abca34bf348e0fc805c755472ebba01a869d5523637a81dfd6b9b3019941dff2e75d6e0978ebfbd60d917191e355aa43a2391500ecaaddab487ebc
-DIST libhtp-0.5.31.tar.gz 495621 BLAKE2B 7c6c552dbecfc8e4314207c1b944dabee1172ebad608848a80549b1726b9b0d576c01b7ba1f79beb3912e5e79384d5c261cf7a548d8c8f49b20f77b2c9d71823 SHA512 8069afe87548a9cb29a883ebeb9fad05a79297fc567de22e9c1c030f5239d4373478bc3ed5ecb284e84401f1086f6a18a58e288f28381b96dbb5b71d60afa03a
-EBUILD libhtp-0.5.22.ebuild 802 BLAKE2B 952ed01b70409f28eabb0297cdfc9b0c3ee18616172a71a9d3a94d70da005b98fdc06cf3a944646ab90d8b7f95f78f426e5eb24facc27108f33d0716ef972e8d SHA512 16e21e57bf13a605e40900f81406b378f5c05332bdd537c5279968975b80ba78d76f0129b8c083d7c234c5520589f2eecad0e1328fee3a11af4ce90c4b072f67
-EBUILD libhtp-0.5.31.ebuild 856 BLAKE2B 662ab3523934bb8e16e01312f5c919d654cab285c063b59bc958a30c6c7ec140d6ad51fb89b4490a1167aeca1ea8675e46bea8ea56bed9c527db696abbe9312e SHA512 af7d56ce1d18b5248583d57698914b34c013c0a0a30ebd583272475337fa9206b59e501fcdc9d361e8fce7468e3b36829e05fbd0ca0fbc1c9f46ff3cdd56d1d7
+DIST libhtp-0.5.32.tar.gz 496086 BLAKE2B 73a9a3cdfe45326a01a53597d25cf30535780de84770a47bd6ea425d5891db893bb0afa77dbaa23fb8c32c6c66c568d3fcd8df78d64fe569056f252ffc89cf04 SHA512 3df877b158b40a2c59bc66c0caf589d51b20d1d3ca27dab82f516693c22bfb9d6845305cfd42bf1a61c5df98a05fcad25850cc78cf948047600d6783ace7fc63
+EBUILD libhtp-0.5.32.ebuild 856 BLAKE2B 662ab3523934bb8e16e01312f5c919d654cab285c063b59bc958a30c6c7ec140d6ad51fb89b4490a1167aeca1ea8675e46bea8ea56bed9c527db696abbe9312e SHA512 af7d56ce1d18b5248583d57698914b34c013c0a0a30ebd583272475337fa9206b59e501fcdc9d361e8fce7468e3b36829e05fbd0ca0fbc1c9f46ff3cdd56d1d7
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.22.ebuild b/net-libs/libhtp/libhtp-0.5.22.ebuild
deleted file mode 100644
index 2f19228060c9..000000000000
--- a/net-libs/libhtp/libhtp-0.5.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
-HOMEPAGE="https://github.com/OISF/libhtp"
-SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="sys-libs/zlib[static-libs?]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# The debug configure logic is broken.
-	ECONF_SOURCE=${S} \
-	econf \
-		$(usex debug '--enable-debug' '') \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libhtp/libhtp-0.5.31.ebuild b/net-libs/libhtp/libhtp-0.5.32.ebuild
index d737b3ef282d..d737b3ef282d 100644
--- a/net-libs/libhtp/libhtp-0.5.31.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.32.ebuild
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 9e0d79b48351..7b546ee5bf4e 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,8 +1,10 @@
 DIST libisds-0.10.6.tar.xz 724120 BLAKE2B b6d3f42d4ff84c377c9425dfd84a14ae97ccc39ea4bb96169e3a8de21b99dd6e5ceda39a6d4a574ccb418561dbec2507f72afc8b6f185c34ff92202abcc49441 SHA512 602c4e7f047dedff131cda941d02ea41fca7b8ea80eb668ab8f7ab2626a013ddc1a86f1e2c7b5759adf266c7c22c515284e6d4fdd9fd594ad310bed1be6016f4
 DIST libisds-0.10.7.tar.xz 724840 BLAKE2B 73d93b518271cbd08787a38da454ceb8fa6c2d421b0291c61cded8f1438d44c5607d1e90d75714c3d76e0886ac723e38dc2a41d60284a58d567abdcba76becd4 SHA512 ba2ef11c2983cb3bc8f779e7af3fb8319d38a786911e68c6b53c25aff339b4630bdf78886825ea3da671e87f689cab376cd9e41398f3f74608af932abe7a0023
 DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
+DIST libisds-0.11.tar.xz 741952 BLAKE2B 553613b7f1d8f5b3af1ecff2734584234f5d461c289c08acaf4353b724102ac87da5e60c2b5ffc2895a6441af2a51e0a381ab9df4494d7543edf356b989df891 SHA512 d30708cc6df92f0da9c4fac9acea3c1f3d97ae5ed1f17967e41c4887fe90f5b7375508df987b4b98cc5653a099a78c7a678f8fcb6897de863ff2f4538413f7dd
 EBUILD libisds-0.10.6.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
 EBUILD libisds-0.10.7.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
 EBUILD libisds-0.10.8.ebuild 1183 BLAKE2B 609e17accfe1f3b0c149890cc81a38f5d03f9d63e826e64b8e0dd48842d17c1292acc27ba58f9f7a1158db292b2a27ee9f0e6165d2a5e0d254d9f9470d4903bb SHA512 4111123c6388132aa065df5c9c1dd4d73f44223086577ef0a3c9afaedf22052ef54f78b762b45e0b950aa41b96e9ee80cb2fc073698661b14e881fad035ee9fd
+EBUILD libisds-0.11.ebuild 1274 BLAKE2B eccde55c98bf443f36ba823fb8d3a723960bcd39dd6968af1b964a16e94cfe128f48a6926d15182cb1b22f19c32d1a32c5dd533ff5f438b66a54e95ee15a0b90 SHA512 5c2b1e00de587bee9dfdd3159c421ffc5be6b077f197520f757576a35d1e2b6b1ef5f2f97d87d0e48edc399f0686bb9536131569526c3f2e117e611dc932c7ca
 EBUILD libisds-9999.ebuild 1232 BLAKE2B b36387416664cf5273f17d6afcaa86157af7a381b9aad4ddff889fe79fc372d63f6db66e4b34d15070b274ac5b091529c57a15e21c60654b373c28cc32918285 SHA512 017031a837d18d026e48a2a87908a39992e3d134ab65eca2570afbc269f1287064ad672e5d0f77f651a190c56a6daad3dc94f2fb323978d963b7a751b709cb4b
 MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
diff --git a/net-libs/libisds/libisds-0.11.ebuild b/net-libs/libisds/libisds-0.11.ebuild
new file mode 100644
index 000000000000..959693ab47c5
--- /dev/null
+++ b/net-libs/libisds/libisds-0.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Client library for accessing ISDS Soap services"
+HOMEPAGE="http://xpisar.wz.cz/libisds/"
+SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
+KEYWORDS="~amd64 ~mips ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="+curl debug doc nls openssl static-libs test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	dev-libs/libxml2
+	curl? ( net-misc/curl[ssl] )
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+	openssl? ( dev-libs/openssl:= )
+	!openssl? (
+		app-crypt/gpgme
+		dev-libs/libgcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=net-libs/gnutls-2.12.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!openssl? ( >=app-crypt/gnupg-2 )
+"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-fatalwarnings
+		$(use_with curl libcurl)
+		$(use_enable curl curlreauthorizationbug)
+		$(use_enable doc)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable openssl openssl-backend)
+		$(use_enable static-libs static)
+		$(use_enable test)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index d90dbd760a99..fb03a19d2fe2 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,7 +1,5 @@
 AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
 AUX libktorrent-2.1.1-fileops.patch 748 BLAKE2B 5c36ed8660b28b76ea2302801ffc2cd098f3743a80fbdc29ac15ce2afe00e0fe05717bbd8ad3375c0a95e4a1c9072b3d1257a572ef1392441393443ea35e764f SHA512 f07cfbbd135d8a726ddbc16a8263676126370438d219c49e23f2796321970dbf10c34a96df92b96da870f5a488b2832049579dab3aabf48370ebb787b30be104
 DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
-DIST libktorrent-2.1.tar.xz 355476 BLAKE2B c86205174ac0526455cc9d2049cd918fa1127e85ca18422823f89c3714950d6e4f606dabbeca4d615a17fc18d8032ef0cf86aa4d80726116ea667d9f257e0ddc SHA512 28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4
-EBUILD libktorrent-2.1-r2.ebuild 1355 BLAKE2B 6b8e1600b6c8eeb8d447166aeac2310cfc3de7b3ec50df02a087bc8306ed53ef6cb21a9dfb453a136c86ff85d87794db6ac06f17b87edceb6cb731f08f58ab64 SHA512 e11dd93dd788c50b93871d3c1bc8c34fd13bbc3db041933b31a0ab29c3b22f412e31186b977e5347e23b65f04620954e425edfda08302bc09b1122f07b3a2771
-EBUILD libktorrent-2.1.1.ebuild 1420 BLAKE2B 3b04160943d1eb14fa788320ba37b9771764d638857a64013311e103c8e3d274430732d6eccb23d2e1bc6f773c3998ec00cb6c88ae0202cd1ccd7f0427872671 SHA512 07f3566eb6cf8afdecf78985c01d5d9e0b479896087a35d736a26afb0eeacae60e12d410cc47310c449738dfae3473e01233d10687b00042e85fa9d1d54fdb26
+EBUILD libktorrent-2.1.1.ebuild 1549 BLAKE2B b28f9f065dc542e90fb9ba9b74f3594446a5953ca760e7cce92129ed3af7b7f2910d771a4928c61729ef263042a09f6c8fa30bf2515fd0ee02201b555f3a04cc SHA512 23c283c72592ca9369187514a286ce2b6a1f0add2ae4ab99a79eba8428305fab30fa1b44ac55f214986b2fe816be52f9e0d1bc826ac1103c481d0e3aa66b36cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.1-r2.ebuild b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
deleted file mode 100644
index 113538733505..000000000000
--- a/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
-SRC_URI="mirror://kde/stable/ktorrent/5.1/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	>=dev-libs/gmp-6.0.0a:0=
-	dev-libs/libgcrypt:0=
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-libs/botan[gmp(-)]
-"
-
-PATCHES=( "${FILESDIR}/${P}-unused-link.patch" )
-
-src_prepare() {
-	kde5_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|transmit)"
-	)
-
-	kde5_src_test
-}
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
index 9399cfd161ba..a71a4a0418bc 100644
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
@@ -3,31 +3,35 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+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="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
 	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
@@ -42,7 +46,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	kde5_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}\" //" \
@@ -57,5 +61,5 @@ src_test() {
 		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 3f9be456dcc1..233bcb4284e8 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -5,5 +5,5 @@ AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
 EBUILD liblockfile-1.09.ebuild 1213 BLAKE2B 6baf53369f3dcfbc3c3d12ad6b4b3f146b4d649aa587a4b29db73959fd9a0623a7b0671089f06210d613a18f854ab127799d3621e1af7f7c3a319fddbd6beb4e SHA512 dc6a60b2695e8f22c496ecdbf4d4520245ebdf4d9306ff4d03e71ece099f590940f16b080684983228f80569596a8c401f6f604077d9a613467fd0d7a48fd4e8
-EBUILD liblockfile-1.16.ebuild 1335 BLAKE2B 17730034da8d80cbcfb5e4777f544f7d06f6e2b6ab71f76f860cd3ea75f68e281e6b822a0ff73486b77b0eb4862380697da0efc6c463071977da8c62230fea2b SHA512 0fb7e56ec4df03eba7d3c8d25913991339cc3b10d9d7d0f7932b7cd9041e93187672fcf886ae6b3947bc1ac63f3c08f31bf139306053fe751bdce88bcde5567e
+EBUILD liblockfile-1.16.ebuild 1332 BLAKE2B 224829212979d45c77fb4fc171d629dfabdb241dc0eac96d74f1616f092c4b492434625acec12954e186b7abfb4e67f5733ca2a54746e9402d8b4b6370827646 SHA512 adc936a5db4f0443d10e7f5887a54e7340de044c91eff3ff4f4f4cfbc7b00b777eb75a098fda6f62edd426ce00a2bc3e03269454b777e9e711610103c65f96ec
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index d350ec4bea37..24f4f3a0aa16 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index bdb536834097..c6dcf6f96042 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,13 +1,7 @@
-DIST libmicrohttpd-0.9.63.tar.gz 1840005 BLAKE2B 0fdbc97901a3c5fd9567e70c58e3ef93517a2b7defd88313329fd2e9c8f610e41524291e877ba6633339a29df4f17a735416904651163c272eb2334fa5012f11 SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17
-DIST libmicrohttpd-0.9.64.tar.gz 1631384 BLAKE2B 15437188f0246ea0270338e45016c344d345c31954256b70de73a16d6858bf7eff03b796214463cd5e34c5c9f8b47e84fcfb80550659d3579031eb3697e8555c SHA512 2569bcfcbc16da988a236fe337b60c0c69c23e7e66e9c9459b26b0b09a4763a42e94db11c9f10fbaf424bdce2b60e7d2837ecdd65393134ff5bc06f8b23c6bd9
 DIST libmicrohttpd-0.9.65.tar.gz 1633346 BLAKE2B ce6ba2b6c52e30194872c66ab5b9e358f0979dd99ef24ce59fddf9e6fc2b76b01f424f9c9b511cf88c2dde2ca98d3f6a25cbcd26bdfadf0b9db65efd36435dc7 SHA512 751b7a5970cef07f260660254bfdeda4882e9e28d5cbdfbfed50e2c4583caf8f19c96ede6d368babc4223e7fbdf85d85eec37dc96abf333377dc13d6a9c6be12
-DIST libmicrohttpd-0.9.66.tar.gz 1877096 BLAKE2B 4788fa63b0438e250264852f291a7661ee64f4116cbe95eec0902a47115721040a9259acb9c3385d833364f9b27695a90a2cedc516a35ee89125e0852d545579 SHA512 59cc56a9511d9d1c05647a57d920a16d0aaa0d0523d0241ceb88641d18bd95fdb3bb5a60fd648ac54a6f4323a673a3145e520a2fe9e124e78973ff6dac3ad89a
-DIST libmicrohttpd-0.9.67.tar.gz 1881973 BLAKE2B 640bc99642160adb6728dfa6ea71720e376bd0bca3b86a56424906a563b9ea1ef92d51c509d0e642c8e32f46a9044826ab41f0e5eef88ee971bde9094a961db7 SHA512 2a2a11e9a525024dada639b1622cc875bb9b59af266a53e2742d5bf92f544192713c4e1369a573b2e3796d27cf490a9a02ba360ccc91136b4780306769edb7ec
 DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13
-EBUILD libmicrohttpd-0.9.63.ebuild 1291 BLAKE2B 77aa399b7154b32e59ca5711ec42632f2dda757fba2fe760293dac3871f62587eca67f3a24f281eb146ca60557c167197aff35c83b3422218128fe6f0815bf97 SHA512 55a1604c9d9a3624354eb7f300261d96ff9e3f129b71c15d7014bf106cf6fa6e977cad2387cd1e1f26b232d61711c33f6a0e048b300021971830d5fdf23a7ba4
-EBUILD libmicrohttpd-0.9.64.ebuild 1299 BLAKE2B 8ca8580dc23d0098bc5d0f98d9b2ad2fd3572858867f1b897d0a33558b369a3a6c67144e8685a585443076dc41fe61a2c1b6519fd7b6aa34d8ee7bdeb257126d SHA512 72ea030e1cd5f356235243e988f2401e8f812f53c340e207dc7c936d1ed4d1eb6af840e372bab2d60165d787f02b327c218b36137dd3c8069797969f0be106a4
+DIST libmicrohttpd-0.9.69.tar.gz 1884511 BLAKE2B 6470b52e58d82a7fee17d8545e546cb9d3fa38012bcf3380d238afdf0f1b5391e19df53a89ac977ac9452d23610dc851f5da5972cace8d8f1088e1040d173572 SHA512 1633d2e606f476489e8af549fff88735e3b5641c85d59071edc8b2e1177fe1b6302578b69b8ff6669d3e1954c20cf0fa1ee52b42378362edd26197d8992e469b
 EBUILD libmicrohttpd-0.9.65.ebuild 1290 BLAKE2B 986e70136a781a204d31a1deb3ab4a248ba4549f1539574c8c838224b8ee1d40ec6af7930a7cb30d04cab71dcc9005bd6a9a4fa2c4f5df2b5ef27565f013f444 SHA512 f0ec497fa405ee34e2dace388dbab2525f163a6e4a38f3082c23327c4adcce4402ce1ba7ca76ebd6f99520a3cdb15d4360ba9f44136e71965052565b7d92e0ce
-EBUILD libmicrohttpd-0.9.66.ebuild 1299 BLAKE2B 8ca8580dc23d0098bc5d0f98d9b2ad2fd3572858867f1b897d0a33558b369a3a6c67144e8685a585443076dc41fe61a2c1b6519fd7b6aa34d8ee7bdeb257126d SHA512 72ea030e1cd5f356235243e988f2401e8f812f53c340e207dc7c936d1ed4d1eb6af840e372bab2d60165d787f02b327c218b36137dd3c8069797969f0be106a4
-EBUILD libmicrohttpd-0.9.67.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
-EBUILD libmicrohttpd-0.9.68.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
+EBUILD libmicrohttpd-0.9.68.ebuild 1277 BLAKE2B 35a36de31cac4a723545eda33472e59b313189b103ed744468e5c6a5b889b47e3651ee1be8cf9b184561c4939cf0030f5f320ed044b245b3877d7e10562d9c73 SHA512 ad2dc9791facaa2f8daecde876ee20de02dd4f2acc75af61647a8d5b5878a8d45d9a36e3d1a0032e0c9fd4e27d55d811a4d8fe2a70b88bbc28cf00edfab5c6b2
+EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
deleted file mode 100644
index 6e1388c35b3f..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-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"
-IUSE="+epoll messages ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
deleted file mode 100644
index 49a324a74749..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-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"
-IUSE="+epoll messages ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.66.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.66.ebuild
deleted file mode 100644
index 49a324a74749..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.66.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-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"
-IUSE="+epoll messages ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
index c17a93c12ff6..9196967b0d04 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.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/libmicrohttpd/libmicrohttpd-0.9.67.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
index c17a93c12ff6..c17a93c12ff6 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index d06aac774a8c..0ed7a8eb0674 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -14,8 +14,8 @@ DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b104
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
 EBUILD libnet-1.0.2a-r5.ebuild 1547 BLAKE2B ddd70dac9ecada0c45dd08e391d15a388f3a370356af91190a3f4bdc6aa267febb69b32420194ffb1a3ef88c61bb613865b87d440cc03fafa3c5384b7d1b0291 SHA512 52fbf03433c1c43f93d173051fbc1125751fb1ea1fd5190679cad0b396d38c6f3383820f7ffde729d1089e25358164cd50d360025ab98551768188591b8da92b
 EBUILD libnet-1.0.2a-r6.ebuild 1300 BLAKE2B fe48dca00c2a8d75a870249167c92c53ee7361aaa642549f48808e3bec38fe7d8e8f2f4c1f623998d72455cd27de02240e7128a72ba0c6f433b29de7e61c2621 SHA512 4ef639aa0dd8832828208cc56bd7485d9f4ce4068f74045d741ca69cbd80598eabc57dee2f965055a5c8a45e21f2288b30aa3d2e31d2876cf87029be4df16614
-EBUILD libnet-1.0.2a-r7.ebuild 1360 BLAKE2B 7eb74daee74199f0cfa2c4b76681c9462bdae4b0cdb4dbcd257770b254364cfc3c937597d27c15132390bda0a7576ed1d2d71d0f4d56e5480592eaa57570a90d SHA512 5a8fb0e8282ef9750dba493ff5a06cfecb455d862bd18ac45a37332a4cf90c8c6d05fed2d553f8eff1caf2ac3b4f648fd09427f17b509fc19b8779f0cc25fbe3
-EBUILD libnet-1.2.9999.ebuild 692 BLAKE2B c0d3f44c1efcd3b3cfc7bea53da3d12273fcb747b1c3ac0a0432eefd5e5d6213bbbf4b85d1c2e5ed7d8c489b894892f967a66e829df5e81d43768ed8421327cb SHA512 5bc4dbe2242afe4e83e46964fc7dded71b8d77bd7793dd6191d76d421f926b8848b0de265d684ad33e327f3a698a7153691cc431125f53d3cb81199ab0f00c3a
-EBUILD libnet-1.2.ebuild 745 BLAKE2B 0684f4e8d8fcda516243a72100f884285f3df859adccca8f9f2a62cdfdf8ac018718ac7650d8abf615deed02fd05671b23c1d7f6e166369d8bc519a9007d8dc6 SHA512 43b8d699541e28547c6610f1bf7930ccaee517949d0661e3b4d433de231d8d9e75f8be810a334eda429da807c1186bf747983eb51df7a71ad2a31beb462c89bd
+EBUILD libnet-1.0.2a-r7.ebuild 1353 BLAKE2B ffd2ad5abffaa27c1dc993d6b9dc0bff129eba5920d02a2168cc03a8742e87570e9e4c7e4f713db0773450aa3bdbba5854860832c60ab09ff23818c63a6f392a SHA512 8e2f33d3ec864118a6b00bb7f2a42a6fbd5220224289b3862191d76166b1025364d25e2f90be46531355eb10a8aca7613867c0c0ef1c035f85acd5a36502d6c4
+EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
+EBUILD libnet-1.2.ebuild 737 BLAKE2B b7ad5f49a8eb5e5fb8521412618b4d6dd694e60cd857b0619afddff998241e16b3ec84b7291c698d3333395d992f0303c75efd078394eb4f351984b9ac234db4 SHA512 f2aa9cb1796404e8170f281fcbad945493c293e45110b05e68c7b9a95023ce194a03f1d08d18d7f5f2f910d4858b03fe900a1df319cf0e7a853b18e3a5e84b88
 EBUILD libnet-1.2_rc3-r1.ebuild 1177 BLAKE2B a55b2b372255c92e2ca74f5408ffe85f36df6ef50ba62cd0e4d24cf0b0f3a52f9271168b0042c12c47446afffccee2b60938b5fea19fe81c4c8926f19136a752 SHA512 c6bea7f97ea6c5a8c1330347ce258716c66248ad4036ddb6353fd73636f20d52757c5d4006865a7d779347ab8512c908d7634d7d17c99eef9dc6e0d2ce9a2af0
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
index 5419190c2e16..d3eac2a745c1 100644
--- a/net-libs/libnet/libnet-1.0.2a-r7.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r7.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="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
diff --git a/net-libs/libnet/libnet-1.2.9999.ebuild b/net-libs/libnet/libnet-1.2.9999.ebuild
index 33f91d1bf653..d2ccab097069 100644
--- a/net-libs/libnet/libnet-1.2.9999.ebuild
+++ b/net-libs/libnet/libnet-1.2.9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="static-libs"
 
 DOCS=(
-	ChangeLog.md README.md doc/{MIGRATION,RAWSOCKET_NON_SEQUITUR,TODO}
+	ChangeLog.md README.md doc/{MIGRATION,RAWSOCKET,TODO}.md
 )
 S=${WORKDIR}/${P/_/-}
 
diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index 1fd8b0b6e396..a45d3c034c38 100644
--- a/net-libs/libnet/libnet-1.2.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DOCS=(
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 78bd9af08a91..b43ba28042bd 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,7 +1,8 @@
+AUX libnftnl-1.1.5-fix-nft-flowtable-test.patch 1537 BLAKE2B 40a0d66fa2f391f4cf19de8d163ebee399338ba650cacf3d1ae35bd2942b1e14c9bf49d81184a0730cbd10fc5f08f0eb587da73aaf7734daf8904adfe6ea85e0 SHA512 6b3aabc393906c9c54d5c8ea2a6308793065494bd7d88fd1157070dc8a4b2d9232efc0a6bfdc957fc758a350d27327895dedb759e07457a8603d3d36aa69be7b
 DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
 DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e3597474b1cedf931728f3105b04a851eeeeff98fd2a49772f29849a9094c2e0cfef7d500050e8f205565e8dfd1ec7a49d SHA512 6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6
 DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170e5209564579ff26bdf49e2b70b5b3944275861e32fcc7f6f2bb1d9f43bf51157665d0d5faea259e14cf930030c0 SHA512 a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7
 EBUILD libnftnl-1.1.3.ebuild 1191 BLAKE2B a95ebfa37d23c20e23d978f2cbb90629c4f0b525134e47106a3cf9c5a80de7b6bc924cdbc76f1b7ba532cc0fde5c56820a25ef36be5c63f235ac301bb6dcfed5 SHA512 d076046e9809dd532d7903b6b55f9958ed98cfe0139f1d11f29d4b4187161923d148b9280ebf3bc03a6505bca46b6d2e3d34c499315f44345e2bad4d4055a364
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
-EBUILD libnftnl-1.1.5.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
+EBUILD libnftnl-1.1.5.ebuild 1256 BLAKE2B 8855d31b7e2bcc4f987864231f08bee17a440790c05f5d407a9d6ae91faf594912af5ab761e029950c7437a7d617eb29d106494e15214d54495db441b50cb26a SHA512 0ea44c78c770f3d8b1d6416be4b88a0cc55ce1e97ae7262282a9fa461bc36af12d8ff6e9594d5ffaf684ca7ef6a8692ef486781b5c63d54456e104e29e56828c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch b/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch
new file mode 100644
index 000000000000..312ff16eecbf
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch
@@ -0,0 +1,40 @@
+From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Mon, 2 Dec 2019 18:29:56 +0100
+Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
+
+Marshalling code around that attribute has been dropped by commit
+d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
+lost during the test.
+
+Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
+later point, leave the test code in place but just comment it out.
+
+Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ tests/nft-flowtable-test.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+(limited to 'tests/nft-flowtable-test.c')
+
+diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
+index 3edb00d..8ab8d4c 100644
+--- a/tests/nft-flowtable-test.c
++++ b/tests/nft-flowtable-test.c
+@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
+ 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
+ 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
+ 		print_err("Flowtable use mismatches");
++#if 0
+ 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
+ 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
+ 		print_err("Flowtable size mismatches");
++#endif
+ 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
+ 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
+ 		print_err("Flowtable flags mismatches");
+-- 
+cgit v1.2.1
+
diff --git a/net-libs/libnftnl/libnftnl-1.1.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
index ce7a01b0ab8a..e9f2995b2868 100644
--- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 )"
@@ -20,6 +20,8 @@ RDEPEND=">=net-libs/libmnl-1.0.3"
 BDEPEND="virtual/pkgconfig"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-nft-flowtable-test.patch )
+
 pkg_setup() {
 	if kernel_is ge 3 13; then
 		CONFIG_CHECK="~NF_TABLES"
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 966a4e2d9e28..c9166d08d77e 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,3 +1,3 @@
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
 EBUILD libotr-4.1.1.ebuild 687 BLAKE2B dadf73107171a83c518914f207c7708625d405a456f02f7b23c7595dad64774269c885cf4d4247ebb083438917a0ee2741ffdb9acf3d186a974f2f7aaa1077f1 SHA512 a530c2025bd24001ff89554d661eb317e3c0d2f80b7b2d25e17574477295fbb69b8b8f1b5fe004a98d7581d50795b0be007de0b4beae26e223435d15f6b1dcdf
-MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libotr/metadata.xml b/net-libs/libotr/metadata.xml
index 95aa13f6c5ef..7a38bb900964 100644
--- a/net-libs/libotr/metadata.xml
+++ b/net-libs/libotr/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 1ebff67786c9..e3fd6791fbde 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,7 +1,10 @@
 AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
 AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73ce1a621277593d8d818119eac910d51a1cf320175409363d94ef5157ccad3768753b2a6d00c404ea6db4b18911bb0e551c5d19447cfb SHA512 00cceca448928c233658600c65534abb76fc76b327c652c241925297ee251e540802b00b9fb7c5f4cafd8c47244df5d73e4c060d99b199e8c2a45f56dcd504f1
+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-r1.ebuild 1825 BLAKE2B e81ff1dab454449b9bc81f40ffee5002cac35bd06a5c5edc93bede91085bbfd211d2fe2924abdf1e2075d33a718f51d38fe3e2153696a9bb9ce9e3472c8d8eb7 SHA512 1274e2dddab51b5b8b00323b4d062db136a2211c5d58691fb6f3caa18b87d60d52357d84ccd625628b4ae14c95692a8b5e253f99aff1e554cf5a7ee80becc4ae
+EBUILD libpcap-1.9.1-r2.ebuild 1865 BLAKE2B ae48e0f880a642a0a034e273f717f829a610b9b30abf521d710fce3ef4b9dbbceb599da1932c697aeceac0448bdbf621103840f399de78147d8ae7680a69c1e5 SHA512 4bb99c14faf5df4f63b14e393d39889de02376e1ecb7575a5a8ce33bc86a995ea4b8708fb7433c7f28977ab99d28d674349f44ed174b4f1b7416ed2d7a3bb8ab
 EBUILD libpcap-1.9.1.ebuild 1743 BLAKE2B 7e4f49c43b63ff444a8df369a5352bd4c96c5649e5c666581f56f2fc14644839790f4d2fb433b5e5ff739db30268e810264ad17adec189c149bfad8fed991426 SHA512 12a8d6edee6dc78e86d0960a31ed80e886e80f4cd8b8a50518ba23bd6d0a6276628c13199d0c6c3a71065f5018bc177d0c0ccc143423bfc8293b3b4cf7301c82
-EBUILD libpcap-9999.ebuild 1511 BLAKE2B 566f2bacf9f69528fded05f0f6b795a0073079471d1a2b612e3f0550336c6a1c1a95bf4ab2429d5a0daba325f6c25403d908c2589b4be0796dda080b7493312f SHA512 567414c4ecc85898051104b46564bceef8c0a8b61f21c6c1ab6116735f1a59379affe8ff4b35b0c22b832ca3be3db948b9d8736bc8f3b47a8d99241603b58d1c
-MISC metadata.xml 532 BLAKE2B 849e5d71a36953d94f8fc4ccce028dea25038eeacf50cbfc45c390155ad84b87fdb217b1f2ec4284c331f98d72367b9e3e82283b3660805f506b9eda8cdfd236 SHA512 e71f06ad211b784c6a454411f54a0bb7575a934f86f345602d205fdfa56b609e4d2d0b5c907bad047793f3c7b4373e000f67e914c17c1f402cc267e7e7493f06
+EBUILD libpcap-9999.ebuild 1600 BLAKE2B 363af894e68780edf3c8ce7fba4ff49e55694aed323cc480ee392a76615d0a57dc0d227efc68a106dfc9886351eb3b86923983898c9682ef51659833773edb74 SHA512 91ae960f6994dacd9b60bd0668255399be0bf9908e639ff0a9d183e5dd74cd51e79b65ed7f16b540bbf9b4dfa3973400ffabb2fbb6f8bc4333a5653c34da3019
+MISC metadata.xml 737 BLAKE2B 7f7e72c07f6874cf166ce018d9dbae17802626b6b6ba7cc0e58ce3bb930e24620227784513d984edf5679ebbafe6b934ea950a613c0d1ae181f9ae59b6229f4b SHA512 506133b5d302a92dc51768ebac2ea38d2b12684b14190598f73bc7bc9f345843f6941e056f818e80407af684aeee6120935bf46ed7acc35036f4ca7fa7b0e430
diff --git a/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch b/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch
new file mode 100644
index 000000000000..937273c43ff0
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch
@@ -0,0 +1,43 @@
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -59,16 +59,16 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir -lpcap $LIBS"
++		echo "-lpcap $LIBS"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $LIBS"
++		echo "$LIBS"
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L$libdir -lpcap $LIBS"
++		echo "-lpcap $LIBS"
+ 	elif [ "$show_additional_libs" = 1 ]
+ 	then
+ 		echo "$LIBS"
+@@ -80,15 +80,15 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
++		echo " $RPATH -l$PACKAGE_NAME"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
++		echo "$RPATH -l$PACKAGE_NAME"
+ 	fi
+ fi
diff --git a/net-libs/libpcap/libpcap-1.9.1-r1.ebuild b/net-libs/libpcap/libpcap-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..704e1bbe519a
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.9.1-r1.ebuild
@@ -0,0 +1,79 @@
+# 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 ~sh ~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}] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+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) \
+		--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-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..96323e01da64
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
@@ -0,0 +1,80 @@
+# 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 ~s390 ~sh ~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[${MULTILIB_USEDEP}] )
+"
+
+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) \
+		--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-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index f240ac606d96..a6571d9395c0 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools git-r3 multilib-minimal ltprune
+EAPI=7
+inherit autotools git-r3 multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
@@ -13,7 +13,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink static-libs usb"
+IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug"
 KEYWORDS=""
 
 RDEPEND="
@@ -30,7 +30,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
+	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )
 
@@ -45,8 +45,11 @@ multilib_src_configure() {
 	econf \
 		$(use_enable bluetooth) \
 		$(use_enable dbus) \
+		$(use_enable remote) \
 		$(use_enable usb) \
-		$(use_with netlink libnl)
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
 }
 
 multilib_src_compile() {
@@ -60,7 +63,8 @@ multilib_src_install_all() {
 	if ! use static-libs; then
 		find "${ED}" -name '*.a' -exec rm {} + || die
 	fi
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 
 	# We need this to build pppd on G/FBSD systems
 	if [[ "${USERLAND}" == "BSD" ]]; then
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 241fb6113b5f..6fb2c6c97aed 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -7,6 +7,8 @@
 </maintainer>
 <use>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
+<flag name="remote">Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!</flag>
+<flag name="yydebug">Enable parser debugging code</flag>
 </use>
 <upstream>
 <remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 0d7f9d817bd7..6397513b1c38 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -3,7 +3,13 @@ AUX libproxy-0.4.11-avoid-nm-build-dep.patch 2062 BLAKE2B e563e162d5b393f2badeeb
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf1ca005f6fe93c621d307c2561c806c1d8718972bf787defc94fc4c9bb65a7c6a7d1e3ff1c2eab403c6290dc78d94e23 SHA512 30ad9224a5676b8ac8f50b56cdb61f2708225994bc26910eb07f58345423102116058a19273b16b462dec846b065925615251fe5fb7b2394f232dd66a013d230
 AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
+AUX libproxy-0.4.15-avoid-nm-build-dep.patch 2300 BLAKE2B 7932706ccb856bf3b68dd319d19a99675217b699332c2ffebbbc8d7c54e4478e722b74e596e94917a1a93b0a13da3bc2e79fa41e23249437c8f21637964237c1 SHA512 b603060bd60d35fc29420a22235c9e46b9afc9bd048ec78738699bcd7b555c93775be60c05f150780af6b77f403d0197649e8e1bd2ce599f415dba90380bfc22
+AUX libproxy-0.4.15-mozjs-52-1.patch 3771 BLAKE2B c5b760979a0c8188ada05e2842d65fd108451d57255c12e971a99f42e373e77c1ac069506085c1d8d20f395551b140dac77a0d33b009b760632921c9452c5d34 SHA512 6572bd725662533aa5a2660461606bc101bb75edfe21021a73f2faa4d3f5d91fb83637ac43e448ad124abfc1c6e59c82f96ae9cd571289767ee6c193be552fbf
+AUX libproxy-0.4.15-mozjs-52-2.patch 847 BLAKE2B 0b6b408b6745c6b4bf277549a8682db67b4db426e0fe87830c0ca51f9da3c0fc6afc39ee22f13af5c4e3abcf587765b1de0bddc508530302dded86eb1e547b8f SHA512 e1f3fd54ea7fba12d019fe9388236eba1afb73a7e9978c4bbcf9309f9d3aa246747f15e1e62a1d86eba05147b62b2d97d45d1b4547f08a01e4ddef8a8b0746ad
+AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3abe01dd26bdd25eacf7685247d262e02ae0b406d0a2871f12d8d1b92df5abcdf207d940fec91c964fb33d38b454a91d82 SHA512 4330e9043ed767accea8f6f74b6999017633c51d615b229e7a43e9ed468630c630653c6917a4196e8f05d285df383de3bb269a79db127d902d1c960f29d39246
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
+DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
 EBUILD libproxy-0.4.13-r2.ebuild 3162 BLAKE2B a47bc29f68d55349482c655bceadb23863dbd759eaf932d2750ecc9d710d2e5fde03ddd919427fe194d8c343a300214bde41301d8b467f3ca57114455b84d588 SHA512 b78198fe3dda3743208f7a1e0f4a04fff1d27e34993585591c32ef968759dc9f8372107d7dacf5cab6794404f865ae4e26bf74fd5c76319d4f944b94b245db1d
+EBUILD libproxy-0.4.15.ebuild 2839 BLAKE2B 66d83f73f4820e7b148574984aa094d8473298af4c156691593e21138c31fd6e8fcfe02bdc7eca4b200fda06ad43c7e3d16b5b0ead7688cc9e3f26eb261a86cd SHA512 7a37a0c189521e06af8fe309be4bcadce2aee63d684c5fe21fc7a58273aeda1224b177187bd18cf20249be569f179b2ad77f1d0723dfe2adf9e725ed8e635108
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch
new file mode 100644
index 000000000000..0b9320a6dfd5
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch
@@ -0,0 +1,63 @@
+From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 29 Apr 2013 23:02:25 -0400
+Subject: [PATCH] Avoid build-time dependency on NetworkManager
+
+Needed to prevent a dependency loop:
+nm -> libsoup -> glib-networking -> libproxy -> nm
+
+https://bugs.gentoo.org/467696
+
+* asturm@gentoo.org: Rebased on top of 0.4.15
+---
+ libproxy/cmake/modules/network_networkmanager.cmk |  4 ++--
+ libproxy/modules/network_networkmanager.cpp       | 23 +++++++++++++++++------
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+--- a/libproxy/cmake/modules/network_networkmanager.cmk	2017-05-11 11:33:33.000000000 +0200
++++ b/libproxy/cmake/modules/network_networkmanager.cmk	2019-10-06 15:17:37.881932672 +0200
+@@ -1,6 +1,6 @@
+ if (NOT WIN32 AND NOT APPLE)
+-  px_check_modules(NM libnm dbus-1)
++  px_check_modules(NM dbus-1)
+   if (NOT NM_FOUND)
+-    px_check_modules(NMold NetworkManager dbus-1)
++    px_check_modules(NMold dbus-1)
+   endif (NOT NM_FOUND)
+ endif()
+
+--- a/libproxy/modules/network_networkmanager.cpp	2017-05-11 11:33:33.000000000 +0200
++++ b/libproxy/modules/network_networkmanager.cpp	2019-10-06 15:24:21.621173178 +0200
+@@ -23,13 +23,24 @@
+ using namespace libproxy;
+ 
+ #include <dbus/dbus.h>
+-#include <NetworkManager.h>
+ 
+-// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no
+-// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased
+-#ifndef NM_STATE_CONNECTED
+-  #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+-#endif
++/*
++ * copy-pasted from NetworkManager-0.9.6.4's NetworkManager.h to prevent
++ * a circular dependency; https://bugs.gentoo.org/467696
++ */
++#define	NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
++#define	NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
++typedef enum {
++	NM_STATE_UNKNOWN          = 0,
++	NM_STATE_ASLEEP           = 10,
++	NM_STATE_DISCONNECTED     = 20,
++	NM_STATE_DISCONNECTING    = 30,
++	NM_STATE_CONNECTING       = 40,
++	NM_STATE_CONNECTED_LOCAL  = 50,
++	NM_STATE_CONNECTED_SITE   = 60,
++	NM_STATE_CONNECTED_GLOBAL = 70
++} NMState;
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+ 
+ class networkmanager_network_extension : public network_extension {
+ public:
+-- 
+1.8.2.1
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch
new file mode 100644
index 000000000000..c2d0257d437f
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch
@@ -0,0 +1,101 @@
+From f594720280b2e40d81fa6e286a0ef8868687ef7e Mon Sep 17 00:00:00 2001
+From: Pierre Lejeune <superheron@gmail.com>
+Date: Sat, 30 Jun 2018 21:10:06 +0200
+Subject: [PATCH] Build with mozjs-52
+
+Fixes #71
+---
+ libproxy/cmake/modules/pacrunner_mozjs.cmk |  2 +-
+ libproxy/modules/pacrunner_mozjs.cpp       | 19 +++++++------------
+ 2 files changed, 8 insertions(+), 13 deletions(-)
+
+diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+index c2ae3db..20857fb 100644
+--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
++++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+@@ -9,7 +9,7 @@ if(WIN32)
+ elseif(NOT APPLE)
+   option(WITH_MOZJS "Search for MOZJS package" ON)
+   if (WITH_MOZJS)
+-    pkg_search_module(MOZJS mozjs-38)
++    pkg_search_module(MOZJS mozjs-52 mozjs-60)
+     if(MOZJS_FOUND)
+       include_directories(${MOZJS_INCLUDE_DIRS})
+       link_directories(${MOZJS_LIBRARY_DIRS})
+diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
+index a70b2e9..ed07c69 100644
+--- a/libproxy/modules/pacrunner_mozjs.cpp
++++ b/libproxy/modules/pacrunner_mozjs.cpp
+@@ -35,6 +35,7 @@ using namespace libproxy;
+ #pragma GCC diagnostic ignored "-Winvalid-offsetof"
+ #include <jsapi.h>
+ #pragma GCC diagnostic error "-Winvalid-offsetof"
++#include <js/Initialization.h>
+ #include <js/CallArgs.h>
+ 
+ #include "pacutils.h"
+@@ -111,17 +112,14 @@ class mozjs_pacrunner : public pacrunner {
+ 	mozjs_pacrunner(string pac, const url& pacurl) throw (bad_alloc) : pacrunner(pac, pacurl) {
+ 
+ 		// Set defaults
+-		this->jsrun = nullptr;
+ 		this->jsctx = nullptr;
+ 		JS_Init();
+ 
+-		// Initialize Javascript runtime environment
+-		if (!(this->jsrun = JS_NewRuntime(1024 * 1024)))                  goto error;
+-		if (!(this->jsctx = JS_NewContext(this->jsrun, 1024 * 1024)))     goto error;
++		// Initialize Javascript context
++		if (!(this->jsctx = JS_NewContext(1024 * 1024)))     goto error;
+ 		{
+ 			JS::RootedValue  rval(this->jsctx);
+ 			JS::CompartmentOptions compart_opts;
+-			compart_opts.setVersion(JSVERSION_LATEST);
+ 
+ 			this->jsglb = new JS::Heap<JSObject*>(JS_NewGlobalObject(
+ 								  this->jsctx, &cls,
+@@ -139,16 +137,15 @@ class mozjs_pacrunner : public pacrunner {
+ 			JS::CompileOptions options(this->jsctx);
+ 			options.setUTF8(true);
+ 
+-			JS::Evaluate(this->jsctx, global, options, JAVASCRIPT_ROUTINES,
+-				     strlen(JAVASCRIPT_ROUTINES), &rval);
++			JS::Evaluate(this->jsctx, options, JAVASCRIPT_ROUTINES,
++				     strlen(JAVASCRIPT_ROUTINES), JS::MutableHandleValue(&rval));
+ 
+ 			// Add PAC to the environment
+-			JS::Evaluate(this->jsctx, global, options, pac.c_str(), pac.length(), &rval);
++			JS::Evaluate(this->jsctx, options, pac.c_str(), pac.length(), JS::MutableHandleValue(&rval));
+ 			return;
+ 		}
+ 		error:
+ 			if (this->jsctx) JS_DestroyContext(this->jsctx);
+-			if (this->jsrun) JS_DestroyRuntime(this->jsrun);
+ 			throw bad_alloc();
+ 	}
+ 
+@@ -156,7 +153,6 @@ class mozjs_pacrunner : public pacrunner {
+ 		if (this->jsac) delete this->jsac;
+ 		if (this->jsglb) delete this->jsglb;
+ 		if (this->jsctx) JS_DestroyContext(this->jsctx);
+-		if (this->jsrun) JS_DestroyRuntime(this->jsrun);
+ 		JS_ShutDown();
+ 	}
+ 
+@@ -178,7 +174,7 @@ class mozjs_pacrunner : public pacrunner {
+ 		JS::RootedObject global(this->jsctx,this->jsglb->get());
+ 		bool result = JS_CallFunctionName(this->jsctx, global, "FindProxyForURL", args, &rval);
+ 		if (!result) return "";
+-		
++
+ 		char * tmpanswer = JS_EncodeString(this->jsctx, rval.toString());
+ 		string answer = string(tmpanswer);
+ 		JS_free(this->jsctx, tmpanswer);
+@@ -188,7 +184,6 @@ class mozjs_pacrunner : public pacrunner {
+ 	}
+ 
+ private:
+-	JSRuntime *jsrun;
+ 	JSContext *jsctx;
+ 	JS::Heap<JSObject*> *jsglb;
+ 	JSAutoCompartment *jsac;
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch
new file mode 100644
index 000000000000..fc23ef2cf8e5
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch
@@ -0,0 +1,23 @@
+From a9b052c6e30101fb0b702917f245a3e2a2f08366 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Tue, 2 Oct 2018 10:22:56 +0200
+Subject: [PATCH] Add call to JS::InitSelfHostedCode()
+
+This is needed otherwise mozjs crashes
+---
+ libproxy/modules/pacrunner_mozjs.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
+index ed07c69..38e7d46 100644
+--- a/libproxy/modules/pacrunner_mozjs.cpp
++++ b/libproxy/modules/pacrunner_mozjs.cpp
+@@ -118,6 +118,8 @@ class mozjs_pacrunner : public pacrunner {
+ 		// Initialize Javascript context
+ 		if (!(this->jsctx = JS_NewContext(1024 * 1024)))     goto error;
+ 		{
++			if (!JS::InitSelfHostedCode(this->jsctx)) goto error;
++
+ 			JS::RootedValue  rval(this->jsctx);
+ 			JS::CompartmentOptions compart_opts;
+ 
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch b/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch
new file mode 100644
index 000000000000..95e56c2fe25d
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch
@@ -0,0 +1,23 @@
+From 2d6da65598b90480b4a62c4633eda035ea51681f Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Wed, 27 Jun 2018 06:36:00 +0100
+Subject: [PATCH] python: support Python 3.7 and 3.8
+
+Add 3.7 and 3.8 to the list of accepted Python 3 versions.
+---
+ cmake/FindPython3Interp.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake
+index c6cbe3d..8e5e409 100644
+--- a/cmake/FindPython3Interp.cmake
++++ b/cmake/FindPython3Interp.cmake
+@@ -39,7 +39,7 @@
+ 
+ unset(_Python3_NAMES)
+ 
+-set(_Python3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(Python3Interp_FIND_VERSION)
+     if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
diff --git a/net-libs/libproxy/libproxy-0.4.15.ebuild b/net-libs/libproxy/libproxy-0.4.15.ebuild
new file mode 100644
index 000000000000..8f8f6a2ec5a1
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.15.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic mono-env
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gnome kde mono networkmanager perl spidermonkey test webkit"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig:0[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	mono? ( dev-lang/mono )
+	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
+	perl? ( dev-lang/perl:= )
+	spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= )
+	webkit? ( net-libs/webkit-gtk:4 )
+"
+RDEPEND="${DEPEND}
+	kde? ( kde-frameworks/kconfig:5 )
+"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
+
+PATCHES=(
+	# get-pac-test freezes when run by the ebuild, succeeds when building
+	# manually; virtualx.eclass doesn't help :(
+	"${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
+
+	# https://github.com/libproxy/libproxy/issues/27
+	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
+
+	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+	# https://github.com/libproxy/libproxy/issues/28
+	"${FILESDIR}/${P}-avoid-nm-build-dep.patch"
+
+	# backports from git master:
+	"${FILESDIR}"/${P}-python-3.7.patch # find python-3.7 and 3.8 as well
+	"${FILESDIR}"/${P}-mozjs-52-{1,2}.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DWITH_NATUS=OFF
+		-DWITH_PYTHON2=OFF
+		# WITH_VALA just copies the .vapi file over and needs no deps,
+		# hence always enable it unconditionally
+		-DWITH_VALA=ON
+		-DWITH_WEBKIT=OFF
+		$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
+		-DWITH_GNOME3=$(usex gnome)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
+		-DWITH_NM=$(usex networkmanager)
+		$(multilib_is_native_abi && usex perl -DPERL_VENDORINSTALL=ON)
+		-DWITH_PERL=$(multilib_is_native_abi && usex perl || echo OFF)
+		-DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
+		-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_install_all() {
+	doman "${FILESDIR}"/proxy.1
+}
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 3759d4a20e76..c5eabd31d0c9 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
-EBUILD libpsl-0.20.2.ebuild 1473 BLAKE2B c70153f34bd9da55823c004eb61fd10cd9f91bd04b55ad33d528d37dbd4bf32bbf3eb6b117adfcc1933099ea09a3f6ce1b490342386054662f7a9f97fc125699 SHA512 32ff684e4938c070a09ecf5410b35e50131716b4e694c798c6b7a9e6cbfb86d3145ab9b78ff7c2469bac74e43c579a131d64ae5dee4002723c15d46431af307a
-EBUILD libpsl-0.21.0.ebuild 1482 BLAKE2B 667dd387fca8947c16a170ec8694f61bf6a7489f2a33103c56e83c0e21ebf09b3b62413cf57e6b2121fda69c6320f6ffe87192a8bb87ed2cbbc8a488db40e78e SHA512 75f3c036d8dc692161705fa21ecb4f6e1119fda2df68df3c192f358b2189e620743f624d5ddf88d10e24ab7112717b0c028b8bb898173508994a25a61659219f
+EBUILD libpsl-0.20.2.ebuild 1471 BLAKE2B 9af489487b1e22a454b4415f44bd0fe9e1802b4bdf1746aac66a4eb449839c39ac49f03d62b95c2567a67bc9ca515d7a5a11a8f5f9d13c0d23506189057c1fb7 SHA512 021bfebc1b92093254849da5049b358225b0cebfd3bcf91267287010db72fec4bf12e09641501ae086c69a50f0181af95bca354b289eca364e71932beea29798
+EBUILD libpsl-0.21.0.ebuild 1479 BLAKE2B ff312ad95930488766845d42231747110e760c3af16413197bb1ec17009187f4279a154d1963e594e7c2fff180e382b602747423a14b6782761c98559a86377b SHA512 5e8d12938ddfcde7f429330b02c863325d407c55d1d3af5e87e18c91137123d6794b8d84ab79b648c32304863145c7dbc03571e03665773e6052bd8160ac3fbe
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
index 3e0dd1f17a06..dec232286541 100644
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.20.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{5,6,7}})
+PYTHON_COMPAT=(python{2_7,3_{6,7}})
 
 inherit multilib-minimal python-any-r1
 
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 1c279f915499..d7875f69fb95 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{5,6,7}})
+PYTHON_COMPAT=(python{2_7,3_{6,7}})
 
 inherit multilib-minimal python-any-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~riscv s390 sparc x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 9cc3d08ed53c..ba9de8fcb27c 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -17,6 +17,6 @@ EBUILD libqmi-1.18.0.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb32
 EBUILD libqmi-1.18.2.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
 EBUILD libqmi-1.20.0.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
 EBUILD libqmi-1.20.2.ebuild 1132 BLAKE2B b00ab99ac45a3385b902977856cd5f6969913078d382ea22b4bd0e523b99fa178885bd1a638ea7ba4c33967fa46758f5ab0f341c012735d1ea349d7dc641c8cd SHA512 d1e91dea19bf8522ef6a297d55862d1daf0bed28c44eaef2bd4af58c0ec63deb388b899c85091d285c9a317ab7d9ce3a3c67a928c0949977aa063842791a06fd
-EBUILD libqmi-1.22.2.ebuild 1127 BLAKE2B 5034a4d167c756bff0dd49973582bceec429c6a2b03f7a034638a9a32d5bd3f516721ddca13262c11693904b4f749153e8a972e1618fe7006b5c6a46de2a5634 SHA512 eb793fc944c163890b3480a393237e102fe35c42c2f90738ee724702a9a1c46c89e5ec387576beed83729a7add4594791a24abe659271a042e8441ea1c363f94
+EBUILD libqmi-1.22.2.ebuild 1125 BLAKE2B 0f46e9c7304e7fa676f02af18dab551ed8bbab8f0da220da37d4304f966eebe85a4574b6a693d12ad4159b753a5b05fbd6cb7dd63ebb817cbd2bb79291a28ed3 SHA512 58546939e8a9f18dd2d0028bcefb9b937f94dc034f0554cae9be7cd5d79769a5a02ddb79e9899f6442ee648f2c3f962ac42e329443d6368dd35080202e421910
 EBUILD libqmi-9999.ebuild 1126 BLAKE2B f57c7326cefc6864daf35627b7ab3733b12ba81398865927f830d8b5e3c0764d78d821b0923ce257513a49a905ee4674acdaaba9fed3f7289ad67cbd8e4602c9 SHA512 5184d185b9f6dd0343e892de0f178eaa1b4231597748287c94f706ea3bf8e7969bc1ecd09291b35c502a57f18dd287b7c0c3706d78523b148ed1fd355d18f171
 MISC metadata.xml 416 BLAKE2B f391913e78bcdb06b9c686a460059b4ee38861fa09fa0d50c19418ac3e1d966efd2646694d89d240d13f0a9bf2eb910d952288de153699b9564040efed8b04ab SHA512 4ebf9f46a3c7c6e18e0eb83341bac1b087bb6471a0f3f11663975b8a6e0e1a78f8db680a628dc693c4c3eb825d50717f0b7ed086d90c9d33818f094de2611fe2
diff --git a/net-libs/libqmi/libqmi-1.22.2.ebuild b/net-libs/libqmi/libqmi-1.22.2.ebuild
index baa6bed183ff..d7fb5078343c 100644
--- a/net-libs/libqmi/libqmi-1.22.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.22.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 7f8a4afa0b27..089b3af23888 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,3 +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 939 BLAKE2B d9b32b8e8fc34eeecb2a516cbdceb031a353f83d833372f4f305201b71168301df8ecefe9158a234a0abf3f2510af005b77e36b2349d0c36bce56620ac60e090 SHA512 b4b0519fff93be89506a45fdc7a76dfe31bcd5213b49a8f248506897178f24a89cc558fc7a2512bd771c981e83007623d907e98ceaec521649a7c26ce9093b36
+EBUILD libsearpc-3.2.0.ebuild 856 BLAKE2B 46963564f039d884000f558eea9a5a148bbfe7bbdfd155a1e3acc76028849464c6dba261b799e2c86e3e5c502a7acdf6a878a29c6d60076579ce3113dfaa0f89 SHA512 1b7e13cbd72cb9f61a75d5ea2bea565d2fa67d2a1e6b9be48171a20d6af3dbf0124eb5dca8a6915015470ca04efb218b6c3920d63d575895bb95f1ccb060021f
 MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
diff --git a/net-libs/libsearpc/libsearpc-3.2.0.ebuild b/net-libs/libsearpc/libsearpc-3.2.0.ebuild
new file mode 100644
index 000000000000..3402888bd457
--- /dev/null
+++ b/net-libs/libsearpc/libsearpc-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{2_7,3_6})
+
+WANT_AUTOMAKE=1.16
+
+inherit autotools python-single-r1
+
+DESCRIPTION="A simple C language RPC framework"
+HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.0
+	>=dev-libs/jansson-2.2.1"
+RDEPEND="${DEPEND}
+	dev-python/simplejson[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index c937610f8b6a..2f62dcaafe62 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
-EBUILD libsignon-glib-2.1.ebuild 1817 BLAKE2B 07588f45e40e9707e38c24123dce695f7ae25eba47f9aa9c5af8f72505b37e4dc4889fde0b0a6302c721c6431542d4496a1bba46edaba0c425f17356e7d06b1c SHA512 24ec9eb44667b33b0bad0657c8b5d561ec83548b0ef3697ebf356ff01833165991554d3ba9b07892bfcef4b8b9094e9e8431f50bf28dfe346319a3ef39ff2501
+EBUILD libsignon-glib-2.1.ebuild 1815 BLAKE2B 97d3e4b5beadcdeaff4967c524749730b9570c5aa59e6da2c4fb6d01ca8cefab26ac255cc8a60bfe62e85d3311c5295ba1e1f2612a63407ece806665c7cbfba2 SHA512 775b77007f1818095cf73b0da207fd3c0f94814aa00e4abde1d015f8b9236cab6666b86c931a82bb9621258afa738c5261bfdee62d0d3f2b12abf84cf72605ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
index 88ad9c326e1f..a07adeedb261 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.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=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit meson python-r1 vala vcs-snapshot
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index aa39b4c107b2..dfe28cf816d0 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -2,5 +2,5 @@ AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c88632
 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 970 BLAKE2B 49174aa06ca0c7b3b40bb06e8a3cfe09c1a3efed67e5dca8a31beae6f7f2b4e43f03a9ff715d714d35757b7ce22eda0058bc05f55c9177c2cbd243dc9d876699 SHA512 5f311cc7ff7778538dc21f091e76f5d8c5e4be70dceb3d4662297a3c41f61b3a60d269929e1299c33c20c75fef40a0bc3af905e65b73bf866d85b906e7ed89b6
-EBUILD libsmi-0.5.0.ebuild 858 BLAKE2B bb580ab6245dbdd84e5e0ce8ef110cb43c1798c65f22592deffd8dfefda5320193ef8afefa5d737b16cc735de60da03ab5291e58e3f0337ad2c8071fefb91a6d SHA512 d1da6b65a5df9e4005cbc4be3a97c9e886ec8845de228928131cb7669a0441c7b92825987896006b65f35aa2a23bbde9bb23bf1dc7bd6b0773718b770bb021b5
+EBUILD libsmi-0.5.0.ebuild 890 BLAKE2B 579b65fc089a10607f391568c809a3912df14138cd0c8ca1e65f6f48cb6352881df7aab7d5b650d6630fb7b156d8da37498de4336f1d18e637a2daadc115c12c SHA512 bbfe00c2fbe8fe284c2bc2cd068dd6676cab55020cdfd26b09c431ad7dfdadecdd35ecf2790f51c86da246148d3adf2ec61c9fe4c3e18b30659fc5e451e72476
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
index 464dd62053c4..de9ec67eecaa 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -6,7 +6,7 @@ inherit eutils
 
 DESCRIPTION="A Library to Access SMI MIB Information"
 HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 7ff9360f6c80..dfb28cb8f1ed 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,14 +4,8 @@ AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde70409
 AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b9d138b6e6ebf1ee8ae3e38fff1a8ac1f89cb088feec8297c8532fcea578260b0947946a18b6e3e8b87e6faf7643cc79a5200ba SHA512 cb8e90ef7d3b163c0e9f9991e7f219d08769f101de09f1cc17dd55fe768f9193938e45f8547e8a26f599d965eea05ff2f27c11af221384b08ab76411325dcfb5
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
-DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
-DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724 SHA512 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092
-DIST libsoup-2.66.3.tar.xz 1448924 BLAKE2B 82edc5afe06d41dcd18989fb5cb439047f52c52bd13406fddaa3cafc5540d4c54924c244bb9d58839eb0cf7187da8da82158ddb01f16a7913f543f95df4f285d SHA512 166559480ab84c9bd5407abbed51f4ed76b5c061e647441bf2657ed2c918402985a0a3b9caaf14639f11a40e0b9130bf270a94b32fb72ade3782fac8692bc2ef
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
-EBUILD libsoup-2.58.2.ebuild 3016 BLAKE2B 3d9407661bcda300b4bc0e9af65c7bb186115dc88c5cf34e49bf4052d4828b7c72e99be2da16f9ef74e6a19ccc9089d20e869ec851a44a8c119778ba7e9c5697 SHA512 c53073bbc0a23f000fead1b40bda2a3eb2d77f773e5955dd65b36834818a14ae7b853c97bc748553cb55455c8fb2ce6298469e1b8230a448ca410cda02ee9cc1
-EBUILD libsoup-2.62.3.ebuild 2927 BLAKE2B a03df09520d43957856928229b1d7cac7cfc64fd59c2d6e98e50b146c5ed33d03efdbf14954b4c48e3ffe1fa0838969d573d1e0fa65f389b5999ebad7728865f SHA512 8399e58d4f887af84125be023b47760affc266693b7c19b0108d0d10f1036e0b063b8d72a1dfccf3892a8a8ee84ce1fe3f60339478bccabb92d80ce62c03bd29
-EBUILD libsoup-2.64.2.ebuild 2775 BLAKE2B ba014f64d6d7dcae695c1e90d81bc7472b307decaf8c9097b672dcba13b3ff4b285fe8a71ac9fab872a720fcfeea0bdace833b940b28006e16278a688171918c SHA512 1f22036de81982d73430fca4932850d736eaf81456455f59efd3cf0d2778adb043ff67e4eb597fe5c4276f3e53067a49e194244df5cd89aa23f47d4fecc194d6
-EBUILD libsoup-2.66.2.ebuild 2778 BLAKE2B 33c83648ec93e1796e735a40ea348c0f43f0802783dd5f3f4c904ac3ae0623a72ad8a31567bed6d3bf5cf1282538d18cc22937f01a57e7c41f601c75fc8250f0 SHA512 3d6618caba64675f28805c547afce49656ec6c6be86c0d1da19945298899a8c7c2522d6118c159b286700d054e355647bd34e35d4eedbc21d555a58600fcbb73
-EBUILD libsoup-2.66.3.ebuild 2784 BLAKE2B 30840ddc73e6e5f08943fd6784dcbeaf25f7ea9b19b75de22df7334ff119b53cbbc42de281cf16caac23bf05ae4d0e4bdae4ac1600c80c798a56e9a9bfbf196e SHA512 90fa261304d8f030f4fd23654f956f906a572cb0da5496f997dcde98729971c0c1ca7e84c50df6a97e6d1480c70285ec5ccc3f3bda7f864564facbb843481cab
-EBUILD libsoup-2.66.4.ebuild 2776 BLAKE2B dacd28928c274cccd756ad8343d8db361a035cfb470196c01a649e1424f32bc73c249afa82ae02267c9dab9abd56112adbe91a27bc204a561ca61feda1ad0b8c SHA512 a2eff60de24569eb2cdc69bc2002215fccce7b3f0787a1fba8c188b165818302526420cbba5258fbca3419ba230fdb243026d75c4744b1935e76569d3a874966
+EBUILD libsoup-2.58.2.ebuild 3012 BLAKE2B 3bb017da566ef31d77e6c1cb325f293ead24763a0fe63c21a14a679a89502a9cff0fd40f785d3eedcb82c02f5444efe2c7dbda6ee36952b51566e5631c070d97 SHA512 e7b7482cbeedac185f3dd30700adef28d80c510ffff6966e872d8314d59d148644b5b94aa002ea93e9288172ecdbe652199571500336b58595b5602b227f1d48
+EBUILD libsoup-2.62.3.ebuild 2921 BLAKE2B 6a14f5d15e79b4da02d367256edcb39f1a67c1924776fa7fecca2cfbcfaace3c432930b06836a161c899bf481ea603e78c3ae9443fe22bfe707ed855d53bf6e9 SHA512 2b759c494e6ca3b008156dbc790f4b46c9f363e107adc8873725a7dc046a748a7659fa952e82f2ce6baadee595d4ae8907d490accfa57ec943231c4d015d8e5b
+EBUILD libsoup-2.66.4.ebuild 2774 BLAKE2B 5b82d42cca5f740935d948605441a5797774df3bf582fce27eea2d9fbdc6b75ec7bb9760a95fce7e28dc374c850f89ddd1abcd90c92d797413e9482ee8128969 SHA512 539b2256d4ccec37d2f1f061009b4c913f93bd90423b8d26943dc8f8646248cf480303cf58d1e418c4b34555c48b072e2f97bda38ebce0e9cc9463b27618c029
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 16b9a977e1b3..7e693939d69a 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.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
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 multilib-minimal python-any-r1 vala
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index 2f0abf9d1c45..be1d814a4b50 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.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=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 multilib-minimal python-any-r1 vala
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
deleted file mode 100644
index d254311ee97f..000000000000
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal 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 ppc ppc64 s390 sparc x86"
-
-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/libpsl-0.20.0[${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}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	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.2.ebuild b/net-libs/libsoup/libsoup-2.66.2.ebuild
deleted file mode 100644
index 80d4ab70d70f..000000000000
--- a/net-libs/libsoup/libsoup-2.66.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 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-0-r1[${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])"
-
-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}"/${PV}-vala-0.46-compat.patch
-	"${FILESDIR}"/${PV}-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)
-		-Ddoc=$(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.66.3.ebuild b/net-libs/libsoup/libsoup-2.66.3.ebuild
deleted file mode 100644
index b834dcca60ab..000000000000
--- a/net-libs/libsoup/libsoup-2.66.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 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-0-r1[${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])"
-
-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.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
index 6407562e85c1..c6e41462f357 100644
--- a/net-libs/libsoup/libsoup-2.66.4.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.4.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
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 5e849ca23040..5f668f33f17e 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -7,6 +7,5 @@ AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aec
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 EBUILD libsrtp-1.6.0-r1.ebuild 2398 BLAKE2B 2173fb4622651c28f714c19e7eaf6848f9f6ca95264c3d4327d81e4a0d938c5683a8e5b2be09a67a96b665da326c2bd22a0f3c76a65162118c3281037c5f02c7 SHA512 4d863311f0b0fe068b261f58b1c72d8bfcc789d52a5e6c1f55b9be07a7cc9d13db4090e5a11b9fe1cc896d4e56e5f82463cc09be706bb02c8464157f23536584
-EBUILD libsrtp-1.6.0.ebuild 2229 BLAKE2B 356249ebdb469dafc66dc8f954f653dd8abbf17cb6f0260fa15a532b03fda3d940780b021108e0e7475f5100d4fc9eec3cf4ff09c5a8ddf07e4dbd64c5904732 SHA512 ba6d025535d3e3f4ad36ee2e534869c72ca2dda895588db57143c761727d5721b3eb86ea3ba350ea2330385e7d8f35eee39c8848ba310e52eab4dafc442580ae
 EBUILD libsrtp-2.2.0.ebuild 1863 BLAKE2B bd1dcd6369ba64b441a168a0364a6c1dd117fe8eb651515c87ec9f42c20eb189bb5ae4d11e288ab6e2be32c9da8ec1c832481fbfdce69c4d3d6b659ef3cfca16 SHA512 1fe796d21c84cedb16cf09397b57215164615386599f43f00d2aed08f1977c394e4799d7fc5ecfe48739cdd0bbac9ef2ce9939269ce95a298dec45e61e7dbafe
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-1.6.0.ebuild b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
deleted file mode 100644
index 6dedd6b55c7a..000000000000
--- a/net-libs/libsrtp/libsrtp-1.6.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/cisco/libsrtp"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES README TODO )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/srtp/config.h
-)
-PATCHES=( "${FILESDIR}/${PN}-pcap-automagic-r0.patch" )
-
-src_prepare() {
-	default
-
-	# test/rtpw.c is using /usr/share/dict/words assuming it exists
-	# using test/rtpw.c guaratees the file exists in any case
-	sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# stdout: default error output for messages in debug
-	# kernel-linux: breaks the build
-	# gdoi: disabled by upstream and breaks the build
-	# pcap: seems to be test-only
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-stdout \
-		--disable-kernel-linux \
-		--disable-gdoi \
-		--disable-pcap \
-		$(use_enable aesicm generic-aesicm) \
-		$(use_enable console) \
-		$(use_enable debug) \
-		$(use_enable openssl) \
-		$(use_enable syslog)
-}
-
-multilib_src_compile() {
-	use static-libs && emake ${PN}.a
-	emake shared_library
-	use test && emake test
-}
-
-multilib_src_test() {
-	# work-around tests that do not like out-of-source builds
-	cp "${S}"/test/{getopt_s,rtpw}.c "${BUILD_DIR}"/test/ || die
-
-	LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest
-
-	# Makefile.in has '$(testapp): libsrtp.a'
-	if use !static-libs; then
-		rm libsrtp.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# libsrtp.pdf can also be generated with doxygen
-	# but it would be a waste of time as an up-to-date version is built
-	use doc && DOCS+=( doc/*.txt doc/${PN}.pdf )
-	einstalldocs
-}
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index f6922e46fc47..7c42a74e06e2 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,10 +1,8 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 AUX libssh-0.9.0-libressl.patch 923 BLAKE2B 997f909b6576e52a9104cf9dd821a42e7a00fb0c934b35d9f6775080db84e3d6a52ccb973c07d94b37f0182caeb8e0ca47330d042ec286692a59014b731fc006 SHA512 d7fdfb19bbf552de9d17bdd09ee28e8f4dcfb1bc94415249fafca52ea0dba9075fd36fef063a1e3be2ec165baae35c0c224c4a30799c7b30a9f749e0639ce91b
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79 SHA512 93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0
 DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2 SHA512 6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3bbbbc69b679b6775edc21dec158d241b076c6f
-EBUILD libssh-0.9.0.ebuild 3204 BLAKE2B 763653c92388856812aaca0156eaad868834bd82be1415374fbfd02a83044e870f4ef9a8f9a15301433216af2ee9e1ee583e0342047b0257a89e213933017851 SHA512 f66ab27de1c903236736119d536280d41e0ba39dbcac3a2e81a53f791cd9ecd38fb62e1a98a2408f85ded21222b2416ce07931046cfacb8866173a1542705f28
-EBUILD libssh-0.9.2.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
-EBUILD libssh-0.9.3.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
-EBUILD libssh-9999.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
+EBUILD libssh-0.9.0.ebuild 3193 BLAKE2B 4ea062ff425b559bba985433021519040d72616e9931fcd648bb8b9525d772f3ed1c1b3e26433c00d50b95e5ef6bcc49cbcdab362ebf5045d5664399728b4ce4 SHA512 e0f16a42922d386b525e9cbfc78712ecf297a030e83d7f9a6e784414d0e4683aca6190bf4271741f2d5b9424a8e7d8870cf38d70c16309cff7f0f7ff7354c7e3
+EBUILD libssh-0.9.3.ebuild 3187 BLAKE2B c0a9582f41c08e46ea83495229ddd7c72bbe206b450f183a1d2d97b09f9bca0bc7e1d30f5f07665a07fb9fa4810e0be9a771c861176b22675003bf4b26232922 SHA512 dbdb6eca437b738d0a2cb68306c568913c2f62c00921eb2de85dda9f70a22c51791f3f4ffc1d64014ffdd0577a6506641ea2358a52d2e94386aeff9c6950c120
+EBUILD libssh-9999.ebuild 3196 BLAKE2B 4234affee1dc97b83d04eb02d7314abb12f7888c3b61a9549397c60e8bde496fe30c9b87ca0ea8f4dd810ef1a11820e452edcd141167759c5c146632d8bd8035 SHA512 80088d91442782770866421e7d7f069dc8e1fff21a24529a38fe5d2c82564c89df89aea84a5b0ef447cc1d58b7f17a1af222929a0f9cb13987637524bc651046
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index b13f672c4840..759da6a2fc09 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -49,7 +50,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
@@ -88,16 +89,16 @@ multilib_src_configure() {
 
 	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
 	# compatibility symlink until all consumers have been updated
diff --git a/net-libs/libssh/libssh-0.9.2.ebuild b/net-libs/libssh/libssh-0.9.2.ebuild
deleted file mode 100644
index dc04b6aee9da..000000000000
--- a/net-libs/libssh/libssh-0.9.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -e "/torture_keyfiles/d" \
-		-i tests/unittests/CMakeLists.txt || die
-
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-			-i tests/unittests/CMakeLists.txt || die
-	fi
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.9.3.ebuild b/net-libs/libssh/libssh-0.9.3.ebuild
index dc04b6aee9da..d7405a073d55 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -13,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
@@ -21,7 +22,7 @@ SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
@@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
@@ -81,25 +82,27 @@ multilib_src_configure() {
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
+		-DBUILD_STATIC_LIB="$(usex static-libs)"
 		-DUNIT_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
 
 	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
+	use static-libs && dolib.a src/libssh.a
+
 	# compatibility symlink until all consumers have been updated
 	# to no longer use libssh_threads.so
 	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index dc04b6aee9da..8ddb3caa00db 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -21,7 +22,7 @@ SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
@@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
@@ -81,25 +82,27 @@ multilib_src_configure() {
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
+		-DBUILD_STATIC_LIB="$(usex static-libs)"
 		-DUNIT_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
 
 	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
+	use static-libs && dolib.a src/libssh.a
+
 	# compatibility symlink until all consumers have been updated
 	# to no longer use libssh_threads.so
 	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index ea642b91573d..9356a6c09661 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,5 +1,7 @@
 AUX libtirpc-1.0.2-bcopy-to-memmove.patch 2226 BLAKE2B c0a5244f21d9a5531303b317946fe53b695aafc54095f617a3918f28a94033cd0a30b5f3bfd6fe671b64d4919d255298b55fbb4fa6179c255ff561517361d4e5 SHA512 221c85c47ec56edbdb4ce95e0f67680050b8d9f666c6795ceef7f7720acdf05a535e4afbcdc4e2e5eaeb6edc04bd43f65486df772ad2a0c87987d1c204661f00
 DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
+DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.1.4.ebuild 1554 BLAKE2B cd9c64b7e550affa9814e8a5e4b9b8c9d5627640debe472cddc16ea36300841b843eb2fd0dca7e3d5eb339c74b2a063a408246ebdd0c7fed086ff6ce31dd60f6 SHA512 c767bac49fb1fb2a22862ee273f94348e176ce229293ade3d81c4c65fb818be7d49980f2bfb54cb443e1f165fa2ee6c0ae908308a89eeb24e2bfde513cd5c033
+EBUILD libtirpc-1.2.5.ebuild 1513 BLAKE2B 57bc520006881b7199e58fcf5ad5e6b00639fbab84a4785830c8bab517c0448d503395f3c5423bd55c3a349b30ee4aa83a20f02f84770c2ce8ad90f485ee979c SHA512 4a3c6555642a221b0249ee69f32354cab38e4a889ed0370bc10f6b1cdd3288150ef78b8bfdd212359e4f56a42f473ea7376d9a13c6acb000c48d3d40e9d649f0
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
new file mode 100644
index 000000000000..5d80a874a922
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs usr-ldscript
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable kerberos gssapi)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# libtirpc replaces rpc support in glibc, so we need it in /
+	gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc
+	doins doc/netconfig
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/*
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index df6aaa3ed04d..ff183c31f18b 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,14 +1,7 @@
-AUX fix-boost-1.70.patch 11122 BLAKE2B 274caa89f6ba189398aaf9c41c51c7570020fdbe67fd235622bf4821f9a094570d038f86e5d68ff77e54cb7ff7581c9cd4a4a7df29ecf60192c1a212b363ebb8 SHA512 724a391e05144a0492d3bf44e4040d7bba6723f343f7bd6eb1ee34e6822b1694b26f914a96e16c09fc561bf1428ad600f81750fb3cdf4ffe309f7f51f090cc74
-DIST libtorrent-rasterbar-1.1.10.tar.gz 3902542 BLAKE2B 3a78862ce2825c9da32ab38122db05c2816daa237559446a60702f562e971c5597210dfc2612235294cec3f60fa3de8cab3a0246887ac4779b01171a460f70f0 SHA512 414deeb9765bfb6072af5fa00ad836bfe3751622a80783ea84389e31355b342a4371f0dc195b2d27b154826e515b2e6063c8786f792afa347abba9caadaa5b2a
-DIST libtorrent-rasterbar-1.1.12.tar.gz 3897237 BLAKE2B 0988b16d79df9499e2f7ab9d568ec560fa701e78fa0c6cc0158629d219259a73f3b2aa8b79d6f9c3a757f97559bc6b354148d5885b29f089a41893df65c92b11 SHA512 6f264ca9fcdcb93c4e16ced4b2657ccb19d47cbd483c3ad9f14909ee7de280b50c15d180c05ebd454236871fceca48cd79647bf89f8cbebf234b8f0f351aa699
 DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160
-DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
-DIST libtorrent-rasterbar-1.2.1.tar.gz 3562762 BLAKE2B 1978356ba00c07c4b89657ebe190b2aa4a938d22e5ab63844fb664312d60f761a07c42b9353f2f500fdf9a08afcb294a39bfb447d255d93b1a45ecc2be629ffe SHA512 a60e38c4c951756786ede69af1a5d56bf6293bcb7d235f0b7feda72f731bc163ea6a7401c4b5f5400b8ce236decff0ae3a1d5fe39c7f8f775e65031677f02074
-DIST libtorrent-rasterbar-1.2.2.tar.gz 3584187 BLAKE2B 93c77544d4641122f0bd2b5c5f0577629fb7bdfc9e81bd54f7a849f5a477255adc699676516865c93610d24a830a26a0de45f10e50ce64ad6f0214c116f7754c SHA512 34dcf5421dfccbba78bdd30890b9c18b92fdee1a2e1693ada9b55b79a167730093862017581b9251a654b5517011dbe4c46b520b03b78aa86a909457f7edcf2c
-EBUILD libtorrent-rasterbar-1.1.10-r1.ebuild 2403 BLAKE2B 850d99b91c3ca211b03c9184963aeaf3cb3e534e2356f44fb4ef0dfc41b38c365300c85c6860eb67759f8db6fe487a354cf78e38e1f4e6385304727474c9e134 SHA512 5b100b6565d2a393456caef36e132477cdfad171d2e60f068c4eb7be6b7a131f110308d8f048e29c7a1b2a3e390db66f17ecb7beea19b81a70685f197c3b2b5e
-EBUILD libtorrent-rasterbar-1.1.12-r1.ebuild 2403 BLAKE2B 24f122a80d00df7f90e1778edd95fd8a92e904144bc7b0156174423be8e1a0b9b1c430e08a31b25fd7b460c85a92df49e596cc616254e83b4da748ffa382338c SHA512 07eb786b5cbc0e5c343f01873f203f9bdf5b520f54227d65af1f926a7c149b24041a1e41d88fec307291b5eb8a18c3f3e8473e04002e9b64757b310c7cba747e
-EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2356 BLAKE2B 43c5f5f839ba1aca885a972fea0de2592cc59b43b287b7ca0830a67a959c8df7040f1f08cb71e65a283509e10aea0d8019f1300b148d85714fbb5805a4aa210e SHA512 04e27495af50412e96f955e2adfc90a48b71bfe21d1aeb7e071152026f2dc751fcd6851498db9027dbf32154a1f74572abfe7086df7708e910a3c8f49a2e9be1
-EBUILD libtorrent-rasterbar-1.2.0-r1.ebuild 2529 BLAKE2B a64b7857bcdbf1522e33ad7822dccf493e38991307efd25cdf5154e51337af7fa609221618e6c75ef4aa48930d43fd1b37575801b1507ef703128e350d72b28f SHA512 f4a8dad117b52d0c519f61d7a92b44e28e7ef86aa7e3db37eaf870c8c61949c96dd83862898479f535fc6c0812ed034ae9957f472012d78451ef0355269bb64e
-EBUILD libtorrent-rasterbar-1.2.1-r1.ebuild 2501 BLAKE2B 47bb661cc8cf40abea1c698e7cd983b7d3fba9f2e3e89e218aae627abf0f6c7e488ed851de66704b9a0eaea3fc46917f428311c38ccebad3cae5c078e29d3037 SHA512 199f444da0ae8aa8562fcd44d27febc6067aca01c67e897cb25c31a7e4f9b8e361709c383a4f86cc8112f8e7836fed3d8b0a449fdaea1a68469837f6fadd3fa0
-EBUILD libtorrent-rasterbar-1.2.2-r1.ebuild 2506 BLAKE2B d2aedbbb47b6bb91035ed79d903f11415e42760d5a591ad0f589cb788c71b9bd404d35cc72b19bcf6ded5d2982f41642376245090e0a2499041f0cdfe85a61e0 SHA512 c52014364a6bffa448d59daed20f3cd07467ed10b65a0b53fd078ad7bb5cef091b1a5345325d213c99ea16e73a7bed019f3a0ffda16770c9d8ad3af38c739c25
+DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
+DIST libtorrent-rasterbar-1.2.3.tar.gz 3591081 BLAKE2B 9766a21c948997b35c6d209940a2d2cfd76b130f1a9d1f611e07d3eeb27f634a3c5eca12c92261139200084b9678913d85f6a56f98ab6894e5def761615c39ad SHA512 11a81c9f4b968ed360740553f8d856a2fad4eb2f6962f6403394e0a4a6b198ef6f04ce92d11fc6bed9aa979c84efd03fb396027dfe6603f394104b4302e04d82
+EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2352 BLAKE2B b1b274c01f49cd03d919bfe038352e51db8eb4279a2454e911632e621c370a49109803e9f2eaa1e7836f885043bcd5d9ad488a564bcd93b9d2a97043d27dc9bb SHA512 f7015e3325fed2f39ccf5a4d2258b36524939237dd6606021be20e865d8d462e5b830f108cbf6e8870df0c2d2e9721a89e8b9f2d9b90c1dbdcef7a887baf9c3d
+EBUILD libtorrent-rasterbar-1.1.14.ebuild 2354 BLAKE2B c934e84456e6a15d3dbc7298bb6a04f7a2577d12f853053675d47cd38b280b5f71808e5b9153c7a3b705574bfe01f82b6f28280230f721061f04317bc6ede5af SHA512 ced4871e896e046b29de877c321da6f91f31e205f8df9ae5b18322ee827a97001f30d4d8810478ce5f7262b8e3934109eda549a0fd5de7a0eec2fb6b33712b61
+EBUILD libtorrent-rasterbar-1.2.3.ebuild 2503 BLAKE2B 7594d465b23d207cbcf3ae0c20c9f8750d6d1561d48f444f9b3b17341251257c0695db5b3bb4f9776659c3895887e0bce99f9906bba993388fe1dc05d383b159 SHA512 2f5c73c76980f74af89a12d2853ab12f8296e6090eaab8f618bd9e9e3da7550efda2e430d26f5a4393a44dbaf55fd4c43e42b5994df8c9fa2bee697bd6518898
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch b/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch
deleted file mode 100644
index 25adcdedcea7..000000000000
--- a/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 76c2794923c4c101ff715be11d794f7fefc6c524 Mon Sep 17 00:00:00 2001
-From: Arvid Norberg <arvid.norberg@gmail.com>
-Date: Fri, 19 Apr 2019 20:56:19 +0200
-Subject: [PATCH] fix build with boost-1.70 (#3788)
-
-fix build with boost 1.70.0 Fix #3683
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- include/libtorrent/io_service.hpp      |  3 +++
- include/libtorrent/io_service_fwd.hpp  | 13 +++++++++++--
- include/libtorrent/proxy_base.hpp      |  2 +-
- include/libtorrent/tracker_manager.hpp |  2 +-
- include/libtorrent/udp_socket.hpp      |  2 +-
- src/disk_io_thread_pool.cpp            |  2 +-
- src/http_connection.cpp                | 18 +++++++++---------
- src/kademlia/dht_tracker.cpp           |  2 +-
- src/lsd.cpp                            |  4 ++--
- src/natpmp.cpp                         |  6 +++---
- src/udp_socket.cpp                     |  2 +-
- src/upnp.cpp                           |  2 +-
- test/test_fast_extension.cpp           |  2 +-
- 13 files changed, 36 insertions(+), 24 deletions(-)
-
-diff --git a/include/libtorrent/io_service.hpp b/include/libtorrent/io_service.hpp
-index 123274019b..5f6be1a2ca 100644
---- a/include/libtorrent/io_service.hpp
-+++ b/include/libtorrent/io_service.hpp
-@@ -38,9 +38,12 @@ POSSIBILITY OF SUCH DAMAGE.
- #else
- #include "libtorrent/aux_/disable_warnings_push.hpp"
- #include <boost/asio/io_service.hpp>
-+#include <boost/version.hpp>
- #include "libtorrent/aux_/disable_warnings_pop.hpp"
- #endif // SIMULATOR
- 
-+#include "libtorrent/io_service_fwd.hpp"
-+
- namespace libtorrent {
- 
- #if defined TORRENT_BUILD_SIMULATOR
-diff --git a/include/libtorrent/io_service_fwd.hpp b/include/libtorrent/io_service_fwd.hpp
-index 1b22c3e58f..71b845d3f3 100644
---- a/include/libtorrent/io_service_fwd.hpp
-+++ b/include/libtorrent/io_service_fwd.hpp
-@@ -55,10 +55,19 @@ namespace boost { namespace asio {
- namespace libtorrent {
- 
- #if defined TORRENT_BUILD_SIMULATOR
--	typedef sim::asio::io_service io_service;
-+	using io_service = sim::asio::io_service;
- #else
--	typedef boost::asio::io_service io_service;
-+	using io_service = boost::asio::io_service;
- #endif
-+
-+#if BOOST_VERSION >= 107000
-+template <typename T>
-+io_service& get_io_service(T& o) { return static_cast<io_service&>(o.get_executor().context()); }
-+#else
-+template <typename T>
-+io_service& get_io_service(T& o) { return o.get_io_service(); }
-+#endif
-+
- }
- 
- #endif
-diff --git a/include/libtorrent/proxy_base.hpp b/include/libtorrent/proxy_base.hpp
-index 344c230977..d7666545c6 100644
---- a/include/libtorrent/proxy_base.hpp
-+++ b/include/libtorrent/proxy_base.hpp
-@@ -246,7 +246,7 @@ class proxy_base
- 
- 	io_service& get_io_service()
- 	{
--		return m_sock.get_io_service();
-+		return lt::get_io_service(m_sock);
- 	}
- 
- 	lowest_layer_type& lowest_layer()
-diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp
-index 86331adbca..1fc28e89ff 100644
---- a/include/libtorrent/tracker_manager.hpp
-+++ b/include/libtorrent/tracker_manager.hpp
-@@ -259,7 +259,7 @@ namespace libtorrent {
- 		virtual void on_timeout(error_code const& ec) = 0;
- 		virtual ~timeout_handler();
- 
--		io_service& get_io_service() { return m_timeout.get_io_service(); }
-+		io_service& get_io_service() { return lt::get_io_service(m_timeout); }
- 
- 	private:
- 
-diff --git a/include/libtorrent/udp_socket.hpp b/include/libtorrent/udp_socket.hpp
-index f4dcbeb248..c5c9aeba66 100644
---- a/include/libtorrent/udp_socket.hpp
-+++ b/include/libtorrent/udp_socket.hpp
-@@ -61,7 +61,7 @@ namespace libtorrent {
- 		static constexpr udp_send_flags_t dont_fragment = 3_bit;
- 
- 		bool is_open() const { return m_abort == false; }
--		io_service& get_io_service() { return m_socket.get_io_service(); }
-+		io_service& get_io_service() { return lt::get_io_service(m_socket); }
- 
- 		template <typename Handler>
- 		void async_read(Handler&& h)
-diff --git a/src/disk_io_thread_pool.cpp b/src/disk_io_thread_pool.cpp
-index 4d4b5ee678..123159a45d 100644
---- a/src/disk_io_thread_pool.cpp
-+++ b/src/disk_io_thread_pool.cpp
-@@ -173,7 +173,7 @@ namespace libtorrent {
- 			// buffer pool won't exist anymore, and crash. This prevents that.
- 			m_threads.emplace_back(&pool_thread_interface::thread_fun
- 				, &m_thread_iface, std::ref(*this)
--				, io_service::work(m_idle_timer.get_io_service()));
-+				, io_service::work(get_io_service(m_idle_timer)));
- 		}
- 	}
- 
-diff --git a/src/http_connection.cpp b/src/http_connection.cpp
-index e01e9ea1d5..81e5368a55 100644
---- a/src/http_connection.cpp
-+++ b/src/http_connection.cpp
-@@ -148,7 +148,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
- 
- 	if (ec)
- 	{
--		m_timer.get_io_service().post(std::bind(&http_connection::callback
-+		lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- 			, me, ec, span<char>{}));
- 		return;
- 	}
-@@ -160,7 +160,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
- 		)
- 	{
- 		error_code err(errors::unsupported_url_protocol);
--		m_timer.get_io_service().post(std::bind(&http_connection::callback
-+		lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- 			, me, err, span<char>{}));
- 		return;
- 	}
-@@ -258,7 +258,7 @@ void http_connection::start(std::string const& hostname, int port
- 
- 	if (ec)
- 	{
--		m_timer.get_io_service().post(std::bind(&http_connection::callback
-+		lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- 			, me, ec, span<char>{}));
- 		return;
- 	}
-@@ -297,7 +297,7 @@ void http_connection::start(std::string const& hostname, int port
- #if TORRENT_USE_I2P
- 			if (i2p_conn->proxy().type != settings_pack::i2p_proxy)
- 			{
--				m_timer.get_io_service().post(std::bind(&http_connection::callback
-+				lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- 					, me, error_code(errors::no_i2p_router), span<char>{}));
- 				return;
- 			}
-@@ -332,8 +332,8 @@ void http_connection::start(std::string const& hostname, int port
- 					m_ssl_ctx->set_verify_mode(ssl::context::verify_none, ec);
- 					if (ec)
- 					{
--						m_timer.get_io_service().post(std::bind(&http_connection::callback
--								, me, ec, span<char>{}));
-+						lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
-+							, me, ec, span<char>{}));
- 						return;
- 					}
- 				}
-@@ -344,7 +344,7 @@ void http_connection::start(std::string const& hostname, int port
- 		// assume this is not a tracker connection. Tracker connections that
- 		// shouldn't be subject to the proxy should pass in nullptr as the proxy
- 		// pointer.
--		instantiate_connection(m_timer.get_io_service()
-+		instantiate_connection(lt::get_io_service(m_timer)
- 			, proxy ? *proxy : null_proxy, m_sock, userdata, nullptr, false, false);
- 
- 		if (m_bind_addr)
-@@ -353,7 +353,7 @@ void http_connection::start(std::string const& hostname, int port
- 			m_sock.bind(tcp::endpoint(*m_bind_addr, 0), ec);
- 			if (ec)
- 			{
--				m_timer.get_io_service().post(std::bind(&http_connection::callback
-+				lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- 					, me, ec, span<char>{}));
- 				return;
- 			}
-@@ -362,7 +362,7 @@ void http_connection::start(std::string const& hostname, int port
- 		setup_ssl_hostname(m_sock, hostname, ec);
- 		if (ec)
- 		{
--			m_timer.get_io_service().post(std::bind(&http_connection::callback
-+			lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- 				, me, ec, span<char>{}));
- 			return;
- 		}
-diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp
-index a840bcf991..f2b2b9e2a1 100644
---- a/src/kademlia/dht_tracker.cpp
-+++ b/src/kademlia/dht_tracker.cpp
-@@ -130,7 +130,7 @@ namespace libtorrent { namespace dht {
- 		// must use piecewise construction because tracker_node::connection_timer
- 		// is neither copyable nor movable
- 		auto n = m_nodes.emplace(std::piecewise_construct_t(), std::forward_as_tuple(s)
--			, std::forward_as_tuple(m_key_refresh_timer.get_io_service()
-+			, std::forward_as_tuple(get_io_service(m_key_refresh_timer)
- 			, s, this, m_settings, nid, m_log, m_counters
- 			, std::bind(&dht_tracker::get_node, this, _1, _2)
- 			, m_storage));
-diff --git a/src/lsd.cpp b/src/lsd.cpp
-index 99e21ead44..562f374c62 100644
---- a/src/lsd.cpp
-+++ b/src/lsd.cpp
-@@ -100,11 +100,11 @@ void lsd::debug_log(char const* fmt, ...) const
- void lsd::start(error_code& ec)
- {
- 	m_socket.open(std::bind(&lsd::on_announce, self(), _1, _2)
--		, m_broadcast_timer.get_io_service(), ec);
-+		, lt::get_io_service(m_broadcast_timer), ec);
- 	if (ec) return;
- 
- 	m_socket6.open(std::bind(&lsd::on_announce, self(), _1, _2)
--		, m_broadcast_timer.get_io_service(), ec);
-+		, lt::get_io_service(m_broadcast_timer), ec);
- }
- 
- lsd::~lsd() = default;
-diff --git a/src/natpmp.cpp b/src/natpmp.cpp
-index 1226bcebac..5876683ea9 100644
---- a/src/natpmp.cpp
-+++ b/src/natpmp.cpp
-@@ -160,13 +160,13 @@ void natpmp::start(address local_address, std::string device)
- 	// try to find one even if the listen socket isn't bound to a device
- 	if (device.empty())
- 	{
--		device = device_for_address(local_address, m_socket.get_io_service(), ec);
-+		device = device_for_address(local_address, get_io_service(m_socket), ec);
- 		// if this fails fall back to using the first default gateway in the
- 		// routing table
- 		ec.clear();
- 	}
- 
--	auto const route = get_default_route(m_socket.get_io_service()
-+	auto const route = get_default_route(get_io_service(m_socket)
- 		, device, local_address.is_v6(), ec);
- 
- 	if (!route)
-@@ -194,7 +194,7 @@ void natpmp::start(address local_address, std::string device)
- 	if (local_address.is_unspecified())
- 	{
- 		std::vector<ip_interface> const net = enum_net_interfaces(
--			m_socket.get_io_service(), ec);
-+			get_io_service(m_socket), ec);
- 
- 		auto const it = std::find_if(net.begin(), net.end(), [&](ip_interface const& i)
- 		{
-diff --git a/src/udp_socket.cpp b/src/udp_socket.cpp
-index 9ca38e5486..2459e4f1ca 100644
---- a/src/udp_socket.cpp
-+++ b/src/udp_socket.cpp
-@@ -492,7 +492,7 @@ void udp_socket::set_proxy_settings(aux::proxy_settings const& ps)
- 	{
- 		// connect to socks5 server and open up the UDP tunnel
- 
--		m_socks5_connection = std::make_shared<socks5>(m_socket.get_io_service());
-+		m_socks5_connection = std::make_shared<socks5>(lt::get_io_service(m_socket));
- 		m_socks5_connection->start(ps);
- 	}
- }
-diff --git a/src/upnp.cpp b/src/upnp.cpp
-index a300571e47..b1e8a5bb19 100644
---- a/src/upnp.cpp
-+++ b/src/upnp.cpp
-@@ -121,7 +121,7 @@ void upnp::start()
- 
- 	error_code ec;
- 	m_socket.open(std::bind(&upnp::on_reply, self(), _1, _2)
--		, m_refresh_timer.get_io_service(), ec);
-+		, lt::get_io_service(m_refresh_timer), ec);
- 
- 	m_mappings.reserve(10);
- }
-diff --git a/test/test_fast_extension.cpp b/test/test_fast_extension.cpp
-index 91256fa0c9..cddc508825 100644
---- a/test/test_fast_extension.cpp
-+++ b/test/test_fast_extension.cpp
-@@ -462,7 +462,7 @@ std::shared_ptr<torrent_info> setup_peer(tcp::socket& s, sha1_hash& ih
- 	}
- 	else
- 	{
--		tcp::acceptor l(s.get_io_service());
-+		tcp::acceptor l(lt::get_io_service(s));
- 		l.open(tcp::v4());
- 		l.bind(tcp::endpoint(address_v4::from_string("127.0.0.1"), 0));
- 		l.listen();
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
deleted file mode 100644
index 6d2ff7ccceaf..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=$(ver_rs 1-2 '_')
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	append-cxxflags -std=c++11 # bug 634506
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
index 300aab6dbcf6..eef2b8bce907 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild
index 8ceb42bfbe83..4af2384b7e72 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -60,9 +60,9 @@ src_configure() {
 
 	local myeconfargs=(
 		$(use_enable debug)
-		$(use_enable debug logging)
 		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
+		$(use_enable debug logging)
+		$(use_enable dht)
 		$(use_enable examples)
 		$(use_enable ssl encryption)
 		$(use_enable static-libs static)
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
deleted file mode 100644
index 118eb5fdcc87..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}_${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-PATCHES=( "${FILESDIR}"/fix-boost-1.70.patch )
-
-src_prepare() {
-	mkdir "${S}"/build-aux/ || die
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
deleted file mode 100644
index d77cbc4c8b34..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-src_prepare() {
-	mkdir "${S}"/build-aux/ || die
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild
index d3c1a6f318d0..9d9ad977f833 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
@@ -18,8 +18,8 @@ HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
 SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+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} )"
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 4f906d13dd87..2d9d872efcf2 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -6,6 +6,6 @@ AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb141647
 AUX libvncserver-0.9.12-pkgconfig-libdir.patch 1241 BLAKE2B 7ac16afc86204a320253c4b0b819e4c66c44c6112ac5a9bfbae13bd567391f137d1c4f786f43e5023663fcccb7d45aed628459301dd0859361a7b01f41a98d29 SHA512 37d15eb01f6c89d012c47fff885c2405ead2b7e18798b3fa68fb72bffff9caf084652e1d29fbb11263800c69e875d9442fdef660ea69b146361690820035f056
 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
-EBUILD libvncserver-0.9.12-r2.ebuild 2097 BLAKE2B 1223ec5554bef0062c5fb20297bf8d07f0c43241cb35e6f51e1b71eb841c3bf392403f1acacd10330b37be829373c6587ad95dccbf6d2ffa192451f3dcf61085 SHA512 bec5d64d0f6400d2f9c434e832f4360e56fdfacfbb6efa2fba58eadbd0df71f5731083415cb6689fa1bab994698ad84a6483a6491b7c6171ef88b463f884235e
-EBUILD libvncserver-0.9.12-r3.ebuild 2272 BLAKE2B 03e90712ea3208d342d672c654b8e8bb03b7d346c4b9318719c3e5ed316d1f36bc50f18dea654e091aa820005beb3009fc267d1c9168e99f7cc86f20a2a1f85e SHA512 875b640acd630ae3f22d06f60633072a93881615fb36853a8629fee38a4f75c64cc3190e704018f614bce6377f9bcfc2be2a88b797f6601f4ddfb4ccbdb2250d
+EBUILD libvncserver-0.9.12-r2.ebuild 2085 BLAKE2B b17dc70efebe80fcb8ede7cd5c949f741e79c90919af9063dacdb905f40d173e18c0bd7fc366781141f52a98eb09bf1fe3412842916e4a9c77828abb103e2ff5 SHA512 a82db697f80034c94e828e334f838f0bbc3a0e43b4edd68752cf72fe71f1cecf4b7bcd4ab4d27d81d7b11c48e69dda3a55c778f393e6abafd4296f4bbb523065
+EBUILD libvncserver-0.9.12-r3.ebuild 2260 BLAKE2B 5c844605a3f214e9c258f1097fcc6e17f936ff416ae08d7fba5141ef10c6ad5e968d58357bf19e37080da048719362d097c6970adac4750cd40c6b492bb039d4 SHA512 a301902c50f834a8a5a594ac109d87cf978d386d170292b44c986d43a2c6ec8c4dfec43e67950aa393d6f2dbf7692d8d006a0ccb54df782d5b89a531c100179a
 MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
index e25b35dcf374..373269e6e349 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_P="LibVNCServer-${PV}"
 DESCRIPTION="library for creating vnc servers"
@@ -65,5 +65,5 @@ src_configure() {
 		-DWITH_IPv6=$(usex ipv6 ON OFF)
 		-DWITH_SASL=$(usex sasl ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
index cedaa4a52fe6..9661224c2a15 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_P="LibVNCServer-${PV}"
 DESCRIPTION="library for creating vnc servers"
@@ -69,5 +69,5 @@ src_configure() {
 		-DWITH_IPv6=$(usex ipv6 ON OFF)
 		-DWITH_SASL=$(usex sasl ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 2577a21ada83..80999bbb436a 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,14 +1,17 @@
 AUX libwebsockets-2.1.1-x86-build.patch 771 BLAKE2B d4b51038dcd6717d6608bfb98da8d0474289927950efc0e6e5d7f2d0ec84e808a4d08e15dc729f7daa4e4c90ab28070ce177b1f64280998f82fc3d0c1a9911dc SHA512 b4f34813309921728e9dcd88e29ae6b2bcb6ac3e55d86e489a85fe9950bc3758d03f7e639773447110c5bb82e4bceee3210569fc065e860f596053ed8c8a317c
 AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
 AUX libwebsockets-3.2.0-string_assignment.patch 482 BLAKE2B 1e926a64a4c1c0bf2ec99bdb2c9b917800f27e0959688ebe26a5620f7e7722e5911ab9ceeeb75cfa5e56e609d5e6aafa0587f9f326d01458111681c57318c7f0 SHA512 7bfd7c79c8355bb2e1a8824559250f7c4482d27c7b502a6b1d7bbbcc66a95d977f4b64da4c91d5483a1e583b368b6b0cd178c2bca16fca2c6291644e031172c7
+AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
 DIST libwebsockets-1.7.9.tar.gz 2915358 BLAKE2B 07aad4ab716212924177aa76233d743d6258d261f6cccb286e478f51bfeac609284cf2e43004bd99c271786a7e30357895c8687c11e1c3d7589ed13dbce4fbe8 SHA512 d5bd6171d58b5d5439af48d6cc1e92623e9bf21e059a2d25d362ef81b1bff62e759fe265261dbee0ac4ceb0d0a2490dc1e030dfee2b36eb8ac74df112da1db56
 DIST libwebsockets-2.0.2.tar.gz 2998585 BLAKE2B 0eaf2301abf9a0e47bd865b6e653f3ea23f3b00d4c6da785a8bd871f3ca729dc43152cad10aeaa9a3cd360aeecd0be87e434102e91e0eeaa6b1865031310a362 SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a
 DIST libwebsockets-2.1.1.tar.gz 3769593 BLAKE2B 8d3aaa0a844925fb927fffaf0d11ba1bdbd013db8a680ce4b85cd5d951219598288fa0f2b97ec22bc00ef879586cb5c2c076b774f3411cb6d8ca553e66fb90e2 SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683
 DIST libwebsockets-2.4.2.tar.gz 3777160 BLAKE2B 6aedc0d340e9e03745309cd1a9674b6c7e84ebdbd5232a265c7a4e0deb612665982353c3ba973b58a835b1747448d415a3625ed044973212b5a897b221d73106 SHA512 7bee49f6763ff3ab7861fcda25af8d80f6757c56e197ea42be53e0b2480969eee73de3aee5198f5ff06fd1cb8ab2be4c6495243e83cd0acc235b0da83b2353d1
 DIST libwebsockets-3.2.0.tar.gz 9848976 BLAKE2B 3ad82281c854ad6ca4183f104a0d0eaa6f6e6e6084e3a98b29d8425d335f02a2d3e4f7e7a1b350e87d4ff975c44a5ed6635e3166219d9294bbf5a56ed1357e75 SHA512 afc1c9e259d6d48000b09da111af4129680d50474cdfedbad197ee22260d57a837b67cc6a3f8e6b1aa7ce7dc5d3fd900569783631540501709868125c6d1e4da
+DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
 EBUILD libwebsockets-1.7.9.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
 EBUILD libwebsockets-2.0.2.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
 EBUILD libwebsockets-2.1.1.ebuild 1841 BLAKE2B c79cdc197d2800a7924cfa134269e1d679c0f6df185f83de157b1211a55e01d0a4cb05797e74ce8946dcda0b1b7266be030824af6fe136aedb89fd21e1535cac SHA512 5561f0c233aad102971bc9d4e626178771b349543bca91e816eace0502672e2e8edcd71e26b9791f657d2f9864b93f5aadcd63f18057ec632d939354d475f191
 EBUILD libwebsockets-2.4.2.ebuild 2120 BLAKE2B 2276db115471732eb30f81cea4fb54aa01fd0f2202c41d1b26234d9468988eca8f376ea3bac3ea105133b56a1b7ef802b9d5ab22de6e107037b1cf2d2d6aaa3a SHA512 4be547c69cfa37ad311270927512d2825facb5ed2fd3aa30498d9301b54fbe05d6138977bdcf2f8fb5672df94ccba2e835757ca6379dadde5bd199fcfe27be2c
-EBUILD libwebsockets-3.2.0.ebuild 2209 BLAKE2B 6f2ea48779952428b13a7d44909a5dc44d3102feabeda8b71c5eb905e80e78cb85d8bab0bd46764b5b801de29a7118ac5a90cc497571312506c253a64eb1ff55 SHA512 dd86106ecc75d63bf4b35d9d331ec329840e71384236207bce84032b0ba15455ed9bc0453b826f4d7018189a376b2f2a14aa06ab0f2b5d6bfb5afa2a6edd24fb
+EBUILD libwebsockets-3.2.0.ebuild 2197 BLAKE2B 108153726302053dd624ba9756993aad661a35ddbf26192de95328ff4f7483bb02aeafc1ba5cbde9d6e0389ffd518357d20ede3b81fb36d090c13a8d67229ae5 SHA512 8e75d36efb21584aecb0228c2bace32c8a1f91a07e62a079492a404e505003c15ffca5628ed85980555f01113eb1032a5f1aad3e4d4f1689da122d0e3f9f4efc
+EBUILD libwebsockets-3.2.1.ebuild 2230 BLAKE2B 41639af18c3205b0f567e5619254e81fd58a1efd95f3c70a503f9a6495003dc3f3745e7286172b37436936974f4cf0507dd25ec1d1aa4a4851549708162701d4 SHA512 2cf407e9cc45cdb85e7010fd178d38d3413aa739f2becbfbb41d8f4f2b8fa887f022f8359e125d1ea5361b69b80c311a96d5f543159b5805741b2725f2eadbf8
 MISC metadata.xml 1723 BLAKE2B 561ac0a5b23081a9b351b2d516d63784c40688a399e0ff49522b4a572b32e7d4462a0062680aa6a1e39c6cc364c1b8fddafb1eb7edcdd99e19eafe557710e23e SHA512 7d259d9f7744deede3f3bde1e79f8e17351443cb8dff672f7c550206bf41064a01a43b2bb955a97144bf9319ee190c9f9ffc49a9513c22db6288b49b51c9ace4
diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch
new file mode 100644
index 000000000000..a7cffbb1f111
--- /dev/null
+++ b/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch
@@ -0,0 +1,29 @@
+From a27dabfd3a422a348135e49ffd4f163cc5c6baae Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@iewc.co.za>
+Date: Mon, 6 Jan 2020 11:52:54 +0200
+Subject: [PATCH] lws_create_vhost compile failure with +SOCKS5 -client.
+
+If LWS is build with SOCKS5 support, but WITHOUT_CLIENT then a compile
+failure occurs which this fixes.
+
+Signed-off-by: Jaco Kroon <jaco@iewc.co.za>
+---
+ lib/core-net/vhost.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/core-net/vhost.c b/lib/core-net/vhost.c
+index 69fe26a5..283b802e 100644
+--- a/lib/core-net/vhost.c
++++ b/lib/core-net/vhost.c
+@@ -437,7 +437,7 @@ lws_create_vhost(struct lws_context *context,
+	struct lws_protocols *lwsp;
+	int m, f = !info->pvo, fx = 0, abs_pcol_count = 0;
+	char buf[96];
+-#if !defined(LWS_WITHOUT_CLIENT) && defined(LWS_HAVE_GETENV)
++#if (!defined(LWS_WITHOUT_CLIENT) || defined(LWS_WITH_SOCKS5)) && defined(LWS_HAVE_GETENV)
+	char *p;
+ #endif
+	int n;
+-- 
+2.23.0
+
diff --git a/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild b/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
index edff1fac3cb4..587991e9177c 100644
--- a/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-3.2.0.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
 
 DESCRIPTION="A flexible pure-C library for implementing network protocols"
 HOMEPAGE="https://libwebsockets.org/"
@@ -74,5 +74,5 @@ src_configure() {
 		-DLWS_WITHOUT_TESTAPPS=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild b/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
new file mode 100644
index 000000000000..c3f2abb8f44d
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/15" # libwebsockets.so.15
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
+	+lejp libev libevent libressl libuv peer-limits server-status smtp socks5
+	sqlite3 ssl static-libs threads zip"
+
+REQUIRED_USE="
+	generic-sessions? ( smtp sqlite3 )
+	http-proxy? ( client )
+	smtp? ( libuv )
+	?? ( libev libevent )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	http-proxy? ( net-libs/libhubbub )
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	sqlite3? ( dev-db/sqlite:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl?  ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
+	"${FILESDIR}/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DLWS_HAVE_LIBCAP=$(usex caps)
+		-DLWS_IPV6=$(usex ipv6)
+		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_WITHOUT_CLIENT=$(usex !client)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
+		-DLWS_WITH_CGI=$(usex cgi)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
+		-DLWS_WITH_HTTP2=$(usex http2)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
+		-DLWS_WITH_HUBBUB=$(usex http-proxy)
+		-DLWS_WITH_LEJP=$(usex lejp)
+		-DLWS_WITH_LIBEV=$(usex libev)
+		-DLWS_WITH_LIBEVENT=$(usex libevent)
+		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
+		-DLWS_WITH_SMTP=$(usex smtp)
+		-DLWS_WITH_SOCKS5=$(usex socks5)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3)
+		-DLWS_WITH_SSL=$(usex ssl)
+		-DLWS_WITH_STATIC=$(usex static-libs)
+		-DLWS_WITH_THREADPOOL=$(usex threads)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip)
+		-DLWS_WITHOUT_TESTAPPS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index cb48e548aa4a..cf440845db95 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,9 +1,15 @@
+DIST mbedcrypto-1.1.0d0.tar.gz 2907562 BLAKE2B 645b8eac1c55e6217d7b309e1b9ddf856f6d565f928e04211bb5714189024bff8f445a8e6c709d6b2e700d9390521cc31d194f4a98f7f211af3ca9b7109d7549 SHA512 923f8b18eaabae56015607442e996d77ddfd68443e3d33176ba9fe1c5a53fe611af584b5d8dc2111fbda41e5396921d6be9a3a3837cd4d85671237e0932f5cc2
+DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a
 DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
 DIST mbedtls-2.16.3.tar.gz 2459563 BLAKE2B 5de21b27274dae61e282114da196078be7931e823750f712145c372160204e02f36f995d2cca8589f7b8ffcb646b0b258b0d49db6a0ffa01117b8c0af9f3fa0e SHA512 3d798f7de9c33325585d5d7c8608cc16acdcf42c246d283b2fb8a29f5e419f2899342965ff297432ef2ab20c91eaee28d6ca53349f5a68b0a4fd29d6905fc64c
 DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
-EBUILD mbedtls-2.10.0.ebuild 2419 BLAKE2B 33cc9bbcc3fbb07de8389fde94cb606ac50c50776f14ab0d192c2bd475a7ca33204e244aa13b8bc9e64514006484106c9dd4fb80b834f3d132ffb7903e761a92 SHA512 d26ecb8788be571165c8a7e98757904b1c751e4c34e19ad541cfde97945f5ba52e564e1ed25aae50989cc9fcdd9e498b1bcaf29683ef06878869f5cf3ffb87d4
-EBUILD mbedtls-2.12.0.ebuild 2447 BLAKE2B f1f75b43f084adcaf6f9268bb39f6c40fee931ab2d7e600e2b44f9df3306f41b558fb52403b8af9525dbb61f77965253999df8cf430f099cf03c11a020f00ab5 SHA512 fe30a115df87767c1515721d84c6bf988226734c1efae802a18773b240c72d66bb9359717b953d17060d71c0847c8c835de705b75d05e39c65776ebb560b724c
-EBUILD mbedtls-2.16.3.ebuild 2457 BLAKE2B 52032b6e91158a0110746a6c928a121d2b4a764589708ff0b2cd3b2c56e94d1186f26cf87b79f25643a881ac34ee9b8ee649737036a0a9572e55e2ac6b2b6f16 SHA512 ff12f6f5403f06003293be95ee44e10ff26855926c0d81aa7b2d24b280441f28e947f0f0aa95c27c562f369555dfa797b5724dfa344a534f72bea77504b22d3a
-EBUILD mbedtls-2.17.0.ebuild 2457 BLAKE2B 52032b6e91158a0110746a6c928a121d2b4a764589708ff0b2cd3b2c56e94d1186f26cf87b79f25643a881ac34ee9b8ee649737036a0a9572e55e2ac6b2b6f16 SHA512 ff12f6f5403f06003293be95ee44e10ff26855926c0d81aa7b2d24b280441f28e947f0f0aa95c27c562f369555dfa797b5724dfa344a534f72bea77504b22d3a
+DIST mbedtls-2.18.1.tar.gz 2810688 BLAKE2B 25e8cfdb16e18049e4c89e271babe5b711634099ef89c54169e606da7aabedde1ac862ecd34dbe05e8052ea0183a7aa3b575d431305af4f8ecdd22da0f79f103 SHA512 39d1844806a0312ad97236d247e624fca15f10d7aff2336e764f214594a505f5109d6407fe6d399171086376124bc74da0c0f0b7aa9db85fa41f70143f04b95b
+DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
+EBUILD mbedtls-2.10.0.ebuild 2415 BLAKE2B 098c59ee882ce4faa38f1a2a35507cbbb6b99fc9e6460fa6fac8e17e89484caf1e1adb27bfe6e5136900fae27f451c9f036e20579af21cb66412f32c3630907e SHA512 ee2350b912246e028c9b18d7f875a45a4f7c5c56ce64185f2cf8c4267d26ee1dfadfe448285afc03d6b42e948075ab674fe9196463a7b5a6f13505a2ecf4cb90
+EBUILD mbedtls-2.12.0.ebuild 2443 BLAKE2B ba001cc31c56aadad9098f21521b3786644bf613d20b21024b52177e43d7d05c28f59cb423675aad2287104fa68233763876807297fa9a9bee4e00987c3d53cd SHA512 8f8b5d3eb27f70f962732c03e9496af5c513766cdbc68ead3f31720433eb0c28cd49cf809997fcbc46e390d98ee8c9aa11959cf2b679d798b99f313eb45585a7
+EBUILD mbedtls-2.16.3.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
+EBUILD mbedtls-2.17.0.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
+EBUILD mbedtls-2.18.1.ebuild 2682 BLAKE2B 08790193d0653596defe071cd2b7d545e497173cc00569bfa832bb34acf6fa3e58f2ac606d5d6469ae28945d84ef5e3546e7aa344a8e65f6fd4fc9a1a68d8c9b SHA512 cd79f0216a2b2053e5501b1dc79b016a0581a777655ca744118312f5a3021183a08d9c16f64ddc622397f33edb0d12f2c8707acb7e5eee886888e3d077cdb9a4
+EBUILD mbedtls-2.19.1.ebuild 2680 BLAKE2B f397067d4d931d48289e8d072aa194a97d5c9839ce1d55319a2180964a107d2c1b9f360a1e13bec04a9840fc481cbb3ae0f99fbecfaffc07616b1e429859b8ec SHA512 7f598ecc13d221cd073d0456fb637f9d36959f614a5c2bd68cdcf2f71edf5be4a67c0cb74ac96110ccad143dc036a0ca9c8f60c92668a72a29a238a418a27ee7
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index ffd06f8ff627..ef4b6c80cbaf 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -80,9 +80,9 @@ multilib_src_install_all() {
 	if use programs ; then
 		# avoid file collisions with sys-apps/coreutils
 		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
+		for p in "${ED}"/usr/bin/* ; do
 			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
 			fi
 		done
 		for e in aes hash pkey ssl test ; do
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index fafff54c9a87..ebf610255382 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -80,9 +80,9 @@ multilib_src_install_all() {
 	if use programs ; then
 		# avoid file collisions with sys-apps/coreutils
 		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
+		for p in "${ED}"/usr/bin/* ; do
 			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
 			fi
 		done
 		for e in aes hash pkey ssl test ; do
diff --git a/net-libs/mbedtls/mbedtls-2.16.3.ebuild b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
index a0303acdb713..13c601c526bb 100644
--- a/net-libs/mbedtls/mbedtls-2.16.3.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
@@ -80,9 +80,9 @@ multilib_src_install_all() {
 	if use programs ; then
 		# avoid file collisions with sys-apps/coreutils
 		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
+		for p in "${ED}"/usr/bin/* ; do
 			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
 			fi
 		done
 		for e in aes hash pkey ssl test ; do
diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
index a0303acdb713..13c601c526bb 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
@@ -80,9 +80,9 @@ multilib_src_install_all() {
 	if use programs ; then
 		# avoid file collisions with sys-apps/coreutils
 		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
+		for p in "${ED}"/usr/bin/* ; do
 			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
 			fi
 		done
 		for e in aes hash pkey ssl test ; do
diff --git a/net-libs/mbedtls/mbedtls-2.18.1.ebuild b/net-libs/mbedtls/mbedtls-2.18.1.ebuild
new file mode 100644
index 000000000000..b94b7770c958
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.18.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+CRYPTO_SUBMODULE="mbedcrypto-1.1.0d0"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
+	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/13" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	# pretend to be git submodule
+	rmdir "${S}"/crypto
+	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.19.1.ebuild b/net-libs/mbedtls/mbedtls-2.19.1.ebuild
new file mode 100644
index 000000000000..e7b65760fa85
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.19.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+CRYPTO_SUBMODULE="mbedcrypto-2.0.0"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
+	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/13" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	# pretend to be git submodule
+	rmdir "${S}"/crypto
+	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index b5211ef6bcab..5009197522da 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,7 @@
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
+DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
 EBUILD miniupnpc-2.1.20190625.ebuild 1323 BLAKE2B f8bc0853f7a47ae30c45cfa3377bfc38792a4fb171fd5aa1f8be2ef83eda84f8f244cf50a5f525ffac8daedfd036339f6daf1a5c44bd6941f0523dd09f6baaea SHA512 cf130e53ad502521880104721b5b092cab3a5841ad838a3eb1efab62bc1a1daf0c3e3e3099cea31f918ee57921b6cd21774f4867824fdf54d18d550f141964da
-EBUILD miniupnpc-2.1.20190824.ebuild 1326 BLAKE2B 340b2a3052d2fab38e382683aa71523bb69c2b9c531fd329fb9de67110a299b5a0560dbf3f0073d1fe55b12ab2ebda9d46793fc8f3654f5d1307e4691a1b256c SHA512 a014c8b229a5a93f9353b23bd5f1d3f791649ef0cfd86c73c01fd6a4784f83e3d0b86e03c009c345ed6e74fd6ebb0ca2bcc5bea1884878f280a3acdcecd95a3b
+EBUILD miniupnpc-2.1.20190824.ebuild 1324 BLAKE2B 57d051770224dbf2c954120ef139970f5bc9029ddeb89cbf2916742ea842ee4d25ac766c32d3612dbc5ac23fb6b855c05b2bdea693fb5c0c30407f1e1febc623 SHA512 51a5402b90a479404796d020406189393c38024120998b705e9cc40096a7951ab632ba2a0d47b534f20d53418c8e2afa7164fc3cf3df2b22f9eb0df523ef6ab9
+EBUILD miniupnpc-2.1.20191224.ebuild 1332 BLAKE2B 1672ad870e46535d43a6cfe2161d0db686cf48af5c27e22ec154c92378ea7daea3d083e131c328297aed339c107cf807fb4b227062e4cfbed1c30e0480f8c974 SHA512 e96a5f62149af3bbc38c696bb8acf48d301bcd6ec4337ac129bfd901064a84f4a26a1ace4e027f7f5c81f7fa0494de9ca118ffc8e56f74c61ed49eb4548a99e9
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
index 7ae2f0642764..f79efb2879c2 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
new file mode 100644
index 000000000000..cc591323e332
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 6e751942ae76..95742d2d1a74 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,10 +1,12 @@
 AUX nDPI-2.2-libcache-include.patch 819 BLAKE2B 5a0698bc19917ebfd737e886937d023e83452bfdd812010e2b2622461ca8eb6758533ecf5c1b01495eab21de72fd7f0608dd826d864336446f893d083b68ed55 SHA512 854b65c5dbdb19bd73040ed12740c945e0f31e50c51a0ebd32c646177043e28eee79e572747fe23580f7c2cca7cf59a22655f084e111bec3e146a4d4b6d941cc
-AUX nDPI-2.8-fix-pkgconfigdir.patch 321 BLAKE2B 1098b213f60fefb46c264f4092e6ac31aa3f227cdc0fc50ee6e2f5a06d1a5fb48735b0d1daeac662ade0ccfd4032837f26f4c3e6805a6cbabcff4f0f0083838f SHA512 e85fedae14902bf11e5520932d0455d517d8ce09821c72ea23afd124a490f072c8b92b0ceb73adc14a35037c3f16a04d99d691e3130d751edb55c5c13d117e68
-AUX nDPI-2.8-relative-sym.patch 691 BLAKE2B 257ee665e40fba3f6a697be8a2a3b7b9954b2b17b6117d4262c448f6bfed7e1043c09c848e8b2ae4ef8e036bceca6e4e617b12d509f34769be1b7dc150e22650 SHA512 3a415dca74bf6a9c1679d48fa469cd035aaf252d22568ff587ac8e5124b765f37795b7d806e6379905bca903e5593058c309c708c40070f45a510efa7538ca16
+AUX nDPI-2.8-fix-pkgconfigdir.patch 248 BLAKE2B c5dcef9651cfcaf1a422903d1231584b7a29c07caba193ab016c380f3cf95887c29ba709ccebfd7649d1f6469bb7116b08f1e1fc384c7e3f00c2e2ae621a3934 SHA512 b461d43ba5673310b4dc0bc37ae772dc1940c5817a6d3817bdab6e6e4a4c86d9797163f458f07417aa3b707253bcc50428b021b6e042f52480597789b92ceffb
+AUX nDPI-2.8-relative-sym.patch 618 BLAKE2B 09a859edccfea2816bdb62e68fff04f11c414a39f6237f1a4606fd88761bb38462fde9ac042352bcccb49b5da713d6f18388e7ec8d4d9a9a351caa4966ac46a8 SHA512 bede4effffd351a2bfe87251ea512c0688f97b89a344f2a91ee0860a74e67535fb611ec11c162f91dd6d612e4a268ac2f551083e790e992f38f1e3173cbc4fc8
 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
+DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
 EBUILD nDPI-2.0.ebuild 628 BLAKE2B 22d7c6797b085bd92a24e8fe85c4509c832857d10f6158a54ba2e9dfe0a0d8d3d3731def8fe3df7363d4e7b6191977f15b24a4a9010eeac1462bc9c9f8f866d9 SHA512 af0f66872a28048b36a994727c756e365a611e875976568698160ee59f1c0e6dc9401e743c1197e7dbe51e083611ac0557f18d02dde2282a769054311a49e3dc
 EBUILD nDPI-2.2.ebuild 1005 BLAKE2B 21c2bf8c4ecca6458b8023b2fd530193c2986cf6777db3d981a50b80cf22b002c3d041e70f092c917bfd4570b3bd2679a746f7f7d07c09ca406f1d9c905555c5 SHA512 97821a39be0ae0a1a58d8c9b275a674a1a2fba937588191292cfa7d8b281b3a755259e10845750ef22860d57b2d66016d56b1c680ef4741b72224ed83825227d
 EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7ba1dd651649840b39245cd470e72c16c5ca46393bc28120d52315a0685249e7a2aa7f04ded86798b69e62 SHA512 dcf8abb346221acf640f858165a5049522c20ce7919466e733f34839c943b487e9beba309e73f7ee1b7a89ffa3b95115e4c7eb51f48cb42e4c7b5430017ccbe9
-MISC metadata.xml 297 BLAKE2B 2e455c6a6ad027d81612f6f4ec28e25389848def5c8f8ad836ddb920f6b3dfb83a8038c2114194ea7cf79fb63b9ce720f946e02776b0915a41e7eaba0ae4026d SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a
+EBUILD nDPI-3.0-r1.ebuild 966 BLAKE2B c0b61a5243af862d1373a734ba8f0ffe8f95c40bb0ffac40dc72b1bca0a704eece2893d4c8d876744ee298a05243b21490f89218d9c493f7cdcd4ae4c3da2527 SHA512 8f0e6004fea392c1573477976b83de81e2bb3467bbcf4ffa18817f79c5b1cca00a6c35fbeccc753e41edbf7a8d15d1dd74bd68bd2af9d4726265c60bf8a3ebbe
+MISC metadata.xml 292 BLAKE2B 387a2816be3615c7a1430ca3888546eecd1b5c679805b87cf7975cf7d4b59a224c8edea34ca354b8bf4d793457531f6388816cdf86641fcc3f6df89432848b46 SHA512 488fc61860f278d9f7be4a6cd246eb45bac7efafe57e777f1c46984a07f132a76dcca6170b4876edea4d720f4696549b85989ae012749a00d234a0137b98ec6f
diff --git a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
index 2604b8c34d8c..f6f805bbeeb1 100644
--- a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
+++ b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2018-10-08 19:04:23.241000607 -0600
-+++ Makefile.am	2018-10-08 19:04:46.710000661 -0600
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,7 +1,7 @@
  ACLOCAL_AMFLAGS = -I m4
  SUBDIRS = src/lib example tests
diff --git a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
index b889d0546ba4..6a0230d65599 100644
--- a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
+++ b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
@@ -1,5 +1,5 @@
---- src/lib/Makefile.in.orig	2019-08-20 07:34:29.667187396 +0200
-+++ src/lib/Makefile.in	2019-08-20 07:34:40.202187657 +0200
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
 @@ -61,7 +61,7 @@
  install: $(NDPI_LIBS)
  	mkdir -p $(DESTDIR)$(libdir)
diff --git a/net-libs/nDPI/metadata.xml b/net-libs/nDPI/metadata.xml
index 7224cca2bede..fe49f07f7714 100644
--- a/net-libs/nDPI/metadata.xml
+++ b/net-libs/nDPI/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+<maintainer type='project'>
+<email>netmon@gentoo.org</email>
+</maintainer>
   <upstream>
     <remote-id type="github">ntop/nDPI</remote-id>
   </upstream>
diff --git a/net-libs/nDPI/nDPI-3.0-r1.ebuild b/net-libs/nDPI/nDPI-3.0-r1.ebuild
new file mode 100644
index 000000000000..42766ed5abf6
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 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}
+"
+
+src_prepare() {
+	sed \
+		-e "s/@NDPI_MAJOR@/$(ver_cut 1)/g" \
+		-e "s/@NDPI_MINOR@/$(ver_cut 2)/g" \
+		-e "s/@NDPI_PATCH@/$(ver_cut 3)/g" \
+		-e "s/@NDPI_VERSION_SHORT@/${PV}/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
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+}
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index 96396613dcd9..9af179f241b4 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -1,4 +1,4 @@
 DIST nghttp3-0_pre20190912.tar.gz 155172 BLAKE2B fabd472e429222502288b7a4030b4aa51f8a1b609590d63b51ab3f918b8cdb462b766a40911986b3f72f2f1b0debee1f0ebdf8802991bf4fc5d4a6d14297bdcc SHA512 89c7b40843bde9d2c2ab24211794b6ae0e1fa15413e92dcf2238b876552f29bb2f0db724d9a205c2a1c98f25a14ef570c9e53df52fb519230b6f78dcc04d2117
-EBUILD nghttp3-0_pre20190912.ebuild 947 BLAKE2B afeea5dfc3c33793175981a74c0d1485b2ab33a5a45b387054705b238d4ccbc73d282ff6163b80295ba3ab550808b8a54aec014e81655ffbe2aacdb3dd5fc614 SHA512 18999a7d0dda93632ba6d015938e60c662448e5a33324b51a44a4e577b332a9be56060cd5b148039394fb9d8d0c843c23974695119d40594ae17411835e89684
-EBUILD nghttp3-9999.ebuild 849 BLAKE2B c471dbbbc2eb5409395d310c258bcd6056cad20f1b03caeb7f64249e28c8324abf323e0d2ba3208f802a6bb258517bd6529e1c261209a49d182a8104ad307fae SHA512 8632a568e194e9101cc77a648546af1b72831d5241860a4f4868ef4f19c4d1c8dd5dfe6f86aef20a144987db6f5e3b53f7fb7de007db6f491c4d0c5f584c25e8
+EBUILD nghttp3-0_pre20190912.ebuild 951 BLAKE2B dccd37b9e789f37395247abfb6018fd9967fd7c0bef54c18d71c06d1eda16dd3ce42c1e118229e32ae7531004f8778aebd41e43177f9d7800a4348a247e6d96d SHA512 a56e3962290706a1a9e4afc9e809792a480712ff84d5b8cb69b700bc3ae044638e7a9f560e6af5f66f2705af161ee6621bf0455b14163f8dcdc499d80c0627a4
+EBUILD nghttp3-9999.ebuild 853 BLAKE2B a7c78a6d9968179edecaabe1b2db1032d8aedd2fb840a31eb7c41caf7e860f1669c4954cf86570ae713a6c1479e22a6261c0772267d59d2b4f934c84c2a60813 SHA512 c8dc975f34b9040df82389bdb738ffa57f0565d708c8b711828f501bb8fd110923d945be8c494daf03346eac1bfe337132f4cb3dd236faf4b1745233844d7d4c
 MISC metadata.xml 326 BLAKE2B 04521fe96f519c53e0a95a6a720be2e9828cb12ca5b51c6895d23e01e99d88d6b9970a5b01cdc9fc158444c01fd77e192a9071445f389df300e0fe9ec5c0d7f4 SHA512 02b24b1a01a3682c089affbba8f49eb19e1751362aa51306b9fd73e1050d465cf98511be57374321eb9b4fbb99db6c867995b9dcc1cc511b96d7286c039270bf
diff --git a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
index 82c8375e72b0..03aecea14f7e 100644
--- a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
+++ b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
@@ -33,9 +34,9 @@ multilib_src_configure() {
 		-DENABLE_EXAMPLES=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
index 7df7eb88b3ac..d6e17cdeb225 100644
--- a/net-libs/nghttp3/nghttp3-9999.ebuild
+++ b/net-libs/nghttp3/nghttp3-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
@@ -31,9 +32,9 @@ multilib_src_configure() {
 		-DENABLE_EXAMPLES=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 1e5396610e24..641d6d0a5d9b 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,4 +1,4 @@
 DIST ngtcp2-0_pre20190912.tar.gz 302984 BLAKE2B 906b248b0c19395288ed2c5ad55c8d42a9df9d76458104785c1013b9ebfaf1b92a4b87ced8755377fcb627018cf8854be0e4687e4c8a23ae994e5a21f466f739 SHA512 91b93575143960af421e8bd37d686602905fa3093750cfbbe3af1b20d743318281d22162676dc451562768ca08b6d0767b1dc28f3f8f6733235ebd76015a05bb
-EBUILD ngtcp2-0_pre20190912.ebuild 1089 BLAKE2B 87104a4d0946a667ff4e4997350affa18318f4d9233db6f7b50ea646aa91554818461dcf213265ed3940b0b754d118b324e9cad587f55be9c2734d71fca2dd38 SHA512 2a96a3cd7a968fac86362ec39a26e153be63fe7abd818ba331abb4125d46a23193a1f62ab1becc80cf50bb92458bbb4df9a8f5e9e98f4e119d77bb61c01282a9
-EBUILD ngtcp2-9999.ebuild 991 BLAKE2B f3fdcc8b88a65d6dc1a80acc39b574a37a63f11c11f7c672e5061121b55312939a7212ccd5235f0be3aa994488ec22b71c79cb8c506c2542933227632a8752af SHA512 3e362e28fa00341c749d688a382ec7e4ce2a9c5323d6009fd36c2abd9f84801cfa5dc4f0054e8863a71cccc00f8f6b44db8e8087d7f0cc463a3635ab47862445
+EBUILD ngtcp2-0_pre20190912.ebuild 1093 BLAKE2B 4d1a0670e39ed662ca3bed0b64c540ef7d01b306cd7798f1ad5f095b5e7db922b37d4c09cd23f005936cc572737998e3886bac8ac30aa23ce123b38967aa7337 SHA512 de5616b35787c7759d7cbef99cf21314397491693c0f397889f4fff1b7c4790641d6e4efe05156202dd981b4a9a894231768ad742599aa5b1176b1f880b6e1ed
+EBUILD ngtcp2-9999.ebuild 995 BLAKE2B ccf3e815dff35405ba6bd231e52f151e22c298dd4fae98cc27cc4c1d8a8ff28fe402c052ce910ed91174c19853d20d9b07ffe3cc15b7c97fccddef3eb0d332be SHA512 2b8f267c9067e6e704ed43b52b0c54bbba522c8b877808ae2cd49893ef22819a1eb2360a42dfd6d85bc1d0cd0679b82b1ed4737fe77078909b9957ade122b510
 MISC metadata.xml 326 BLAKE2B 04521fe96f519c53e0a95a6a720be2e9828cb12ca5b51c6895d23e01e99d88d6b9970a5b01cdc9fc158444c01fd77e192a9071445f389df300e0fe9ec5c0d7f4 SHA512 02b24b1a01a3682c089affbba8f49eb19e1751362aa51306b9fd73e1050d465cf98511be57374321eb9b4fbb99db6c867995b9dcc1cc511b96d7286c039270bf
diff --git a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
index 044390610304..b5cafbd8d8df 100644
--- a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
@@ -35,9 +36,9 @@ multilib_src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index 43db6bf28c55..8031a8e7028a 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
@@ -33,9 +34,9 @@ multilib_src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 566e1202ee1e..adbc0175d562 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,22 +2,26 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v10.17.0.tar.xz 21514260 BLAKE2B a37793d78e14d1d2ca861c39f27c5e1dbb47ad26f14aa97139fd9f9be039bd47e528f10c9977725f1ca4b5f4e31a1066715091ffaa488f764c67290bc1c84541 SHA512 4eec936fa8d848b7e261f83b6e25c1bfb06355a7146dcca91b0f64fc401ca32dd1b0758c127b81be7f0d1cc59c3b24b4ec2c17282b4bdb91c5bf71f42f2f7cbc
+DIST node-v10.18.0.tar.xz 21913328 BLAKE2B 84b0b5157671dcc3e96bb2cfd11e085251fd2942c03b27491f712f5603797bab7503d8f7c0eb45ca8e348b20a0555c1767d4d1964fff474c8590a47eb01523a5 SHA512 8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c
+DIST node-v10.18.1.tar.xz 21920068 BLAKE2B 9dc0887a33f0888a347628e5bf15eb3687f15cba264a00317a15336fda48e41da9b4c45df6d0f223f2017c6b55b99eda0c4cd6f5913673da29c52a61450d03e2 SHA512 0979d264ef5286caea61a527771e2ac2fbe1b909a151061dbb7d9e0fde9461edd76b6060f55cfbd49d3ae2e7e10595a2eb4d2e98182e735e7df10940120fb9b6
 DIST node-v12.13.0.tar.xz 22862096 BLAKE2B b0121f45b535bac7baa0103db538070b4beb4b40a6c871c217eebfb1abb5a7821d83d46946047b3385af182f901c0390eb85134c9201be2d03b5745b297271f8 SHA512 a7aa8b1f010ea1df122d9d7b88ee0a9d10e0d79ae2f3d18c706ac6ce36e2e2039c21ea6f3dba3a22a79ed3f6069850a8a3c463dbd64e1e8f4a9dbe8901a89cc8
-DIST node-v12.13.1.tar.xz 22854348 BLAKE2B d1cce8d367db93d47fee45209547bd29d9574240d9bc00b8dd0e66572f79478d96a03e6e25495f710410670c4fc3942bae61dbe918811c84e3543d219cf2dcf7 SHA512 439116a8610686d59fa7b5ee214fb3c3995d5555de3e03dd057610d0bffae9e4ae4d8c738878b6827a46654acaffe59490c4cdd8a21f913ac5fd9d720cb1ed29
-DIST node-v13.0.1.tar.xz 31986844 BLAKE2B f30937878ef68fe94b69912b994b84c03d75fd92e243d77453cfa7d335e9e1a37ce4f18eb1cbba141ff9a017a777e31ae64261f46dbf17d1f6ff0d6d5c263a2a SHA512 a39a64761ef3867379f3a2ef230f65ddeb91fb93d8833c1ada7312588fd75d060f4d73df1a106f7d7cc08886ac7c5335d453e4d882c8cdde28a25a0a8cbcbfa6
-DIST node-v13.1.0.tar.xz 31981260 BLAKE2B a7c9a8d851b22f3cb24132adad0c0e971401c1555951fffc2bd69b3b8bcfc295fdebde6918a467203c30bd62f883f5997f6ec57c7197854187ef78a56e52a8e8 SHA512 fa05064980c47f58b6f3e3590ca94b45850184c86d79cc2f1e489222685cb38ca7c8e0e7bc7b9dceec1148256c2ae7bcf3ddc6468c6b366a4281d77c1c20b699
-DIST node-v13.2.0.tar.xz 32219304 BLAKE2B 89cc3a80c2c75441038d7993c1a435842b4565728771e1a3d28d0939e50abd3032564d3ea694272cd79cee2c0f7fae4037c162d3b8b29122d2072fb75134af87 SHA512 7d1653f67d1c833bf459b2689a2780d3b6ebdeddf66f6c8c9aa3b3e9f0e438d29939875dee90766e41b70c9b82377774fa177c736095e0783a111d2f43db1920
-DIST node-v13.3.0.tar.xz 32312032 BLAKE2B 833e3f06aaf59aa0b7a2ed87a268877ad047f7d9b8dedfc8f9441e3318e6746709915f10446d781cd4054a2cbb32f3372caec96871244589f0dd067aaa7ab5de SHA512 82e30fc342101230b69227ecd6fbf0078194ad6f48b3ba51689bf958dba554183beca3a3ea4f658faedee4ed645b6e129c24bc267a25727372bae7650755c571
+DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b
+DIST node-v12.14.1.tar.xz 23258936 BLAKE2B 125289ce3e342c2e5e7bbb6f0b1af109f0ba8fbf2d6630f2cdc4aa31c25a3d846afe773e84daed9824360a6680a2d21378af4fbc42c6337399a143f92850a82f SHA512 2e2b6fa8351b59450ab5491b5e31dc36ce4d9be13c55a14e6e4d95a82cc8334f9fc35261a56a8843903f8021ff333a333bb4d5f24c92b5d7483d4779c3d88342
+DIST node-v13.5.0.tar.xz 32706024 BLAKE2B 570b2d676919cb333e2f36529e886039f7abfc4f7cd705cabbb2a1115918aa9ffc9d1e54a90e8deac09488f248c007721c090ed0500f113af81b2cda2e8248be SHA512 85bad55334e6ef63be0dbf90cef856c0a0835aa1b32e6ffc418b6a52f88f7ee266505f769f4204c000c766869cd85f7d914c9a3592dd52bcabdb6cb906f433e3
+DIST node-v13.6.0.tar.xz 32706824 BLAKE2B 69e66354570e057fe215830a2d5bd157e5decfd1e58e4ead4304e0dfcf64e5adfe48503f3bf54afe2cc27df581a0f2ae79e9b730257ceb70c412bd2a47fa5603 SHA512 e7dc8356ac1b167cc32055e209f13cee82c9251440b6a6cc99b26c91f9625e11bd025cfc1c22b6ece95ea178640209a7c8700d678678b3e8bad26080aa2762c6
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.16.2.tar.xz 18531368 BLAKE2B aec2f6257ab9237097e590b70b2e8615b664576b3af2f176260f26460f4f50bb1e00c2aff477a32cdb9ebf83f8b4eadc3ccdc2df431e359904fe4375513fb6c1 SHA512 8b0d4a089a5c80869971ceeffbef3ca03f4de4f53452a9fd16cbd189e5d76c7fdef475c144848c8d657256b41e342c020e11f6acd1880dde92ed0d0e8cf9e600
+DIST node-v8.17.0.tar.xz 19013844 BLAKE2B 2f35f61ccc2d67132441dace8b59df6565e5df9e14e6798ab0cb0a024493182881708368248964db30e1213fa7b66301bd73b5146944129d7b14cd2b5b1a9583 SHA512 9f7b0b5695e882b4f727802ad855d398da596f908e64263902781e01f6222a4044be48c104eb76182ddb525dedfc4b28ccd07d64dfa126c462a248d9e8b49fca
 EBUILD nodejs-10.17.0.ebuild 6276 BLAKE2B 4e823d8a4f8a994a1ef908d1203d22106be9432f0177cdb88ec1983b6d505a824db35c0c55f59b9af0a9b706bcfb6eb91f337eec5ef28eb109122906bebdfb13 SHA512 9a454f61424ff36a9d84d45c61a366589bbc28e8e4d5bef5341942e9f19a551656e08c7298fa86191c46943230874535155616b553f14094b246ee80a74387b6
+EBUILD nodejs-10.18.0.ebuild 6277 BLAKE2B 61dfe9c3790bb0eaff12b63b78e00c29e0374e57b1ae8d0b110798044dba2657a1dcf14c42df70044d47b1d1db5bb8fedd79df2dd0f98fdb2f2d8a106642aa8e SHA512 0b04c45ec19447fb35aa9bf3e49eb833ac29d742d8187b2bb54330949c768b3dbb11f40800a70f0612ac6fb6ea760d5f92661912d54eca61f7e1a816c8c5a6cd
+EBUILD nodejs-10.18.1.ebuild 6279 BLAKE2B a620b05278a18edf70fb786e6840238a38b780469479cd9c8fb18deb8c0d89202c0e1ae324b04362538ba1059d6e049e1b7da52f02592a82edf94cc53991e100 SHA512 b243a92aff7c7b3c93321a910c180ae2b26cef726ff96232edfa87352ae38d16ad9fec439428233070df72ba5cfde6a5560a4c798b67b417866b2285af211342
 EBUILD nodejs-12.13.0.ebuild 6400 BLAKE2B 75df2ea0fa35af0d75c67f5ea2fb3c7b6cffb64756d25638f714156d30aeb9b43caecf74f24c344b287926cf9af8a1b48e8b089055f310de4d076631e2c34e90 SHA512 fedcbedb6ca35bbd3ab50f811bfa8747305241cfeea554d5a5f4e8a4ffbf726d6f0630633dcb21523211094bdc5da52484cd5162c343aa419bdc50d6ac448258
-EBUILD nodejs-12.13.1.ebuild 6121 BLAKE2B 9d98d4799fe0a2f1f805164a990d7581145800c4446c08bf35d188ded8a546245f5ffa1a6874a865b71d6bb4de9aa36c1ee3d37eaec9df5e9b340bd3fe72bb98 SHA512 8668e731ad11521c9184fe5af34cc8feffaa2e19315e37f8378873721eab7e11979889f55d65248bb3f2fb7bf9a1e06c7075aa8ac307d12176da9c05e780fa21
-EBUILD nodejs-13.0.1.ebuild 6018 BLAKE2B b716eb86763201578359efb5d3894716d5cc3e7abddecd407942b21fedc6b32b05281a279ec6c7455b2b362958f01af19b87b8e50c2b112b08d74bb6c15732ac SHA512 5364a2c63a0a9f16e036c4258e60a26e6a6c222ce6273adf724124c020ff11dfb5b3c89bba08db0c026aaef68b024a992886a89ab1659ddc473e6790de4afedf
-EBUILD nodejs-13.1.0.ebuild 6018 BLAKE2B b716eb86763201578359efb5d3894716d5cc3e7abddecd407942b21fedc6b32b05281a279ec6c7455b2b362958f01af19b87b8e50c2b112b08d74bb6c15732ac SHA512 5364a2c63a0a9f16e036c4258e60a26e6a6c222ce6273adf724124c020ff11dfb5b3c89bba08db0c026aaef68b024a992886a89ab1659ddc473e6790de4afedf
-EBUILD nodejs-13.2.0.ebuild 6142 BLAKE2B 8e498e3b2acec711bf7578d5488f0788ec46d7425cba5a8684244f0c4eec852b84b2d0a8efc8d52cb0415cf4bfb68a9a5ad590a58a1faa1879c337df66932908 SHA512 399d34f0bb5504901c228e523955946658b54f00e3fb111d1b419af979b05308194659d460ce9397ce64cbb3393d13a6d8d64f30df1d97a40e5b722604af7834
-EBUILD nodejs-13.3.0.ebuild 6142 BLAKE2B 8e498e3b2acec711bf7578d5488f0788ec46d7425cba5a8684244f0c4eec852b84b2d0a8efc8d52cb0415cf4bfb68a9a5ad590a58a1faa1879c337df66932908 SHA512 399d34f0bb5504901c228e523955946658b54f00e3fb111d1b419af979b05308194659d460ce9397ce64cbb3393d13a6d8d64f30df1d97a40e5b722604af7834
+EBUILD nodejs-12.14.0.ebuild 6117 BLAKE2B ec310e1d1e50cf9f48ff6cf7a5bb98fe2239b20e5495ee5902f6a3caf151ddd725d90d8890f8f42024f4a9bd2f9dc298864847376d81bf79adbf2e6d16ad936f SHA512 5fc8e7a8eebb8e81160f56457183bbc3d946990960d96a010382ef809aa0c1d3d40b2868c27f37119049a6e70ab72931bfaf52b641f5a4390a8aa8e62a69f282
+EBUILD nodejs-12.14.1.ebuild 6119 BLAKE2B 10f8e3c7ef7db2c00fdecc6305bd4928a26a4283613878e8486a18e497c310174033a3f1df31289b6aaa3a2b027f0cbce5568ace197716f9188744fe1a07d773 SHA512 132399c18b562103ac953e2d8fbf6a2045fd9de8902b454774e2d14794ce2818601e09b29bac4abb0fa546108c32d6fa73928375bb78c627cac91468947e1d43
+EBUILD nodejs-13.5.0-r1.ebuild 6140 BLAKE2B 4bad792ead15e0999b02dfe46690cf57ce3fc8fd13f3b6986d26f3046bd22ddbea49eb3a85138a0b0c71d17a8d396dd9e4ff646abd14ef2a62e8c93d95127003 SHA512 8c8a81c2d700105026ba30dd6703aa265554843db7fa9b0673b2641d3a1d6cdb9e1f5904e4dd9558f45ca51a188bc6847cf9bb6f474d92c11e7e2918669db671
+EBUILD nodejs-13.6.0.ebuild 6140 BLAKE2B 4bad792ead15e0999b02dfe46690cf57ce3fc8fd13f3b6986d26f3046bd22ddbea49eb3a85138a0b0c71d17a8d396dd9e4ff646abd14ef2a62e8c93d95127003 SHA512 8c8a81c2d700105026ba30dd6703aa265554843db7fa9b0673b2641d3a1d6cdb9e1f5904e4dd9558f45ca51a188bc6847cf9bb6f474d92c11e7e2918669db671
 EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513
 EBUILD nodejs-8.16.2.ebuild 6474 BLAKE2B 1b3ea27bebebac7a516162ea1dfd59c68498e9e49d6c4cb2e54967f0307c01015c6ab4aa4bfb3fff0eed6a22961cee4e74972e85c34af7a2ba4b2625448935e9 SHA512 14f1524bee2fa4bfd31330d2b22ca65c978b74c6702c6991c687412c95b6102c292a9e29adb7ffecd57aa55216ec47ed3881a9ff646605dc9f74d6d8add9b934
-EBUILD nodejs-99999999.ebuild 6058 BLAKE2B e16f4325cbc184a1eac2723e0f1226b6fe06567c4df9596cc029c4b25045c8831457e0266d01f2b76e8f76f04e2254a53a6771a158cf9c8d3bc6a054b6e9ba35 SHA512 50a998e065cac9b2c54066e01bc7646a9506154045ade60ff83711136765cd7441781223af3804154a1ab9a476d110c58c98e5bf157b1a8559e0d1ebfb1c34be
+EBUILD nodejs-8.17.0.ebuild 6475 BLAKE2B bd281b428f5155ea409955137da219ef268ceda5922ca2fab9e9f80daa96529e061811f6e703c103cdd8912824dbe87dd28cc7d2d274ecdc1667cccbe80d43c9 SHA512 a6b43f8a0557e0e0dad52374d3b355e80c2e1f46440f9dd1c5668a202df58b1e0ac68d67a0574cca0da6c2e0019cc9d1a1475555491e9535dc333808a1e5ef0c
+EBUILD nodejs-99999999.ebuild 6056 BLAKE2B 2a9d1878477e764d612ff1c11aac1d02f322ad883e9460d9bfc6c546686267329c3abcaf6d912240034e52203b3de0f6ba971de93787472fb6f2632efa37c675 SHA512 1d0c40133c8a2d29cba56c4fffde03fc50f8f495313241923e4cc9043ccec746921ccd235682d3130792fce12318d001186b0630c38dab7e533dbdaefc1f8731
 MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4
diff --git a/net-libs/nodejs/nodejs-10.18.0.ebuild b/net-libs/nodejs/nodejs-10.18.0.ebuild
new file mode 100644
index 000000000000..a476e3597956
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.18.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=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit bash-completion-r1 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 +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.28.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || 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 deps/v8/gypfiles/toolchain.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
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	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" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	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 "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-13.0.1.ebuild b/net-libs/nodejs/nodejs-10.18.1.ebuild
index 56bbeb5526f4..489857c39f97 100644
--- a/net-libs/nodejs/nodejs-13.0.1.ebuild
+++ b/net-libs/nodejs/nodejs-10.18.1.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads(+)"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
 inherit bash-completion-r1 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
-"
+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"
@@ -22,21 +20,20 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.33.1:=
+	>=dev-libs/libuv-1.28.0:=
 	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
-BDEPEND="
+DEPEND="
+	${RDEPEND}
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
-DEPEND="
-	${RDEPEND}
-"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 )
@@ -60,6 +57,10 @@ src_prepare() {
 	# https://code.google.com/p/gyp/issues/detail?id=260
 	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
 
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
 	# less verbose install output (stating the same as portage, basically)
 	sed -i -e "/print/d" tools/install.py || die
 
@@ -71,7 +72,7 @@ src_prepare() {
 	# 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
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.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).
@@ -92,15 +93,13 @@ src_prepare() {
 src_configure() {
 	xdg_environment_reset
 
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
 
 	local myarch=""
 	case ${ABI} in
@@ -116,7 +115,7 @@ src_configure() {
 	GYP_DEFINES="linux_use_gold_flags=0
 		linux_use_bundled_binutils=0
 		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
+	"${PYTHON}" configure \
 		--prefix="${EPREFIX}"/usr \
 		--dest-cpu=${myarch} \
 		$(use_with systemtap dtrace) \
@@ -131,8 +130,7 @@ src_compile() {
 
 src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
+	emake install DESTDIR="${D}"
 	pax-mark -m "${ED}"/usr/bin/node
 
 	# set up a symlink structure that node-gyp expects..
@@ -184,19 +182,19 @@ src_install() {
 			\) \) -exec rm -rf "{}" \;
 	fi
 
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
 }
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
 }
diff --git a/net-libs/nodejs/nodejs-13.1.0.ebuild b/net-libs/nodejs/nodejs-12.14.0.ebuild
index 56bbeb5526f4..8468a27e2219 100644
--- a/net-libs/nodejs/nodejs-13.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.14.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -24,6 +24,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.33.1:=
 	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
@@ -39,6 +40,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
@@ -93,7 +95,11 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
@@ -189,7 +195,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-12.13.1.ebuild b/net-libs/nodejs/nodejs-12.14.1.ebuild
index 93881fe7882e..a9a42fa11ba4 100644
--- a/net-libs/nodejs/nodejs-12.13.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.14.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-libs/libuv-1.33.1:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.39.2
+	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
diff --git a/net-libs/nodejs/nodejs-13.2.0.ebuild b/net-libs/nodejs/nodejs-13.5.0-r1.ebuild
index 8013ab7c39ae..3f434606d2fe 100644
--- a/net-libs/nodejs/nodejs-13.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.5.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -22,9 +22,9 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.33.1:=
+	>=dev-libs/libuv-1.34.0:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/nghttp2-1.39.2
+	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
diff --git a/net-libs/nodejs/nodejs-13.3.0.ebuild b/net-libs/nodejs/nodejs-13.6.0.ebuild
index 8013ab7c39ae..3f434606d2fe 100644
--- a/net-libs/nodejs/nodejs-13.3.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -22,9 +22,9 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.33.1:=
+	>=dev-libs/libuv-1.34.0:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/nghttp2-1.39.2
+	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
diff --git a/net-libs/nodejs/nodejs-8.17.0.ebuild b/net-libs/nodejs/nodejs-8.17.0.ebuild
new file mode 100644
index 000000000000..18be7b6849fc
--- /dev/null
+++ b/net-libs/nodejs/nodejs-8.17.0.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 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 +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.2:=
+	>=net-dns/c-ares-1.10.1
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-60.1:= )
+	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || 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" \
+		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
+		tools/install.py || die
+
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js 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 deps/v8/gypfiles/toolchain.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
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	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" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	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
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		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
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index ff8d2952c984..8ea61c3c118d 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -21,7 +21,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.33.1:=
+	>=dev-libs/libuv-1.34.0:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 108f6d57f7e8..c1261c9f7be1 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,7 +1,7 @@
 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
-EBUILD ntirpc-1.7.1.ebuild 742 BLAKE2B 6c65b2bb30cde7ee1d36fffaaa93fa4ab7afed246d90de97e3410847e0680bddc27a61e30af8cbfd3000d1ce320dc4a179a2d235fda183c36e20d61589341e67 SHA512 8d3a8a5131dea9db88ab3d7a34957478f44e8e628cf176419840fda945c4de02ddfad777c4f3095839b83a8021bd73c05722ab255f78b64525b79ab2dda611dd
-EBUILD ntirpc-1.7.4.ebuild 740 BLAKE2B 8e1539462ffe6a0b6700fb29dc7a3dbfa389e757e8d862c3581a199b317b10460f7fc293a6ad503cb677a13b03d9a7fc520ae4fda0b06657d60b91c5dd6eee3b SHA512 603d21ff32cff6fd08fed345797d7f0b6f7481ceb7249e06a6cc0db66af03b72af91283484175eedf00b6835669f056ff6e2b2ea5fc88e6e1cd54510b40bc635
-EBUILD ntirpc-3.0.ebuild 770 BLAKE2B c425aa769bdebe375fceb3e53e87defb13ed93e58570affaf0a88519ebf7e708f432347fa8bb97fe74269cac0f74fe37152031f424720fa81170728a108a4498 SHA512 6478f2766d035205bdd5a38bb8b1214dfb49828f4a9215a83ddddbc18a591232b6969a8a850535ffd24204ec43b66186fbc2965e2e4949e4c8da41236133afa1
+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
 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c
diff --git a/net-libs/ntirpc/ntirpc-1.7.1.ebuild b/net-libs/ntirpc/ntirpc-1.7.1.ebuild
index 07720adb2490..888c3fea1167 100644
--- a/net-libs/ntirpc/ntirpc-1.7.1.ebuild
+++ b/net-libs/ntirpc/ntirpc-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,7 +7,7 @@ inherit cmake-multilib
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-libs/ntirpc/ntirpc-1.7.4.ebuild b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
index a6136e935816..97b6f9397aba 100644
--- a/net-libs/ntirpc/ntirpc-1.7.4.ebuild
+++ b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
@@ -7,7 +7,7 @@ inherit cmake-multilib
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-libs/ntirpc/ntirpc-3.0.ebuild b/net-libs/ntirpc/ntirpc-3.0.ebuild
index f492c2991f56..660a94304bdd 100644
--- a/net-libs/ntirpc/ntirpc-3.0.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake-multilib
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest
index 7f42651559ee..66999b8c21d3 100644
--- a/net-libs/pacparser/Manifest
+++ b/net-libs/pacparser/Manifest
@@ -1,3 +1,3 @@
 DIST pacparser-1.3.7.tar.gz 905596 BLAKE2B 122127b6e1d8f68fde4c5ca98207bf2a0fa2a081dbb60aaf34126700a3de9d861e7b5f881e78d3eefdd2a9af97a9ba677339ca2b2a0b4459d26e60a62226e839 SHA512 979238204cd352ecf502a5a6216a35d7c47e82a173c32c6f0a5166f1fe790c66ac74ec1d9d0a58b54038d19e893f8b365ed868664f84ab9d5e653584bf20130b
-EBUILD pacparser-1.3.7.ebuild 1595 BLAKE2B afd77f76ae43a70ca495ca2a40213ed3c491882af0d226fa6ed16cc28e1793cd4e7ffbe285db410f887d9ee357ea22479da96528e8d75d7b60885748f8c8134d SHA512 0034bf23286c3e8f020c7890e792fae634909bac00919eb569a0b4e4da6cab37d2202fafeca8ed87772eae2b0079ea456289378a499650d769e6687b42358051
+EBUILD pacparser-1.3.7.ebuild 1591 BLAKE2B 1453b6513e6fab091a5fe35aabc31452ddb0b774b32d3d36d9ed1d2b7f91e55eda78247d5e70b1262f8adb36b031e7982dd0b2827c7cd399c1041ae46033181f SHA512 3b6c735fcddc0fc07e392460d646478429261b96257b7e27f70773b8a6fbd871740b551b113c465059051ffd58a7d035ad9a06eceb2b0cc71a711dc191155a3c
 MISC metadata.xml 1156 BLAKE2B 6c4e195b94172823c0dc6bbf426c2d8a31d83a0bb7044efa92b9f07f846fa7a2e0ecd4f49678eb517ddeaca43f18942ca9256bc92909cbd1242ed2cfbdbc39de SHA512 e391221061937896f5f27a4d77f959756afdfd1c58f47f4ac5d27e2f289ca70bd7907c86efc6114ec02d03b6f5a88fd3b8d5755bf97dae6e613d7835f2c71704
diff --git a/net-libs/pacparser/pacparser-1.3.7.ebuild b/net-libs/pacparser/pacparser-1.3.7.ebuild
index 29e87f0c1277..b3f0ea0502e4 100644
--- a/net-libs/pacparser/pacparser-1.3.7.ebuild
+++ b/net-libs/pacparser/pacparser-1.3.7.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
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils python-r1 toolchain-funcs
 
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index db465397bb51..6aa2308b561f 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -7,6 +7,6 @@ DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
 EBUILD pjproject-2.7.1.ebuild 2614 BLAKE2B 10ee58a83d0ebce1fe52bfe395bd319e08a4128364f7fbf889d0d089daef222859992b12786bf0796d6bf77f599a9dcc9dc9800253d4e781069a9587efe07259 SHA512 2bd916ffdc6449e3fc62fd4aa1d3dee7634a97351b369e896384b46316e089185121c39efb8fa30143745c6c91ccd001c797cd0f13020481769dc3bf0e196e8f
-EBUILD pjproject-2.7.2.ebuild 2755 BLAKE2B efbca2a7da848ea23594811a1ae9636ac15010f1ee7228b821237076d3d497d0aa240c15cdce4f14619138acef073aa86670b5bfba051c027532c04e3a524bb8 SHA512 f1ccce719dc7b0e7c667cccd0c9137115089d0ef882949994918215068913369843391490ee407bd2c164204a0241b55b87c6b63b75c5160c3402d46fa42a964
-EBUILD pjproject-2.9.ebuild 3030 BLAKE2B 1418bc3c0973a06f109f3b5afa61418074676354755b6878ac6908cae06b452852703d9de60acd45de5282883f40a3b0d202c3c2fd1aae18a31bb8b97345bdd3 SHA512 9f8481927212966ae472220fce138e211779bb7ce453795f5c0376434713180ebee985ec029e39c2cbd0ee87e165bceabd1494a7198ff20f146febace1715b5d
+EBUILD pjproject-2.7.2-r1.ebuild 2752 BLAKE2B eda52740056669b8a86a9917031672cf359af5e45e3965f522e6b2551577068249de51b877abf58a569edffe1e847c4adf6b0515fdac0d90319d364ed145581d SHA512 d20c175fcd85526ae3fbccbef8bd958d9f22bbe476412d45a7cecc31a7b62ecc32e2ac570d24930c083ef0e3c3b0c8593b7dadfc28fb72d8ea56e80a7b28777f
+EBUILD pjproject-2.9-r1.ebuild 3027 BLAKE2B 07645f7555e389c0cbb749f790363cc00dbe649e4a64e6d1ae86d03e4f6249971f0326414f4673cf06917eb68d4dea0b5e7640f6343bd025ab0346b44320b498 SHA512 a8ff33d4ac36bca70ef47d6ba76330c29e033c901bbb40c868bcd1bf002c81e7376dd711b8ce93b7c7d68a9a49ce90b50d23a590da8e3c37a97b04fc4bc16004
 MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
index 141fa9edf647..3b320d329fc8 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2-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=6
@@ -28,7 +28,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 
 	amr? ( media-libs/opencore-amr )
 	gsm? ( media-sound/gsm )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
+	ilbc? ( media-libs/libilbc )
 	opus? ( media-libs/opus )
 	speex? ( media-libs/speexdsp )
 
diff --git a/net-libs/pjproject/pjproject-2.9.ebuild b/net-libs/pjproject/pjproject-2.9-r1.ebuild
index 5a4d582b1e2e..b5d5bbcf318c 100644
--- a/net-libs/pjproject/pjproject-2.9.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-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
@@ -33,7 +33,7 @@ RDEPEND="net-libs/libsrtp:=
 	ffmpeg? ( virtual/ffmpeg:= )
 	g729? ( media-libs/bcg729 )
 	gsm? ( media-sound/gsm )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
+	ilbc? ( media-libs/libilbc )
 	openh264? ( media-libs/openh264 )
 	opus? ( media-libs/opus )
 	portaudio? ( media-libs/portaudio )
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 941dc0d41a47..6ea8b8737b79 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -1,18 +1,25 @@
 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 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.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 byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 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 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
@@ -20,10 +27,15 @@ DIST cmake-0.1.42.crate 14266 BLAKE2B eab3de3a5a482f58dcf72809f63109605d71e1376e
 DIST criterion-0.3.0.crate 87281 BLAKE2B 9c246cc4cb4a9007add5d73058ecbac64f8f9093d2272f21b311be2704ef129bbffe24717de10c4b061e0787febca2aab60b141b2bf94e81d3a45a7eb99a0f14 SHA512 d1110f0699493281013980dbeeccb93553e4147e138bde7ab4a6bffcd522385fb74e8f3f15c2bac32661c56fc720ba808e6483223ca4cae05b2a1da7307de620
 DIST criterion-plot-0.4.0.crate 17204 BLAKE2B dbde14b2a7e3bcfc41886aade72c88f31835b0739dcc0d745233c4b936693cba3638ac5f60a47355f37f9caab2f6addd86c8ef1881c21899dfd43491b24dbeab SHA512 06e46dd31ebdd83621bab4b108892b366566ca6819db4a7832cb24fe5bb2155ce086ec97f282a6fb5aa1e1103de2c2d8a42a69b71af20cd62f49e51994c21864
 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-epoch-0.7.2.crate 38134 BLAKE2B 1a71b24f507e95c9552a3d5906bdfa77add4723144e1f5275dad65a5de7cd82305eb2c4ad0d99b3f08a06ce050dbcfefff08790a4a65744f4d578c7106abc671 SHA512 672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8
+DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
 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 csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
+DIST csv-1.1.2.crate 890778 BLAKE2B ac04af5edff7054c557f50c5fca153286fe6f9045cf12733bebbd377a7dea22e8a916eebfd72e17e0b8a4ce1446488572bcceffd28259635796e587c73cdcde5 SHA512 51c3309b3e4ea6b9c20881fd871dd26fbabc579dd06d714e979357a6073622781434a9f89b9cafc04f8528c9a058c3464516329f7db54b8b0f1c469b50e4cbb4
 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
@@ -34,42 +46,57 @@ DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e
 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 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 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 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 log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 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 miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
 DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
 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.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 percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 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 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 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 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 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-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
@@ -77,31 +104,42 @@ DIST ring-0.16.9.crate 5319964 BLAKE2B b1f3807beecc2aefce36ae605c94cf056483ea47f
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
 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_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_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
 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 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.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 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 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.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-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
@@ -109,20 +147,28 @@ DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53a
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 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-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-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-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-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-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 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 weedle-0.10.0.crate 34686 BLAKE2B 9592932b38543c700717dbc1ea2852acc4fc73cc9c6550e4abdec6d230c7e4a2e01663643222a5fe025767d83d0a802be74a9798fcb57083dd795b513a64ade2 SHA512 c7e5ca778af68d69284cc93556a67884adbc437aae32f85ef305bb9489a5181dd3b77ded68657c1d3a088386586ead4830707a8e6bc0c912c953e1a74ded49ad
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
@@ -132,7 +178,8 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 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 3988 BLAKE2B 39f2e25701cf7bd72fac25257f43088dc51f19fcfd24bb0e031615c307fadb670b0a7940c7dc6deff0d8e35f4e0abd2f5b8d460626ce25aac051f5649850b505 SHA512 9c00fad5edadc7d28662872ecc947889921a221e3ba91ceaf0d672549d105c571013cdc37eaf08e0c7cf6af9397d3488431a146e56f5c39c5b8d5de329707bd6
+EBUILD quiche-0.1.0-r1.ebuild 3987 BLAKE2B 62ae63b2c66ebddf1dd2b9e8181f8d45a7afa8dbe9afb9c22957a1efae593f7125447312c7555f1712dee0c40f4f0385f3025f34918b10a7bda9312fa3b7bd28 SHA512 a5a721db4b9364cd2ffb272b7e94986271c5db7dee39d3970aa750754a96696f44b0a2cb815712089e58a77dbc8e8c53714a045af2db3aa2cbb46d92fcaab61d
 EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3776 BLAKE2B 78ea083d45b9426a5920160e1faafa0cc0057c7dd1e6f6af5a166be875419eb11b7f2fd5a7884823a42a6c0c7e62863301d71bc40074782ac31de8e9678f5e11 SHA512 b918a7ad17decc581f18944007827b88fb524ddb5848f0cd6dbfc9c74334cc276578ddf29cd504c6108429d27e49c12f45558bf5d169ec66528a92df7ed31bca
-EBUILD quiche-9999.ebuild 3987 BLAKE2B f9fa4525be4439f8ac2b8526a9223352289896b939bc96bb313f011996429d8f917c050fe654aa811848210bbbb1c66f6a35566ae767c73e31f076e7102a1991 SHA512 c89f95f983dc18c08add4031158b8b5d40a233e5dde382717d2325489d8a534531c2eaedf61d28937922c34a61ba2c4bed461c1b30b4e0c4b4d135ec0b2d6779
+EBUILD quiche-0.2.0.ebuild 4043 BLAKE2B cda6c553d2d371850e5dd6e5cabd7404e9cea7de39568482391b240bb3f1bcf643a6223400627e96434b8be8341f5ecfa07eb25f26d3090b8800adb54926f35d SHA512 63adf493f46663254cf678ce901b40f4b2e0fe290718b247a4055c3a5e819f765db9a5af48448bb9d6428f89c60d0acda912f0743214eb0cc3bb00de344db441
+EBUILD quiche-9999.ebuild 4043 BLAKE2B cda6c553d2d371850e5dd6e5cabd7404e9cea7de39568482391b240bb3f1bcf643a6223400627e96434b8be8341f5ecfa07eb25f26d3090b8800adb54926f35d SHA512 63adf493f46663254cf678ce901b40f4b2e0fe290718b247a4055c3a5e819f765db9a5af48448bb9d6428f89c60d0acda912f0743214eb0cc3bb00de344db441
 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
index 68ddc23bf7a3..1caba1ec4de6 100644
--- a/net-libs/quiche/quiche-0.1.0-r1.ebuild
+++ b/net-libs/quiche/quiche-0.1.0-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
@@ -151,7 +151,7 @@ IUSE=""
 DOCS=( CODEOWNERS  COPYING README.md )
 
 BDEPEND="
-	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
+	>=virtual/rust-1.38.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
 	dev-lang/go
 	dev-lang/perl
diff --git a/net-libs/quiche/quiche-0.2.0.ebuild b/net-libs/quiche/quiche-0.2.0.ebuild
new file mode 100644
index 000000000000..f288474ca16b
--- /dev/null
+++ b/net-libs/quiche/quiche-0.2.0.ebuild
@@ -0,0 +1,206 @@
+# 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-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index f641b6907a83..f288474ca16b 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -1,116 +1,118 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.13
-autocfg-0.1.6
+atty-0.2.14
+autocfg-0.1.7
 backtrace-0.3.37
 backtrace-sys-0.1.31
-bitflags-1.1.0
+bitflags-1.2.1
 bstr-0.2.8
-bumpalo-2.6.0
+bumpalo-3.1.2
 byteorder-1.3.2
-cast-0.2.2
-cc-1.0.45
-cfg-if-0.1.9
+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.1
-crossbeam-epoch-0.7.2
-crossbeam-queue-0.1.2
-crossbeam-utils-0.6.6
-csv-1.1.1
+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.2
+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
+getrandom-0.1.14
 heck-0.3.1
+hermit-abi-0.1.6
 humantime-1.3.0
 idna-0.1.5
-iovec-0.1.2
-itertools-0.8.0
+iovec-0.1.4
+itertools-0.8.2
 itoa-0.4.4
-js-sys-0.3.27
+js-sys-0.3.35
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.62
+libc-0.2.66
 log-0.4.8
 matches-0.1.8
 memchr-2.2.1
-memoffset-0.5.1
-mio-0.6.19
+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.8
-num_cpus-1.10.1
+num-traits-0.2.10
+num_cpus-1.11.1
 percent-encoding-1.0.1
 proc-macro2-0.4.30
-proc-macro2-1.0.3
-quick-error-1.2.2
+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.2.0
-rayon-core-1.6.0
+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.0
+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.100
-serde_derive-1.0.100
-serde_json-1.0.40
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.44
 slab-0.4.2
-smallvec-0.6.10
+smallvec-1.1.0
 sourcefile-0.1.4
 spin-0.5.2
-strsim-0.9.2
+strsim-0.9.3
 syn-0.15.44
-syn-1.0.5
+syn-1.0.13
 synstructure-0.10.2
 termcolor-1.0.5
 textwrap-0.11.0
 thread_local-0.3.6
-tinytemplate-1.0.2
+tinytemplate-1.0.3
 unicode-bidi-0.3.4
-unicode-normalization-0.1.8
-unicode-segmentation-1.3.0
-unicode-width-0.1.6
+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.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
+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
@@ -151,7 +153,7 @@ IUSE=""
 DOCS=( CODEOWNERS  COPYING README.md )
 
 BDEPEND="
-	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
+	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
 	dev-lang/go
 	dev-lang/perl
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 120071de42af..eba23d2096df 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,6 @@
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 DIST qxmpp-1.0.1.tar.gz 259791 BLAKE2B 3687dd8f74db8a995bc37850f6988b1750219b2f683281d26990a430046cd1d7f1957c19604540a56c3110aa5b9a40d037388f9726f684a56a0d15c7de6a4849 SHA512 b6fb5fc0e3edfd978ac47b3ce32d8d0892678247479ba3e30beba3a7e67da1eb053bb95de07306920cf6ca5e744c12fd31f1a72612c5ee5b724a3eac7b8d6c6e
 EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede
-EBUILD qxmpp-1.0.1.ebuild 1398 BLAKE2B 8436df254b5fb10cb60a7044fcba975fa283d765cadb1e52abcc73ea86b14bc1cee4bd4ed2c6965d477eaadced2d295e44ef15bde6e24e82b3ea921ca5e67251 SHA512 5017f3b418e388ece03015adf98205984fa7cd578bef9a4b33acf06a2c0177f1988cee1543cdd0143378f6809eadb02373c72cfdb20389fe359b80f308d58a84
+EBUILD qxmpp-1.0.1.ebuild 1380 BLAKE2B 744109d8c5fadd54231d67c47e03b468dad42df207475911af48a5bdb06338b552c85abffb7571fb162cb8e7bd5721066f8000aa7b9705ec10760ecbfd34f3b1 SHA512 d8c90421e145362accc6f12d7300e7a247c88ef061a430b60269a12825001b70ce9df04a247354db2b322ffe17fb95601c73001a09093c7f171291546502b0ae
 EBUILD qxmpp-9999.ebuild 1370 BLAKE2B 4b29c5e54630679f9dbbfc04f773f3ce4a2c70b87f0774d8b144bfb6d8008b013a227714d37e30f444c518da37d70ee0fb125eedd84494211bc53034d3181eda SHA512 b196a0a6a2cafc320bff35528a92f05dd2821602b5cbaaea0b9cbe9773352b27816aa7da0049fe490fa75da2bcd99ce3f444dd2750218e6284500d000c905169
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-1.0.1.ebuild b/net-libs/qxmpp/qxmpp-1.0.1.ebuild
index 3085ee7a3745..e56ca1cc2f44 100644
--- a/net-libs/qxmpp/qxmpp-1.0.1.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
 HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
@@ -40,7 +40,7 @@ src_prepare() {
 	sed -e "/qxmpptransfermanager/d" \
 		-i tests/CMakeLists.txt || die "failed to drop single test"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -54,5 +54,5 @@ src_configure() {
 		-DWITH_VPX=$(usex vpx)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 8ce9e5e6ac0d..a11c5bb80dcc 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,5 +1,3 @@
 DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c
-DIST rabbitmq-c-v0.9.0.zip 227245 BLAKE2B ea37e0a9734bc7a8923cab880a9e150f055bab83bb79eb793882a1d435e6e435fbf4610034235f858d0e4d20978287b9432b312c8c3eea5e588655dc2f831554 SHA512 0cac0e26b4caca3de22b468200a20c38c8ace1a824442faa0855d93922b0c3a649fc2067366f6694eca0be635187ca9a9cfe47643472f4abb3d67028768f49fb
-EBUILD rabbitmq-c-0.10.0.ebuild 1355 BLAKE2B e47b8654955d3d3ece16d1cd591fa677a2a7dbaa80b8f25ab6398889a38b32ddc38220aea7339c51a2e6eefc218c22b658d8954070bf1d869f03591d802753cb SHA512 598eae2c2cd2b3f436383c46fe4d4a9e992ad7f7f0708e4cff85de7e456769de7295b4c3734f3948eb95bf63bc3667e4eea94ce3aa2cb2cfae69546973e67211
-EBUILD rabbitmq-c-0.9.0.ebuild 1355 BLAKE2B 370570b5ac07ff56dd09cdfe3480beabf32de947b99c612ba70056a07a5f550f24078a1b7c88733ffb705f0fd2bbd80615745e4f1f59544547f91b9d52ebe780 SHA512 5ea896020c5b33bd845876c34488cd30f678e2f6a16179c4f2095e3b2120c28d09d1c34a2a08fe2c9808ad01bd07d51ad6ac95641710b670392cd7546c8df20a
+EBUILD rabbitmq-c-0.10.0.ebuild 1342 BLAKE2B 04a79580d7f8145966dae8d5059ed32ea8552dcba3cf8c41eb814ba63b7bc507085279aa00bcd713eeae5c04f21c232d0542900965c44b6adc1baff0c33994b0 SHA512 5e74eb7f3dfc123d13f6c082df23952184da091bf64110613704a97c5f268b80542c15d78911d01511cbe5ec3f70d7796253e3fd5b303d5c93685f825ed8ce8e
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
index 91110cbd2aee..7ca183a40a57 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="RabbitMQ C client"
 HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
@@ -44,7 +44,7 @@ src_configure() {
 		-DBUILD_TOOLS_DOCS=$(usex tools)
 		-DENABLE_SSL_SUPPORT=$(usex ssl)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
deleted file mode 100644
index 6969404a06ed..000000000000
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake-utils
-
-DESCRIPTION="RabbitMQ C client"
-HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
-else
-	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/4"
-IUSE="doc libressl test +ssl static-libs tools"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="ssl? (
-		libressl? ( dev-libs/libressl:= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	tools? ( dev-libs/popt )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen )
-	tools? ( app-text/xmlto )"
-DOCS=( AUTHORS README.md THANKS TODO )
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_API_DOCS=$(usex doc)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_TOOLS=$(usex tools)
-		-DBUILD_TOOLS_DOCS=$(usex tools)
-		-DENABLE_SSL_SUPPORT=$(usex ssl)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Skip "basic" test which requires running local rabbitmq-server instance,
-	# see https://github.com/alanxz/rabbitmq-c/issues/530
-	ctest -v -E basic || die
-}
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
index e68f9cb2d808..808600036966 100644
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ b/net-libs/ripe-atlas-sagan/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
-EBUILD ripe-atlas-sagan-1.1.11.ebuild 883 BLAKE2B 9160396045660b8afe6f80947594977e312125da6c25c67cc2808d82e8946554e2aba1c0a6a821637ac9c986d15ce903ff75a9dc107884a2587d8474f331b2e6 SHA512 3b57106362a0d763b70e8af09d60ab95afeaa08b71da001f69168c44f94909afefda85963459423c8d55062b61b90307cc767c2e2fff443b3433910aef038d86
+EBUILD ripe-atlas-sagan-1.1.11.ebuild 877 BLAKE2B fc316f02d06dc562a563dbb25acdba74e7871bd7fb34083f86ddfafa3ef00658f4f94b8e21a68e9318a2e1f1ceb9b02e860773dec9b5a7d99f4cab61ef3873e8 SHA512 b0d51f9331fcc30e360f307d10016881a0c1caaafeae1b823ad976a7d6cdb6e8ba0b2a3bfc838c3909432e491ec3949685ed81b7a5a53b5e81793b7b4edf9273
 MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
index f31e0b416f1d..71dc20c7c259 100644
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
+++ b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
@@ -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
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index b5bd6c00855c..f4ee581e9279 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,6 @@
+AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
 EBUILD rpcsvc-proto-0.ebuild 481 BLAKE2B 4e507a8892c32f17d0852603b2828ca6b69621fc2686db96016b81f1112d1fd38ef6b83798800710fea95cc2bed21b95957c72c83dbbc2397a724c9907891d6d SHA512 9ca5e01d4aeb44b676f958b895a5bdb754ba88b2db19f4c8522408e073e1c901297c135391e1fd94368e9b1c87671e84523715458c98567d60ff3b037eca4cc5
+EBUILD rpcsvc-proto-1.4-r1.ebuild 803 BLAKE2B 802dd445f8a13d0030c0d82f31a40e812cef9157efd229c9f64ff3ab6ecd862075b6cd432d390bd04eed25121f908df372df0479185e5d9203f7c37991aa605b SHA512 4e77071aa69aed0d0227cba0bedeae38930c84ede43e67070a3509d99ed2201f82f3aa49cf2843fdb5846f4f04d07d27cc28de8d3eaaae8e1dcacde6b4cd9846
 EBUILD rpcsvc-proto-1.4.ebuild 636 BLAKE2B 7ab5930b37236fe1ea6a68e2388e8cb29537be09f27810213b185686ddd0dba9103cb846155d84fa3a26354ea30bfa302dd3aec98d5a8eb0d045f9696af41310 SHA512 9d14f4183f64d416cc68f8051ab76542330efdc076311eb6000f9382181c1ea888c28698914d7823f069b9eaeac21d2ea13441e4fe83ae1d7a51304466959d68
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
new file mode 100644
index 000000000000..a5088735bbb1
--- /dev/null
+++ b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
@@ -0,0 +1,47 @@
+From 2527c37f956aa38408e251587556a6c8389af319 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 29 Dec 2019 23:38:28 +0000
+Subject: [PATCH] configure.ac: autodetect need for external libintl
+
+uclibc-ng and macos standard libraries don't provide libintl
+facilities. As a result build fails as
+(x86_64-gentoo-linux-uclibc example):
+
+```
+...
+gcc  -g -O2   -o rpcgen rpc_clntout.o rpc_cout.o rpc_hout.o rpc_main.o rpc_parse.o rpc_sample.o rpc_scan.o rpc_svcout.o rpc_tblout.o rpc_util.o
+/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: rpc_main.o: in function `usage':
+/root/rpcsvc-proto/rpcgen/rpc_main.c:1403: undefined reference to `libintl_gettext'
+/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: /root/rpcsvc-proto/rpcgen/rpc_main.c:1404: undefined reference to `libintl_gettext'
+...
+```
+
+The change is simple: add gettext m4 macros to detect need
+for libintl and link to an external library if needed.
+
+Tested on x86_64-glibc and x86_64-uclibc-ng.
+
+Reported-by: Anton
+Bug: https://bugs.gentoo.org/637084
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,4 +16,7 @@ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
++AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.18.1])
++
+ AC_OUTPUT([Makefile rpcgen/Makefile rpcsvc/Makefile])
+--- a/rpcgen/Makefile.am
++++ b/rpcgen/Makefile.am
+@@ -10,3 +10,4 @@ noinst_HEADERS = proto.h rpc_parse.h rpc_scan.h rpc_util.h
+ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
+ 	rpc_parse.c rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c \
+ 	rpc_util.c
++rpcgen_LDADD = $(LIBINTL)
+-- 
+2.24.1
+
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
new file mode 100644
index 000000000000..7a8ead0d69d7
--- /dev/null
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+ BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+# sys-devel/gettext is only for libintl detection macros.
+DEPEND="sys-devel/gettext"
+RDEPEND="
+	!<sys-libs/glibc-2.26
+	virtual/libintl
+"
+
+PATCHES=("${FILESDIR}"/${P}-external-libintl.patch)
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_install(){
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
+}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 8700b1481b27..64f7aaa631ae 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -3,9 +3,12 @@ AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc
 AUX serf-1.3.8-scons_variables.patch 3553 BLAKE2B 528a642abd693f4052f3af9d1580defde70fe1ea4ee9e3c117847249b270cb8928a63282d4be34ece1aa29b8230fe42393329f56b5286526f168097d184efcec SHA512 e492c5a9289700330e964a9b42da9002f1b992ed197a9aea54f188188264e8dc2047a3005c9724769ff5e845d5b9db31d622981e016284523fc65dec6a3c04bf
 AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
+AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
+AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.8-r1.ebuild 2103 BLAKE2B c9c928af25deb62750762a126298839a43d3ebe1476448e068275fa74151975c47b077f6c2def47a452d1649a439f4feb71096b7460b9b38c5562874473ff168 SHA512 1d14932bae9d1cb24370838a6056e847c658ba33c129dae1cbc8168bca6ff7ffbb1ec8136ffdcab7eecf5afca63545d27dec0b757bdc64597c71a830470c2612
 EBUILD serf-1.3.8.ebuild 1490 BLAKE2B 5415619701d339b0eac2ff6c61c34e6a06dd02167f3f5b9ce217433f7d75ab1362ec2161bcdb7728a74b3334c4f265b228ee384d71b6fb719db0f1c0c7022e4d SHA512 d04cf838e7530417cbfc5cbf4ede46a9fa511d5057b7c4b0ccb303eb9ad0f37f02ad8b71950fce002ee9c45a83878d46595c99e4f517d40c874311ea3ddd0b97
+EBUILD serf-1.3.9-r1.ebuild 2066 BLAKE2B a049b9aa26d7433a4634ed0cee0d44cab2ea21340509892234c950da7dd5f6046ba904f39ed73933d1e16c8cbfe778714c2eb769baed591bb6d22c7ad54c2181 SHA512 4f5f477cc4ff4375745d244f3c0aeef39201e5f2eb92bda77e5ecb94975733be3d1bd0dc15156c49609650c3e60ddd2e6ab98018918af2e508feab9f9a4945e9
 EBUILD serf-1.3.9.ebuild 2105 BLAKE2B a9ea4101ac14929db52d07c739bf5f4800cad86165134e8455855d90de791fac22830dc9c60ef12569a8dbfbcbaf54bb0537e54af6467dcc7b4f815a9dc776bc SHA512 f0d959741a6657632b55038417351d3f51e4c6d38cb1911d3eb3618ee01843e2627d6d03b7d6d80e8d97d89654826a3a312d34c3b9bf0cb703be7dfbe946be21
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/files/serf-1.3.9-python3.patch b/net-libs/serf/files/serf-1.3.9-python3.patch
new file mode 100644
index 000000000000..7ba43d91968c
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-python3.patch
@@ -0,0 +1,28 @@
+From 1c0241847e845a8da265aa89f297d3db6ae483b1 Mon Sep 17 00:00:00 2001
+From: Bert Huijben <rhuijben@apache.org>
+Date: Wed, 4 Oct 2017 14:56:22 +0000
+Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building
+ with most recent scons version.
+
+* SConstruct
+  Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python 3.0
+  and 2.7.
+
+git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-0310-9956-ffa450edef68
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index e5d407b..fab9828 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -199,7 +199,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
+ 
+ unknown = opts.UnknownVariables()
+ if unknown:
+-  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++  print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+ 
+ apr = str(env['APR'])
+ apu = str(env['APU'])
diff --git a/net-libs/serf/files/serf-1.3.9-python3_byte.patch b/net-libs/serf/files/serf-1.3.9-python3_byte.patch
new file mode 100644
index 000000000000..ab86af2082d9
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-python3_byte.patch
@@ -0,0 +1,28 @@
+From 9d30108b630b77f732ef94d1642b159066ffd890 Mon Sep 17 00:00:00 2001
+From: Andreas Stieger <astieger@apache.org>
+Date: Wed, 8 Nov 2017 17:05:28 +0000
+Subject: [PATCH] Follow-up to r1811083, fix building with scons 3.0.0 and
+ Python3
+
+* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid
+  TypeError: cannot use a string pattern on a bytes-like object
+
+
+git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1814604 13f79535-47bb-0310-9956-ffa450edef68
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 5f5036b..71e5b0a 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -182,7 +182,7 @@ env.Append(BUILDERS = {
+ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+                   'SERF_MINOR_VERSION ([0-9]+).*'
+                   'SERF_PATCH_VERSION ([0-9]+)',
+-                  env.File('serf.h').get_contents(),
++                  env.File('serf.h').get_contents().decode('utf-8'),
+                   re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
diff --git a/net-libs/serf/serf-1.3.9-r1.ebuild b/net-libs/serf/serf-1.3.9-r1.ebuild
new file mode 100644
index 000000000000..c01698dc85d4
--- /dev/null
+++ b/net-libs/serf/serf-1.3.9-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="https://serf.apache.org/"
+SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="kerberos static-libs libressl"
+RESTRICT="test"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/apr-util:1=
+	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-2.3.0"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch
+	"${FILESDIR}"/${PN}-1.3.8-openssl.patch
+	"${FILESDIR}"/${PN}-1.3.9-python3.patch
+	"${FILESDIR}"/${PN}-1.3.9-python3_byte.patch )
+
+src_prepare() {
+	default
+
+	# https://code.google.com/p/serf/issues/detail?id=133
+	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+
+	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
+}
+
+src_compile() {
+	myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		# These config scripts are sent through a shell with an empty env
+		# which breaks the SYSROOT usage in them.  Set the vars inline to
+		# avoid that.
+		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
+		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
+		BUILD_STATIC=$(usex static-libs)
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+	)
+
+	if use kerberos; then
+		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
+	fi
+
+	escons "${myesconsargs[@]}"
+}
+
+src_test() {
+	escons check
+}
+
+src_install() {
+	escons install --install-sandbox="${D}"
+}
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 8e908f5f4b15..5572890b8479 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -7,5 +7,5 @@ EBUILD socket_wrapper-1.1.6.ebuild 725 BLAKE2B 5cf1168b44fe35d96af100ce245a6c01f
 EBUILD socket_wrapper-1.1.7.ebuild 731 BLAKE2B 7811c4271517ae5fb3faf99adc08576dd76d8f99981577458c0bb3ce97689ddbe4ba27e5efc86a256b1cff2d8e1f859979455792b13c63073f06817963c131f8 SHA512 223b55e8ddfc367fa948b2619c652c16fad67202e07406c9ceb373e93b34f814ed16e1ba64291af14cbb6c221065f98c963c905d188ac71ee858553346fb958d
 EBUILD socket_wrapper-1.1.9.ebuild 740 BLAKE2B 68d345bca842e396e131c095f8e805a308ebeb4328a109c90bf7c1a2980d3bbe4e18b86efe1a77c8809e4531146f5a1739cacec590a2c3d8f4c2001ec587fe45 SHA512 114e8d0b3b14634a894ce7228dccf0a7b1ad60bc597d2d5fd02cd6a020b6df19de1d5ce2235251cacf4785784c509541bcb4081a2e160bbc45605546912faba9
 EBUILD socket_wrapper-1.2.1.ebuild 485 BLAKE2B 85dd52805f1b4930db0d62097696ae09a3b0ea5f149bcd4c625a32dec57a0a4f33a0006516e1e78f3602953def3f9cda321900d9d042425a9632221a1093e82b SHA512 1bb53ecea125936652cbb67b4d11b6bf9d0c4dddcd35b79d8c3feed30ec734549d7253232737f67a01484b2a0666abfe748b452f4710ae6ac7425368561e7ed3
-EBUILD socket_wrapper-1.2.3.ebuild 485 BLAKE2B 443a1a73c1f7b23b77067000db83cd30f5273ee8e2be54c1f136f0671ff5463a8d7adcbaa8602292a0f83da4b73bc8c593dc3ce4ce6d1ad85a63dabba9d6d03c SHA512 8388c75eae272098319f1fd79f3a953da0ec91af89693b2f8da2c820db51ba95261560dd2ad28812817601db07a1e0b94e82d4d1edeef85737b06f42fdb49010
+EBUILD socket_wrapper-1.2.3.ebuild 477 BLAKE2B dd761aee1c472cd1dec987541ba73286ed7d9e68cb78a5cd12aa853b0885cb5b79a64ad33d389dfef5c446ba15a8bc2ea917f7f48de16d4a4b6acade80e0ecb9 SHA512 d4cc629e0a46299f29d5dee1ef49b787c32eb54e00d2b3a78b2b7e8fbb5c4d990f5042b5c266c1cd46d7b4ae67b0d2bc439f23712f9d423d610015d883b9a12b
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
index b2882fb86753..9214fbdc49af 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.3.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 @@ HOMEPAGE="https://cwrap.org/socket_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index 8eecfb445f40..8a4bdb21ffbc 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -2,8 +2,10 @@ DIST stem-1.5.4.tar.gz 1915722 BLAKE2B 37c278eab0d7c7c305d7fcb498ff39460921ff59e
 DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca46db140463882cbc1f5701893e6a4a28820100e05e3ed4fa5ff76135a3b20ec1af917a63f63b3abdf5361df6 SHA512 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c
 DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
 DIST stem-1.7.1.tar.gz 2196854 BLAKE2B 318b762390ad5f1b8a7ad49bd442841d4552cf3d6782c7c912ca8251a076baa6d01bd6f60ea2d79f96994f7c29775c09b815ee41177c638c7e4089e5f4b1b1e4 SHA512 a275f59bba650cb5bb151cf53fb1dd820334f9abbeae1a25e64502adc854c7f54c51bc3d6c1656b595d142fc0695ffad53aab3c57bc285421c1f4f10c9c3db4c
-EBUILD stem-1.5.4.ebuild 1283 BLAKE2B 625d9b3c2b5ddd35b7d3793f80eaf50ff426bde33d5a67f568e68aa98f01a5798c4e8acae82d1e8921ef45ce3920d6a701d40d35140dfad300e994722849423a SHA512 65161ce2d94693b05b10594880fa0055b3538784687e207370d3e535bc392192145674c323356229a77c400f925215c3c1845c3d3b8936738a38356ec262d585
-EBUILD stem-1.6.0.ebuild 1283 BLAKE2B 625d9b3c2b5ddd35b7d3793f80eaf50ff426bde33d5a67f568e68aa98f01a5798c4e8acae82d1e8921ef45ce3920d6a701d40d35140dfad300e994722849423a SHA512 65161ce2d94693b05b10594880fa0055b3538784687e207370d3e535bc392192145674c323356229a77c400f925215c3c1845c3d3b8936738a38356ec262d585
-EBUILD stem-1.7.0.ebuild 1382 BLAKE2B 8849f490d17f0cfb919fa9a50341e5071db5f8d8d3313207aa3936155abc2093ce2e40d60ac83ea2e4f87f2b8efb3cf8187e5d7f913b65d8b3450d44285994d2 SHA512 6a7388a6113d9f04fdd7d0bc953d6b4b6c4eeddad8f25b87a43debb65dfc0bfd89d12b64cc8c7ac77a93c45849b5c3759d654bfd32709f63806a42bbc8768fc5
-EBUILD stem-1.7.1.ebuild 1382 BLAKE2B 8849f490d17f0cfb919fa9a50341e5071db5f8d8d3313207aa3936155abc2093ce2e40d60ac83ea2e4f87f2b8efb3cf8187e5d7f913b65d8b3450d44285994d2 SHA512 6a7388a6113d9f04fdd7d0bc953d6b4b6c4eeddad8f25b87a43debb65dfc0bfd89d12b64cc8c7ac77a93c45849b5c3759d654bfd32709f63806a42bbc8768fc5
+DIST stem-1.8.0.tar.gz 2853802 BLAKE2B a275a38e53c5a4a3771a30528fd5781c51370352dd384a77ce27b31f034bece6fef448d74008adb82d2d909104b7338b5168a1a343c799637f9e12d39028bd09 SHA512 aa2033567b79aef960f8321e4c6cbc28105c59d6513ff49a9f12509d8f97b1a2e8a3b04dc28abb07fad59b0f6ba66443b92bbefa0d08b26038bbaf24f7f2846d
+EBUILD stem-1.5.4.ebuild 1279 BLAKE2B 05d9075558c8e28c0291a249595b4a42873e3ce74a9acbabd615f3b0ef4de0a8a42df11730e5aaa775913f8a2e073552bdd4c72d81ffff42061d32b880638ad0 SHA512 ca3488228e427bbdf497543d045d5c27d85661d414c390bbc9fc2c0961ad407c44a293d9088c2d06b275203225fd39ddfe31ac1d242ef87466318d4f04d65df4
+EBUILD stem-1.6.0.ebuild 1279 BLAKE2B 05d9075558c8e28c0291a249595b4a42873e3ce74a9acbabd615f3b0ef4de0a8a42df11730e5aaa775913f8a2e073552bdd4c72d81ffff42061d32b880638ad0 SHA512 ca3488228e427bbdf497543d045d5c27d85661d414c390bbc9fc2c0961ad407c44a293d9088c2d06b275203225fd39ddfe31ac1d242ef87466318d4f04d65df4
+EBUILD stem-1.7.0.ebuild 1378 BLAKE2B 3d784f4ee93387cfb1bea6c3511272841e154b1e1bddeeba05488509355682c91e5a7e40fdc9d752dff82e71399cd38842251618228e5c03d0c4ce7d34233f3b SHA512 f7aafa866047d7a9f783fa8cd5860700b44a0897dda7eb98334f1ccb6c8b9a8affe285e1574356ca66840bffd1da0bdf26782284704c248caf165a4296ee8b29
+EBUILD stem-1.7.1.ebuild 1378 BLAKE2B 3d784f4ee93387cfb1bea6c3511272841e154b1e1bddeeba05488509355682c91e5a7e40fdc9d752dff82e71399cd38842251618228e5c03d0c4ce7d34233f3b SHA512 f7aafa866047d7a9f783fa8cd5860700b44a0897dda7eb98334f1ccb6c8b9a8affe285e1574356ca66840bffd1da0bdf26782284704c248caf165a4296ee8b29
+EBUILD stem-1.8.0.ebuild 1378 BLAKE2B 3d784f4ee93387cfb1bea6c3511272841e154b1e1bddeeba05488509355682c91e5a7e40fdc9d752dff82e71399cd38842251618228e5c03d0c4ce7d34233f3b SHA512 f7aafa866047d7a9f783fa8cd5860700b44a0897dda7eb98334f1ccb6c8b9a8affe285e1574356ca66840bffd1da0bdf26782284704c248caf165a4296ee8b29
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.5.4.ebuild b/net-libs/stem/stem-1.5.4.ebuild
index 552c994602ee..456f86ed3997 100644
--- a/net-libs/stem/stem-1.5.4.ebuild
+++ b/net-libs/stem/stem-1.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/stem/stem-1.6.0.ebuild b/net-libs/stem/stem-1.6.0.ebuild
index 552c994602ee..456f86ed3997 100644
--- a/net-libs/stem/stem-1.6.0.ebuild
+++ b/net-libs/stem/stem-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
index 277cf472802c..0369bc66b7b6 100644
--- a/net-libs/stem/stem-1.7.0.ebuild
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/stem/stem-1.7.1.ebuild b/net-libs/stem/stem-1.7.1.ebuild
index 277cf472802c..0369bc66b7b6 100644
--- a/net-libs/stem/stem-1.7.1.ebuild
+++ b/net-libs/stem/stem-1.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/stem/stem-1.8.0.ebuild b/net-libs/stem/stem-1.8.0.ebuild
new file mode 100644
index 000000000000..0369bc66b7b6
--- /dev/null
+++ b/net-libs/stem/stem-1.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+	net-vpn/tor )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-vpn/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+	# Disable failing test
+	sed -i -e "/test_expand_path/a \
+		\ \ \ \ return" test/integ/util/system.py || die
+	sed -i -e "/test_parsing_with_example/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_parsing_with_unknown_options/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_saving_manual/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_sdist_matches_git/a \
+		\ \ \ \ return" test/integ/installation.py || die
+	sed -i -e "/test_connections_by_ss/a \
+		\ \ \ \ return" test/integ/util/connection.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/telepathy-accounts-signon/Manifest b/net-libs/telepathy-accounts-signon/Manifest
index e83d05871508..84521e91dc13 100644
--- a/net-libs/telepathy-accounts-signon/Manifest
+++ b/net-libs/telepathy-accounts-signon/Manifest
@@ -1,5 +1,3 @@
-DIST telepathy-accounts-signon-2.0.tar.bz2 15335 BLAKE2B 5c33403b2c271cc93526058d8415e8f47249018b6fdef4cc9d41ac8f530de61dfa94fd33f1cac433f2ac90077db0a322b8f3907953172ba20bcdee812c852298 SHA512 2fc4e04b47740a0500f6c7a6f08b5d421c1415970c97331b460bdb124b029e35b5288211dfe3da20eab18924a0c05f769094faa258cf05b76665b4428855f1ce
 DIST telepathy-accounts-signon-2.1.tar.bz2 15362 BLAKE2B 62919b9dda9514ad554026c733e03fbb272334f72f4c8d5220ba10b7680220f67e696f2a4e0824da8f450ea901dc9a7e8b4628f05b733bd492af69c4d713b43b SHA512 537d5e1da577101514662771de6394c66ae2e3e95189a755432f1c88b61aa493843b2c8eac778b45e281e5a612fbadf2cda8d4ae09c6e2ccebdc3700009096bd
-EBUILD telepathy-accounts-signon-2.0.ebuild 631 BLAKE2B c5e545d32466d23995946382d10fe81bc7dc876bcfc30219d54641f85434bee092cf7179d2be24575a52f8224a44fd673371f6dca11b428d4b64cd37f2b955b1 SHA512 3424889053d5b1e86b57c705a0aa648a7dfc4793b487a40f91dc606bc614b02daa9e99f3d3a83d25e57550760c45821d9a2f5cfe06bb497d4c3eca5fa073d1d1
-EBUILD telepathy-accounts-signon-2.1.ebuild 602 BLAKE2B 5eabdfb6500cf41487784eca4363a5d830affe4c718eca1aab3281aae909d99a122abc7d6d2f54d1819857d2c85fa97a55948df83c212c2da28a41329d7b6fdf SHA512 802230abcb5116469a19cfc4a8d410f9c808a45da4e0f610313ae5f4dda674dc27263146b3c95942002cf59d4bb17d797a8ef5886a436a81f6e22472a02d8f8f
+EBUILD telepathy-accounts-signon-2.1.ebuild 599 BLAKE2B b5770e795a4467c4b3257a80014cab3327b01c305e86d63e11a8e71fd8c85c6c7e0d040830d1c11d16933bda119b2ddeaa2dc534518511138f6d0742626c9a35 SHA512 94d7e15917dd765440f86b9d6c138731242621b71fafa3356cfd1f5f1efb0616edacc548c01d7369796297043478b0b4497c5698242eb5c02437ccb98919373c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.0.ebuild b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.0.ebuild
deleted file mode 100644
index bb6dcafe1795..000000000000
--- a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Mission control plugin for Telepathy to provide IM accounts and authentication"
-HOMEPAGE="https://gitlab.com/accounts-sso/telepathy-accounts-signon"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/2.0/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND=">=dev-util/meson-0.49.2"
-DEPEND="
-	dev-libs/glib:2
-	net-im/telepathy-mission-control
-	net-libs/libaccounts-glib:=
-	>=net-libs/libsignon-glib-2.0
-	net-libs/telepathy-glib
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild
index e2e5c5ce6fa6..8722294b0d69 100644
--- a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild
+++ b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.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 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index fb1e9f2c380c..5ffbec5b15e9 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,4 +1,3 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1-r1.ebuild 1495 BLAKE2B b7850c8d3ab91d8505d89ad0a3e8b9dc9f0e63e40911f75805a74ab3c3868d4083c7312616ae5b37fa673a23b32006836a930878ca35122b3c62c5e90291d54a SHA512 ad8f538be1e54f6e3102c9a436f8b8fc08606f0c951c50214bdfba42d09c860c86500090759da431334eb37b1fb445e37e32cb34e5d3123a5fceae8ebbd6ca7a
-EBUILD telepathy-glib-0.24.1.ebuild 1529 BLAKE2B d600e8e085f9708c3837776a09c43ace1558b90eacc07a5594cd2ebc16d7b499dad761e2efd382bceeb6e491fa2c21f7790701ac470476084121b4b036b54be2 SHA512 92f11d3981cc2d8a9744865c5ae4e69ba9f8100d1ee9bb3364a4a498cd44dcc3de6e1c401898861e3fc8e3833ddbf88821ad84ce4055d5e97275cece5b80642e
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1493 BLAKE2B 99e042ebffe648c9a2ae08c9fa39b0ac96a502ecffe8116eb7765533ca9b162935b42a92225883d979d25414097c6e18e705de9398261e7d6d51ef7eaf857a36 SHA512 4acb890a1ad210babd8a8b54368496b31303f417966c87e30c522ea11e560f34a114d3c59ae6e7c24090d21655ccf705822277d98d8885edf92604d4a889e941
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
index 8e2f66639cc8..9fd97b463c6d 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
@@ -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
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
deleted file mode 100644
index 3469dd10c54f..000000000000
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 python-single-r1 vala virtualx
-
-DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="debug +introspection +vala"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	vala? ( introspection )
-"
-
-# Broken for a long time and upstream doesn't care
-# https://bugs.freedesktop.org/show_bug.cgi?id=63212
-RESTRICT="test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/dbus-glib-0.90
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# See bug 504744 for reference
-PDEPEND="
-	net-im/telepathy-mission-control
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-installed-tests \
-		$(use_enable debug backtrace) \
-		$(use_enable debug debug-cache) \
-		$(use_enable introspection) \
-		$(use_enable vala vala-bindings)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Needs dbus for tests (auto-launched)
-	Xemake -j1 check
-}
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index 594f973c3896..c79322407b8e 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,5 +1,4 @@
 DIST telepathy-logger-qt-17.08.0-python3.patch.xz 16228 BLAKE2B 8226a6cd0537e46edadccc50027da6386bafcf3e5cd2d9af2f7ce996da30f42762f43a00c1274771a15d3fd2e5de912ad0833cda6ad7630f1d25492cc27a9bff SHA512 c762213f09933ee08b755d830fd32309fb248ff91f2d4c0ac04f7096e874f2a63d7231aaf5abfc4245cf6f66056d2e9cabb6a83b0c561422efd0e8944bc05893
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
-EBUILD telepathy-logger-qt-17.08.0-r1.ebuild 838 BLAKE2B 92380a675c1aedcf9a9ba71fd3b9c9ce0019a38c4101062307b6fa168efd6fdae3bc13121e3d8275f0698f417950ecfd8bdf83f79ffedd1e86d788bb67e78eac SHA512 fe058a105615d916ead4a5800dcc5fea8a2a210d8e78446e029c55fda18a285980af7e7214e32aecf442fd52252227316ae289df26586b69c0ecf64be3970b5b
-EBUILD telepathy-logger-qt-17.08.0.ebuild 685 BLAKE2B 0bc1287ad89bc2f6aa78362470f8bd8bdae42753960105d627f7550848b9714a32bd4a8ee12d808c7a329f60801103deefe9cfac30b9db3b5c6475a5e7bf9079 SHA512 9b05246bdc3ec66418261bfe8b1d2c04671c3a0521015df09e892f0cce8991c49719475610024751f7069bd6b71da054b7d5b1a96985f1bb45b15dde6d4cde15
+EBUILD telepathy-logger-qt-17.08.0-r1.ebuild 835 BLAKE2B ea106c3fce96bc9b6e95c8be598c42d4eb66d19138651815eabf50a1367122a7ee824fee6ef8347d57b6773d4738197a198f8aac5e9240b87c204db037dff3f1 SHA512 7967939f0f7da4cba9440d412aa2631fcc960c53ae6027f9895192e1ad9169acee9b2f229209787e0b24bdcc2f46ccc7b00d4ddf15924c4e552630b3a4af9fda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0-r1.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0-r1.ebuild
index 412c055fd2f8..5741180b8144 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0-r1.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0-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
@@ -13,7 +13,7 @@ HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz
 	https://dev.gentoo.org/~asturm/distfiles/${P}-python3.patch.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
deleted file mode 100644
index 5e3b122b8ed9..000000000000
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 python-any-r1
-
-DESCRIPTION="Qt bindings for the Telepathy logger"
-HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}"
-DEPEND="
-	$(add_qt_dep qtdbus)
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-im/telepathy-logger
-	net-libs/telepathy-glib
-	net-libs/telepathy-qt[qt5(+)]
-	sys-apps/dbus
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 8fc974f9c57f..dcb3bbb8f601 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,3 +1,4 @@
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.8.ebuild 1484 BLAKE2B 0e09cc5d671686c52243669f02fb644fda4b76e6f384b7b2db514e5c0196deb4fdda06c919c095f024b3c2b9150d806573a28af07c5692487b0f414cf7d38dba SHA512 25a87c7168cbde43a73efd18c1a2fdd2efd8e7602fe1ca6a8db759e18a733e2d78328125427ca2c77f5d43999dd9b38646c38f5a40654f965d21711548c9b4ce
+EBUILD telepathy-qt-0.9.8.ebuild 1464 BLAKE2B a6ceb45fd0549a6c27be49421d7b1e21d09b92022f5141a5cc2d4b139bafff8a29b38b3d8264bccdecee0f01322141ac90caef22c376f91e9e6c6c6f741d5bcb SHA512 4e9feaae5a2827ff27cf4604ad98ba4f273973c7e0da9cb2c697ecf49294cefce305d56aa95c6f960021da9ffd85bdbaf677abfc661403e54b28241cfda2d996
+EBUILD telepathy-qt-9999.ebuild 1607 BLAKE2B 45c28da9a88a5289302901f8fbca6ac04b370c6c09e386bafa0d0a732ad148fa330f4296302c7c2ed8cd56ba73f121e54f5ae5e848a4389d2215839b04ce696b SHA512 c46bf6f4586c45c688c6ebeaba735a5b1e69df54264f08daba5ab2f9c1b92948a841bb86d47899eaa5549c9b892b7748136c775e2a478e456b234c0e5de5dad0
 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 1f505982cf39..12ca100f7091 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit python-any-r1 cmake-utils virtualx
+PYTHON_COMPAT=( python3_{6,7} )
+inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="https://telepathy.freedesktop.org/"
@@ -61,7 +61,7 @@ src_configure() {
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_EXAMPLES=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -70,6 +70,6 @@ src_test() {
 		-E "(BaseConnectionManager|BaseProtocol)"
 	)
 	pushd "${BUILD_DIR}" > /dev/null || die
-	virtx cmake-utils_src_test
+	virtx cmake_src_test
 	popd > /dev/null || die
 }
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
new file mode 100644
index 000000000000..84ab23609aac
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+if [[ ${PV} = *9999* ]]; then
+    EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" )
+    inherit git-r3
+else
+    SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+    KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+inherit python-any-r1 cmake virtualx
+
+DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug farstream test"
+
+REQUIRED_USE="test? ( farstream )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	farstream? (
+		>=net-libs/telepathy-farstream-0.2.2
+		>=net-libs/telepathy-glib-0.18.0
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/dbus-glib
+		dev-qt/qttest:5
+	)
+"
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEBUG_OUTPUT=$(usex debug)
+		-DENABLE_FARSTREAM=$(usex farstream)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_EXAMPLES=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# some tests require D-Bus
+	local myctestargs=(
+		-E "(BaseConnectionManager|BaseProtocol)"
+	)
+	pushd "${BUILD_DIR}" > /dev/null || die
+	virtx cmake_src_test
+	popd > /dev/null || die
+}
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index bc8cbda17e57..d42dbbbfcc64 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -1,13 +1,10 @@
 AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199ed21c2d6e0fd61e639d2eb669ee00c53088db2b6290dc98149ce20b0fafd8700c891c SHA512 1f7d9888a794ca4db64332430f6fd4ed3e257618fd87855922ff9186bca332827197f4f5aa199a27586fd2fcee04ed4d617bbaeb3866d9ba6f9c37ff8cb61ba1
-AUX initd 533 BLAKE2B 0e5b218af1b78b3613bfcd33b9c6c941ff708e55dff6383d234aea19b1677b7cc1f5f69205f4a9ae3db7a668887537d52281c7738f95506ab06088188c3b665e SHA512 46fb490c26244a894e2a33b464083c0b653f9c195af08848cd85b6f74f1677ffe66664c90e9c85e8ddbefec91d773ceec95e7043ea678f7f96c50ed0f96efb56
-AUX tox-bootstrapd.conf 2171 BLAKE2B 25021453c2be24bad5ff8e5484c41ebf0c2487f326e30af305fd13f949242098c4a0392caafed2653196b56b8c7f495964e465a5ef0d0dbe22100ee58e8aae89 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda
+AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c05145be0898ce5c10d60c894ef369c46afe2a65454ab9e2d2a23d1c859c074d80b8a86 SHA512 c7eaf934497329a369ea9fe5eefe061937719e34d965c464ccea6b72b12bf16c7b79bd821e3550fecb1fde3b014f40afad61c10cf4d7140f42d3d8ba964acdc6
+AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
 DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
-DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735
 DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966
 EBUILD tox-0.2.10.ebuild 3145 BLAKE2B 5c4e33623b746c48d7527ed054919218a18bfa8b44c10cc7acf529d86e179d141428de3753b9c8a5bca7810cf548ed5dca2968140f0d92f37fe62a4c2de6bcf2 SHA512 f22a73a65c2720e0c5a0742f796d8a02cb9a0c07843837e3b8c4c20e2444b7f7dfb313f884c79cb8029b1e51d21eb1ee5eaca18a9e75a961ec0c17feef6a3d71
-EBUILD tox-0.2.8.ebuild 2784 BLAKE2B 3941172b9bc29f67f4c289756e1e040ea8d8b5205885bcf8ba0370ed1c18b8d0355c8fce8a669d4b366a4c7447899f49f198c8b5936e477ff65aec48cfa660a7 SHA512 33a3deccf95578f8594cd7d0faee8953fa80839f48a62aafe7831170e0e25eeb1e97a3e93b5b5a4a6702622f3a8ad6f8fb363a2c833f3de5d856cbd5d5755ca4
-EBUILD tox-0.2.9-r1.ebuild 3155 BLAKE2B 4d494a5b28e07969e3bbad6211af176da73a05e61197cf87f6c57d95725b72ea43cda690b046a32eea40178137513f5927dfed5efe1d3196ecb570bb13db7d2e SHA512 db0d847bdf211f04c9bd392085cb061f5b72c2de85aa979e7bd38cd01fa44b3fe39bb43d5ba6231d126b061e9c4602f2db582b96c3bd938614ccd2b07138a4d8
-EBUILD tox-0.2.9.ebuild 2722 BLAKE2B ef78575e1f4cc95612425dbda0393c843713d0e6aa926ba797e4b353d3f8509b98353372448c6f43b9a65874f0a1a9056b8cbd1dc662567d4f434d887c36f2e5 SHA512 2ab0f1b5a6161bf6e42b54f1453bda7a4c4660dfa6b314407271f827d1e5460e12f5cb3651701f513e28eb9101565bed30f5d6767a13e7735d1d923b9e4908d0
+EBUILD tox-0.2.9-r1.ebuild 3167 BLAKE2B 62cdc2dfdc2492712eaafd05d96534c429dbc6c49687775bf211d33783d845a36b304778123b7fccf99e680534f4559cda4986e30594e4ebc47cc585ee147a7e SHA512 cfd6ccc8f583dae2bade9d6d17bec74099997521eba68637b7bbb5d5934a91cc31eac6686151ef942057aec24d473ca3666a4b0ee148037665896d8fe9979302
 EBUILD tox-9999.ebuild 3084 BLAKE2B 2265c2ddb19ba08857148cc05623b4bb6a42d9979661f201be265cb25602992aa344c37e1c7863031075478663f70878df877e23c4c7125f9e92a865b0b79ee8 SHA512 c78c1c80f5da28a58f710446b74f03c3b849fece2bfec36f71cefe49a6d045d37076c127c754b7d8e370b01f7ea47075f54e29e77c6962a6abe3345334c268ed
-MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279
+MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
diff --git a/net-libs/tox/files/initd b/net-libs/tox/files/initd
index 101d3297056f..49880897a1a0 100644
--- a/net-libs/tox/files/initd
+++ b/net-libs/tox/files/initd
@@ -1,7 +1,10 @@
 #!/sbin/openrc-run
 
 PIDDIR=/run/tox-bootstrapd
-PIDFILE="${PIDDIR}"/tox-bootstrap.pid
+PIDFILE="${PIDDIR}"/tox-bootstrapd.pid
+KEYSDIR=/var/lib/tox-bootstrapd
+TOX_USER=tox
+TOX_GROUP=tox
 
 depend() {
 	need net
@@ -11,6 +14,7 @@ start() {
 	ebegin "Starting tox-dht-bootstrap daemon"
 
 	checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${PIDDIR}"
+	checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${KEYSDIR}"
 
 	start-stop-daemon --start \
 		--pidfile "${PIDFILE}" \
diff --git a/net-libs/tox/files/tox-bootstrapd.conf b/net-libs/tox/files/tox-bootstrapd.conf
index 3413f5907d46..34836de6287d 100644
--- a/net-libs/tox/files/tox-bootstrapd.conf
+++ b/net-libs/tox/files/tox-bootstrapd.conf
@@ -5,13 +5,16 @@ port = 33445
 
 // A key file is like a password, so keep it where no one can read it.
 // If there is no key file, a new one will be generated.
-// The daemon should have permission to read/write it.
+// If you change this directory, either change the keys directory
+// in the /etc/init.d/tox-dht-daemon script or manually set the
+// new directory to have user "tox" and group "tox".
 keys_file_path = "/var/lib/tox-bootstrapd/keys"
 
 // The PID file written to by the daemon.
-// Make sure that the user that daemon runs as has permissions to write to the
-// PID file.
-pid_file_path = "/var/run/tox-bootstrapd/tox-bootstrapd.pid"
+// Make sure that the user that daemon runs as has permissions to 
+// write to the PID file. If you change this file, please edit the 
+// etc/init.d/tox-dht-daemon script to reflect the change.
+pid_file_path = "/run/tox-bootstrapd/tox-bootstrapd.pid"
 
 // Enable IPv6.
 enable_ipv6 = true
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 9b67a0bb1737..bfbb95186f12 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="av">Adds support for audio and video.</flag>
 		<flag name="dht-node">Enables DHT Bootstrap Node.</flag> 
-		<flag name="no-log">Log level: 0 (no debug info logged)</flag>
 		<flag name="log-error">Log level: 1</flag>
 		<flag name="log-warn">Log level: 2</flag>
 		<flag name="log-info">Log level: 3</flag>
diff --git a/net-libs/tox/tox-0.2.8.ebuild b/net-libs/tox/tox-0.2.8.ebuild
deleted file mode 100644
index 7e056d8ed926..000000000000
--- a/net-libs/tox/tox-0.2.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-MY_P="c-toxcore-${PV}"
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+av daemon ipv6 no-log log-trace log-debug log-info log-warn +log-error static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )"
-
-RDEPEND="
-	av? ( media-libs/libvpx:=
-		media-libs/opus )
-	daemon? ( dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TOXAV=$(usex av)
-		-DMUST_BUILD_TOXAV=$(usex av)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_SHARED=ON
-		-DBUILD_AV_TEST=$(usex test)
-		-DUSE_IPV6=$(usex test && usex ipv6)
-	)
-	if use test; then
-		mycmakeargs+=(-DTEST_TIMEOUT_SECONDS=120)
-	fi
-	if use no-log; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "logging disable"
-	elif use log-trace; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
-		einfo "Trace logging enabled"
-	elif use log-debug; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
-		einfo "debug logging enabled"
-	elif use log-info; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
-		einfo "info logging enabled"
-	elif use log-warn; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
-		einfo "warning logging enabled"
-	else
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
-		einfo "error logging enabled"
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/initd tox-dht-daemon
-		newconfd "${FILESDIR}"/confd tox-dht-daemon
-		insinto /etc
-		doins "${FILESDIR}"/tox-bootstrapd.conf
-		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		enewgroup tox
-		enewuser tox -1 -1 -1 tox
-		if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT%/}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT%/}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT%/}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
-	fi
-}
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild
index 54d31725efe7..5307394b1288 100644
--- a/net-libs/tox/tox-0.2.9-r1.ebuild
+++ b/net-libs/tox/tox-0.2.9-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 cmake-utils systemd user
+inherit cmake-utils systemd
 
 MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
@@ -14,17 +14,19 @@ LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
+RESTRICT="!test? ( test )"
 
-RDEPEND="
-	av? ( media-libs/libvpx:=
-		media-libs/opus )
-	daemon? ( dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
 BDEPEND="virtual/pkgconfig"
+DEPEND=">=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	av? ( media-libs/libvpx
+		media-libs/opus )
+	daemon? ( dev-libs/libconfig )"
+RDEPEND="${DEPEND}
+	daemon? ( acct-group/tox
+		  acct-user/tox )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -97,8 +99,6 @@ pkg_postinst() {
 		ewarn "consider disabling the DHT-node use flag."
 	fi
 	if use daemon; then
-		enewgroup tox
-		enewuser tox -1 -1 -1 tox
 		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
 			ewarn "Backwards compatability with the bootstrap daemon might have been"
 			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
diff --git a/net-libs/tox/tox-0.2.9.ebuild b/net-libs/tox/tox-0.2.9.ebuild
deleted file mode 100644
index f227ce28006d..000000000000
--- a/net-libs/tox/tox-0.2.9.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils systemd user
-
-MY_P="c-toxcore-${PV}"
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+av daemon ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )"
-
-RDEPEND="
-	av? ( media-libs/libvpx:=
-		media-libs/opus )
-	daemon? ( dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUTOTEST=$(usex test)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DBUILD_MISC_TESTS=$(usex test)
-		-DBUILD_TOXAV=$(usex av)
-		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=$(usex av)
-			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
-	else
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=OFF
-			-DUSE_IPV6=OFF)
-	fi
-
-	if use log-trace; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
-	elif use log-debug; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
-	elif use log-info; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
-	elif use log-warn; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
-	elif use log-error; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
-	else
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "Logging disabled"
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/initd tox-dht-daemon
-		newconfd "${FILESDIR}"/confd tox-dht-daemon
-		insinto /etc
-		doins "${FILESDIR}"/tox-bootstrapd.conf
-		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		enewgroup tox
-		enewuser tox -1 -1 -1 tox
-		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
-	fi
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3c3b33fcc6f5..984c23d25bcb 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,8 @@
+AUX 2.26.2-fix-noGL-build.patch 1491 BLAKE2B 1bdbffea8af3d2d7d8ddefe0b9a057e0dca2cdeead448a5b693f5ba14a74fdd0cc9bb9407c5a6fb9f0ed344bf438678910d746620b5038314b0f0477c6272bd7 SHA512 a1f8d968b1487b7172a2f66f47478c1fc85ea55c64da2fe45ded77463c8e3541bed3f14d16177db881dfeb2d68cd9bcf3a8b411242f5c51a1f302e2d99fd2a8a
 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
-EBUILD webkit-gtk-2.24.4.ebuild 8439 BLAKE2B 7ec88a755d2797216fdde296c2ef58a7e447f83962868189799dcd1ba14016cb430b0e670b2819dfe916ff8c376f31ddb2005ce918a91f16736fbf953aef8e62 SHA512 4766bdf88de134dd6e239e0ef8642ffd9f581a2cccaedcd68e7e7d62f5dd6f21973652786ff744aae6f5bd1148c0728782e85a4f89cc95d29e693e78b918f9e2
-MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
+DIST webkitgtk-2.26.2.tar.xz 19330000 BLAKE2B c0142aa19572c96e3dff11251316a4527be0357cf101177e056dd40aa9b5346216a4dcc14071d9c1240c101bd03f2179559d0d2bd81308967aba8530208186e0 SHA512 98d47282fd8f766dbe4a74c1a3f618aaeeeed69bd0666ed4e8674ae562b634681b3bd18b0d428df6bfefbaa3e18eb4cfb2fb077f5be4fed34cbc81c8293ec33e
+EBUILD webkit-gtk-2.24.4.ebuild 8484 BLAKE2B e90d9d5215581ff7c8adb971b3a9f9a4baa77ba96aabe25315bc5af09ba37e130a95e4049b5769c6ff479420bdd9940acf03059e672f27090f961c3f2d5a0d0c SHA512 547a97fe6ae454c820610238aeca287d62e3d7b44feb3b53c0bf21f235bafc8e0e0fb07aa751a90b30ce43aca0648dbe7717516a9b1d9e1875ba1fbe6b9b7674
+EBUILD webkit-gtk-2.26.2.ebuild 8682 BLAKE2B 432bfa6a0177d064f75dba0ee3e2006f5e60f370b96d7ca2de4dfa35a34d3bba2c7ff1d0333b771a5bc7a1509957f2029c86106946e8301126b1d3fb7dd63a51 SHA512 713fdb52ec4f432737dda2fc618848b8672f8f34be17cf313d7b75a56ed3aba05c3d1e3a41837ee949f9af4a0c36f66d00f0ee5b1dbf97606c948f331d7bc295
+MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
new file mode 100644
index 000000000000..422c71a452f2
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
@@ -0,0 +1,31 @@
+From 0fb66b8787a857c5c51b7efdc950a6ecf930b6ee Mon Sep 17 00:00:00 2001
+From: "ross.kirsling@sony.com"
+ <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Fri, 4 Oct 2019 20:25:56 +0000
+Subject: [PATCH] Unreviewed WinCairo build fix for r250717.
+
+* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
+(WebKit::LayerTreeHost::invalidate): Deleted.
+
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250743 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+index 980513647ff..d214532d852 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -212,7 +212,6 @@ inline void LayerTreeHost::scheduleLayerFlush() { }
+ inline void LayerTreeHost::cancelPendingLayerFlush() { }
+ inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
+ inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
+-inline void LayerTreeHost::invalidate() { }
+ inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
+ inline void LayerTreeHost::forceRepaint() { }
+ inline bool LayerTreeHost::forceRepaintAsync(CallbackID) { return false; }
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 0d69dc72c24f..e88c10a5699c 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -10,6 +10,8 @@
 	<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="gles2-only">Use GLES 2.0 or later instead of full OpenGL</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>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 93381a7d5a11..0388d9311798 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.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=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,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
@@ -160,7 +160,7 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
-	eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054
+	eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
new file mode 100644
index 000000000000..b2ae6bf0f10d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -0,0 +1,287 @@
+# 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{2_7,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 ~ia64 ~ppc64 x86"
+
+IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +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:= )
+	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/gtk-doc-am-1.10
+	>=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
+
+	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-icu-65.patch" # bug 698596
+	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch # bug 704236
+	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 "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 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/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 91e3648ce5a6..9d9482798526 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,20 +1,12 @@
-AUX wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch 383 BLAKE2B 96a5cc390fdfd41de567aec0f18b70449cfbc41246511995d522928253ef1892b961b79f65a8300eb83197bd842ac93dfc1727abf1229cc68880d83d4aa0f1c9 SHA512 629d0890d46849f2b46ce1823955f9bca98f0adb04f3ac92758c90435841803a0134cea66ef9ba01262f2abc8da82ded9e113dfeec51722593b36943c5d2786f
 AUX wvstreams-4.6.1-_DEFAULT_SOURCE.patch 271 BLAKE2B 9960e2d7db57c7f91e6f1a8709f82e6fffe7131579943342a10146750fa68ac7175d141df8eaad3228f93c3f152e5feef0ad33812be844db959c24b4a78acfdc SHA512 99ffbd0551b60f66487db9cdda019400d244d8865ce8998bc906fbf169f1a3c19b7e8deaed57f2b572df8aa23405762405919929b894251115db05b786bee0dd
 AUX wvstreams-4.6.1-autoconf.patch 701 BLAKE2B 1d76fab4056d78be9491439166c6c256352f389abd3d43e33a3af4727c198b82cc8721e14be23a7c4cdca17ef922a30a3ad6e060b4278ac08573c0dda2321d34 SHA512 31262107df38069b64b52b9660f0b5d8a2644a7f59e0e3e03a0502b1590690f039ad19d33ce73c3890b1e3d240658a5119791386db9e5a1f7045ae4650b1349e
-AUX wvstreams-4.6.1-fix-c++14.patch 1205 BLAKE2B 9f7574dc2e1f4fdb77e3498bf427dcb716f7a0d7f450b7933a7bacda10e5b15f6f4ddf72b16ab5ea7bdbb670ff1bc8fc97048818aefc6da3e486b9be1ff22fde SHA512 a627b30fa9af412307fa082f27ff999fb7f198cf4acecc14f9efa0aee493a602672628b555096e833692c66abc35bc64011abd0588ac26232d338b0c81c69306
 AUX wvstreams-4.6.1-gcc47.patch 1308 BLAKE2B 4c49bb694eb50452f3d158ef9e8c80978614c94d9e482e55434ab3aa9ec62468b7fa87c737d2812f56c8acd6a221234f80548ccae65f20e46d7e7ba2b1ad3748 SHA512 cfac44a0c80d58e67d4a3be17cca3008f6c7bba02b434701fcf07a1209220edf93b4d0dc1f478456e07e28f9e39ab9d19a52a07ad1f9ecd09028ef5446cebfa5
-AUX wvstreams-4.6.1-glibc212.patch 497 BLAKE2B d4ba5b6e687b7746f4be510721ee5fc7fda4d5f8c7c7e9b14479e0301de6329925b8a876ec3e98007d7edcc3646685c1e18b45d4b91ed891a69df4950ccb4415 SHA512 467ef4faad88b4ba150a05f95147bbd2ba8d297bbb5e32a1c85e482b62786e1ec82f6ae8a8f62426c01239ec9e9da899f38fcd7a7d4737dd9a8c9d6de0bdedb1
-AUX wvstreams-4.6.1-openssl-1.0.0.patch 399 BLAKE2B c290744f06cd7781ce64fa43e0d7a076b80fa3130425e2ad19768f6cf3f88bcd007b6ab5d3fc2fef24396cb064c76917a577f25f9329cecbc3c41f1500f4008a SHA512 98d8c8b529e9ce6c8219f70dbec8f9270d14952e88e3f0f0cf16e58cfed2cad8a2bd4039d2006290f9567beaeb5ec77ef500fb5bc812b7a3bac6a1bf4e2888aa
 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-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a570194a93d64142ce6e96f81c141cdb4ae33c6e785fe863278347e2b7903df13a5390305a18568fca9880c2ac45534458671ec SHA512 a8b90e1bbda676ba4303c7a31fc896955c3a0aea0ba4d8a69514210a4baa1cc4228de43b648788cfca2e6b607040daaa520568c7d15b258d04b803bba6375637
 AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
-DIST wvstreams-4.6.1.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
 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-r3.ebuild 2402 BLAKE2B 11f5dc37d031861bda2deb3dc218b8d67a6bedb6bf8b16d35f1d55629e41ff9442bc84194f26702bc9e04f9a3bab49aaf1dea0c2ebf46609dbf4f85e19b9ab5f SHA512 3d2ef93469dcefac2389f9f0cf6db5fa8a5971449ff33e146c290de7d45984078a8652a8613f0ee7aecd3adff65896d131b8363613dd73e36f1a6f8569a517d7
-EBUILD wvstreams-4.6.1-r4.ebuild 2039 BLAKE2B 8d2e705b314f886c8522e63fac56614962ac58326e208f870f72725827a9664d1b758800fc3df1d1c51c4bbe2e350614ed820a06eab3d9af5b6613179bf069f4 SHA512 4ba831bf157f148dcf3e2e9b8f5c23cf84ce81868031ac8e88390a867af988eb2b332a55e19867a99838ddd088ecc12bcc038c305303e3b1741dbce826989ffa
-EBUILD wvstreams-4.6.1-r5.ebuild 2113 BLAKE2B 312af3556c5452ce0b995389d5aa90259fd86d3fcc3267e621caa8688aefa90f0f48886e500eaf7e56bb0118edb4304da26114e747c3f590825388f9ef715b9d SHA512 54240ebac515d1e1c042d9ae4f558d95c3051ddacb2ec2f3aa1f686c4bccfb2d10f1d0aab44c33f95cdabc8df91a7563824bc0a2cbdd30542444f4b763fe32c0
-EBUILD wvstreams-4.6.1_p14-r1.ebuild 2189 BLAKE2B 9b096fd73ab24b14a6a54b7d61f6ceccc1ab22f0fbfc6471eab68326870d628de6bccff7f34a82523cd1c6360bb4055b8108e90a6004a9ebc47bc8735d613fca SHA512 8fe32b296980ff64b846344b91cf0e3e45c5531d3719a6e57e7e881d2344625b0cbaf54737ecd96dc3d4cc41c6489af2ce7037eb1d8bcf95a6e7e84a5af38ce5
-EBUILD wvstreams-99999.ebuild 1968 BLAKE2B 201f9877c6b7a826896dfd477dca8e70bb851be3189107b5aac33b2cfac891fa0d82e04687ace39213c36e753d07bc760368be67af73f4f4a8f2128de703379b SHA512 4cec4908411d8e650ba2fd047bc37e2bf60b78b3abb2ec7befb4cc0be1ce6f1a1f70139523e15162492e9f73ccfa6e9e0763917bb9cfab9a13c4b814c1c2242c
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2187 BLAKE2B 7622c4df5392cd805c08a0e7ce256a2ff2a281f3c4d1ec1c2c538bf94572f72f7021095efa81f4a8541387362ae91e3bb84b728c32a3be883697e1f91c8de40d SHA512 211932968546be0ba58571d3cc86cf01983cba85972da6a9431bc275c00bbbe43f96cc64c7c36e6df64eac0f0a08991477323b4063fdd3938560f43b37303cc4
+EBUILD wvstreams-99999.ebuild 1994 BLAKE2B 4b2ec6ec4b00ef7489e7686ba4e5e1246f764184b6fe0a9bc858ce13c2978dc09c5c008375fa0b9cec037259a1b9092623b26bde9b3d833c1a175350dc3e3a6d SHA512 a6dfa70fa397c14af6721ba461b271e09208ecb12f5f5253e4bdbfdc1edc768aca14652d95fcc6610baab044bf7cf76d71a392bf42c76573db40e126b2ea2ad8
 MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch
deleted file mode 100644
index 15fb13ca633c..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/utils/wvtask.cc
-+++ b/utils/wvtask.cc
-@@ -429,7 +429,7 @@
- 	    total = (val+1) * (size_t)1024;
- 	    
-             if (!use_shared_stack())
--                total = 1024; // enough to save the do_task stack frame
-+                total = 2048; // enough to save the do_task stack frame
- 
- 	    // set up a stack frame for the new task.  This runs once
- 	    // per get_stack.
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
deleted file mode 100644
index b2c2efd56248..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix building with C++14, which errors out due to explicit operator bool() conversion
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594058
-
---- a/streams/wvstream.cc
-+++ b/streams/wvstream.cc
-@@ -907,9 +907,9 @@
-     
-     if (forceable)
-     {
--	si.wants.readable = readcb;
--	si.wants.writable = writecb;
--	si.wants.isexception = exceptcb;
-+	si.wants.readable = static_cast<bool>(readcb);
-+	si.wants.writable = static_cast<bool>(writecb);
-+	si.wants.isexception = static_cast<bool>(exceptcb);
-     }
-     else
-     {
-@@ -1019,7 +1019,7 @@
- 
- IWvStream::SelectRequest WvStream::get_select_request()
- {
--    return IWvStream::SelectRequest(readcb, writecb, exceptcb);
-+    return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
- 
- 
-@@ -1107,7 +1107,7 @@
-     // inefficient, because if the alarm was expired then pre_select()
-     // returned true anyway and short-circuited the previous select().
-     TRACE("hello-%p\n", this);
--    return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
-+    return !alarm_was_ticking || select(0, static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
- 
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
deleted file mode 100644
index 38218d7213a9..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/333301
-
---- a/ipstreams/wvunixdgsocket.cc
-+++ b/ipstreams/wvunixdgsocket.cc
-@@ -1,5 +1,5 @@
- #include "wvunixdgsocket.h"
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #endif
---- a/streams/wvatomicfile.cc
-+++ b/streams/wvatomicfile.cc
-@@ -11,7 +11,8 @@
- #include "wvfileutils.h"
- #include "wvstrutils.h"
- 
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
-+#include <sys/types.h>
- #include <sys/stat.h>
- #endif
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
deleted file mode 100644
index 327e19a0c11b..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/304283
-
---- a/crypto/wvx509.cc
-+++ b/crypto/wvx509.cc
-@@ -1157,7 +1157,11 @@
-         
-         if (ext)
-         {
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+            const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#else
-             X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#endif
-             if (!method)
-             {
-                 WvDynBuf buf;
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
deleted file mode 100644
index 34eb54286d84..000000000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE="pam doc +ssl +dbus debug boost"
-
-#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
-RESTRICT="test"
-
-#QA Fail: xplc is compiled as a part of wvstreams.
-#It'll take a larger patching effort to get it extracted, since upstream integrated it
-#more tightly this time. Probably for the better since upstream xplc seems dead.
-
-RDEPEND="sys-libs/readline:0=
-	sys-libs/zlib
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	<dev-libs/openssl-1.1:0=
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	boost? ( >=dev-libs/boost-1.34.1:= )"
-
-DOCS="ChangeLog README*"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	if ! use boost && ! version_is_at_least 4.1 "$(gcc-fullversion)"; then
-		eerror "This package requires the active gcc to be at least version 4.1"
-		eerror "or USE=boost must be installed."
-		die "Please activate >=sys-devel/gcc-4.1 with gcc-config."
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-parallel-make.patch \
-		"${FILESDIR}"/${P}-openssl-1.0.0.patch \
-		"${FILESDIR}"/${P}-glibc212.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-fix-c++14.patch
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		argp/configure.ac || die
-
-	eautoreconf
-	pushd argp >/dev/null
-	eautoreconf
-	popd >/dev/null
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CXX
-
-	use boost && export ac_cv_header_tr1_functional=no
-
-	econf \
-		--localstatedir=/var \
-		$(use_enable debug) \
-		--disable-optimization \
-		$(use_with dbus) \
-		--with-openssl \
-		$(use_with pam) \
-		--without-tcl \
-		--without-qt \
-		--with-zlib \
-		--without-valgrind
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		#the list of files is too big for dohtml -r Docs/doxy-html/*
-		cd Docs/doxy-html
-		dohtml -r *
-	fi
-}
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
deleted file mode 100644
index 2cd4879c7322..000000000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="pam doc +ssl +dbus debug boost"
-
-#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
-RESTRICT="test"
-
-#QA Fail: xplc is compiled as a part of wvstreams.
-#It'll take a larger patching effort to get it extracted, since upstream integrated it
-#more tightly this time. Probably for the better since upstream xplc seems dead.
-
-RDEPEND="
-	<dev-libs/openssl-1.1:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	boost? ( >=dev-libs/boost-1.34.1:= )
-"
-DOCS="ChangeLog README*"
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-glibc212.patch
-	"${FILESDIR}"/${P}-openssl-1.0.0.patch
-	"${FILESDIR}"/${P}-parallel-make.patch
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CXX
-
-	use boost && export ac_cv_header_tr1_functional=no
-
-	econf \
-		$(use_enable debug) \
-		$(use_with dbus) \
-		$(use_with pam) \
-		--cache-file="${T}"/config.cache \
-		--disable-optimization \
-		--localstatedir=/var \
-		--with-openssl \
-		--with-zlib \
-		--without-qt \
-		--without-tcl \
-		--without-valgrind
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		#the list of files is too big for dohtml -r Docs/doxy-html/*
-		docinto html
-		dodoc -r Docs/doxy-html/*
-	fi
-}
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
deleted file mode 100644
index db808c10219b..000000000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="pam doc +ssl +dbus debug boost"
-
-#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
-RESTRICT="test"
-
-#QA Fail: xplc is compiled as a part of wvstreams.
-#It'll take a larger patching effort to get it extracted, since upstream integrated it
-#more tightly this time. Probably for the better since upstream xplc seems dead.
-
-RDEPEND="
-	<dev-libs/openssl-1.1:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	boost? ( >=dev-libs/boost-1.34.1:= )
-"
-DOCS="ChangeLog README*"
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-glibc212.patch
-	"${FILESDIR}"/${P}-openssl-1.0.0.patch
-	"${FILESDIR}"/${P}-parallel-make.patch
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-	"${FILESDIR}"/${P}-2048-bytes-should-be-enough-right-question-mark.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CXX
-
-	use boost && export ac_cv_header_tr1_functional=no
-
-	econf \
-		$(use_enable debug) \
-		$(use_with dbus) \
-		$(use_with pam) \
-		--cache-file="${T}"/config.cache \
-		--disable-optimization \
-		--localstatedir=/var \
-		--with-openssl \
-		--with-zlib \
-		--without-qt \
-		--without-tcl \
-		--without-valgrind
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		#the list of files is too big for dohtml -r Docs/doxy-html/*
-		docinto html
-		dodoc -r Docs/doxy-html/*
-	fi
-}
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 d0d55418697e..85af66408cbb 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="boost +dbus debug doc libressl pam"
 
 #Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
index c1820cfa0dbd..d700be44cdf9 100644
--- a/net-libs/wvstreams/wvstreams-99999.ebuild
+++ b/net-libs/wvstreams/wvstreams-99999.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic git-r3 multiprocessing toolchain-funcs out-of-sou
 
 DESCRIPTION="A network programming library in C++"
 HOMEPAGE="https://github.com/apenwarr/wvstreams"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/apenwarr/wvstreams"
 
 LICENSE="GPL-2"
 SLOT="0/5.0"
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index dd55d8660486..14fbf3e1f600 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,13 +1,16 @@
 AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e5e05a938a19a583feca808f78c4b497fd459a8adaece01d0482b132646033575cd50ad5b1b7 SHA512 7f666e98634b205964d69fd540fb79c7ff3b6f1b423ed416a966d1e0d6a18d950908e1dc463e3cc8029fc062b2ff7d29693af8e5af2fb13a36500d40b16345e9
 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30
 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768
+AUX xrootd-4.8.3-Werror_only_Debug.patch 1183 BLAKE2B 482ea67f3138600b3e3a2de22986526366cac6e854ffc09ff613601a7ec7d71de796129137eb2df47feccb232c5c2160286ef3328834da76960819a914a6475a SHA512 48cb86f5e5ea4fa1c238048aebc775db3d6611c6b3f61adcf692715dcdd0dba4d0c4fafbef3beeaa4690723c9684ccf899e236cd1a4e772f55ac31bb4b597839
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-4.10.1.tar.gz 2532982 BLAKE2B 79cc334c631060e9be48c4f443837065e786f49513e535150f7490a9a5a17ec91f4f5dd054b0f15cb6b60ecfc18a1447e28825dc7d6665ef59004ab11665f9e2 SHA512 49234db532292c6ef04d455a1a6a5d1ff4d6705c088d5c2571602f444cb9bf03699e63a12ba962a6d3a8b9cc9f43635889ec33976840326a8301c81da7099397
+DIST xrootd-4.11.1.tar.gz 2549971 BLAKE2B e131769291d33d2198c4afdedd0d9f9a0eac9459654277763554d2dfba211b7123f3d0dfc90fe365c7f4da2590d9bec6daf994ee7ae241897aa10b4500362c3c SHA512 7853de40d40f28177f70a18f17ee99f83c8b6c6ddf0b5e7ef64df83c5457bad11e6249c75f985c207c3292fab73a2181730ce9c8bf11979535a566c5364de8a1
 DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
 DIST xrootd-4.9.0.tar.gz 2517614 BLAKE2B 5f1ce6f599fdf5b1f9b4fa078d9b306be241757f95e9b5e9bc0a6f06450a21315778428d8c1d1ffd28ef0841bc50fca387036740bb707d9a96b7f07e94e15540 SHA512 a956262a8adae4c9cb9a91275d4207943cf43251fc61ade111c91152c62baf06c1cbdf1d659c6d792703045a4c2a82bac732220ecfd2fa707e445d6fc66ee047
-EBUILD xrootd-4.10.1.ebuild 2613 BLAKE2B dd3799d4fbed93f55ef047269b342838df7d08a9e6391cf952ddd05faa0bc949826bd1aec522fa2cdd3ad7fa305d1b8b37f01147a9bd946670e24c08c24702fd SHA512 18871a066b60dfe7b4b36656999b767dbe8be79bba44aa8d0f9b84d0eac5c7ebe061c888392a93316753cee66f03cabb0f975fc8ee37804b7394c115a1167336
-EBUILD xrootd-4.8.3.ebuild 2620 BLAKE2B c3d7e283da7c22f9ea7290053ed84f4e3be59cbac25d80bad0a0b42c08e470a5a49ab2cf2537dc1b6cb58fd6a643793fdd16d87c9b1dbe2b4f82834c082ebf5a SHA512 3f98a43aa8e0eee1c5a511ace759fa7c191b254534e15acd6b34972601d6a5c7a5adcd291fd63a99bb6466c85f2e0038dd492f54c4f94007a24f932f3765a111
-EBUILD xrootd-4.9.0.ebuild 2630 BLAKE2B 3117b56d6a2bd7b41e0e7a2e8146615a4852cba3f4eafe49bb6e3b17a2a2074918aac9442e951f36b8d93e52c313acfda06ec8eac9f1ab888e15f8490a50d909 SHA512 6a36fd83e707fcf7a08192a1bfa3d7c0d5589d0e68bd8599ca686be8a0dca5073bff1840473cade6570fa09fb7970304441547129180d0f8f457b83ab7293f9c
+EBUILD xrootd-4.10.1.ebuild 2552 BLAKE2B cc55def6902199693116daad42eae35079a15dbb51dd32d86f7a7b1ced1a8afd3f8407c1abd5e5232747973b490324b1bf244146e668e99ea9375299910429fc SHA512 b3dfba06efa1454a9178c23cdd4507ad1d7c7fbffb9a91f69da10d34f814bfe6735cb42221827e3ec1ec08ffb58736dac2008a49f9819247b17fb77c6b99e3ce
+EBUILD xrootd-4.11.1.ebuild 2516 BLAKE2B fda9ae309307fbdc7c6b2996ecc305d310e1750e47f044744e9fc1f15b45b452c0c7b4b1e49f33c15346cc6458462a9b3a19e3af6a72b3e55cb61cf467c3ac8e SHA512 8d386d956d6c323bf54f07d7c02065cb477ff3b2f77fa40f3d894e6a8aa767133c5fec7ee879de530ec6478e8f9bd3ce45b47fb8d13db3c267333f088a8b19dc
+EBUILD xrootd-4.8.3.ebuild 2672 BLAKE2B 6d7ca5ca0dde690749a3f704935c2ea93ab7323fc2bb55a63fd5b4b595f11f2829440e690b2b5decb2fa576926e05901c6b42144914cb4fa369007bd25e3c603 SHA512 7f368cc50498ac135739a2b51dfa13a2501cfc9421dc9f7d92f09fdce1e3868a87b4ac1c68459dfb467bfb2f9f4798ee4eafc2f9b6c19e0609c1a4a0ef7252af
+EBUILD xrootd-4.9.0.ebuild 2682 BLAKE2B f1f04784c3d4419fcab646542b6db9299544f5e8a3fff1d033bda20be2e864fad3e26ae9ee3ab73ef63ebf0d2fe7bb8da920336319537be75dcb21a1b6ce5445 SHA512 9e4cd7c71c6276a37277766c226c4df6eb1868c678326c557b67b6f4c58cd87cf5872832a6b45db395fec24a0f0b05eb8512be2aa23b3332950b70c224b12b97
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch b/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
new file mode 100644
index 000000000000..2f0a64b13fd8
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
@@ -0,0 +1,22 @@
+Only set -Werror - which among other things prevents xrootd-4.8.3 from being
+compiled with gcc-9 - either in debug mode or when explicitly requested.
+Backport of the change made upstream in 4.10.
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -26,7 +26,15 @@
+ #-------------------------------------------------------------------------------
+ if( CMAKE_COMPILER_IS_GNUCXX )
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
+-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
++  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
++  #-----------------------------------------------------------------------------
++  # Set -Werror only for Debug (or undefined) build type or if we have been
++  # explicitly asked to do so
++  #-----------------------------------------------------------------------------
++  if( ( CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL ""
++        OR FORCE_WERROR ) )
++    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
++  endif()
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" )
+   # gcc 4.1 is retarded
+   execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion
diff --git a/net-libs/xrootd/xrootd-4.10.1.ebuild b/net-libs/xrootd/xrootd-4.10.1.ebuild
index 84ac2910a28b..bdfdc4d72002 100644
--- a/net-libs/xrootd/xrootd-4.10.1.ebuild
+++ b/net-libs/xrootd/xrootd-4.10.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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils python-single-r1 user
 
@@ -14,7 +14,7 @@ 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 rbd ssl test"
+IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
@@ -22,7 +22,6 @@ CDEPEND="
 	fuse? ( sys-fs/fuse:= )
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
-	rbd? ( sys-cluster/ceph )
 	readline? ( sys-libs/readline:0= )
 	ssl? ( dev-libs/openssl:0= )
 "
@@ -56,7 +55,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_CEPH=$(usex rbd)
 		-DENABLE_CRYPTO=$(usex ssl)
 		-DENABLE_FUSE=$(usex fuse)
 		-DENABLE_HTTP=$(usex http)
diff --git a/net-libs/xrootd/xrootd-4.11.1.ebuild b/net-libs/xrootd/xrootd-4.11.1.ebuild
new file mode 100644
index 000000000000..735dfba08105
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.11.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/"
+SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fuse http kerberos python readline ssl test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="acct-group/xrootd
+	acct-user/xrootd
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:= )
+	kerberos? ( virtual/krb5 )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		python? ( dev-python/sphinx )
+	)
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+"
+REQUIRED_USE="
+	http? ( kerberos ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib*/libXrd*-4.so"
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CRYPTO=$(usex ssl)
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+		if use python; then
+			emake -C bindings/python/docs html
+		fi
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doxydoc/html/. )
+	dodoc docs/ReleaseNotes.txt
+	cmake-utils_src_install
+	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+	# base configs
+	insinto /etc/xrootd
+	doins packaging/common/*.cfg
+
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
+
+	local i
+	for i in cmsd frm_purged frm_xfrd xrootd; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+	done
+	# all daemons MUST use single master config file
+	newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+	if use python; then
+		python_optimize "${D}/$(python_get_sitedir)"
+
+		if use doc; then
+			docinto python
+			docompress -x "/usr/share/doc/${PF}/python/html"
+			dodoc -r bindings/python/docs/build/html
+		fi
+		if use examples; then
+			docinto python
+			dodoc -r bindings/python/examples
+		fi
+	fi
+}
diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild
index 90f82f05b9a5..df36a3d62137 100644
--- a/net-libs/xrootd/xrootd-4.8.3.ebuild
+++ b/net-libs/xrootd/xrootd-4.8.3.ebuild
@@ -42,7 +42,10 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-crc32.patch
+	"${FILESDIR}"/${PN}-4.8.3-Werror_only_Debug.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
diff --git a/net-libs/xrootd/xrootd-4.9.0.ebuild b/net-libs/xrootd/xrootd-4.9.0.ebuild
index f42a32f1833b..55c0653ee3be 100644
--- a/net-libs/xrootd/xrootd-4.9.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.9.0.ebuild
@@ -42,7 +42,10 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/xrootd-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-4.8.3-Werror_only_Debug.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-libs
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)