gentoo resync : 03.11.2019

102 files changed, 1263 insertions, 1650 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 52d44da8972b..4674fc73731d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 1d08b1427b06..87b545eb9370 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,5 @@
 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 2075 BLAKE2B 4dd36dd182b973f2ea7dfe62e261b343009fe6883cea866939d2d0acc0f3dd7a583f0bbd4679f1b2664e76e15f1c9c4ea55976b3e805320b88c2e77a0c143ba3 SHA512 dff482a6cadbf14ab95f2b616e18a859a451091b4798e646d1f06a925e4e9cd2ff686fe620f1f500a5e815c4fa2a038b0aeb0538512747da167f86e6d9ecaf21
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
new file mode 100644
index 000000000000..d35a99d2acd9
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
@@ -0,0 +1,82 @@
+# 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-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 7c8befddac4b..5d4cd57b93d7 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,5 +1,7 @@
+DIST gnutls-3.6.10.tar.xz 5795984 BLAKE2B faa4069613bacffbbc3fe00a7b8963f0aa7eacc7946ea51912e2b6366964cf7001d40aa5de3f0543405c54a3200da0c0029150ec7cce84d598bce44b461f2fab SHA512 fe0481f9e4219e983b01b91e69ffd95819a4c0d0c09028509106d561967e9c5d900bc5e3a48140a34fa4467feda2a619085adf3fa8fdade96c8debf125e91ae8
 DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3
 DIST gnutls-3.6.9.tar.xz 5773928 BLAKE2B 9dd7678fd7ea9f170816358a6ac385193fe4db8052e7a35d553e18e8618ea88aeed2b618b288f98f2f480cafd560d46de04234808560a8ec18028574bf26b706 SHA512 a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07
+EBUILD gnutls-3.6.10.ebuild 3906 BLAKE2B 133310cd3a4804042e8e82990f5e60933c8ef8ee05e2a312bbd9e7217971efe09541a6018165f67b3903612d274ce24c86cb7358062da06bf34cc94d6eea1916 SHA512 e5dc77b13cd0d0f7759bb316f50d62fbf3872ce977d49d24c28aef402818ef4464e82662c0030a01bc435f1204b5d81f5e81e9bd6861a654c35ae3cc190f4a10
 EBUILD gnutls-3.6.7.ebuild 3886 BLAKE2B e794b5866ad786d8efb9127d8016551d21167143419c61fe7b7ede90e30bb89e6ba8b113953bda692c798271f8b81e7f86a61d9c44af21a830a9bd125ee9e8f1 SHA512 7984b2c7e407b930bdc71bb87576ec792181bf6ad35c5d4c9761900d50aa2adffa7ea64724e12581a566538c5fa513b4adb2ddb80284bd96766f21588986c4da
 EBUILD gnutls-3.6.9.ebuild 3906 BLAKE2B 133310cd3a4804042e8e82990f5e60933c8ef8ee05e2a312bbd9e7217971efe09541a6018165f67b3903612d274ce24c86cb7358062da06bf34cc94d6eea1916 SHA512 e5dc77b13cd0d0f7759bb316f50d62fbf3872ce977d49d24c28aef402818ef4464e82662c0030a01bc435f1204b5d81f5e81e9bd6861a654c35ae3cc190f4a10
 MISC metadata.xml 1277 BLAKE2B 08fd439ce197f1ce2b1fd5bdedf6e409410aeb45a473b2b81ab9316ef32b367d44d0c65f3e768fae9edba1a03f572417e3f7dd23ee73b700dd0798e3dca30292 SHA512 dc4e4e3a72732012cf37d21b881e44933d5e3720ee1f3dc2c5d88ae97e7e2cea79628282bebd7d58048db7edd0bb7be80ffca23d126f333600172f16473341f5
diff --git a/net-libs/gnutls/gnutls-3.6.10.ebuild b/net-libs/gnutls/gnutls-3.6.10.ebuild
new file mode 100644
index 000000000000..04d15d723851
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.10.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	ECONF_SOURCE=${S} econf \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable seccomp seccomp-tests) \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable test-full full-test-suite) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable valgrind valgrind-tests) \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable sslv2 ssl2-support) \
+		$(use_enable sslv3 ssl3-support) \
+		$(use_enable static-libs static) \
+		$(use_enable tls-heartbeat heartbeat-support) \
+		$(use_with idn) \
+		$(use_with pkcs11 p11-kit) \
+		--disable-rpath \
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
+		--without-included-libtasn1 \
+		"${libconf[@]}" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 4e19a79de148..e2ec7aec4198 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -15,6 +15,7 @@ DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c
 DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6
 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
+DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
 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
@@ -23,4 +24,5 @@ EBUILD grpc-1.20.1-r1.ebuild 2413 BLAKE2B 283f25fd00b590bcf935841f3f8ebbb3d955dc
 EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056356a8da4218a7c82489525563caa5b660ac23d4a7b45b35648d7d6c0d8cc3a1d36454c2595fbd294802115ca61 SHA512 e162969923aa7c9e9ef27ce35b22a57d93f1cea297b4b4fe4667a912cbf9a953738da5beb223e36c041648ee809e3073e26b41a37b0242179cdc61fa0bf1e64e
 EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
+EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
 MISC metadata.xml 737 BLAKE2B de7262f1cccfe21d55f3ae0f744e067d54912995520b46b9fd3107abfed3c057082f91854f4bc4c399606a31200f0f2da468218b1d677de1aca1155532395d60 SHA512 dbc3dc0370c809f0ea1ad5f88dcef44b0ca5a2bbde47606acf85ec6149892f19990608da9b5fd4417e77a5b565a34fc481a9c7b27b00e11a5c0015ef04800a7c
diff --git a/net-libs/grpc/grpc-1.24.3.ebuild b/net-libs/grpc/grpc-1.24.3.ebuild
new file mode 100644
index 000000000000..ee95dff335a2
--- /dev/null
+++ b/net-libs/grpc/grpc-1.24.3.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.7.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index ad278c34289b..0358a61ea925 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -3,6 +3,6 @@ DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691fae
 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 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
+EBUILD http-parser-2.9.2.ebuild 987 BLAKE2B 25ab848c502bed87d886141c4cdda99d717b4efb1c9adf12b2ba0a585b5941cad568ee05cc7b0d873f9fc1cee0bcabc908eff7493c8bf0a2924bd842aa809442 SHA512 a537821d7431625cc06eea472b78aed6c2dade6b4e748a01d5d1134bdd029f2f4ddfbecb807c584dc12c09a667257e6d9bd339ee546b65d4b46349ecb203e163
 EBUILD http-parser-99999.ebuild 848 BLAKE2B a34ef61acb4072b1b51e13f4381fc6076b8b5e2693a281d1d41a0a15455ec29532aa7c69e474ecaad23b2230ff0d9894d02302e6940148ae19dafc080b508761 SHA512 b74380f265418b2956102b0d56c34ebbe8a439eb81dfd75f91b80eb266094d19940f29af59d50c894f832499af6aca11710ba14631b6111f5a9ea2c4ff4d1735
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
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 2abe7cff69f8..c09ea2bb8b01 100644
--- a/net-libs/http-parser/http-parser-2.9.2.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2.9.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index 7ab56eee92fd..b83d59d4ef1c 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -6,6 +6,6 @@ AUX libircclient-1.8-shared.patch 2348 BLAKE2B eea99254aed77d0f9f05968c7d08bd6d9
 AUX libircclient-1.8-static.patch 209 BLAKE2B cc25d264d6d1801584ee06ca51921f7ad1dee1499b1e604c8d732779b44f22aa93fc076c97fee45d131d10cb46cf611a4e03220e61462d2b0003653554667217 SHA512 b1161ce28e5a8d668c852ee0ac336c186426a9467156c66ebe4805a722297ec225cc6b859c13003741d05a15ced1ccfaca0a20d98bf0bf933fc84fc1a97d8827
 DIST libircclient-1.10.tar.gz 288863 BLAKE2B 28bcfb36553c04be28ef4ffc0cf5fe3af8538704997f628f311719d245a0629ff49bee2c512d29e4d43a24a2803cbafc99512ebda7d5c991d9ecb2f1786a9d24 SHA512 d677ceae0bfabc112671b351fb94d048399a7ad025ff33a2ff1ae6313382fcc78b64d499f2c882eb8b894abdde949562395819e4059fd14640dfae6757b0c259
 DIST libircclient-1.8.tar.gz 291803 BLAKE2B 7fcbf8e8466ac95ca5a27475551af45f828b29385b28071d02271deae03d6bbd3589e86efe56b1fe5020be7894e699534ef1e3a2f2fedca1909e4d8e0c04d067 SHA512 f19e4b55cf49091ab2c83ff3d5cace2252daad6bf23cb61b7677b9c6055fe8a8a7d891f6e1e5962481c836f47b7dcd35ef563c8807737ac81e3c4cee253cfc4a
-EBUILD libircclient-1.10.ebuild 1365 BLAKE2B 4254434f3d3752a5dcc227dbcc30d5e0a3222f896be6d79cf2e4eba1ed7be97899b7faf915f52277e4067346a86105cb33213784353a7959c2a43e9e4f788f8f SHA512 d276b780ec42933013769c3a36195fc58aee441152664eb7bb50e316025a9d3989b97d2c4584be568ba2f373c61e8aceac173e1df3a0efce04806743e7458a00
+EBUILD libircclient-1.10.ebuild 1360 BLAKE2B 3091541933889ee79eb321ac1d3dc2d203c6c7082a5cb692c5f73830faf47b8e43dfb5bc511231290c9770189106d0d33df9516266d5b16400a8400f1ed99e64 SHA512 fcc3712deb08af153a3b76e885d59d01e201eb0ec746afa2bf5eed4b4640965005e1c56731ec3fa55b08c5e17a2bd036303bde161aa2acbf363eca1941790086
 EBUILD libircclient-1.8.ebuild 1135 BLAKE2B f28f32d1a8a08987f214ca78c4c53a7108644495a9136b2145c36396a1bfcebf8e205cc69381b261183006ed1beec1f89c39ecb23e5e5d99d22f5f5c209bcf29 SHA512 c638d79b35913a4c095ce6a8b2b7122bed056fa0dd01242837067fe1273181d898970961647afeed42311a9cccfb1c6cdf00f0af4f33b6bdcbe899fa76517d03
 MISC metadata.xml 335 BLAKE2B 9616df0f3f19ee3ece536dfb658a60a9ffb53bed2562086cc5d0f15f27116a86d3ace0c0a796c476045a74d49e803008d9c345ad027f8bdfbb5923e008445268 SHA512 af62ea7ba30a57f3271bded0d53a9122693e992d1050667701ba54bb33d6851b6ddabecf5f54bbdf8aebb212bd3e6a5999a8e8c1b2bbdd6666243ccb24a6182b
diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild
index 03a8f11f2744..4607040231bc 100644
--- a/net-libs/libircclient/libircclient-1.10.ebuild
+++ b/net-libs/libircclient/libircclient-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="doc ipv6 libressl ssl static-libs threads"
 
 DEPEND="ssl? (
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 55084634a242..4ecc4f594d91 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -2,5 +2,5 @@ AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c7
 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 1348 BLAKE2B e2e563a158b9be304a206f6359d7965b367d238893b979bc65b257a216ce253fb61e1b5785c530104ea752b79eac80988758b33eb7adac86adf6525e35d79e7d SHA512 22e76136f24c9783b6a0948d6bf7dd3504d9cdfabed4e14acb5d733e1eeac747867982c9c36e94da1add7bf63ca316b8500454691a9469ad21d672fea7d97154
+EBUILD libktorrent-2.1.1.ebuild 1373 BLAKE2B 56d5d05762fd9c691fdcaa91e9cbd6fe5aee41209f9ff59d72bdc25e03771fbb6783e8ddb9b2edb79a4e985eab6649b5c3d7b397fc9a968d23bb576c680ed844 SHA512 309addb6a6fa35912c1ce737c1cbd3e263d970f087c9e764bfd53be051aa697b4f9a74d7ef5a68e8ef74b53fd2bb24e494dd4f0ef1d8be8cc468f8695ffdaebf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
index d9c041e72e83..4c1d065c3ba0 100644
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
 SRC_URI="mirror://kde/stable/ktorrent/5.1.2/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
@@ -51,7 +51,7 @@ src_prepare() {
 src_test() {
 	# failing network tests
 	local myctestargs=(
-		-E "(fin|packetloss|send|transmit)"
+		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
 	)
 
 	kde5_src_test
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 2a9ffe2e55a2..5568103363a4 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -7,13 +7,13 @@ DIST libmbim-1.16.0.tar.xz 453532 BLAKE2B 68732c02f7ee56d898895fe61a1aac44b0c1e8
 DIST libmbim-1.16.2.tar.xz 455096 BLAKE2B f29eaea16ab1f627ed7976fb84d6d1234bc58009e140e70e5ef4f3b9d2a37fcbc3a5492ccbf94d83c169cc64d4f7b545ce556704ce3c750bc00da80d5431119d SHA512 6081a5b40b7fc5cd21adf1948c16c57919c452bc2eccdccb561412ecada5aca7ff1fcac79568eb3dda83d49c780b0dab95a0b15bda0c4f2712b735cbe95402be
 DIST libmbim-1.18.0.tar.xz 474768 BLAKE2B 3dce8e1fa0e57cdf75174d0145006b38213fcd2de9166589f2d3ddd7a17dae3b308ce7a7338d388543c8ba83b6a9d2bf12051cbde1666fc43580314d9906704b SHA512 510af324563a6a4f9a9d656d6724398cf5c5ba07424962d5407dd05867ef36da40e1ee6c8be8040c6a67e764bc059d24282db45ce3d47075fcf4d7416245b28d
 DIST libmbim-1.6.0.tar.xz 360800 BLAKE2B 28b36b14ee8b28793ae0dbe2b2cd421b1d5cf7c2c8aa853d9920fb2f413239fcb5cff7c341f2841ee68052621b2a60e1dea3f212a0ba62a7310353f9215191b4 SHA512 60c20da65cb5e0e5e3d73434c8b7960ebb7138d6b004d4e6223ba63ea95fdc97b35697a329f12a81033c39c36efcbb3bcb5d8ae813a569dc6e6ca928a1cd79dd
-EBUILD libmbim-1.10.0.ebuild 978 BLAKE2B 4bfd2e6e747e123c344a4470a106c9eeb9507e3396a3193b9f84fb3d136ba84a621ff849c6b7abf5f43bc7e4714ffc9120baad2189d4b270cc9b199446ba40dc SHA512 4c00111928fdb75fb724a53af78d1c0f9f8ecb2ecdf7b3ffa16dcb6d2074793bbf847cd1fae3dfd5a75c4b98d70ad85d43fd723a8b87a55468db7d748acee477
-EBUILD libmbim-1.12.2.ebuild 987 BLAKE2B 31e41adf3a6a3d9b11a22d22e893a005814294a317aad607348e25e75b4dee3e0cf9227715a0cd342cbf71d76a635afc7cc5fe9b0ee01192960cb501189e6a9a SHA512 4c0d5114727d4e57b8a397f3a0b60bbed4f6added6a6eb10e2ec58fbf4275550616ff65229b660b62e87d16fbaf66e16631ca378f50add7e9f1241ef68fb5ad7
-EBUILD libmbim-1.12.4.ebuild 988 BLAKE2B 07a00a52935fe1802f68a2f451a12c323184f839ac460e39ab4beb29df9e8267eb46862acd94ab3c997b3dc6ab13ecfc6121d7afd26ca4245b423086d0fe9ad4 SHA512 8bbd7f599f2d75d929c783d43034df610be4644dfeda5a3614a33ba9dac701b865a4192fe06012797ad1b8af0f563afdd295a0a5a6c975c09eff57fc9f48ae34
-EBUILD libmbim-1.14.0.ebuild 810 BLAKE2B 52706816df8314067a8942676155dd03248a54557fda02eb68c6f72596e3c43056246e3ebe45a9267f3eb3291382116d6a2da04211108cb45bb46268b4a65c21 SHA512 f8d9216416815e67ac3ff0aa8a21bf1256df4e844a8d32ac6accc3fbc42fdee623f66cb93c5398eabc1d245fa52c718b8186862ce882ccb847d439700ac978ae
-EBUILD libmbim-1.14.4.ebuild 815 BLAKE2B 338dd76d93238f75f41ebd107061f25d6021060bedd43786ef72fbe0d8a74fb47f7ee4f71fdabb195e069abacfa17bad40d54a08b339c2904acdaf95cb7825eb SHA512 2bb0ab43a8e3f67c8374478c624efc939af2619763816a0049b24574ecc3f8759212f681c8e9fa4e03b6575f8ea17b14d25170d041945b8651bec9279d61dad0
-EBUILD libmbim-1.16.0.ebuild 815 BLAKE2B 338dd76d93238f75f41ebd107061f25d6021060bedd43786ef72fbe0d8a74fb47f7ee4f71fdabb195e069abacfa17bad40d54a08b339c2904acdaf95cb7825eb SHA512 2bb0ab43a8e3f67c8374478c624efc939af2619763816a0049b24574ecc3f8759212f681c8e9fa4e03b6575f8ea17b14d25170d041945b8651bec9279d61dad0
-EBUILD libmbim-1.16.2.ebuild 809 BLAKE2B c4d9bf31b9f66c7a7db41fcf364434493efc060e44aca108b00d61347d5bc427da3c6f2eb6cb7217961994e0e784c75c9b4d070085209cc02309fcdd99baa8b0 SHA512 22f7701c9d9f3d3bbfd299085be8fb6f9afffbeaa13f4593373309f5c167cd9c0cd5e894ed7e7648511db74ebbca4f7e2e5604bc3fef463be7d0ee3691f56586
-EBUILD libmbim-1.18.0.ebuild 824 BLAKE2B 48aee6f7c039487cd4c9d3621d29b5869bd5b5d9ea8770fe9263d865a700311eca66cc299cd286f53a14b05fe0c7a8b3b759dd9f542e3674a0ba28ac0dd94357 SHA512 3514d10062d850f5c04ae30edb78361b287d27a5393b98bf025fcb44753595683225d70f4c2e45b512d9a34ed8cfd1f772e6801eb6f1fe95a12ad30856e30f72
-EBUILD libmbim-1.6.0.ebuild 1023 BLAKE2B cc6e5b462180591769753a4dbd40b0044559efda7fe562d930cbbb623e44216b48b1c0287557b620a867455730ed8a643adba60a986ee20a22681c3eb29a39b4 SHA512 32d7ed0a5e40b0113aa920f67451b4b7494f9ef52dcf20c7e785418409fbf068e898b1b6e762c6e13c97cb8768391b67b9e669fd429196986f78a25a14cf03d0
+EBUILD libmbim-1.10.0.ebuild 979 BLAKE2B 058a9fb29064585ec9f2fcb92581a916d380d5e36086de0adda8fa5235a2046eaeca1791c3488b6f06ece04999974362e92b485838cc9ac87be1f024f020f81d SHA512 7881744c5e3d8c7edc33f4105cbcec269e39fd62f1dce458cfef346ba78d7a4457c7fe1e77809ffbdd1ffda2085498c235490c3e26885b1a851c6dee10c08ec8
+EBUILD libmbim-1.12.2.ebuild 988 BLAKE2B fa6ee4214c67581706d76391286f573c28e5f6b78bc923d00beb3e2168cc85fe354de92ab6f88dfb09e4f713b2e030b3beb9db8f2893451bb6722aced3ba7615 SHA512 ef6017ccc7856b8e8a0af519923aa472866f7967018483065cf8091eacdde852f38d0604e3fdcd82a39c6d1638cf721e6ce54415be7ec49fc8a49778e34b4618
+EBUILD libmbim-1.12.4.ebuild 989 BLAKE2B eda63b9b2012135245be21ba56d45d8493e1cb6faccb23ba476cd97c7720c4af17878759d8f16bbc11271b52eee7e335e55f7a45fa3b7898b4688015de507c45 SHA512 2596c64860e086c34159755761f978e886de761a6e04eff3883cab98d55d52efa05871b3cabb4f2bc235a5674c3f99bf110a973b5a5624f76b04a5da209edbc4
+EBUILD libmbim-1.14.0.ebuild 811 BLAKE2B 489a2c2d5a8fbde0a084631025ac8780c962407c9e07b27b83c7363a43792d4e0d1c0e4d9302fecc132d9cff45c4e191961a350115c2befb682e5c69a6ae175a SHA512 8e384e7ee4914adec14ff6ceab39bf0940d48a5e7d657c9a0f416429a6fc56ca33f0c691427a4155f447191a0695b0b8e325bbe431eee1665f85e522b918ef7f
+EBUILD libmbim-1.14.4.ebuild 816 BLAKE2B 398027b913bebfddd07a91335c9df5e58a584cf46b8fc364a7f7b23872a4349660b680956fae8b1301643e5072c01711ee1be561729145aa65c830676c758228 SHA512 057b2fdab9ef6784236e173b0b9dc21f6fa68d642c4acb7fcb32e4f55ba6f0fac365486489f4e5ba33fbb2aa38dd6780dd89924dd3910cc05b482c7e7692fa2d
+EBUILD libmbim-1.16.0.ebuild 816 BLAKE2B 398027b913bebfddd07a91335c9df5e58a584cf46b8fc364a7f7b23872a4349660b680956fae8b1301643e5072c01711ee1be561729145aa65c830676c758228 SHA512 057b2fdab9ef6784236e173b0b9dc21f6fa68d642c4acb7fcb32e4f55ba6f0fac365486489f4e5ba33fbb2aa38dd6780dd89924dd3910cc05b482c7e7692fa2d
+EBUILD libmbim-1.16.2.ebuild 810 BLAKE2B 81d677b03e4fa582cf7807102db9b7a44449c62fc024357e0c52d97730308411d474e35da970ab0f9de86e1492ec7636dce0c35e5d3fbc133ba7b73c66e61638 SHA512 a19fa48df208b1c7ac5136c7b0dcb9de41d74e898db8f0279fd1c07a3ca3cd69669c202eb9f742cebea4e1b950466e90a0a37a8f159661de3d263c01a7c16172
+EBUILD libmbim-1.18.0.ebuild 825 BLAKE2B 55f5f72e4f5ee961508c9afbc33548b7c5513469d67768fbc9854f4c6e7e08bc7d63c129c33adfd41a8f55cbd2a097d91a4340f604d8d60c2fc2eb9a5d0f4b96 SHA512 ddd17fa4bcbdb0f65d785e3b08d84dce712e2a34e38c0ea62e851d45a9977fc8e5d7e22a4a5f5979e70c77e5e79305d5ef98dd48c73be16f5923d80c008f90eb
+EBUILD libmbim-1.6.0.ebuild 1024 BLAKE2B b938785aca0831730d7fb88f5639c6f998a613cd6844a6bb1042626f0665ce3ea8ef7e715c52e7272388b0e8a75d3fe730d29b313280b983029cf6e78a507709 SHA512 94d9cda9535f60d53d494c4c4cf64e0dca5229f2e31aa7fc396608e2eb694d4f932f5ea28888304fca60a503de3a65f7bd48124caac48c32909eb7b500df6b04
 MISC metadata.xml 241 BLAKE2B 5323e3cc2a6d62c9fe301f465f7e03b145f6877adc893cf9e3f0fe4863fce3423f3471f62fce04fafc65428fb4781d2d74d796281d9332d0707e45bedec9a1a0 SHA512 d85c72d707e2c7290ff4bf18bbbd34b938cddb7e09528c5d10fa7f141122e3836687c2fff91c1000791457b7f808d3222fe671755a0fc25c157d80c908bc3cae
diff --git a/net-libs/libmbim/libmbim-1.10.0.ebuild b/net-libs/libmbim/libmbim-1.10.0.ebuild
index 580a6aac03e0..a91ced3b0bcf 100644
--- a/net-libs/libmbim/libmbim-1.10.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.10.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	virtual/libgudev:="
+	dev-libs/libgudev:="
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/net-libs/libmbim/libmbim-1.12.2.ebuild b/net-libs/libmbim/libmbim-1.12.2.ebuild
index 7d9320f581a9..f96e8c73e933 100644
--- a/net-libs/libmbim/libmbim-1.12.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.12.2.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	virtual/libgudev:="
+	dev-libs/libgudev:="
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/net-libs/libmbim/libmbim-1.12.4.ebuild b/net-libs/libmbim/libmbim-1.12.4.ebuild
index a91f073f9d48..5f1e5580419b 100644
--- a/net-libs/libmbim/libmbim-1.12.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.12.4.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	virtual/libgudev:="
+	dev-libs/libgudev:="
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/net-libs/libmbim/libmbim-1.14.0.ebuild b/net-libs/libmbim/libmbim-1.14.0.ebuild
index f10f42cfecdd..ae78f4905e48 100644
--- a/net-libs/libmbim/libmbim-1.14.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.14.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/net-libs/libmbim/libmbim-1.14.4.ebuild b/net-libs/libmbim/libmbim-1.14.4.ebuild
index 9620241e8973..3205f4a10e4a 100644
--- a/net-libs/libmbim/libmbim-1.14.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.14.4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/net-libs/libmbim/libmbim-1.16.0.ebuild b/net-libs/libmbim/libmbim-1.16.0.ebuild
index 9620241e8973..3205f4a10e4a 100644
--- a/net-libs/libmbim/libmbim-1.16.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.16.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/net-libs/libmbim/libmbim-1.16.2.ebuild b/net-libs/libmbim/libmbim-1.16.2.ebuild
index 595dcdc5bfc9..ceb337e60f12 100644
--- a/net-libs/libmbim/libmbim-1.16.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.16.2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/net-libs/libmbim/libmbim-1.18.0.ebuild b/net-libs/libmbim/libmbim-1.18.0.ebuild
index a8e2b82383b3..b1da88a0beab 100644
--- a/net-libs/libmbim/libmbim-1.18.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.18.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.36:2
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	virtual/pkgconfig"
diff --git a/net-libs/libmbim/libmbim-1.6.0.ebuild b/net-libs/libmbim/libmbim-1.6.0.ebuild
index c959f6cc15bf..c0c238ded468 100644
--- a/net-libs/libmbim/libmbim-1.6.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.6.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.32
-	virtual/libgudev:="
+	dev-libs/libgudev:="
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index e6c9849a9ffa..60c700a7d2d0 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -2,8 +2,12 @@ DIST libmicrohttpd-0.9.63.tar.gz 1840005 BLAKE2B 0fdbc97901a3c5fd9567e70c58e3ef9
 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 1264 BLAKE2B 6cd0a690a3f344e6e6fd60cb7c7601f1c5abf9f8fcbcc4fc81e2b4b730ae037afda530e984318c7cdba26d6126f22f11d2747a56194047eacd69e86cf181abf4 SHA512 eac1917a4193109502a487008b23405a4f11acb437e87f3b444d328b41f228c5e3a08f78aa11b71d6471b64df294e594b5f56e1e64ef6b2abae49c0acd235cfb
 EBUILD libmicrohttpd-0.9.64.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
 EBUILD libmicrohttpd-0.9.65.ebuild 1263 BLAKE2B 0bcd99e0f8042197263d6b8ae874121597f379e7d3f5e543b16f0d967a1501ef5de207184012bcd3cd0f26b5e484267de92927e6313686ab44dc53d48e6454c9 SHA512 dfbd43c649735e7a9e67b1493a4f1cf562a9a9ffe8841aa680483675c2e748a60b2fa5f9d0e4d22eee479096922731f3b477f76812488c49ee38a753f5eba30f
 EBUILD libmicrohttpd-0.9.66.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
+EBUILD libmicrohttpd-0.9.67.ebuild 1258 BLAKE2B c4c3cd46275d511540b912a9394d16cab151c412810b6349979c504e59713549d110658364924ec966e83d163ce8ea0bd45e3b52932970022c86f4bfc884afb3 SHA512 f2434105bb05696f3c104b523fcc7872aab568bdb2bc263391ae8902bf1ea02f5033ca1abba2984b94191614d9bf9e2bef34a980cb2ff9ecb9a49ff61e9ced39
+EBUILD libmicrohttpd-0.9.68.ebuild 1258 BLAKE2B c4c3cd46275d511540b912a9394d16cab151c412810b6349979c504e59713549d110658364924ec966e83d163ce8ea0bd45e3b52932970022c86f4bfc884afb3 SHA512 f2434105bb05696f3c104b523fcc7872aab568bdb2bc263391ae8902bf1ea02f5033ca1abba2984b94191614d9bf9e2bef34a980cb2ff9ecb9a49ff61e9ced39
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild
new file mode 100644
index 000000000000..6d9443a12376
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild
@@ -0,0 +1,60 @@
+# 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 ssl static-libs 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-messages \
+		--enable-postprocessor \
+		--disable-thread-names \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(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
new file mode 100644
index 000000000000..6d9443a12376
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
@@ -0,0 +1,60 @@
+# 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 ssl static-libs 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-messages \
+		--enable-postprocessor \
+		--disable-thread-names \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(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/libnet/Manifest b/net-libs/libnet/Manifest
index b3f8d691081c..d06aac774a8c 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -3,6 +3,7 @@ AUX libnet-1.0.2a-endian.patch 393 BLAKE2B a9dd6ce1763fb109b7f36d0cdf2c36297c0b1
 AUX libnet-1.0.2a-funroll.patch 232 BLAKE2B dc4eea13f830b03e02cab52d594dbd0322c30b2f7189ad35ebc6bd6c703f35ff5e6ae9f69ef35fc57cf224d56d09f07b71287be3c429421da7da5bb6ccf4e939 SHA512 c00749b3a17f08ba000ff26206a46a1b49f53e0a04b49df2151124e95b789854d8a3df563ad13553b35b4c683dca2be53905380a0f1d8eedb71c86d18b26127d
 AUX libnet-1.0.2a-gcc33-fix.patch 462 BLAKE2B 04fc43b82605a6200aac4edc5de509bf545d0fd103e9d088db147bcd5042c11827b918e8560792665982548033e439cd0a5af1938415c2852bd335e0f6f283f6 SHA512 ca4913145ffaf42ef1d267558ac00c096d1561a6dddf05b11f229aef969cc1601492168ae238d5d46b7015722822f9600018bc8a7cc344a4176e4d6c6e0c363f
 AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5
+AUX libnet-1.0.2a-test.patch 1172 BLAKE2B 105a23a904da361216f370b005016d205ea971855a064d45b1282faabdb11878cbc2568ffe311074eb437677e03d604497727c58273711826af125a1cc3f11a6 SHA512 3ab6e667798362d605c2a1a5b8c172c80a99d2569d4418cb47b7bb8f69ea424e718b2947ea22b43d882c556f65470bec04451d9356070b8a4fe10f6505122bf7
 AUX libnet-1.1.6-musl.patch 686 BLAKE2B 08d509fbb0dc960aa8e3fa622e958fe9b4fbadaf8cd47896c02eb90bcc897eb1a3b7699350f7a64f63a529efc325573bd5b5d730f7129ea601f6338db2d09fe3 SHA512 23bbf5e87b704b2d4cf3f6da308b29d840950fde67eb67294ed44bc18eb327b4a2bcd04218dbd1a27a2445b3df7a98af72b1d5bd1afc83cb448a9e8f403aec01
 AUX libnet-1.2-_SOURCE.patch 735 BLAKE2B af32a0eb7f6dac2fb909785f7ef95bd98d0bd92f48759ab4673d2c3f10b894bd0732fe82fa1fd60ce897c0c4b0eaefc8ff57b3cd13ec632f89ebd00376e5fee1 SHA512 698138d6d39984090fb906cc0201b720c399f0a55dd06cc8857159f0e045bd980c195876ef2662fa4e54d6dfd12e1a106e6c829dc201226c97296c2d24bc2a59
 AUX libnet-1.2-rc.patch 333 BLAKE2B 5e3d0803e985f2ec49f11236b8fdc59742aad401448e921c3c5180354f52e4bd9be28804c656ede929c107c7577c48241277642a5650e0647b0842194afecca0 SHA512 144796cbcf550982a523df46763a60ee5261c8fd80adc674c0a2075b1003623785a1c5589e6ff53a5472e43f3f16d859e71ba6fa98aaaabc767ceb4805676bcd
@@ -10,10 +11,11 @@ AUX libnet-1.2-sizeof.patch 239 BLAKE2B 141f8d9c32d351e5f30eedfe0b92b0d9cb7ad0dd
 AUX libnet-1.2-socklen_t.patch 145 BLAKE2B 35a13516984af9f460c0778a25e205c79e7152178549203f070676dc69ae20b9c99ada7a0194ec898beaa45b403cd584a458079b1d2c458b0b1923f9628d7d8c SHA512 31e7dbee2e6d747a69d86f9cfba43d1f591d97f2868b14c9fa16884f5d1650a7602ca10e875afe5779477d9358db6121fd66371fe183a865860376fb809aef97
 DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
 DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
-DIST libnet-1.2-rc4.tar.gz 615726 BLAKE2B 90d2a98dc52c32ff7d97edd4f85c04e56ba5c9300b39fff560f39078dbfd451474118168c291db1fa13fb0d6af123c23a604e03d0f88609a0c131c694cffd755 SHA512 01c815c9e544f00a2b35372466ff8b372b132e3d4ee7b99557f799e0b4380777bebde2ce9bdd804314dffe88ce953f332923d9fa2bf3c186ea19e045b94edbcd
+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.2_rc3-r1.ebuild 1177 BLAKE2B a55b2b372255c92e2ca74f5408ffe85f36df6ef50ba62cd0e4d24cf0b0f3a52f9271168b0042c12c47446afffccee2b60938b5fea19fe81c4c8926f19136a752 SHA512 c6bea7f97ea6c5a8c1330347ce258716c66248ad4036ddb6353fd73636f20d52757c5d4006865a7d779347ab8512c908d7634d7d17c99eef9dc6e0d2ce9a2af0
-EBUILD libnet-1.2_rc4.ebuild 802 BLAKE2B 7e1e42f622c4046be068259d653bc912bd7d3cc008ebe9073ed0f75acbf99339d48c154796f697a9f8007823f10258935ef1cf7fd1b2594fe60f1d5cb7a3d5b8 SHA512 aee2b9821fb0b9b72a7b5920b8296a976713b1031271afea5351df96461d19ea8ca042904568926f297f4055385acd356fbb5b80cd90d75ad95dbc6ba42918a9
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/files/libnet-1.0.2a-test.patch b/net-libs/libnet/files/libnet-1.0.2a-test.patch
new file mode 100644
index 000000000000..8bbb2ac45d19
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.0.2a-test.patch
@@ -0,0 +1,54 @@
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -9,31 +9,31 @@
+ all: test
+ 
+ test:
+-	if ! test -e ../lib/libnet.a; then \
+-	    cd .. &&  make; \
++	if ! test -e ../lib/libnet-1.0.a; then \
++	    cd .. &&  $(MAKE); \
+ 	fi
+-	cd Random; make all
+-	cd ICMP; make all
+-	cd UDP; make all
+-	cd TCP; make all
+-	cd Ethernet; make all
+-	cd OSPF; make all
++	cd Random; $(MAKE) all
++	cd ICMP; $(MAKE) all
++	cd UDP; $(MAKE) all
++	cd TCP; $(MAKE) all
++	cd Ethernet; $(MAKE) all
++	cd OSPF; $(MAKE) all
+ 
+ clean:
+-	cd Random; make clean
+-	cd ICMP; make clean
+-	cd UDP; make clean
+-	cd TCP; make clean
+-	cd Ethernet; make clean
+-	cd OSPF; make clean
++	cd Random; $(MAKE) clean
++	cd ICMP; $(MAKE) clean
++	cd UDP; $(MAKE) clean
++	cd TCP; $(MAKE) clean
++	cd Ethernet; $(MAKE) clean
++	cd OSPF; $(MAKE) clean
+ 
+ distclean: clean
+-	cd TCP; make distclean
+-	cd UDP; make distclean
+-	cd ICMP; make distclean
+-	cd Random; make distclean
+-	cd Ethernet; make distclean
+-	cd OSPF; make distclean
++	cd TCP; $(MAKE) distclean
++	cd UDP; $(MAKE) distclean
++	cd ICMP; $(MAKE) distclean
++	cd Random; $(MAKE) distclean
++	cd Ethernet; $(MAKE) distclean
++	cd OSPF; $(MAKE) distclean
+ 	rm -f Makefile
+ 
+ # EOF
diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
new file mode 100644
index 000000000000..5419190c2e16
--- /dev/null
+++ b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
+	"${FILESDIR}"/${PN}-1.0.2a-slot.patch
+	"${FILESDIR}"/${PN}-1.0.2a-endian.patch
+	"${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
+	"${FILESDIR}"/${PN}-1.0.2a-funroll.patch
+	"${FILESDIR}"/${PN}-1.0.2a-test.patch
+
+)
+S=${WORKDIR}/Libnet-${PV}
+
+src_prepare() {
+	default
+
+	cd "${S}"
+	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
+
+	cd "${S}"/include
+	ln -s libnet.h libnet-${SLOT}.h
+
+	cd libnet
+	for f in *.h ; do
+		ln -s ${f} ${f/-/-${SLOT}-} || die
+	done
+
+	cd "${S}"/doc
+	ln -s libnet.3 libnet-${SLOT}.3 || die
+
+	cd "${S}"
+
+	eautoconf
+
+	tc-export AR RANLIB
+}
+
+src_test() {
+	emake -C test
+}
+
+src_install() {
+	default
+	doman "${D}"/usr/man/man3/libnet-1.0.3
+	rm -r "${D}"/usr/man
+
+	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
+	newdoc README README.1st
+	docinto example ; dodoc example/libnet*
+	docinto Ancillary ; dodoc doc/Ancillary/*
+}
diff --git a/net-libs/libnet/libnet-1.2_rc4.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index 8a6dcf74cdce..1fd8b0b6e396 100644
--- a/net-libs/libnet/libnet-1.2_rc4.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="library providing an API for commonly used low-level network functions"
 HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
@@ -13,9 +13,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="static-libs"
 
 DOCS=(
-	ChangeLog.md README.md doc/{MIGRATION,RAWSOCKET_NON_SEQUITUR,TODO}
+	ChangeLog.md README.md doc/MIGRATION.md
 )
-S=${WORKDIR}/${P/_/-}
 
 src_configure() {
 	econf $(use_enable static-libs static)
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 0e866c743236..966a4e2d9e28 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 574 BLAKE2B 79b753ff72150879a2ecf3d9392b4440142f6101350942521cc026e5f171f7461276a5799529caccc7b81206ff7c23e99dcfad81a732e4602ec12b8d59a92bc7 SHA512 c1091dd47ddda735c20f2ca82adbdddc6fd14e6bd5a896fc5940085996b4edf986cc6a646acac011878252f6f5015ac4ce7afffc6a01660c8a659744745a71e0
+EBUILD libotr-4.1.1.ebuild 687 BLAKE2B dadf73107171a83c518914f207c7708625d405a456f02f7b23c7595dad64774269c885cf4d4247ebb083438917a0ee2741ffdb9acf3d186a974f2f7aaa1077f1 SHA512 a530c2025bd24001ff89554d661eb317e3c0d2f80b7b2d25e17574477295fbb69b8b8f1b5fe004a98d7581d50795b0be007de0b4beae26e223435d15f6b1dcdf
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index ed4e3b66ff8c..ce15add6ba4e 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -12,8 +12,19 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-RDEPEND=">=dev-libs/libgcrypt-1.2:0
-	dev-libs/libgpg-error"
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error:0="
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS ChangeLog NEWS README UPGRADING )
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	dodoc UPGRADING
+
+	# no static archives, #465686
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 4d0d8bd6eb28..1ebff67786c9 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,20 +1,7 @@
-AUX libpcap-1.6.1-prefix-solaris.patch 806 BLAKE2B b79c23f923724c3a202ac14c3ba00aef0e6ec97431e61ad3e1ff518554fa155194425cdd04f15ca9233c69d70d66cb5583e1f2c26cb17de0141da137da91637b SHA512 a1b49dcf4328518e95807c8f307cbc3eb34680002fd9367c29cf637d80e0c55ffa2e4525822fe42660159be8a71ab925680e058a44ce63ea4482e7ebfdb0a709
-AUX libpcap-1.8.1-cross-compile.patch 555 BLAKE2B f86da7efd3a04b393a3ba77fb762924bd9c592b24f0b223920f91d52a9acaa2311b5481fdcc25e256c4dc2ae2f806bc20993a9a84e6ef1dd4434ff6176af2451 SHA512 a857a9c79ab6160cd82ed9d427c5e49b79c7ddfcbddd9f19998be5a27d8fd16920d7d5bdce14353ac7af80df878782b997007e0c7a7ebb6eb5e094eb6db1275f
-AUX libpcap-1.8.1-darwin.patch 395 BLAKE2B 629e349f4734ed1fd234082abf06eb2b1280c71a42049f84c37118d44f116a1a12dfe3a1df0f4f114f03492d59fef4dd0d8561c7f88904bc628f694ee0d62b15 SHA512 f068ec0a5853451676f6c4f2950880dd22623c5ad4a0c18441b7244914dc9b4db7a4df2ed81687b89adc9e742dbcd5d68bcbfa0fda1d61fd3d322c7fc6180907
-AUX libpcap-1.8.1-disable-remote.patch 776 BLAKE2B 085500b64c4f1da871b0ca13115dd95981f96279581908dd5bd779187970c82423531bcbd916955cc3deb1e15b71488adc9dcb5a92207cded6f162d7e137f3a8 SHA512 929243aa68ecf8ee4605fc993a9c64d1b7dba29990765f60a44c158ac7cc8c64f2c06861eae441cf8ee7379ebf3067ba5a2cd2df859212010180e85d2c3c6cd4
-AUX libpcap-1.8.1-libnl.patch 688 BLAKE2B 8f3c68374815f86c894c5fb9d29969bb5b76f757cf7e35e44b4d0021a2b67b3a39b70dd070070fd8a82ab68550e2c60bfbf4eb8a95e6a5c478316eceb398b4ad SHA512 f56a8f4b87c2f9bfb70e2b31b2e4dcb4fb80654b13cf541f9ff42f193cb9bb4e90a3ad9ef7e91c6ebc8667525bfc75ab78b54381d3f1709f10aaf9f48fd3a1f0
 AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
-AUX libpcap-1.9.0-os.patch 784 BLAKE2B 7b3d493ef9b4ffc62e113c22bd8b0f8e49cc2aa1abf91a98bc3d47114e53dff641ad256705c1a979ec0568d9b8b8ad14f47341d46eb44c945820219cbd39bb13 SHA512 ae64c22c12b812a15fc52f65aa26bf3860be6b5d64d63864dca140f03c6b435f30368447abb21f6ffc52a4e6d8ddf0e3a39ae40d11735e4314ba0829637563b9
 AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73ce1a621277593d8d818119eac910d51a1cf320175409363d94ef5157ccad3768753b2a6d00c404ea6db4b18911bb0e551c5d19447cfb SHA512 00cceca448928c233658600c65534abb76fc76b327c652c241925297ee251e540802b00b9fb7c5f4cafd8c47244df5d73e4c060d99b199e8c2a45f56dcd504f1
-AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856ad2c0ebaf68dc99b8a375158a112c47e0dfad7763caff7b0f7da8ce5b1ebfcb79a6cf3cf72636605dfd4097fb711 SHA512 82e0c48f2fc42c8df4a21009b9afac18ca4aaa14db822c0c85b4ea420434391dec3b5da90261d7afe01879354b43ef425c7464c9fe98a407a4b232590e361117
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
-DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
-DIST libpcap-1.9.0.tar.gz 819766 BLAKE2B bf98029eea58328c1c820966b100d8467373c9469c107bfe36bcf17e5250d64c45a331050b8a1027c4f4eb1600925b873e4fe43d866ba5a9dc5dcc7995137de1 SHA512 b94d63204f74fd155c1409c50b84c4a02d5b9db7069a24d42d496056416923183331f587903f9101d8464b74efc7db22f113c48e518bd7fb3082b333bbc337fd
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
-EBUILD libpcap-1.8.1-r2.ebuild 1979 BLAKE2B f5ec73791a44f9c865732a6515d5664d43464d6c6a761836f10d8ee6903f4f207e9c82a482f9a2f1ef5bce5c9b68fe6035e04f36b2a703830987fc2d6b0373b7 SHA512 6ad2eea58b2974065cab9a4ae9d26db6f06b33670ee59200ff393c76c96b90daeccb4f2af2b4a963f50d2e138f2acf97fccc4276ad6274903c58aff1d93372ea
-EBUILD libpcap-1.8.1.ebuild 1892 BLAKE2B 58b1cbaeb29022a110253276b7df4f4182626ec1992b9beaa3370521ffe9837fa286b46605c8f1279b2bd03128249c51739a0944bd75dcf183737d35f62626ff SHA512 50e6b200117df2b5f8299a4120e587c20a88f9e6f9de00751a13051a22cfd93bf2d26171cb98c0c336941ec6d1f721ad480c3a1d37a9082b875420cd4c7c0901
-EBUILD libpcap-1.9.0-r1.ebuild 1829 BLAKE2B 0c0f8d9d48e4beab451889b1a196a25f6d466ef9e28179f492ea954247c7fea84f9318d8c5f3287927587b9902186ed1989b7ceff016badf4f2eb8a9fc54f0f5 SHA512 3a17ab76016ca78c3d662c78a81aa6650e35b4c1d4c775097bc4c8ae1d2a1c4d29d75ba85f5f53026e962ee7d4d7b8b1e2f787a923fd7373027802ba639153e3
-EBUILD libpcap-1.9.0.ebuild 1786 BLAKE2B a03a7cd4be50fd8bd0aab4e2cdea773888d446ecd80648bab12e99bf5e79fe9cc2bbcb2014a5c95a4525df6c06e0ce1d44be14500dbc1e7ffa4d121b46e3f1a3 SHA512 bce2cbec68b83853bf771050ff14afbc3619aa955a2f0b3cb78354b86d053dc9e6dc657e9de28231c3a94e1c26120f36a8b458d55a9ff1eb706536d72fab2fed
-EBUILD libpcap-1.9.1.ebuild 1746 BLAKE2B 078278ef947781c3ac8c72657a6c6efbd30f279beaa741b8d3c19765d2941d341d68ee1c391003051324752d0885b95684b80baf9676e1c24afb4d6a67590b8e SHA512 dd4c2fdf7d990e84907beb5160c0e496814b2f679c0e87645f3718e7e7ce0c93954bb774cf16d08d2455534f5efa0a2b4f289c27922ce5b450fb08c7243c6c66
+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
diff --git a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
deleted file mode 100644
index 324aead551ae..000000000000
--- a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Prefix' Solaris uses GNU ld
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- 	    aix*)
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
- 	    	    #
- 		    # Platforms where the linker is the GNU linker
- 		    # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- 		    PIC_OPT=-fpic
- 		    case "$host_cpu" in
- 
--		    sparc64*)
-+		    sparc64*|sparcv9*)
- 			case "$host_os" in
- 
--			freebsd*|openbsd*)
-+			freebsd*|solaris*|openbsd*)
- 			    PIC_OPT=-fPIC
- 			    ;;
- 			esac
-@@ -497,7 +497,7 @@
- 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- 		    #
- 		    # "cc" is GCC.
- 		    #
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch b/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
deleted file mode 100644
index 361cdeb5ec50..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,7 +291,12 @@
- dnl XXX This could be done for cross-compiling, but for now it's not.
- dnl
- if test -z "$with_pcap" && test "$cross_compiling" = yes; then
--	AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
-+	if test -z "$with_pcap" ; then
-+		case $host in
-+			*-linux*) with_pcap="linux";;
-+			*) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
-+		esac
-+	fi
- fi
- AC_ARG_WITH(pcap,
- AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch b/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
deleted file mode 100644
index 650bea82518a..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
-Check for bluetooth/mgmt.h before use
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,7 +1117,7 @@
- 	if test "$enable_universal" != "no"; then
- 		case "$host_os" in
- 
--		darwin[0-7].*)
-+		darwin**)
- 			#
- 			# Pre-Tiger.  Build only for 32-bit PowerPC; no
- 			# need for any special compiler or linker flags.
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch b/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
deleted file mode 100644
index df68a5f0aa03..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch was taken directly from debian: https://packages.debian.org/source/stretch/libpcap
-
-Disable bits of remote capture support inherited from the WinPCAP merge
-which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
-
---- a/pcap/pcap.h
-+++ b/pcap/pcap.h
-@@ -506,6 +506,11 @@
-   #define MODE_STAT 1
-   #define MODE_MON 2
- 
-+#ifdef HAVE_REMOTE
-+  /* Includes most of the public stuff that is needed for the remote capture */
-+  #include <remote-ext.h>
-+#endif	 /* HAVE_REMOTE */
-+
- #elif defined(MSDOS)
- 
-   /*
-@@ -526,11 +531,6 @@
- 
- #endif /* _WIN32/MSDOS/UN*X */
- 
--#ifdef HAVE_REMOTE
--  /* Includes most of the public stuff that is needed for the remote capture */
--  #include <remote-ext.h>
--#endif	 /* HAVE_REMOTE */
--
- #ifdef __cplusplus
- }
- #endif
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch b/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
deleted file mode 100644
index 61dfc4e201d9..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -453,10 +453,6 @@
- 
-                 incdir=-I/usr/include/libnl3
-                 libnldir=
--                if test x$withval != x ; then
--                  libnldir=-L${withval}/lib/.libs
--                  incdir=-I${withval}/include
--                fi
- 
- 		#
- 		# Try libnl 3.x first.
-@@ -471,7 +467,7 @@
- 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS ${incdir}"
-+			V_INCLS="${incdir} $V_INCLS"
- 			have_any_nl="yes"
- 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
- 
diff --git a/net-libs/libpcap/files/libpcap-1.9.0-os.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
deleted file mode 100644
index d3ec8014084f..000000000000
--- a/net-libs/libpcap/files/libpcap-1.9.0-os.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- 	    aix*)
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
- 	    	    #
- 		    # Platforms where the linker is the GNU linker
- 		    # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- 		    PIC_OPT=-fpic
- 		    case "$host_cpu" in
- 
--		    sparc64*)
-+		    sparc64*|sparcv9*)
- 			case "$host_os" in
- 
--			freebsd*|openbsd*)
-+			freebsd*|solaris*|openbsd*|linux*)
- 			    PIC_OPT=-fPIC
- 			    ;;
- 			esac
-@@ -497,7 +497,7 @@
- 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- 		    #
- 		    # "cc" is GCC.
- 		    #
diff --git a/net-libs/libpcap/files/libpcap-9999-parallel.patch b/net-libs/libpcap/files/libpcap-9999-parallel.patch
deleted file mode 100644
index 61381a8e6d6c..000000000000
--- a/net-libs/libpcap/files/libpcap-9999-parallel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
-From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
-Date: Tue, 21 Feb 2017 11:41:43 +0100
-Subject: [PATCH] Makefile.in: Fix missing dependency
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7044f0438..f5d443aed 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -465,7 +465,7 @@ grammar.h: grammar.c
- 		$(MAKE) $(MAKEFLAGS) grammar.c; \
- 	fi
- 
--grammar.o: grammar.c
-+grammar.o: grammar.c scanner.h
- 	$(CC) $(FULL_CFLAGS) -c grammar.c
- 
- gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
deleted file mode 100644
index 92a37da429be..000000000000
--- a/net-libs/libpcap/libpcap-1.8.1-r2.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
-inherit autotools multilib-minimal ltprune
-
-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 static-libs usb"
-
-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.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.8.1-disable-remote.patch
-	"${FILESDIR}"/${PN}-9999-parallel.patch
-)
-
-src_prepare() {
-	default
-
-	eapply_user
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# 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.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
deleted file mode 100644
index 9fc1dee01997..000000000000
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-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 static-libs usb"
-
-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.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-9999-parallel.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h
-	fi
-}
diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
deleted file mode 100644
index 4fcee8fb7f7e..000000000000
--- a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-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 static-libs usb"
-
-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-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
-	"${FILESDIR}"/${PN}-1.9.0-os.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(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
-	prune_libtool_files
-
-	# 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.0.ebuild b/net-libs/libpcap/libpcap-1.9.0.ebuild
deleted file mode 100644
index 2aec97348eff..000000000000
--- a/net-libs/libpcap/libpcap-1.9.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-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 static-libs usb"
-
-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.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(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
-	prune_libtool_files
-
-	# 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.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
index 774c6e1c729e..9f48337ff265 100644
--- a/net-libs/libpcap/libpcap-1.9.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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"
+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 static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 6d328bb05e5c..877b8c514c78 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -13,10 +13,10 @@ EBUILD libqmi-1.14.0.ebuild 939 BLAKE2B 92e709ac26f9e53b52bf4dcd1cdb4a1dc574c2dc
 EBUILD libqmi-1.16.0.ebuild 1033 BLAKE2B 41776532f8d59524b9e15c5ffba94d39c6e164a90224b4e6091bbb3c5e8725a38f159816a7db31f85d9da4cb4f39d2cf230a6a31f19f012861211d6712c0b1b0 SHA512 18dca52d046cfb903f792a6d0b3b1bb668a249ea531db723481c8e0665640b85a911edebe62164865e9c865f8ee7a923cc23da07879cf81d741fe379141ede4b
 EBUILD libqmi-1.16.2.ebuild 1104 BLAKE2B d1c6fc14d1089b229d32c103b1737428eeac0d150614e752b1c517122cfaca9ee515ab0ac60fbccd39af17953bd425d6f0e32db3640664a9db466c71bd8052ac SHA512 1167f68f0a0d6edd26a8d66443c05c4bf7c4feced8ee7cbce1a1a7afc8a65e21eb2b7b02d8e79685d89a74f075b50e6852da6dfe6254a9a64677041112c9b3f6
 EBUILD libqmi-1.16.4.ebuild 1108 BLAKE2B d2be43c1b65dc95941f1aa6c63472f7edaf627892bfb2d53a986fac98aa59a2ee43d2f83f152456bc021c8fa10c3dc7ae25827cf28c52b795896bb19622b6262 SHA512 1263e89c91947b5385a7e9e744dca9a992bc6fccf72b8e85d651a638ce7cda232764f8a3efdb1863f26ab99da5d035d65b2b46f3dc40ada3597decfdb98b182e
-EBUILD libqmi-1.18.0.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
-EBUILD libqmi-1.18.2.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
-EBUILD libqmi-1.20.0.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
-EBUILD libqmi-1.20.2.ebuild 1131 BLAKE2B 0face20d09b64b7e8b6315a7d9381ab1d8a33768872c04c36f2d3fd2b6bd4d31734df65264d15aa72a0589d76c0a92ffff7e9dcc41059fedd1a5025ee8531e76 SHA512 8e3cf0588a972955d2026512507cf43ee6e946896cd0cec60e934e377a12004df374e49ce8713c3d428af9a3800d2866effb958004caab1b5c4cb90d3835f65d
-EBUILD libqmi-1.22.2.ebuild 1130 BLAKE2B aea3702794c6d733eed557e40bfb471776a0f16e62e45378a3ec86ce0aea5805b4fccba876f0048e9f585f2bb6dbba5dbc2d0d68bb7b8f8eb5a2eaba3823b242 SHA512 a4152f00ca288315529acbdb3ecd1a6ca4220f2f85b5f36ce05341b11a22d7eb8330d3868cc54f267197b93d566e49668652cdf27d2cefa9b758b0d825708c06
-EBUILD libqmi-9999.ebuild 1128 BLAKE2B a79aaf1d60a996f5e9fe3d53a7b1d59b61763720cd3598748141e6d3cc21959a0c07fc327d9ebd508cab7bd1e787df20ad025dca55d22e2255c3ebdbe61fd1db SHA512 57703ca8652c1ff10d999184b55f0e69006602d4ac29faf66eb044f9b3db961adb92c4aab91196e089724755f947c4af203e76aa91e612dd7a140ecb53197c8d
+EBUILD libqmi-1.18.0.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
+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 1131 BLAKE2B 5759e56e1f92fab80eecb805b306c8327be818c0fd48fe95b3d83d0bd5d49d4ff1f38956cd9f1cda945a32cf6728b6c615f8571fb8b08aeb50fdac9e2b2593ca SHA512 55b6cf58dfbed8984e925f904b8cc25409d309833fc7ebd973d3a18a26d3ac0b26967e7d2a8337ba3e95c071f06526ae540598a26bb27e350b4f08a13fb7ab6d
+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.18.0.ebuild b/net-libs/libqmi/libqmi-1.18.0.ebuild
index 3c9b3648c603..e8219b0697e2 100644
--- a/net-libs/libqmi/libqmi-1.18.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ SLOT="0/5.1"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32
-	virtual/libgudev
+	dev-libs/libgudev
 	mbim? ( >=net-libs/libmbim-1.14.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/libqmi/libqmi-1.18.2.ebuild b/net-libs/libqmi/libqmi-1.18.2.ebuild
index 3c9b3648c603..e8219b0697e2 100644
--- a/net-libs/libqmi/libqmi-1.18.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ SLOT="0/5.1"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32
-	virtual/libgudev
+	dev-libs/libgudev
 	mbim? ( >=net-libs/libmbim-1.14.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/libqmi/libqmi-1.20.0.ebuild b/net-libs/libqmi/libqmi-1.20.0.ebuild
index 3c9b3648c603..e8219b0697e2 100644
--- a/net-libs/libqmi/libqmi-1.20.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ SLOT="0/5.1"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32
-	virtual/libgudev
+	dev-libs/libgudev
 	mbim? ( >=net-libs/libmbim-1.14.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/libqmi/libqmi-1.20.2.ebuild b/net-libs/libqmi/libqmi-1.20.2.ebuild
index f233d8e52a59..3f2f0561c2fb 100644
--- a/net-libs/libqmi/libqmi-1.20.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.20.2.ebuild
@@ -20,7 +20,7 @@ SLOT="0/5.1"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32
-	virtual/libgudev
+	dev-libs/libgudev
 	mbim? ( >=net-libs/libmbim-1.14.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/libqmi/libqmi-1.22.2.ebuild b/net-libs/libqmi/libqmi-1.22.2.ebuild
index 84afb73ad2d7..80fd734cd9b1 100644
--- a/net-libs/libqmi/libqmi-1.22.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.22.2.ebuild
@@ -20,7 +20,7 @@ SLOT="0/5.4"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.36
-	virtual/libgudev
+	dev-libs/libgudev
 	mbim? ( >=net-libs/libmbim-1.18.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 37e9191d90cb..9ae85656240c 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ SLOT="0/5.1"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.36
-	virtual/libgudev
+	dev-libs/libgudev
 	mbim? ( >=net-libs/libmbim-1.14.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 6885914a2564..afa4e23ed3fe 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -8,8 +8,10 @@ DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 0f8a7a758d847498876401aa04473946970be0
 DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a SHA512 70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
 DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
 DIST librsync-2.1.0.tar.gz 175630 BLAKE2B effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e SHA512 9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04
+DIST librsync-2.2.1.tar.gz 180649 BLAKE2B 6dd97a7f140655317c5258d9588ba831716a8909c0d145665b742640a02b317f8736c05b04106f7a221726680f9ccf0ec1bd9a7f760851a993b7783f93193804 SHA512 6581a4285ebcfa1c4dfecac2d6796dab736a4c66a7fb82863c778506073446d9a113d39de7eb29e845a484646f1d8fec29019338bce31a091b0acdc461ab1bcd
 EBUILD librsync-0.9.7-r3.ebuild 880 BLAKE2B 92da9999000bae998ed7761373ec8d5dca977280cfc713d600de73ba4a9b6c186503cb9c7149d9167bf24b931e4decd2cf87c3bcb3f155ee0196ab0517f3f7ae SHA512 0096c65f111f796ee1ff6ffc26053bcce03c65eeda12fa7bf36c038768fe027587e0666104f66f107784cf1680810da28b2b620c4710a5df2032cd7e5a4c2806
 EBUILD librsync-2.0.1-r1.ebuild 670 BLAKE2B 4ce6598ddb823e0fffcf09097b226820dee13699b15e0df10481394014f803279674195f5781a17e4a417967f4acc86102ef69ab3c2f87b0169ddf677b9a8b52 SHA512 bb4ae215c3680313652ac5e919eb3c3458f9ab42b968b33b29fa250537bac4de32fe6522e122787a42c5991091cbd1f0459f2bddac48601762324570dc41d253
 EBUILD librsync-2.0.2.ebuild 615 BLAKE2B 884a1929b644cf41e4caa4d11ded0a6b7318c76e95e0f8bb1ac539b2411441b02753eafedb31ad04dd58da1f13cc7a9c22e6c14322d574fc30bb47113f932b9e SHA512 80cf4f2a7edc12be596a3005a89ca34649d94cefe7a4faa7a62da6411d1281ebd936d7304e1a3b54c6839c8cbed59633282e9d30cf048054ff95cee093364603
 EBUILD librsync-2.1.0.ebuild 615 BLAKE2B efd433ccf17b5f5814f9c65cd3c87c339c7647c53b04fa28cd8955df78912d8798ef971a199f68705d0d37b1f32ac9ff674bf24ddc0cab467ad3bc8738303cd2 SHA512 0112716733dc48917bf9ad56060c8b3b4ce55d9f0e7278b1b8e22616428e37d8e08a385fa60f79bdcdfc5139d7732012f89c7046e216beec84fce0414996062f
+EBUILD librsync-2.2.1.ebuild 615 BLAKE2B b60d21d10d93892b5eb419c526fe483f3a54374c815accd9a23aa36b05a1842ceb4a97da2ea9a45afdff44b369559b37026c55a43a09ea68ea5b45ddcfb86417 SHA512 f80aa4658448cb18ca584abbed161d7bd96d7bdc7d720b6b1e48c4a3b3206ae90d13861124b60ae219582b7067219d8a60dcbee7c3d75bd6496b34981c00d348
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/librsync-2.2.1.ebuild b/net-libs/librsync/librsync-2.2.1.ebuild
new file mode 100644
index 000000000000..93d015f1bb94
--- /dev/null
+++ b/net-libs/librsync/librsync-2.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="https://librsync.github.io/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	dev-libs/popt
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_LIBB2=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
new file mode 100644
index 000000000000..4df9e89052ce
--- /dev/null
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -0,0 +1,4 @@
+DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d
+EBUILD libsignal-protocol-c-2.3.2.ebuild 352 BLAKE2B ed42c8b4b05431d9abaa4ad0318cdfe053309aec56d888f689434a6c10ead72a5f9e7616c50019ed437d48396aeca9435a48c140f1fdafd3ecfd215458c8b35a SHA512 68e8ed4543da7968f66e9a349b4aeec05fd462f2a35d3411cc24db77eefb02d1884b44e932263cfbfc48f857c2a21d16b47c55cc215b9d2e8e521b34b373fb63
+EBUILD libsignal-protocol-c-9999.ebuild 326 BLAKE2B 804b315a202a1710247f6ca621f582098dc328381a84820fdf6e1e79a9cd66cebe697cbaf1d7a43c26c975007a9f259fa1500dd068e98282cc31f7ec63b51ce6 SHA512 ff25cb3b54300cb3dd742213401356bca0f4ce2fe5e3c9034378a4269e2f204698d41691d58af75535615f1df5727e5ad905a55beb208f293aa3ecc35a889690
+MISC metadata.xml 755 BLAKE2B 21256bc6df6fb41d342f223737511c581680b9516fcb30b2f77b5995efc6e109a610e484e5dda2cc504b0cf0d2098f58623ddff98a80a2de03d65d5b78367f97 SHA512 4974101fe9a0878f72ee64cc12612f2f9bcad5b5623e01f31c95c7cbed30419b8730d192a794c9e3da249f47564d1fe0f99267d43621532e6d7b136a9e2df820
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
new file mode 100644
index 000000000000..fc1c8f6ae91c
--- /dev/null
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib cmake-utils
+
+DESCRIPTION="Signal Protocol C Library"
+HOMEPAGE="https://www.whispersystems.org/"
+SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
new file mode 100644
index 000000000000..e56f24c04c63
--- /dev/null
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 multilib cmake-utils
+
+DESCRIPTION="Signal Protocol C Library"
+HOMEPAGE="https://www.whispersystems.org/"
+
+EGIT_REPO_URI="https://github.com/signalapp/libsignal-protocol-c"
+
+LICENSE="GPL-3"
+SLOT="0"
diff --git a/net-libs/libsignal-protocol-c/metadata.xml b/net-libs/libsignal-protocol-c/metadata.xml
new file mode 100644
index 000000000000..b84663d18fe7
--- /dev/null
+++ b/net-libs/libsignal-protocol-c/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>william+gentoo-overlay@optmzr.se</email>
+		<name>William Wennerström</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">signalapp/libsignal-protocol-c</remote-id>
+		<bugs-to>https://github.com/signalapp/libsignal-protocol-c/issues</bugs-to>
+		<doc>https://github.com/signalapp/libsignal-protocol-c/blob/master/README.md</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index b64f9f9df84b..21be5d8893e4 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,6 +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.1.tar.xz 1246696 BLAKE2B 3be87c3020930ddfb67b6eb2ded91e805fd17ec5493e443064ec1e7cb23797fc5128c4e39ff9c3067c3026ae370eebbdcc7706bd886a2a644b34b66cb494b6c4 SHA512 7776db347acb2d2d2ef3c19bc8ac61a4b18a4e61c1d7c2814fe44d3b7716e36d5440cdf170fb151af6c2bd9491921911b7f84732d781992c064667ea2ac3cab2
 EBUILD libssh-0.9.0.ebuild 3177 BLAKE2B 1d91789cacbab261b57ab0c1c07f67a4688b8711d0ce9522ec2692135daa3d5426663e9dddaef065af4ce419512e4d12461eb1861080a7049b31f182e9c2e6fd SHA512 70e1e4a45a841b2f99c4b12cf3f6ad7c5c5ef5cd2780ca8b526029b0d6ae6baa6bbc29036ec356cdb582c7cc9276948f28f42e5379f3c5da911ea6b504f5c61d
+EBUILD libssh-0.9.1.ebuild 3144 BLAKE2B c0183a15ff0cde6e171d3a94650de9153df7304706636f58b4722632007b0e8aabead5ff028cdd64dc402afca53d0b2c69c05c9bab9790b84739f5cbf813524d SHA512 53f5935246b021b559684bff22dc6aacfff9186d816f654b9f579797b90c8bb35b6f86cdb81b5cd612306c5411b9fcc1ebe0aae7aae28c5515fc76b95d722e8e
 EBUILD libssh-9999.ebuild 3144 BLAKE2B c0183a15ff0cde6e171d3a94650de9153df7304706636f58b4722632007b0e8aabead5ff028cdd64dc402afca53d0b2c69c05c9bab9790b84739f5cbf813524d SHA512 53f5935246b021b559684bff22dc6aacfff9186d816f654b9f579797b90c8bb35b6f86cdb81b5cd612306c5411b9fcc1ebe0aae7aae28c5515fc76b95d722e8e
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.1.ebuild b/net-libs/libssh/libssh-0.9.1.ebuild
new file mode 100644
index 000000000000..7731aab23884
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.1.ebuild
@@ -0,0 +1,112 @@
+# 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 )"
+
+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}
+	doc? ( app-doc/doxygen[dot] )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+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)"
+		-DWITH_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
+}
+
+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/libssh2/Manifest b/net-libs/libssh2/Manifest
index c7bb83206f41..f245934bbfff 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,15 +1,7 @@
-AUX libssh2-1.8.0-libgcrypt-prefix.patch 1026 BLAKE2B da1ba552aafecb1b950bc8d5d472d5f9f1bb64cff1bf6d8f32cc7492585017014ff4659d440729f972b240bd202ef187c497949b0fbfc70f4229c22e99b07931 SHA512 8acd91d729c881ec87473895f3deba1e8f3b655a5394b130395fa75420c346dfe0e76028e7e43bd22783d2af4e1e50e5c25dd7f3d7a93cb35059bbbe5651d08e
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
-AUX libssh2-1.8.0-openssl11-memleak.patch 823 BLAKE2B 3d2abd43798a23b551ef5ba97b705f8e8e24db010a19a2387efe10299e436e0dbe655db419fa8da1467aed18ec2bb39e1d863eb981603afecb302700c565159e SHA512 d93ee0b8ea5f37b81883ff79fb7d2f19633a4415990de1743f1388f49f7897be200ae0911b6ca14d505498294727aa5542c7d76a29e7b8df0051a53e6dcd586a
-AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d51065ceb9be22e450984aef9dea0a59b5b93cac7498e3c3e9cf8057ac13dd93330bc470bd717c9a06af9d9294ef7172eed SHA512 3cfd11ef23884a3de173422e001b0ec0f9af48c832948b5d0f90f0be2008334c30ed769a642786cad9aa68ea445b66780b10d3c64434178978018e709510deab
 AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446
 AUX libssh2-1.9.0-missing.patch 4796 BLAKE2B 185428de9298fc210c30a1b826b958ebde761a6b258d2b6a79c2162533c81c6f9dfa5a1c574b239067a7bf79bda36656498cea78b0da797579b5cb6711a6dfe0 SHA512 65d75ecdc041cfb627c49f992804201dc234ba63558e2cbac066efbe0c4de03900668f61f87674ea9ef5beeb217d82cb441018f11e703545ba9349a4f05c8ae6
-DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
-DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
 DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f SHA512 41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
-EBUILD libssh2-1.8.0-r1.ebuild 1340 BLAKE2B 937cb94e56521948308276e7c6f3e93819baab72bf1ee3506c1c8df19bfcbda82e1ebe571b4c1576f0d5e538400a093676825fa85cd970833c854ec051ed5666 SHA512 930201e5ed05b7079736102591824530fd5ab9ffd262fe0366e35319e44b31ea99c4e26f29dc2fc9c09d8108e1541bc1d552553b2d3ec79644eaf67483a78e92
-EBUILD libssh2-1.8.0-r2.ebuild 1625 BLAKE2B 47cf6fc489aab04feea02a3e6274ceaedbcc965b3f7f4544156724e36e442716ba2cc391b28dfdaf9bb6b6fc00f9410e560973e174d9cd54f784f9fc27f10283 SHA512 691c86606d0b033bd39f8b16ae18f7bb160a8fc9245cc7f9b63a936dae46be16882f037e97b0571c991e421547e69b5988b0fc32d5bafa406ec552ca6a643c5f
-EBUILD libssh2-1.8.2.ebuild 1615 BLAKE2B 26da3b7929a0b8ecc2911e1063b1ab060da052e01173026fe7c48aef74778c1b69eb28ac9da6398a679b407944ca281d586e3da47e168d7d6ae578b96d264974 SHA512 e53540d9cfbc7d6109cd77e5e188d31aa8e855f5b3ff321bcf6dafb52d7398e9143368b6f270454d83961d55c1992f9f56a628b129be2399dfcb20353630799d
 EBUILD libssh2-1.9.0-r1.ebuild 1449 BLAKE2B 88a40f3252d4f95efa3642f3d2729f49d93b0e63ca56ed6bc5f61dc277c1460491658bbe50259e28c6fef0fc1dd3281943a6c86bdc6dc096f37fff355df8ba8b SHA512 1e2bd2ce469fa46a148af4f0db6b1924692c0c0ca47b7e125f431055d5ae968fddcd73254eda1bc04f22af43a3fce83fda8c82cd5f7b6ab6e7da6c8dbdc4c739
 EBUILD libssh2-1.9.0.ebuild 1397 BLAKE2B b3f23ca2f291f72f439d0dcbc2693719c9183775f4f80ffda6e74733ce2f552e1201586f8d50cc056eb33e194f26c148df264d409dd17edbf662984867eb5720 SHA512 c41a5133c1703771bb12c4f7f65d7ae27332b502fe436536b939a5b23c63f9564e36cf9348a2abf119d959c40ff7b184f3ab40193a9a5a4f593401cb69624a09
 EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
diff --git a/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch b/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch
deleted file mode 100644
index 10065626fe2b..000000000000
--- a/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
- 
-   old_LDFLAGS=$LDFLAGS
-   old_CFLAGS=$CFLAGS
--  if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
--    LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
--    CFLAGS="$CFLAGS -I$use_libgcrypt/include"
-+  if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then
-+    LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
-+    CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
-   fi
-   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [
-     #include <gcrypt.h>
---- a/configure
-+++ b/configure
-@@ -14250,9 +14235,9 @@
- 
-   old_LDFLAGS=$LDFLAGS
-   old_CFLAGS=$CFLAGS
--  if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
--    LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
--    CFLAGS="$CFLAGS -I$use_libgcrypt/include"
-+  if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then
-+    LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
-+    CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
-   fi
- 
- 
diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch b/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch
deleted file mode 100644
index d7d41f976cc8..000000000000
--- a/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 97518ca8bda91ce12c503197a98fa71690cb67f9 Mon Sep 17 00:00:00 2001
-From: Will Cosgrove <will@panic.com>
-Date: Fri, 12 May 2017 16:34:26 -0700
-Subject: [PATCH] Fix memory leak of crypt_ctx->h using openSSL 1.1+ (#177)
-
-Need to use EVP_CIPHER_CTX_free instead of EVP_CIPHER_CTX_reset.
----
- src/openssl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/openssl.h b/src/openssl.h
-index 6aa12192..2bd80b96 100644
---- a/src/openssl.h
-+++ b/src/openssl.h
-@@ -267,7 +267,7 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx);
- #define _libssh2_cipher_3des EVP_des_ede3_cbc
- 
- #ifdef HAVE_OPAQUE_STRUCTS
--#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_reset(*(ctx))
-+#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_free(*(ctx))
- #else
- #define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_cleanup(ctx)
- #endif
diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch b/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch
deleted file mode 100644
index 0824dd061762..000000000000
--- a/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From c423b543ca45d6caca7b94763bf65ff79d07e811 Mon Sep 17 00:00:00 2001
-From: Marcel Raad <MarcelRaad@users.noreply.github.com>
-Date: Wed, 24 May 2017 19:21:22 +0200
-Subject: [PATCH] openssl: fix build with OpenSSL 1.1 API (#176)
-
-When building with OPENSSL_API_COMPAT=0x10100000L, OpenSSL_add_all_algorithms
-and OpenSSL_add_all_ciphers don't exist. The corresponding functionality is
-handled automatically with OpenSSL 1.1.
----
- src/openssl.c | 4 ++++
- src/openssl.h | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/src/openssl.c b/src/openssl.c
-index f10f2921..25cef082 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -1056,6 +1056,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
-                               "Unable to extract public key from private key "
-                               "file: Unable to open private key file");
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     if (!EVP_get_cipherbyname("des")) {
-         /* If this cipher isn't loaded it's a pretty good indication that none
-          * are.  I have *NO DOUBT* that there's a better way to deal with this
-@@ -1064,6 +1065,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
-          */
-         OpenSSL_add_all_ciphers();
-     }
-+#endif
-     BIO_reset(bp);
-     pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase);
-     BIO_free(bp);
-@@ -1132,6 +1134,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
-     if (!bp) {
-         return -1;
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     if (!EVP_get_cipherbyname("des")) {
-         /* If this cipher isn't loaded it's a pretty good indication that none
-          * are.  I have *NO DOUBT* that there's a better way to deal with this
-@@ -1140,6 +1143,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
-          */
-         OpenSSL_add_all_ciphers();
-     }
-+#endif
-     BIO_reset(bp);
-     pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase);
-     BIO_free(bp);
-diff --git a/src/openssl.h b/src/openssl.h
-index 2bd80b96..d8874286 100644
---- a/src/openssl.h
-+++ b/src/openssl.h
-@@ -226,10 +226,16 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx);
- #define libssh2_hmac_cleanup(ctx) HMAC_cleanup(ctx)
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#define libssh2_crypto_init() \
-+  ENGINE_load_builtin_engines(); \
-+  ENGINE_register_all_complete()
-+#else
- #define libssh2_crypto_init() \
-   OpenSSL_add_all_algorithms(); \
-   ENGINE_load_builtin_engines(); \
-   ENGINE_register_all_complete()
-+#endif
- 
- #define libssh2_crypto_exit()
- 
diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
deleted file mode 100644
index 2cbb730d3d75..000000000000
--- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
-SRC_URI="https://www.${PN}.org/download/${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-solaris"
-IUSE="gcrypt libressl static-libs test zlib"
-
-RDEPEND="
-	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch
-	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
-	"${FILESDIR}"/${PN}-1.8.0-openssl11.patch
-	"${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch
-)
-
-multilib_src_configure() {
-	# Disable tests that require extra permissions (bug #333319)
-	use test && local -x ac_cv_path_SSHD=
-
-	ECONF_SOURCE=${S} econf \
-		$(use_with zlib libz) \
-		$(usex gcrypt --with-libgcrypt --with-openssl) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
deleted file mode 100644
index 4a971721dd14..000000000000
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
-SRC_URI="https://www.${PN}.org/download/${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-solaris"
-IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
-
-RDEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	!gcrypt? (
-		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch
-	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
-	"${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch
-	"${FILESDIR}"/${PN}-1.8.0-openssl11.patch
-)
-
-multilib_src_configure() {
-	local crypto_backend=OpenSSL
-	if use gcrypt; then
-		crypto_backend=Libgcrypt
-	elif use mbedtls; then
-		crypto_backend=mbedTLS
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCRYPTO_BACKEND=${crypto_backend}
-		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-	mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
-	rm -r "${ED}"/usr/share/doc/${PN}/ || die
-}
diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild
deleted file mode 100644
index 4c8055cf0276..000000000000
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
-SRC_URI="https://www.${PN}.org/download/${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-solaris"
-IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
-
-RDEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	!gcrypt? (
-		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch
-	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
-	"${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch
-	"${FILESDIR}"/${PN}-1.8.0-openssl11.patch
-)
-
-multilib_src_configure() {
-	local crypto_backend=OpenSSL
-	if use gcrypt; then
-		crypto_backend=Libgcrypt
-	elif use mbedtls; then
-		crypto_backend=mbedTLS
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCRYPTO_BACKEND=${crypto_backend}
-		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-	mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
-	rm -r "${ED}"/usr/share/doc/${PN}/ || die
-}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 1684652ca0f5..0da94cfce6fd 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -5,16 +5,10 @@ DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19
 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 2377 BLAKE2B 90cd8263d24e69b019561a242fb21cec59f0d672dfa518d3236840a60d9fd82319247404408523e1de22f7827c003da6e628e09891f79a5d959dd01d5bfcff0b SHA512 6f30e385dea6bc5e745e776ea1f236f8eb56b532042e339e7d5f5bf56646885cf283c5b5471f4bc3709809040e8e0e4d782ebbba00fb46f5205bd5ca5abdc14f
-EBUILD libtorrent-rasterbar-1.1.10.ebuild 2373 BLAKE2B 367fd0213ea9115502dadad912f01db28d10bd159b3164f785f30890a78c3e968825aaebf486b14d81f3d1b70ced02f04a46bc4b603964e6f8e1ef709a1a2761 SHA512 2ded4210a562fb44266a3955c34bbee42ddc39767117b616880ba0b4813e707a9746d03bcac40f9ce89ccd3a1f75b4323970de1db675847a6cb2edd165fa755e
-EBUILD libtorrent-rasterbar-1.1.12-r1.ebuild 2377 BLAKE2B 3747e319a73efc39d910e39d8a78219a9c51d4c40392ea1524d331ec667bda19312752d51df1ae4657b68749a2781e4815a8600dbff48567739261df35ff3ab6 SHA512 ac436fceb0fe41a16352b35b291e6d9ef6eb8fc7202513e6e1c8eceb4663e71834a496d8a7b5b5a88499836aeed2f0da8b2828639348e7398436e47fc5b32039
-EBUILD libtorrent-rasterbar-1.1.12.ebuild 2373 BLAKE2B d4df43a0f63a1c05bd5fcfa4da85b039df849b6183f2e7095704919a5f4cff79f18ed66e696a013a0e10a2c03f2cad7df3d47a3ea3445ff63054aa684ba785bc SHA512 821e69f334316b289e624277cfcdc5597677196f51a31329dacde33df1c67cd53fe274d173476021d6f14ac66fbeac229c98f2b6d88898aec9567ab80a4f1859
-EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2330 BLAKE2B d83f50724a215033b62041c4bd1da160515fb5be3a58486c39a837ffb7d63ea1d7bfaf7fd83299bd4d6ac0d1d1109d902236c32ae19b727cf5dd2a5d1f077ea8 SHA512 906b89a5789d1595888757239ac5f85544bb1889c60d4d8a2aff753a49a02c2c0f59a4dbc580ecb78727c91e800cfd5b3f4d405f321fc1f98ca1d99223b2e0f0
-EBUILD libtorrent-rasterbar-1.1.13.ebuild 2326 BLAKE2B 554029bc18168761192d91ce430d6093b12776898ae96ad5ca2c38cd827c7d099b39a2e3a523e31e79728baa31a5f401cc3eee0b5eb22f96efb4828886f7f94c SHA512 8a2d196b5beffbb26c792135670280b06d84e18dc264307983270b0d9af06218ab67ca4155a9374dfe12b7a0f079145d856541fe65ac2ba8f6b77c6b4c06e5de
+EBUILD libtorrent-rasterbar-1.1.10-r1.ebuild 2375 BLAKE2B 4d24f43c40311260dff5fdcbb8cb056a0c69c4128b4929204fd2fc276a79c860c726a9fb939b9ae4c97cbce03dd1c3fc9cf876d5f01675a1e984ba62cd6e65b8 SHA512 bb373329e48181df13b282fb5a2b4b64819e1334b06c2fad6b4f8dceed0bbade70a6f4c4a74947d5972890528a2d22472a3124122e7d487e6e76b9a7a572aae1
+EBUILD libtorrent-rasterbar-1.1.12-r1.ebuild 2375 BLAKE2B 98d0e4f944523ef291f1e7a0218bac5ff5a8ca98793da62eafc45c0dff67e69ddae2c3f2797187ef8bdb5d0047bf20a4db7a39d7cd43fae2655589dda2a76ade SHA512 43505a296ec86d384ca86518ac23c08b0bd58ceac2f9aadcea9333feb902f833b79162ba592c047cfa5ef2d38a3d7fb4941804e4ac93a4a10929b3206b980f4a
+EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2328 BLAKE2B 950160199313d985b48c1bd4ea764018545dbcf28ee9e000ea557deb1b48f3b01f6f95680f11e27e486ea1dd07f44a8e2b6535793e92e861e5a03f88412603cf SHA512 e63c332a1fdb3d289077a8921068f572b395f7776fcbffcecac009f3e3ff5104db539700b70dca2fa10ca1848f48c40c7a3d851c57332c8d818986fea4bbbe3d
 EBUILD libtorrent-rasterbar-1.2.0-r1.ebuild 2555 BLAKE2B 16b160c0455d7b5058e5e66e2bdd16530f60f349eedcee15a18b65a7ba024cf57fa28b8c934182ea44b395326c0e2ca87fe40c92969236df6cc7df9f538c8750 SHA512 f967c0f6ae21e0637d136e2bdc8105b2ddbe06a9f4f051a4dd43853cac6aadfb4a5e99caf7ddeac3d84f718858192655b831130e776447c0e038633a6ce402c0
-EBUILD libtorrent-rasterbar-1.2.0.ebuild 2553 BLAKE2B f99de207a9338164c429095bfc2b36f23af9200ccf24666acecf3c821e697f76056614bf4529274337b89c9a47d44409464920aff574835d02e4c50d04f444ee SHA512 c524238def1d24f6023da5a507eec9f96c4b9ddc062b04677a0a714d237469a55db84445b20b48e5d2b6975c8b88784b351fa5d715c526b9878b5d623227e9e2
 EBUILD libtorrent-rasterbar-1.2.1-r1.ebuild 2527 BLAKE2B bd28fd8e842def8add44bff06debd412f4dc55854f99ab2708353d779d95e3621be95f6042bbf956e615c0aecb74abc21ed71fdee6d63fd1321bc46ab3d45f6e SHA512 7032d9a3e3f084139e0ebd76254176d36ce20b39013ccc329072811947eebb11181f78285d97104c8d2e7899b2472aedcbe24770a3f2ac63cdce3e4f2e7f2c6c
-EBUILD libtorrent-rasterbar-1.2.1.ebuild 2525 BLAKE2B b899a7df927d6aa5c663fd79be8fcb9fe3c00717f7551588b1f048d01409f19a89a7f71dc4e897a6e48e3867d54518c6c55df148ef31cd4dd88d0589a69a7425 SHA512 0d916b9c285691ef8ae92cdc7a3231e3491e8500f8e750a2abedd8b090622727a9d007f09a0da13b6584454e1ae1e61f8070fc99401f7cbfed40a33ba4f82251
 EBUILD libtorrent-rasterbar-1.2.2-r1.ebuild 2532 BLAKE2B f74ad83e31aeee0460b6fc1480bd5fefae1bbf04d5458379c8b55a37e538b429090543a64ac7048756c037c073046b34aaf4396e4bc2d2bd351f041c0b8c5c57 SHA512 cdf6080d94ecf42859da9dd46bdc21d7309ad234bcfffb54c5839b9d6b08f4fbaa3dd440372e717afb7ea33af67a1cac39c70772885d1218353e3e2512989c83
-EBUILD libtorrent-rasterbar-1.2.2.ebuild 2525 BLAKE2B b899a7df927d6aa5c663fd79be8fcb9fe3c00717f7551588b1f048d01409f19a89a7f71dc4e897a6e48e3867d54518c6c55df148ef31cd4dd88d0589a69a7425 SHA512 0d916b9c285691ef8ae92cdc7a3231e3491e8500f8e750a2abedd8b090622727a9d007f09a0da13b6584454e1ae1e61f8070fc99401f7cbfed40a33ba4f82251
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
index bad9c6cc4359..64ee98e5ca60 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
@@ -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} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
deleted file mode 100644
index de5e91692fd5..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
+++ /dev/null
@@ -1,104 +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} )"
-
-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="${EPYTHON#python}"
-		}
-		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.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
index 083a26319c05..732866f91701 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
@@ -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} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
deleted file mode 100644
index d047b6469980..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
+++ /dev/null
@@ -1,104 +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} )"
-
-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="${EPYTHON#python}"
-		}
-		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 7608777a6333..cc10a56b4223 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
@@ -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} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
deleted file mode 100644
index 8cc6099b3955..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
+++ /dev/null
@@ -1,104 +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} )"
-
-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 disk-stats)
-		$(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="${EPYTHON#python}"
-		}
-		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.0.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
deleted file mode 100644
index d00acbe4f8ed..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.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 flag-o-matic
-
-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} )"
-
-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() {
-	append-cxxflags -std=c++11 # bug 634506
-
-	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="${EPYTHON#python}"
-		}
-		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.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
deleted file mode 100644
index 9f40198c2dd6..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
+++ /dev/null
@@ -1,111 +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 flag-o-matic
-
-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} )"
-
-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() {
-	append-cxxflags -std=c++11 # bug 634506
-
-	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="${EPYTHON#python}"
-		}
-		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.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild
deleted file mode 100644
index 9f40198c2dd6..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild
+++ /dev/null
@@ -1,111 +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 flag-o-matic
-
-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} )"
-
-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() {
-	append-cxxflags -std=c++11 # bug 634506
-
-	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="${EPYTHON#python}"
-		}
-		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/libupnp/Manifest b/net-libs/libupnp/Manifest
index d4f983d2cdf6..dc3a4b9072d8 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -2,12 +2,10 @@ AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
 DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
-DIST libupnp-1.8.2.tar.gz 1379953 BLAKE2B 472851bfd25530ead4c113657f0e30cf7a3a1a4c88b86864676a2b7096817c1780718710a9535068904901c21d70d92fb267f295e88531e3eeef7d9a0cee58f3 SHA512 026f2568a1ffa56a3a0ebc823b126dceabb7e821acb6db52fbca02c4c02febd5508cb644cd2ac51f65397c3248a22340b3673069951e97dcdd22d4cc321d4511
-DIST libupnp-1.8.3.tar.gz 1382278 BLAKE2B 65774d46633d81fcc810f01339e0eac5d7c7313f69c1a467e6c0bbb26eeee03fdb4d8330f46e86346737cc17c1c953ef26045526bc9fe438f7e917928a3a3d0e SHA512 592a719614492ee1dad3630e5de2dca1dbe369faa3c87ba20fb939334c9d24f9dc869a457f5903cd28c5f7662145d1db4eeb512ee93b47adad4fc9b7d9171507
 DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
+DIST libupnp-1.8.5.tar.gz 785053 BLAKE2B 3ffb2568b6b56678732a9784254ba6b5f36dbed3b36a97dfecf8879bf75c1f2643e66ec590625a8060ca18af1ec84cf165ea0e87fecb99c4c1d98429709ea2f5 SHA512 0a29a3a05d7ad2a249d17a2b476addf56c64368fddd4e973851e652109ca3ccb7e30e92a97cdc03da3057eec93ea189c71803dbd6a282b70a744c7cfac3bee5b
 EBUILD libupnp-1.6.21.ebuild 1036 BLAKE2B d3b4077358a8d14b25df794258251bf81ac29d4283714f7d5abb2a974a2265246168986e034d07923675996063db4ff86806fb623895e5c099cfed7a83af114a SHA512 bc71c740ae8b29159960aff843fa3281e1dc4baf93761be4026edaa83ced0195a965b4c58c43f84e16618045935fd1a8ee1f780a4c672535be9b6e36ebf5d108
 EBUILD libupnp-1.6.25.ebuild 1038 BLAKE2B 5ff0fa549ca82029feeb59b0c67edb10fa46a73c62476a751d1e89a070de94fb563a6bc38ebe604be429e54d66162069695f04df20e225dc22d6b0f8801ea549 SHA512 2d335e95edd391006d6f9cd9324702dbf3380c4e22b56895d919d812b6195f094fed0bb464e8b38ad6e55701c06385f1bc8af803ceef77b2453036c047961ff5
-EBUILD libupnp-1.8.2.ebuild 1716 BLAKE2B a7a63be7eef83a56f8e6e1313d3d8368541d8282cb367834ebdf5854d46a38d723c23b8eabcbe568591af2adcd199a4170c08b6f0404f7e5c1349a1edf95a99c SHA512 2ea16eccfb1e22f4d4f306dd9b5301b2fbf5b913a4e9ac142b7a7412c83e3621f0ad22a74107886e8cef7d58e5353796c478dafad7ac666050f1ca9cf08e55bc
-EBUILD libupnp-1.8.3-r1.ebuild 1773 BLAKE2B 27ae00ecd8c1d01663b071f658dfb42b8eb6bca42087d6774c6139c56095014bd6713fe460eb391bce9e61ce2136c608b368c012e3292f3dd3d28d3525db69bb SHA512 36dc05b2d47a2f8b587cc424dad8d443d3a351ef2ee7d993b16f849f0126008b18b6babebbebe0dacd413f17146932bc4a92bf88b2ba9a7dc84a75ee0c28a83d
 EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94
+EBUILD libupnp-1.8.5.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/libupnp-1.8.2.ebuild b/net-libs/libupnp/libupnp-1.8.2.ebuild
deleted file mode 100644
index 4e724b79fc2f..000000000000
--- a/net-libs/libupnp/libupnp-1.8.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools vcs-snapshot
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
-
-DOCS="NEWS README.md ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
-	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf $(use_enable debug) \
-		$(use_enable blocking-tcp blocking-tcp-connections) \
-		$(use_enable ipv6) \
-		$(use_enable reuseaddr) \
-		$(use_enable static-libs static) \
-		$(use_enable samples) \
-		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
-}
-
-src_install () {
-	default
-
-	use static-libs || prune_libtool_files
-
-	# Slot samples
-	if $(use samples); then
-		for bin in combo ctrlpt device ; do
-			newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}"
-		done
-	fi
-
-	# Slot includes
-	cd "${D}/usr/include" || die
-	mv upnp "upnp-${SLOT}" || die
-
-	# Slot pkgconfig
-	cd "${D}/usr/$(get_libdir)/pkgconfig" || die
-	mv libupnp.pc "libupnp-${SLOT}.pc" || die
-	sed -i "s#/upnp#/upnp-${SLOT}#" "libupnp-${SLOT}.pc" || die
-
-	# Slot symlinks
-	cd "${D}/usr/$(get_libdir)" || die
-	mv libupnp.so "libupnp-${SLOT}.so" || die
-	mv libixml.so "libixml-${SLOT}.so" || die
-}
diff --git a/net-libs/libupnp/libupnp-1.8.3-r1.ebuild b/net-libs/libupnp/libupnp-1.8.5.ebuild
index 1f618d7ad3de..2d629febf65e 100644
--- a/net-libs/libupnp/libupnp-1.8.3-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,9 @@ SLOT="1.8"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
-DOCS="NEWS ChangeLog"
+DOCS="ChangeLog"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
 	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
 )
 
@@ -38,8 +37,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable reuseaddr) \
 		$(use_enable static-libs static) \
-		$(use_enable samples) \
-		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+		$(use_enable samples)
 }
 
 src_install () {
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 6fef1b804330..5401c12d7417 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,6 +1,11 @@
-AUX libvncserver-0.9.12-cmake-libdir.patch 669 BLAKE2B 1906637be7180a884aa3daf8e6c670181a639a9646488830e3e84cf71ed927e656f51edd097145fac9c554d2f8af796300906ade5c3a5d910a49c4c486a8475f SHA512 e6833922d39ad13484a3ae96eb2ee5cda3ce52d41e0a0ea88281221f5378e7effa8f0a8eaac593e111e8e0b64de0f458d17df496fbdf124f2fbca2806f52012c
+AUX libvncserver-0.9.12-CVE-2018-20750.patch 1865 BLAKE2B 351e515b4b2ccb22c8b6620763df04f57e5f32a98031e941aef4beff26f5fafb846bdf224d3b9cde49fd7a098ff5b7bf3040aaca3013e09aa19c2897d7bd9847 SHA512 439e309cc2d16a1aa5d37349e2af52c2637f68fce699882192dacf4e256a98351f7c95f7217bf6f6a54feb3a6b8e381ed7889218d86a00df45cd9dd4941bbb7f
+AUX libvncserver-0.9.12-CVE-2019-15681.patch 881 BLAKE2B 27422045c50ae2c51a49f0b6616b5dd4e4cc33538ef86945e4ed8c4ca13893fffe0e36ac977efb20166c281bda3609ff9e9e4040bf45880b38343c88b00b475a SHA512 1043f40f7d7d4747df4d93ffbfdd102b447eb974e2d023fae64e833beb2e8e5370fc4243728db6403b5cf6c7bd65b2585b0ac8cfafabe24b2a9a4a498d9c2a46
+AUX libvncserver-0.9.12-cmake-libdir.patch 1272 BLAKE2B ee987d2cf311000de0e8d8ee3449b1f2705a3ec328eecd1b848ebe3fdc5f01e97b074acdab921a5f8e0608494efc0e96d3cfe574f3c5cce01d71f46c5f44fe4b SHA512 1867199b89fd7b1a9308fa10c3bf96ea088371833e34f339a115b23160dcfb668a026c7d4aa87f493288ad9e9e215642a04f902b7afb4225216e336f7d9816f3
+AUX libvncserver-0.9.12-fix-tight-raw-decoding.patch 1486 BLAKE2B 6baf50393a728e0af7dbdc2442c881992a22d2b206ba4381f52ac7607c1a92c3c15084fad81a3bcaa68d1c989306bdce0e64808adbf392c4b102531d9f1bbfc9 SHA512 258ffd60e33fcf8b60fe1d6843f14a0421fc4c309b2bec65bdb2c381718c92d850da9ebc8feae23aef610b72ac2c52afe9fe8048c6ecae6a4340e6a947e1ea5a
 AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb1416477c9fa255f84e6cc40b9d1d5e7dfa3e2467effb3481155b5eeeb29835cf29c0a6aa0ed381862fc184e4070b149b3a1bfc84c9e SHA512 2b2aba010104b2206eab7bec1bc6a258edb28d43da2a376d03e063d9d5e7236d690388da8ccd501b22d3181b966d2b6ee1e6752153c1ff78ab498a59355fb385
+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 2281 BLAKE2B 91fafd161a72b9d0124c5bc8b92a52312db21a7fa2104b5206eb3ac908ce3fb0f448efe615a9cb0dedd8b7b4cf8c928256fcefa696979836ae2c64b0aaf5727c SHA512 20b8fa68a6def2a2242dc52472716dab3b3002ef72d8e2218ad6d9cc5392b6ba6e56ea20783b091919074294f60f4e2c1834a45e76672f9e0c96cb4c5fb1b1b8
 MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2018-20750.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2018-20750.patch
new file mode 100644
index 000000000000..55f122d12584
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2018-20750.patch
@@ -0,0 +1,47 @@
+From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 7 Jan 2019 10:40:01 +0100
+Subject: [PATCH 01/51] Limit lenght to INT_MAX bytes in
+ rfbProcessFileTransferReadBuffer()
+
+This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap
+out-of-bound write access in rfbProcessFileTransferReadBuffer() when
+reading a transfered file content in a server. The former fix did not
+work on platforms with a 32-bit int type (expected by rfbReadExact()).
+
+CVE-2018-15127
+<https://github.com/LibVNC/libvncserver/issues/243>
+<https://github.com/LibVNC/libvncserver/issues/273>
+---
+ libvncserver/rfbserver.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
+index 7af8490..f2edbee 100644
+--- a/libvncserver/rfbserver.c
++++ b/libvncserver/rfbserver.c
+@@ -88,6 +88,8 @@
+ #include <errno.h>
+ /* strftime() */
+ #include <time.h>
++/* INT_MAX */
++#include <limits.h>
+ 
+ #ifdef LIBVNCSERVER_WITH_WEBSOCKETS
+ #include "rfbssl.h"
+@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length)
+        0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF
+        will safely be allocated since this check will never trigger and malloc() can digest length+1
+        without problems as length is a uint32_t.
++       We also later pass length to rfbReadExact() that expects a signed int type and
++       that might wrap on platforms with a 32-bit int type if length is bigger
++       than 0X7FFFFFFF.
+     */
+-    if(length == SIZE_MAX) {
++    if(length == SIZE_MAX || length > INT_MAX) {
+ 	rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length);
+ 	rfbCloseClient(cl);
+ 	return NULL;
+-- 
+2.23.0
+
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15681.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15681.patch
new file mode 100644
index 000000000000..301d1340d14c
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15681.patch
@@ -0,0 +1,26 @@
+From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Mon, 19 Aug 2019 22:32:25 +0200
+Subject: [PATCH 48/51] rfbserver: don't leak stack memory to the remote
+
+Thanks go to Pavel Cheremushkin of Kaspersky for reporting.
+---
+ libvncserver/rfbserver.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
+index 3bacc89..310e548 100644
+--- a/libvncserver/rfbserver.c
++++ b/libvncserver/rfbserver.c
+@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len)
+     rfbServerCutTextMsg sct;
+     rfbClientIteratorPtr iterator;
+ 
++    memset((char *)&sct, 0, sizeof(sct));
++
+     iterator = rfbGetClientIterator(rfbScreen);
+     while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
+         sct.type = rfbServerCutText;
+-- 
+2.23.0
+
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
index 35ee26dc7b04..cc6e4bdc9097 100644
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
@@ -1,6 +1,27 @@
---- libvncserver-LibVNCServer-0.9.12/CMakeLists.txt
-+++ libvncserver-LibVNCServer-0.9.12/CMakeLists.txt
-@@ -666,8 +666,8 @@
+From 3348a7e42e86dfb98dd7458ad29def476cf6096f Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Sat, 9 Feb 2019 13:23:26 +0100
+Subject: [PATCH 02/51] CMake: replace hardcoded 'lib' with
+ ${CMAKE_INSTALL_LIBDIR}
+
+Closes #281
+---
+ CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 873cc7b..55f7e65 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ include(CheckTypeSize)
+ include(TestBigEndian)
+ include(CheckCSourceCompiles)
+ include(CheckCSourceRuns)
++include(GNUInstallDirs)
+ 
+ enable_testing()
+ 
+@@ -666,8 +667,8 @@ get_link_libraries(PRIVATE_LIBS vncclient)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
  
  
@@ -11,7 +32,7 @@
  install_files(/include/rfb FILES
      rfb/keysym.h
      rfb/rfb.h
-@@ -677,7 +677,7 @@
+@@ -677,7 +678,7 @@ install_files(/include/rfb FILES
      rfb/rfbregion.h
  )
  
@@ -20,3 +41,6 @@
      libvncserver.pc
      libvncclient.pc
  )
+-- 
+2.23.0
+
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-fix-tight-raw-decoding.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-fix-tight-raw-decoding.patch
new file mode 100644
index 000000000000..e862d634346f
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-fix-tight-raw-decoding.patch
@@ -0,0 +1,40 @@
+From 6b87d6154200667a66212f80068f7468eaa0f048 Mon Sep 17 00:00:00 2001
+From: DRC <information@virtualgl.org>
+Date: Sat, 28 Sep 2019 14:54:30 -0500
+Subject: [PATCH 50/51] LibVNCClient: Fix regression in Tight/Raw decoding
+
+Introduced by d7b1462 in LibVNCServer 0.9.12.  This regression caused
+the pixels in some RFB rectangles to become corrupted/garbled when the
+Tight encoding was used, without the JPEG subencoding, with a 15-bit or
+16-bit color depth.
+
+Fixes #335
+Fixes https://gitlab.com/Remmina/Remmina/issues/1824
+---
+ libvncclient/tight.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libvncclient/tight.c b/libvncclient/tight.c
+index df01812..0586f47 100644
+--- a/libvncclient/tight.c
++++ b/libvncclient/tight.c
+@@ -1,5 +1,5 @@
+ /*
+- *  Copyright (C) 2017 D. R. Commander.  All Rights Reserved.
++ *  Copyright (C) 2017, 2019 D. R. Commander.  All Rights Reserved.
+  *  Copyright (C) 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
+  *  Copyright (C) 2004 Landmark Graphics Corporation.  All Rights Reserved.
+  *  Copyright (C) 2000, 2001 Const Kaplinsky.  All Rights Reserved.
+@@ -360,7 +360,8 @@ FilterCopyBPP (rfbClient* client, int srcx, int srcy, int numRows)
+ #endif
+ 
+   for (y = 0; y < numRows; y++)
+-    memcpy (&dst[y*client->width], &client->buffer[y*client->rectWidth],
++    memcpy (&dst[y*client->width],
++            &client->buffer[y * client->rectWidth * (BPP / 8)],
+             client->rectWidth * (BPP / 8));
+ }
+ 
+-- 
+2.23.0
+
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-pkgconfig-libdir.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..6a50ac892064
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-pkgconfig-libdir.patch
@@ -0,0 +1,41 @@
+From 36a71279ed5b10effecd879caf6c3791842ca713 Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Thu, 28 Mar 2019 21:06:36 +0100
+Subject: [PATCH 03/51] CMake: replace 'lib' with ${CMAKE_INSTALL_LIBDIR} for
+ pkgconfig files as well
+
+Thanks to https://github.com/ikelos for spotting this ;-)
+
+Closes #290
+---
+ libvncclient.pc.cmakein | 2 +-
+ libvncserver.pc.cmakein | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein
+index 169a8b7..445f7e7 100644
+--- a/libvncclient.pc.cmakein
++++ b/libvncclient.pc.cmakein
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: LibVNCClient
+diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein
+index f38d74f..c689806 100644
+--- a/libvncserver.pc.cmakein
++++ b/libvncserver.pc.cmakein
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: LibVNCServer
+-- 
+2.23.0
+
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
new file mode 100644
index 000000000000..e21ed47bcc3d
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_P="LibVNCServer-${PV}"
+DESCRIPTION="library for creating vnc servers"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
+
+# libvncserver/tightvnc-filetransfer/*: GPL-2, but we don't build it
+# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88
+LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
+# no sub slot wanted (yet), see #578958
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
+# https://bugs.gentoo.org/690202
+# https://bugs.gentoo.org/435326
+# https://bugs.gentoo.org/550916
+REQUIRED_USE="jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )"
+
+DEPEND="
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+			libressl? ( >=dev-libs/libressl-2.7.0:0= )
+		)
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
+	)
+	jpeg? ( >=virtual/jpeg-0-r2:0 )
+	lzo? ( dev-libs/lzo )
+	png? ( >=media-libs/libpng-1.6.10:0= )
+	sasl? ( dev-libs/cyrus-sasl )
+	systemd? ( sys-apps/systemd:= )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-libdir.patch
+	"${FILESDIR}"/${P}-pkgconfig-libdir.patch
+	"${FILESDIR}"/${P}-libgcrypt.patch
+	"${FILESDIR}"/${P}-sparc-unaligned.patch
+	"${FILESDIR}"/${P}-CVE-2018-20750.patch
+	"${FILESDIR}"/${P}-CVE-2019-15681.patch
+	"${FILESDIR}"/${P}-fix-tight-raw-decoding.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_ZLIB=$(usex zlib ON OFF)
+		-DWITH_LZO=$(usex lzo ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_PNG=$(usex png ON OFF)
+		-DWITH_THREADS=$(usex threads ON OFF)
+		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
+		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
+		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+		-DWITH_FFMPEG=OFF
+		-DWITH_24BPP=$(usex 24bpp ON OFF)
+		-DWITH_IPv6=$(usex ipv6 ON OFF)
+		-DWITH_SASL=$(usex sasl ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index e258a123f1c4..96ebdefb5d2c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,14 +1,14 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v10.16.3.tar.xz 21505540 BLAKE2B 2ae6c3ce96a42cb72a388ca7727affb1e2eae06b997098bd8cad2b339b888f1f188c868d39631c51e10ef7b3a5a9173a3b016afe9fa7a4fb74c24a584781c329 SHA512 5d5457adaae87e41699cdf5bd62d32e9590248f7dadd583614cca9078a1749a4ee477433ebbe4278ec872fdfc377d99097c1e06073e0fd47c8c6597256ccdeb7
-DIST node-v12.11.1.tar.xz 22852156 BLAKE2B 38205c3ad52ccac2656c72b31c5714268e4771375b13d7c113e4a5fe7e9530d2826c43aeaa3ed3e30210f504d37221f90f3fb2a15f4c5fbca8878d0f2639b9fa SHA512 9567ee592ea8a05f899755d5e1c934413532676c78a663a1a861a6fa882c7eecae411c05c4b034191b7266776341609c098fbccfcd93c93eba7b84d138eeffb9
-DIST node-v12.12.0.tar.xz 22836688 BLAKE2B 81ff202fb807c557a30eeb08a76a8e95e2faec300d360caac5ce177cdfcda3963bcea904f3e79f9ced9fe2219e7e1d4a760a9c4e69dfe5b670c737e2a598cf6a SHA512 91872784a7a7e7e1e0beeb1166eb1ddd7a5432271e9f62265815d4c5b5d831f269916954bb36724e65108c57d6a7ebac3a2a5be2e49f51f7904a7d549c92176b
+DIST node-v10.17.0.tar.xz 21514260 BLAKE2B a37793d78e14d1d2ca861c39f27c5e1dbb47ad26f14aa97139fd9f9be039bd47e528f10c9977725f1ca4b5f4e31a1066715091ffaa488f764c67290bc1c84541 SHA512 4eec936fa8d848b7e261f83b6e25c1bfb06355a7146dcca91b0f64fc401ca32dd1b0758c127b81be7f0d1cc59c3b24b4ec2c17282b4bdb91c5bf71f42f2f7cbc
+DIST node-v12.13.0.tar.xz 22862096 BLAKE2B b0121f45b535bac7baa0103db538070b4beb4b40a6c871c217eebfb1abb5a7821d83d46946047b3385af182f901c0390eb85134c9201be2d03b5745b297271f8 SHA512 a7aa8b1f010ea1df122d9d7b88ee0a9d10e0d79ae2f3d18c706ac6ce36e2e2039c21ea6f3dba3a22a79ed3f6069850a8a3c463dbd64e1e8f4a9dbe8901a89cc8
+DIST node-v13.0.1.tar.xz 31986844 BLAKE2B f30937878ef68fe94b69912b994b84c03d75fd92e243d77453cfa7d335e9e1a37ce4f18eb1cbba141ff9a017a777e31ae64261f46dbf17d1f6ff0d6d5c263a2a SHA512 a39a64761ef3867379f3a2ef230f65ddeb91fb93d8833c1ada7312588fd75d060f4d73df1a106f7d7cc08886ac7c5335d453e4d882c8cdde28a25a0a8cbcbfa6
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.16.2.tar.xz 18531368 BLAKE2B aec2f6257ab9237097e590b70b2e8615b664576b3af2f176260f26460f4f50bb1e00c2aff477a32cdb9ebf83f8b4eadc3ccdc2df431e359904fe4375513fb6c1 SHA512 8b0d4a089a5c80869971ceeffbef3ca03f4de4f53452a9fd16cbd189e5d76c7fdef475c144848c8d657256b41e342c020e11f6acd1880dde92ed0d0e8cf9e600
-EBUILD nodejs-10.16.3.ebuild 6451 BLAKE2B 99559c2e5e964f133e31b21263138c563cdde52ed3982c4ececb19e68df6348a7fb448234256465d8e22f38efbd9f1b6057b38cf6d0050c7c0093a6987dd7bb4 SHA512 699e010ef0e326f323f8f7599afa1ee4d810500844873de328f162aa03093af2b9a227008aaf5f9e3971919f0309525b45bbf07bc4c8c3a100e8db41444f4e98
-EBUILD nodejs-12.11.1.ebuild 6375 BLAKE2B 3badd6680db12de36d79324ae6f2f1c87a5fbf2741286017e9f68ec575a353d7b36149999707d79caea6c872a15aa3612cd25c475f0959eaabefb8925405fdac SHA512 3cae4dc49a8cc248224a1d7ce2f83420769e3a8f89ae59be58fa0f074033876c8d989f242dc1ce7a1bc4cd2b2ae36ea6fb811a1024734c5d8276a9ba96db6a66
-EBUILD nodejs-12.12.0.ebuild 6375 BLAKE2B 3badd6680db12de36d79324ae6f2f1c87a5fbf2741286017e9f68ec575a353d7b36149999707d79caea6c872a15aa3612cd25c475f0959eaabefb8925405fdac SHA512 3cae4dc49a8cc248224a1d7ce2f83420769e3a8f89ae59be58fa0f074033876c8d989f242dc1ce7a1bc4cd2b2ae36ea6fb811a1024734c5d8276a9ba96db6a66
+EBUILD nodejs-10.17.0.ebuild 6279 BLAKE2B 8eb86a20ee7b128cf6f367e6d1e0c4e3f59fa2920304b4715c98f2b93c2b3ef65df529f3be5dab0c84e41eb9197f42ef0931a832e6b2d8781f417c02af4ca572 SHA512 ee699e5805e2295ad1f06a022d7696b184d1e9ec504e4f7f468fcf04b8f003700f13cad2a1b6cda9be46debd4cc07c98379b7aec6cbb1f4a74be0cae37d98fcc
+EBUILD nodejs-12.13.0.ebuild 6402 BLAKE2B 2f90c426ffd9373534fb9ff5963b7a52735758695cb52e290affcddc95dd5963ad48c2cee68569976fe072ccfd2196fde6a7a6308c2bba231da2e46c3e6c99c8 SHA512 4192e1501436e59849ecd9ca126e351c2bcbc662f41aa8e2aa639e325f5c201ad41bc5128d7132d488c82a6506144b548ad03a0fcab9fa2375a92e50e90c8794
+EBUILD nodejs-13.0.1.ebuild 6140 BLAKE2B 53b80f89d2189a92c455cfbd7f4652378feddaf693f9c33da0388b6e548214567e6c1a6ed494cb99d44b74c58ba508da194d266191eae670e7a3d53cfef990c5 SHA512 e3193d01c1c1b8c11b9b1245dd97c925b04eea96e46d61c44c6f1f624cda2b9ab4d1d0d4dc8e509a71c968fb121b25e7b5a63ca0ba9bfd8f326f227cfc1081ab
 EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513
-EBUILD nodejs-8.16.2.ebuild 6465 BLAKE2B 1b8fd1a7d393e88fea7f12e5622d701bdd4326d059ebc7f5845143f011e1ec3ac48e9a99323ba9673b01e84479bbb059df542a6904e4806e9addc4c8e653935a SHA512 4833463afeda2dba9dd8b44517ba8408785cf486a7f1c6550c01f00c2bc177b241b078bc7d084e111871f8d4aa93bd237978271d77d417f2e4347c1bfe32789d
-EBUILD nodejs-99999999.ebuild 6337 BLAKE2B 2db05ed8f94016c72fb9ee5f0d9bd1ebeb05627a4c596a703d17b33c9fca0a92494728453a1e829250e8bc1e9ae8807eeb396dad9f04c8954a86c5f56d5587df SHA512 8639490d22b8b7e0147960673a179c9d5bc712015afbf8a21f716115d9c6b9d54b6ff8055e7ebbba50fb80d3458f2d5050ff8587a8029c7329720e3b80ec58c0
+EBUILD nodejs-8.16.2.ebuild 6476 BLAKE2B 62c1c56423c4673f9eb40717c3636cd8262d8972a9ea8cc83d24bc3b7d6bf9a62c4273ff5e6103eae53def7079b3b46ef4c25fc0a6b920de1d8b5ec6c0732dbf SHA512 723231c6e64f60c9643358769fa0f6d55f1ec5405272f89a1ab7fbb1d9e8cafc7fc388505040395c2f040a8b344b0eff1a704454a459365d25a4e855f897983b
+EBUILD nodejs-99999999.ebuild 6261 BLAKE2B 993b25d35bef4f54655c6bc9c8679b1ef667c2130add32a2bbff2c3a521bfe1ddde903b021fbec291af1fc205b1226fa1062fb722f57a39b34faf58211831f43 SHA512 cae49616d8151ab0cfa590080cfe0263666900a2bbf7b0cc278192b096cdd24b365943ead6aeb8b894a91b2dacc3377a82de9ec47bc1a5b94495f05b446731ca
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-10.16.3.ebuild b/net-libs/nodejs/nodejs-10.17.0.ebuild
index 4dfee5eb4434..1b63a38abb43 100644
--- a/net-libs/nodejs/nodejs-10.16.3.ebuild
+++ b/net-libs/nodejs/nodejs-10.17.0.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+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/"
@@ -39,6 +37,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 )
+RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
@@ -132,7 +131,7 @@ src_compile() {
 src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
 	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
+	pax-mark -m "${ED}"/usr/bin/node
 
 	# set up a symlink structure that node-gyp expects..
 	dodir /usr/include/node/deps/{v8,uv}
@@ -142,11 +141,6 @@ src_install() {
 	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
 		docinto html
 		dodoc -r "${S}"/doc/*
 	fi
diff --git a/net-libs/nodejs/nodejs-12.11.1.ebuild b/net-libs/nodejs/nodejs-12.13.0.ebuild
index fdf342ca0430..e76d005fd0b9 100644
--- a/net-libs/nodejs/nodejs-12.11.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -22,7 +22,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.31.0:=
+	>=dev-libs/libuv-1.32.0:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
@@ -30,16 +30,19 @@ RDEPEND="
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
+RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-12.12.0.ebuild b/net-libs/nodejs/nodejs-13.0.1.ebuild
index fdf342ca0430..64dd1ca4d151 100644
--- a/net-libs/nodejs/nodejs-12.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.0.1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python{2_7,3_{5,6,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"
@@ -22,24 +22,25 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.31.0:=
+	>=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:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
+RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
@@ -95,8 +96,7 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
-		--shared-zlib
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
 	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
@@ -146,11 +146,6 @@ src_install() {
 	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
 		docinto html
 		dodoc -r "${S}"/doc/*
 	fi
diff --git a/net-libs/nodejs/nodejs-8.16.2.ebuild b/net-libs/nodejs/nodejs-8.16.2.ebuild
index 621189a0947e..a0f60063098e 100644
--- a/net-libs/nodejs/nodejs-8.16.2.ebuild
+++ b/net-libs/nodejs/nodejs-8.16.2.ebuild
@@ -14,7 +14,7 @@ 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"
+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 )
@@ -30,12 +30,14 @@ RDEPEND="
 	icu? ( >=dev-libs/icu-60.1:= )
 	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
 )
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 098bb9968f85..1b6515a23d40 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 PYTHON_REQ_USE="threads"
 inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -20,20 +20,22 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.30.1:=
+	>=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.1
+	>=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}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 )
@@ -57,7 +59,6 @@ src_prepare() {
 
 	# 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
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 8717c24c6306..bcb320ab11cc 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,4 +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 1815 BLAKE2B 7e800dcaad27d3d876a07b41dbba5dfd2f27c506c8a95f0c75b42778054a25b584828756437309787fe0b585868e433e4cce764b8ce8325c044ba6218d4f0fdc SHA512 69a64ff108de9d7d0b70bc5f21d18c1bcc0c2949a701ba5b89eef13412fa4f85c7084ae3c6f3f70e814cb9aaeb027bfbf5afdd83c2ed7f43e40652f3766092b3
+EBUILD qxmpp-1.0.1.ebuild 1371 BLAKE2B 656f09c6f6191ed9ecefec938218dce6256ab1ab071fe86bff62e932213b10f5027a4433b5aa93887fdbab4730f7889dce87daf847bcf7a85110b6ab31c8425c SHA512 5ac23406455b745ac331003ce2777f1463a1668ed6458c2d7220d3cc4c8a0c5ea5220c8778039d3da9573a5b06085ecf24874d6708e614dbd9b0c870cc17b027
 EBUILD qxmpp-9999.ebuild 1346 BLAKE2B 706db83d1c49524069d421e26fae37d49ce6221ed88a225e5a8b9ceec792c51523326d21661b4d7a1fd022d85e0483ef71175fdfcf5191928c90efe25524c7f0 SHA512 7df917d3cb6138af27d7717a2ec98f701f1a00e067b33dcda0eaaf808851800cb6800390f60edfe64af0fcd66a06195426a892a4173d7060c4a4a91cae38d63e
 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
new file mode 100644
index 000000000000..de71964e178c
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-1.0.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc opus +speex test theora vpx"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	opus? ( media-libs/opus )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )
+	vpx? ( media-libs/libvpx:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	# requires network connection, bug #623708
+	sed -e "/qxmppiceconnection/d" \
+		-i tests/CMakeLists.txt || die "failed to drop single test"
+	sed -e "/qxmppserver/d" \
+		-i tests/CMakeLists.txt || die "failed to drop single test"
+	sed -e "/qxmpptransfermanager/d" \
+		-i tests/CMakeLists.txt || die "failed to drop single test"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DWITH_OPUS=$(usex opus)
+		-DWITH_SPEEX=$(usex speex)
+		-DWITH_THEORA=$(usex theora)
+		-DWITH_VPX=$(usex vpx)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index d8a1e534e16e..0f387a2bbfbd 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,5 +1,5 @@
 AUX signon-oauth2-0.24-disable-examples.patch 331 BLAKE2B 259170e4ef75d002dbdcb8494cd0a3e6ea7fb77e5222db600c8d7a5d731af147cd5c7149b7e15e724607018331a29a53d589c2e6f60f614248e7badff5e63056 SHA512 a12e14d59987925dc0c14d407455c95d49751fc3bda66211898c1308a76d4f910b7ba4fdbfe98902a457980f7037f9853c5a007ee82df690375e5e430afa587d
 AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
-EBUILD signon-oauth2-0.24.ebuild 946 BLAKE2B 12b54b0456d31a69c58709907901919637adf5058e1e272c7054d112d6b6dbc01caa675e545b3bf9bef83089b9abb875d7be1bebf03802e337fc7151ec56409d SHA512 374796f93b011729351f6bcd508d4758e1c4d53bd1b9401b20dcfcaa7b11efed27c2d8306a88eae4e564f87c024452f141d46593c3a0c04eb0ab756214715c5d
+EBUILD signon-oauth2-0.24.ebuild 1092 BLAKE2B 36d030a82b6130ecca2d8e9de6a359c799213de67957834f79e70bb9be48415f16519fcd3a4bc96ac3be57fc79f5be27ca371865b93cfba4471a1e667b6487f3 SHA512 d73d42487f74334caa8fdf5f026f48f70e4b9b9ccba36be57c7f7ebdb832e938f9717919762bbe825064a353cba284754f7a927992eb255a7972b8075b0264cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
index 28d8ae826baa..ff53dc277ac8 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -8,7 +8,7 @@ MY_PV=VERSION_${PV}
 inherit qmake-utils
 
 DESCRIPTION="OAuth2 plugin for Signon daemon"
-HOMEPAGE="https://01.org/gsso/"
+HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
 SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -34,9 +34,11 @@ PATCHES=(
 
 src_prepare() {
 	default
-
+	sed -i -e '/QMAKE_CXXFLAGS.*Werror/s/^/#DONT /' common-project-config.pri ||
+		die "failed to disable -Werror"
 	if ! use test; then
-		sed -i -e '/^SUBDIRS/s/tests//' signon-oauth2.pro || die "Failed to disable tests"
+		sed -i -e '/^SUBDIRS/s/tests//' signon-oauth2.pro ||
+			die "Failed to disable tests"
 	fi
 }
 
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 75bf554f9c4d..fd7382047769 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,3 @@
 DIST uhttpmock-0.5.1.tar.xz 310976 BLAKE2B a7aa609d853a8593461aaaed0074532bc7df1d43638c720694a558cd4eefac14b140f79025cbf7ca9a93ad41cfecfa7728eb049e52d514edda7267389f4d8097 SHA512 99135c0983be78eaaf962e5b182eaaf921e1d6ed30f98691d8766e9d4a9e07188965ce3f546a13a8c32b148bad305083cc3cfdf48d9a8b91efffaec5a46d8006
-EBUILD uhttpmock-0.5.1.ebuild 914 BLAKE2B d2467cd34b994cc47899b1419f1d03fc363df6c0793dc5da9c9b7d86dc7ff41e596618d75d24a72f47c64e4090c614f88b6e50e6e8507c842044701673d04ea0 SHA512 a52c26a5216cda25dd25a8dcb3cb12c691b696f9bea05581a728d1c1c086f7a3a49f9ee975b2aabb0424e442f6536a93339faa166cc3dc43b2b4b7be72c004ed
+EBUILD uhttpmock-0.5.1.ebuild 913 BLAKE2B 65d0c2fa1db4aac5580e616283c8dd7ad3afb033b891c2a3ac9c7b1811baf881ad2aa2fe21adc5d808da5549767efe6f501096f5313f8cc9294a409f5130067c SHA512 b2e0633d067557eae2076c4ca04846502811fe50b423184144631d7232f72701ac5222b3782e099dd10dd2934e5463bf4dfed3bd16c269480df09b51a2cd263a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
index d2c4f91cfe88..486fe307ce09 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 59b134aa714d..e3b707c8eb54 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
+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 8321 BLAKE2B d3263ffbd469097ce1e7df535b814c0e1b4b66bb6b26b816223a54da92d4ba064c4bb01bd4daca76d25f6250e84475364da555fb2a3cee96b610313794d0316b SHA512 370f62eb690ebc54a78924482468b98ee8ac28ce04183637f1ed5f1904cc1b60e6e9769477bffb19ff5fc08e7fbedec2a8e4b14b47abddcf24129db8d9b58777
+EBUILD webkit-gtk-2.24.4.ebuild 8374 BLAKE2B 1379429bc52472ddc23ee11a6e698dec2eb06bdc4f678eb491c533ef83e5f436fc472df0840c30ca3d390af988223b0b1403fe31a2490614c1d3bdf10f6030f8 SHA512 1d7ae08c0b9e78d4915475001b8e4a2e13a3891292f428fcf52776a76cae9c1e6f6835d1a825bece2a465f368ea460c7f0e7fdecbc5e1a559979da58c5013922
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
new file mode 100644
index 000000000000..475c9851e637
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
@@ -0,0 +1,53 @@
+From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 22:17:11 +0200
+Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
+
+---
+ Source/WTF/wtf/URLHelpers.cpp   |  2 +-
+ Source/WebCore/dom/Document.cpp |  6 +++---
+ 4 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
+index 18e7f13cd61..c584f1a0cb7 100644
+--- a/Source/WTF/wtf/URLHelpers.cpp
++++ b/Source/WTF/wtf/URLHelpers.cpp
+@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
+     Optional<UChar32> previousCodePoint;
+     while (i < length) {
+         UChar32 c;
+-        U16_NEXT(buffer, i, length, c)
++        U16_NEXT(buffer, i, length, c);
+         UErrorCode error = U_ZERO_ERROR;
+         UScriptCode script = uscript_getScript(c, &error);
+         if (error != U_ZERO_ERROR) {
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 0fd0fa090bf..01f76850f3d 100644
+--- a/Source/WebCore/dom/Document.cpp
++++ b/Source/WebCore/dom/Document.cpp
+@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
+     unsigned i = 0;
+ 
+     UChar32 c;
+-    U16_NEXT(characters, i, length, c)
++    U16_NEXT(characters, i, length, c);
+     if (!isValidNameStart(c))
+         return false;
+ 
+     while (i < length) {
+-        U16_NEXT(characters, i, length, c)
++        U16_NEXT(characters, i, length, c);
+         if (!isValidNamePart(c))
+             return false;
+     }
+@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
+ 
+     for (unsigned i = 0; i < length; ) {
+         UChar32 c;
+-        U16_NEXT(qualifiedName, i, length, c)
++        U16_NEXT(qualifiedName, i, length, c);
+         if (c == ':') {
+             if (sawColon)
+                 return Exception { InvalidCharacterError };
+-- 
+2.23.0
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index f8ed8e6fec93..d90cc8c26a48 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -159,6 +159,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }