gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /net-libs
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
88 files changed, 2190 insertions, 661 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ad963eddc868..0f902ddf2edb 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 5d6f60efc500..83cc6c8f1546 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -3,13 +3,11 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-1.5.3.tar.gz 1309853 BLAKE2B 8a7db4df4775dc73e35c3a9b2a7bbee783d96f36c122393b72b47a4ed4e66f41e4736dcb7ed8eee4d756760957feafc113a5a4c6df58847b94721b1fb8560196 SHA512 d37fb1341259b079ed234512a96656d67e005c50d9f8e0c856fb140c9da35267624e065134e0cc8310f70e5cf5d196c7dd34f01e2a7a5cc29e77e7ca46c25281
-DIST axTLS-2.1.1.tar.gz 1305982 BLAKE2B 37f6a233139ed290fd96787644eb9c40de57f4ddbf0615bf5fa314907ac497e2be26d66cef0245c5859038e4f2ec4edcca7c6b31d754e2d1989bfeb83cbf9587 SHA512 55619d5e02ce466bab223ebc1036ef39c6491d11126ed70f2712a427de2c7e396086a97d3607c9cb69685ade0763e2e55f2c94f9ba746d8ce7b34b0d1996f51a
-DIST axTLS-2.1.2.tar.gz 1317506 BLAKE2B e331ac1028fa59821e8213c30349839d324e62a24e3cb602050f87dab4ce044964bf04aa5dda1b533fc623ed300bb3a8987c4f5faa7e06c7b5b13e62a46c9d2d SHA512 29e915c0b8549cf93f0664525c84281dd64159dcb3703badec382d203d0209b4f97d7cb875c710610da8e50a7e28d2b94ac161d1fd5fb625d492b15869333ada
 DIST axTLS-2.1.3.tar.gz 1316776 BLAKE2B f60502d34a9d23ac772e1bbe05dc9350ab2385fb3c42480117120923647f122ef7a955289b656b8a70b3ac9817b1bcf947f541739b8d01ebe1eb4340f8d9cf38 SHA512 aa116b671bf0fa059cb77f9e5c0307c48ab476b7ce7017f1d4b2e6362d9d527e534908cb30ec3667eec8c49566f950de3ae4ec0adf5b603fb4efb571eaffc596
 DIST axTLS-2.1.4.tar.gz 1316768 BLAKE2B 3ff302c59313ee80d18a0d5390c591e6259625e62707cc0c7c677add1f7fddffa5b4dc46860ee18dd96fcc227b3cac1179ab290f8af50ac91fe2841fff977cd4 SHA512 ce301719a12f5b836e3c67a169119d2836382b7b97d39f4010b8b8a644a6751b9f948a6c91f8dc6c39d19f5723311af7aca8958f9052e72cb38a9907247af3e6
+DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
 EBUILD axtls-1.5.3.ebuild 4658 BLAKE2B f58494ccce35e2d488d9a85b9f92c44be6845a474eb2ee6fb6c7bec5b06976510e39ff2da6f2bbbd72c46e7013325f24a1a974e9945a8d241e9e6bce4a957e7a SHA512 49d2cd35f692d828e16b56bb6eb0ed2cdc45329fdbf1641fbab53418e237141ad233121e3d1aa663df146ab13cecfefa6c2318457cbcd6f2cd8db1aa9046b2f9
-EBUILD axtls-2.1.1.ebuild 4666 BLAKE2B aeb07ee2ba416c4d71a7e6276408415c5434c1b26700385cf749ec7ff514dc3d81bf82aa5e0423d1eac226ea2ec3fd009957b7ea864967656c178ebf4d5c8f6c SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a
-EBUILD axtls-2.1.2.ebuild 4666 BLAKE2B aeb07ee2ba416c4d71a7e6276408415c5434c1b26700385cf749ec7ff514dc3d81bf82aa5e0423d1eac226ea2ec3fd009957b7ea864967656c178ebf4d5c8f6c SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a
 EBUILD axtls-2.1.3.ebuild 4680 BLAKE2B 97053559414aad27e913fdb547a84f2cd4bced639eff5e9a6e50d6b45617cd43fe32257ab161a7fe572cb54f926a0523bfbf6f2734fdc11487d0f3016085abfd SHA512 9762f6e4e8f517c1ee24012f93413e5fdb36016b3dd310f6ad02ddcbd4521a09209a2e2b18e6f5da26e23ce3ea8ced7514b7b59bb0cddf1f00d8ac9a9bfec096
 EBUILD axtls-2.1.4.ebuild 4687 BLAKE2B a530f9d57e16f65587028a293f0f1ddcb9efa96493ad8d6082b1217a43f1b3645629b2b2910075b6b5ffad4a380a0403b1358f171d352b2d0cf9f470e42939f7 SHA512 e266f60307098635db515eca0e6dc4aaed14d6c0ebd9b11184afe8bb34a20a1eee9367e8ee8e44ce843811d13c39ea7ba8b114657cdeeaa9c74656175ed33dda
+EBUILD axtls-2.1.5.ebuild 4684 BLAKE2B b5fb76ad45727676b7c5fdd71041257531770a95e22b2df59e9e6a068f790461c4c9e8c7a27f1c4c26c44b348738d98fe06f3ed3facee1978cf88dd8011d03c5 SHA512 6609be9ae877b62c253862f89a8c3d640e5806e68db6ad83ecace087d8edb5f213e08d50f98204a64678b656d37b0557a3db13edc8227f369344bc987c6e0d27
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-2.1.2.ebuild b/net-libs/axtls/axtls-2.1.2.ebuild
deleted file mode 100644
index 26c6da079834..000000000000
--- a/net-libs/axtls/axtls-2.1.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	epatch "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	yes "n" | emake -j1 oldconfig > /dev/null || die
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		yes "" | emake -j1 oldconfig > /dev/null || die
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.1.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild
index 26c6da079834..490ad132093a 100644
--- a/net-libs/axtls/axtls-2.1.1.ebuild
+++ b/net-libs/axtls/axtls-2.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
+inherit multilib multilib-minimal savedconfig toolchain-funcs user
 
 ################################################################################
 # axtls CONFIG MINI-HOWTO
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
@@ -73,13 +73,15 @@ pkg_setup() {
 src_prepare() {
 	tc-export AR CC
 
-	epatch "${FILESDIR}/explicit-libdir-r1.patch"
+	eapply "${FILESDIR}/explicit-libdir-r1.patch"
 
 	#We want CONFIG_DEBUG to avoid stripping
 	#but not for debugging info
 	sed -i -e 's: -g::' config/Rules.mak || die
 	sed -i -e 's: -g::' config/makefile.conf || die
 
+	eapply_user
+
 	multilib_copy_sources
 }
 
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index dfc6cfd3a3ee..b584f7fa54ab 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -5,5 +5,5 @@ AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98
 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00
 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD c-client-2007f-r6.ebuild 4608 BLAKE2B ba7ad0312cec1a783acb0a4528e49ab43c011e791a4664ee46b52fb028c6e68f55bd89839dd4f26860b9cbedd3c002d6c1713d56e33a064558c40525cd272a10 SHA512 599b88e2428ab26ddec011882f9e62a76bf016218d6d26ac6a9f8274da0511da9d4a2889801cdf9c82aa989e0bfd2aa6413d0b0bb0f72ae327df89619aa2d727
+EBUILD c-client-2007f-r6.ebuild 4607 BLAKE2B f874d65e6517a4a9d780f22da2e7b1a7c5cc342c7de6fb0d2c6802983f4e4fee3da36885a31815bff5b6aa1512d2aa584c2197da49c79adf24f2087536528f6a SHA512 0aad017446a3625dd20292f0b3c7af001e0632672d62b3455ef55587e1c788afeba232cc2f19bcf55c6d449b403f9dbb31598196dfc1b4fd0689175a9dca1b00
 MISC metadata.xml 557 BLAKE2B 44505412653c4f93aeeb3391e48b6f8922e83f29af6486f25621619804c510df783b51f327a8b986bedadfbe5ff4809d9c03a148fbab0fd0eca60f7d740c0fb3 SHA512 fa7558b3e834e008688e4bf3c854e5813a27b908f685267e4ff5fe6a41f9beef9a2689156857039e0a13cbcf94fecd1dff4e0a75e70afc1bd5d81421bbac36de
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index 4135436c43f7..b7980c7cbbbe 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 5df2384bb81b..7a5d57d0f561 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -10,5 +10,5 @@ EBUILD courier-authlib-0.65.0-r3.ebuild 5172 BLAKE2B 2bc31ffdfa5284c3d7054ef698b
 EBUILD courier-authlib-0.66.4.ebuild 4512 BLAKE2B c348788f85b636efe9d19d3d2e2b4b7155865a546898a099db5f20c40c996dec5cf841086060760d13b9064f226a87c5b8e71e35103b59b8d7c201255da40d40 SHA512 e46992d601717a0d5d3c5f52c345c61646e317bad878fe2ffaab57ae3e0c4339232bcbe87422ce8626de9807ec38bfe12b770a0be10edd4523d4b6261d388dcb
 EBUILD courier-authlib-0.67.0.ebuild 4565 BLAKE2B 421bdda6b5a0db98de2359ff6bca26da3675b16c833db575f98b8013d3fdb84e81d7b84f01f08e36f306213657e3db02dc08d9bf0e8762806aaa09a4309e95a7 SHA512 c1458bf707a9d03985351c0e25a648ced09a4545a5928a2a718efd4f15b9a0fceaf02e4634a56a7eb79604fea98f4531e093f73b96e6fe6a140ee4f1f38b2e8d
 EBUILD courier-authlib-0.68.0-r1.ebuild 4569 BLAKE2B 87a0fab1111584bdf4ae3c4e81b52d71074f1e1ecc7f5682ea83b35e20a941a86f033e0a50cbc0da4260627128b1357c55e5ab1c35b17a53241468a872c81deb SHA512 8e0a63aa39d46896e0c5ad90125867b552adcfaa8ea3d35175062abbb43bbff4c73da794f6cc2c5a547eeb4e1f5cc3ae2e1eba2aa81868c89f3daa9c11de6bb8
-EBUILD courier-authlib-0.69.0-r1.ebuild 4527 BLAKE2B fb5cb251a18e95c531d93b595e21122e0fd3afce534de6d33792b7752e022224ffb0219cd37e734ba9792d9ecfffb7dcbd945912e8c8882367cec8b0b9dca933 SHA512 1b4a36b012d429913d0ad8aacae2a8aa30d44220d58eb787adc91180027cf0fbd04d5d09178190b8980a454e9c89a35270d776e3cb5f1ec38a75cfbf1c575c82
+EBUILD courier-authlib-0.69.0-r1.ebuild 4524 BLAKE2B 588e0cfcdd2a0985e6742b6caa55ffe2648e99a34527c788d22cf2d87e8cedd274d809bc755e03465537aea4c3f73de117146bed304b5ee608501e3fb6c502c2 SHA512 94d2136f0a0612c4d7c4601e94c2c0c30aa8dce991f2bf399982818888976978b38ace42151e986eae086be6f83e6660ae6d812dc738302bdb23c7202c3d426a
 MISC metadata.xml 486 BLAKE2B 160b9ab143eb206d225343dfac08321684250eae48ee0ea26023c2b36c008b8f8b17933e6044beab79415ee7a27d1658226f84f1553ba106f5298e6f487423a7 SHA512 5ccb8e2df98ea00c3a0825ea738d7cfa4045e24612e18b7e62994c8ad94271debce6c90a7813ca054cc1d7ea5cb0c11cc9fd71a3bf59f803375ae8583338c2e6
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
index 47dbe6cda303..5889de2b12c9 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index d670a267a1da..058ea2daec17 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -3,5 +3,5 @@ DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f7
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
 EBUILD courier-unicode-1.3.ebuild 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
 EBUILD courier-unicode-1.4.ebuild 479 BLAKE2B d7f051ef5cba4aa2641aa3dc6fba505a1dcd1fb13a59bd2b41d3ae9165dcdef37c20b98aedf2a5e9a9900dc9b54731e34261ed6fc5d9d8497b540e48fb85f154 SHA512 5a4c74f25b4e4a07f7b1be28385b990ddda5156a343330278191084b8baca73de3ec86044f73768638a9751354853d4205b9195f35e3577f5f9defe5721092e2
-EBUILD courier-unicode-2.1.ebuild 480 BLAKE2B d4e07fffebd801446835544ab811dd6a4243968db1f7978536deeb3884da3868e392c93d7f5845e3563a933b479a37432d05e6ae9c6686127bbbb027958062e5 SHA512 959260a3fa83d2962c1cb69d219f874a6f7430e6d9017890afca8e86113f48a750095ca95d1d265a693e8e7e87bd022ac27250070629fad1785fe690ade519b1
+EBUILD courier-unicode-2.1.ebuild 480 BLAKE2B 61753690df7b21564a3bcf64b2e03c122581fc9cf8816bf572c5a744823a669eae15e4c0da1b4b9989c19d69cbcc84c606841df2f4cca16c858067ba31591928 SHA512 c4abcef68c5412ee7ee6baa61cbd210cf5a3a1b57b7049fa4ebde5b28f88127af9195bdf5e98503bb9eff93170a62fabcda83fc4e6ad265edcffa75bdf63fdc1
 MISC metadata.xml 398 BLAKE2B 5a29532863617f727864e5a02b31d9170bbe09d5bed8641c94aad759997613832940cdffdaf8ed31c44b41b3c5e769ba220b5e6fa53c9d3540d9646e9c31a492 SHA512 78789db4f9e2b92e56c3833245f64c31bc274f6986b70af9c3bda21e5c6d3c6b3987a6a97e0ec73aa619d71ee814fa6a263ed8d295ec7473481134769414396b
diff --git a/net-libs/courier-unicode/courier-unicode-2.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index 202a047b8e23..d12131789b94 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 2c455ac70584..8fcd8a35f6e2 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -2,6 +2,8 @@ AUX davix-0.6.7-uio.patch 316 BLAKE2B 71bf63feb080a4c34f8b672516d8237149bee9d360
 AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7eb2c7eded0771f251459bc391e4b8a22ad1ad685918525ff0ef89bd319e562a221530ce70807f2161efdef65d SHA512 683257bf61dca6394e5ab0b375e35ea3e28c85f0e01a308a514f91f1da18aca4c63f57e45db7b3862fd7d9e0f80e7129e518798241bfec1ddefd87affc1bad4e
 DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce
 DIST davix-0.7.1.tar 4336124 BLAKE2B 5db4f8f03fef38feedb0f0a9dfce763ff53ba9b1aa19d09f0af979e111d9f52226222e7b00e48aa3589070e9bf857e000f297d1a162aac83fe877ce3cd2984e1 SHA512 a4408960c4e16011de5e6cea1470d7fa487fd0b9c462082d8fb800bcaa812cab10a92643c9eeb66dda506d177903917176e6310c2a10042a848a52b858f4eb4e
+DIST davix-0.7.2.tar 4338425 BLAKE2B 9a09d2d702b8d9767ac6b0a5e04170d3f7e930b4c9c0cd8127bee2eae99978f5fdbed7be09875c1bbdcd38c29aede1b8f74a56cc15d31ab5ffa3e1f92fb26990 SHA512 207cf290aa4dedfa8c37cf7e7d8fd2162ecd04421abef55f7ade23193e6ca18942d1fb0d611a63fbeed45d9ba5eab8f9957efcdad7f6296b9ac9a69b07c9c339
 EBUILD davix-0.6.7.ebuild 1479 BLAKE2B b443682bf8396040d259a69f39a5b6d3c04e8bd96f315aff99e84cad4a8afa571b2d3aaca24310b7f632739e43db129c595ed6ac1c404ccf98d05cb178887ecf SHA512 7032a772e90ed906f446f6e9ce1104545c6bf38c433914936759864402526197cb9aa6dfa0d586984fa7b19865aa96cf9c8b801a85a48171885a4bd566c135f1
 EBUILD davix-0.7.1.ebuild 1597 BLAKE2B b6e322e6c78ff1044750f95f6b767b320752a782824ffa3cd0a28b8f69e463ecb0d80f29af11f8d958144267d670a5f6fb95f26cf3f41e23f4fe3dd8349abd0d SHA512 b04f578b4096f521bab40cef92ff2a28ba3433d0abcfd6f583faecb156ea04f6311811f2ff605a29c353f4d0d46dd13ea5ee8872196406f9d30686d94278dd6b
+EBUILD davix-0.7.2.ebuild 1597 BLAKE2B f01cf0694e0b0b4ae31af08f7303904e84d86f87ac9e811bdea09c376c1102845838ff8be825bd2caed1a14fdf88aad02ca8943aa9b9af4b93040aac08d5d19e SHA512 4718cac415d1582a3e326cb2c37295c1785b7dd2e86600e6b5cffb198a3763fa835349ef49812c2d9bf1f7659e849f7396dfc54864b74b3649b1ecf5d89941c4
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.7.2.ebuild b/net-libs/davix/davix-0.7.2.ebuild
new file mode 100644
index 000000000000..b80ff8a2e7e7
--- /dev/null
+++ b/net-libs/davix/davix-0.7.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="High-performance file management over WebDAV/HTTP"
+HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
+SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 kernel_linux test tools"
+
+CDEPEND="
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+		kernel_linux? ( sys-apps/util-linux )
+"
+
+DEPEND="${CDEPEND}
+		doc? (
+			app-doc/doxygen[dot]
+			dev-python/sphinx
+		)
+		virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="test? ( tools )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	for x in doc test; do
+		if ! use $x; then
+			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
+		fi
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DENABLE_HTML_DOCS=$(usex doc)
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_TOOLS=$(usex tools)
+		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
+		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
+		-DSTATIC_LIBRARY=OFF
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use tools; then
+		rm -rf "${ED}/usr/share/man/man1"
+	fi
+
+	if use test; then
+		rm -rf "${ED}/usr/bin/davix-unit-tests"
+	fi
+}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index a9b0cd5fc16a..86a94e0f3a86 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -4,5 +4,5 @@ DIST glib-networking-2.54.1.tar.xz 441232 BLAKE2B 4697ac5fe248d12839d2a3c1340e2e
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 EBUILD glib-networking-2.50.0.ebuild 2298 BLAKE2B 0426bb0f2248be977e20c1f3f95df7283e56c08969f4f2ffe6b20dfa34b91bbe3d37200574f9e708803a4f8eeae450ce4a3ef2ec7028ac0ba76791225c755292 SHA512 9e84588bde50d6b13f36ffc0e0e906639eb38bcd4c0282fe531a42adffaca7a199b678f59878f443058a4b9489cd31eccab7a153f421d61f350433eaa58b7993
 EBUILD glib-networking-2.54.1.ebuild 2339 BLAKE2B 2d80998dbfd0e21a05a4beb5e2afde8bdb1ac91c4c2f173d92cca248e70e45cdee7757e77494c0d70bc79961003fc108dbfd1b3810e253255731d928dcce1cb7 SHA512 426b115c6b91429be6cd428645bd9810c0e9a655a88ce0f913c4861bf174e960d16b1cf5d3b378d1469fdc4a18516ac36b007e26c3d6886bb7fe2f6eb3eedc41
-EBUILD glib-networking-2.58.0.ebuild 1960 BLAKE2B 1896b53c5897d7f092b283098f7420f501815aaf1d12ac1dfae5e40d52f9c935951841652faa0e0f4c42be35ad6d904172d84458a909474e9bf01da719b58283 SHA512 b8b4e94af319b7434f0e35415cdc892509adb341ca6db390b873fee20ea2f024a723bdc2bf364f6e5ce1c2739ddcaaf65df0760f835f96c8672b4a78ebc76473
+EBUILD glib-networking-2.58.0.ebuild 1958 BLAKE2B 78ab5d718f19165e168990bbc2e25d7d64cce7cbc13c839f136f46df69257dea673f63f0704ff94e02ef45e661972b6c3874718d68f98f44a88d3d3c1d48f83d SHA512 44894f2602d1c344674ccee730fa1d2f1d80c23de191c82690d89fd8c31e611cfc4ce6529133cd34289b2babb98a308795a0e08dfc48118444a9613007e4241a
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
index bfdc90f80243..84ddeadb54ea 100644
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 33f354572e6e..08c78c3f553d 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -3,6 +3,8 @@ AUX 3.28.0-glib-2.58-compat.patch 13027 BLAKE2B 5608538740ca2ab693429dca9a22b9ae
 AUX glib-2.58-compat2.patch 1361 BLAKE2B 85c6243812c58a759c710a3e3238d0383067381da0a39462006670702b57b89d3ca5915219747279500d89d205a94fd92d58c1ebee0514674d5d21c9d6b4dfe4 SHA512 3fc4180ee317338e1ac8def03c9a0779f0823431ee7de63fa2e15ff46b5d003ff1e7ebca6701a472814d7fe9289bc58a53f560f7c547b6c1b9b1585e0c8f7bbf
 DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4
 DIST gnome-online-accounts-3.28.2.tar.xz 1539640 BLAKE2B ff0e5b5a82617c2f8b53ff51dd6651465e8c9da14a1d484e29c97b17d612fdc535d35855c197da2c826f38e4500b117efbfc929e56318feb58fcc38fdb645a1f SHA512 6fac52c939598817bb3ca44b2e3281c98e3c74d8de5aed30e5ac61187392116393d09a0f900d9e45b0e723a90475dca7edc576a9d567a3fb716b0801e36350ca
+DIST gnome-online-accounts-3.30.2.tar.xz 921284 BLAKE2B 9dc503f73ddda64411f73ac865a0355f318ad13789fac0cf7e7a91d16e53b03dee33acca6752060ce54936cfd5050adb8fadfd121158c0496a3f516e35e8fa45 SHA512 3555421adbfec0e7da1c8f3a47415f6c5bc3eaf8b246cf08eb6ee420286a4b40d11bc6e2514bca937b022b95068c9862438fa632d3385503aba2647a4a57976b
 EBUILD gnome-online-accounts-3.24.5.ebuild 2564 BLAKE2B 3079163a311a3cb7284649ddacf36d303263ec2b7fde638724be5f27f69c3c85b6533ed2a2898f4ab85c2a60762d58c7e69fcfef61d9f428f9653b4c974997b1 SHA512 ef3cebd5b5c97524941f40289daf0e6aaef07ae0821ae5be05806fb95f77ff82e2a72033cf541d4badd4b1b8dbbc12d701f2ae93ab6cc76f5f241c11baaf5087
 EBUILD gnome-online-accounts-3.28.2.ebuild 2555 BLAKE2B 340298a8c9a0a6c28d16862bc666b2bc65a346f2ae245c53362ab2217f9d3e0e09f65070ce1e7276202d2d1384d209522d620a23c8622c7f15a50c12c7fe1898 SHA512 a618bee2056ef2923eaa99a6b9080c03bc5fb993cbe7e93d884eb65c50d43fa5c251e52ff13977ed991aba4e2196103fd32e88aeb0ece33dcd8a0ab3929aacc0
+EBUILD gnome-online-accounts-3.30.2.ebuild 2096 BLAKE2B 0d2fd703b22edd2a819a28a1d38a9097aca19e3f2010d3ea87ebaded182a27f90b07dbc68faf9993ac570dcb50af47daaff67646a6d34a1fde53734f58dca514 SHA512 89f71315bbb3648486c966db0a0c819ba471c0d8778850355361af49d2d69ff34f15292b6a3a2c4cf81069bb55f57f4ef627e42936e1ce481a3ca8e2e7e6d439
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
new file mode 100644
index 000000000000..450fa084c558
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="debug gnome +introspection kerberos +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	>=net-libs/webkit-gtk-2.12.0:4
+	>=x11-libs/gtk+-3.19.12:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=[gtk]
+		app-crypt/mit-krb5 )
+"
+#	telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.3
+	>=dev-util/gdbus-codegen-2.30.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-todoist \
+		--enable-windows-live \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable kerberos) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 47a0a2321184..b0cddeb2e86c 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -3,9 +3,9 @@ AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6
 AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
 AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.79.zip 32686007 BLAKE2B 393a48b951cacc48bd6b58b0520b2d52984d0442e376a87404915117d90c2cabbf58e633ff113851b860d7b66febaec5804e65ae6cc2f86d854e1616ff1bdfc7 SHA512 9164d3f7bf60aa6d6a0e3c99334fac749ed595efce6612345d0df2ff867bfe8d2df75af9e54a4f084846e580647e09969c79fa67f9807a92b2555ff9141d2c19
 DIST gsoap_2.8.80.zip 32686918 BLAKE2B 63a49b09696be0eb7318233bc3df1f44b118a238a206cf25a47bfbdb1d60ad08cc0eb5c24c6d0952e72bfcc850d3780c56e09153a935450aec3c543c9ef2dc79 SHA512 7018f9904d6b3cd5f0d6dacdd03e399fa01df450ec37a4fd29988657b639b86027da62ffc8b03b79a05547e80250fb974b56784fb57e4583899bc8c1958aa8e1
+DIST gsoap_2.8.82.zip 32514214 BLAKE2B 4945fc9e8c6fcbf364235c31aaf5eff5546b4f927a69cc973ba9e855a97ba2e40af2823448c2ea7d371aafea3ea6f6a71cc2d0527049fea53a2d6e1bbeecceec SHA512 daf6a1870fe43beb20d0faf646b171c92629885708baabea5bbce79fa5a8030f014dbe5c0bf4024031df993dd3ed3a90449db813946cfdfa9c12318096b57eec
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.79.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 EBUILD gsoap-2.8.80.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+EBUILD gsoap-2.8.82.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.79.ebuild b/net-libs/gsoap/gsoap-2.8.82.ebuild
index a36f6c5466c9..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.79.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.82.ebuild
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 2375bd536aa8..bbf64a369d45 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,4 +1,4 @@
 DIST gtk-vnc-0.8.0.tar.xz 448984 BLAKE2B e9de98a969297832ff6eaba79707a44494b20d944264ac6902596f882b95e8ab1bc6b7eb25e040d17f939d678a81eec730f983942db38d73c81751fc2afd45df SHA512 9b66e4028e56b01af8d0ded5b833fc6c0ba752ac72cd664293b0009868bbec0bc8750b619ece9786eddc06155e390ecccc4c5bc84717c49ac4bd866e6febd8e3
-EBUILD gtk-vnc-0.8.0-r1.ebuild 1700 BLAKE2B 9d293c7a2c0a3e4009fe8fdf080a90fe130f0a1486e5ade6e9ed48d033a3a09c001ecc9490f5646f9db47f6c4b052b98715405f9b8aada894adc9c12c8722bed SHA512 2dbbc1ae4f10f728a0ffa96f584721e3e959613243c6d2e534b275b7b4f316a811ef2b8a631281f464a5cd14a3a3a01a258b3b761971fb4e5677681a7b8f8042
+EBUILD gtk-vnc-0.8.0-r1.ebuild 1701 BLAKE2B 9e04a4d20d36bf14f9494cd84dcfeb841a0b3e5e911d2f610db87e63527fa078a0d0f4ee8369179d2b5641315bd23fd4626c17719a10a3d6ae9014b49e27a2b4 SHA512 45e50f0fac67504a6f573b38f1f40a791b60e14a01bd010e66fd6ef3dea3b1acdc49b0c866df2e44e95cfb4e1ad0f200672c33783b93f6186fc0193fc0b07ed1
 EBUILD gtk-vnc-0.8.0.ebuild 1668 BLAKE2B 2e86531f529ae179dc07cf1a4b71975422fe3abcc06ef3acabeda89fc287d77b73df1ebc238509c806a3d4da62fbc51854622e28532e64d86452ab94af7a2cb0 SHA512 b618a30a9c9503787a819e113457f33978ec85d90e21c7fc41df55fa20c9db88cc64047ca487156e5c353880c5be86bbe92d06d80b87e9d4c5a1a11a928c25c6
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
index 16545aa4b3e5..0a28696fd004 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples +introspection pulseaudio sasl vala"
+IUSE="examples +introspection pulseaudio sasl +vala"
 REQUIRED_USE="
 	vala? ( introspection )
 "
diff --git a/net-libs/libeXosip/Manifest b/net-libs/libeXosip/Manifest
deleted file mode 100644
index 26d97ade025f..000000000000
--- a/net-libs/libeXosip/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libeXosip2-4.0.0.tar.gz 526339 BLAKE2B d6edea14fc93ff7565eee33f50f56a4d0ff02d2a625828ec61f6187c1913bec48a1667df6e01e7abd0e28764e9b442b13ee34595d3ac89c50a1e44696beaaa26 SHA512 8e286e1e533c12bce26a164e42286c3239556860863a877438f63a694e47055f17fb98eb0f2ed91cac72f0645e8bf4dd9b922b5065357f16c0bacafc99406f51
-EBUILD libeXosip-4.0.0.ebuild 788 BLAKE2B 42c43e1f1d42e2d8c1e2ccb3cb6f0cd30a5f4463f92d10c78f3c664e6d0972238638849a720941f42b769f00c0f1eaea438633c270e6bd859ae2618dae01b7fd SHA512 caeb33bd60cf8710d656fdcfd1ed3fbdd82ddd63fbed0e51aa55f9c0f874cff7819dc0ea717fdbcf78903f0a9bed7f248c8726653df1f7dcb4bb62b6a0606c01
-MISC metadata.xml 248 BLAKE2B c8ba4d540d2d9b361f88e13daea01277cf4a9ab9d71677cde8239242889abf5a2faafe67be62b0b7fc8412cc0b4eaebdba34f585f8a9f121fd21d406209cee1c SHA512 7f794e2ea42e0db5ef80003a8981af42fb6a85acb3b3d1b9f003821e0085ea958eac3d60b6cd35bb5148702015455c6bb58fddea93009fa2302c11db142bdba1
diff --git a/net-libs/libeXosip/libeXosip-4.0.0.ebuild b/net-libs/libeXosip/libeXosip-4.0.0.ebuild
deleted file mode 100644
index c068cc5a6b31..000000000000
--- a/net-libs/libeXosip/libeXosip-4.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV=${PV%.?}-${PV##*.}
-MY_PV=${PV}
-MY_P=${PN}2-${MY_PV}
-
-DESCRIPTION="library to use the SIP protocol for multimedia session establishement"
-HOMEPAGE="https://savannah.nongnu.org/projects/exosip/"
-SRC_URI="mirror://nongnu/exosip/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos"
-SLOT="0/$(get_version_component_range 1-2)"
-LICENSE="GPL-2"
-IUSE="libressl +srv ssl"
-
-DEPEND=">=net-libs/libosip-4.0.0:=
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--enable-mt \
-		$(use_enable ssl openssl) \
-		$(use_enable srv srvrec)
-}
diff --git a/net-libs/libeXosip/metadata.xml b/net-libs/libeXosip/metadata.xml
deleted file mode 100644
index 6781a909e3c2..000000000000
--- a/net-libs/libeXosip/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="srv">enable support for SRV records DNS queries</flag>
-</use>
-</pkgmetadata>
diff --git a/net-libs/libflowmanager/Manifest b/net-libs/libflowmanager/Manifest
index baf240954bd0..2c39378a56ee 100644
--- a/net-libs/libflowmanager/Manifest
+++ b/net-libs/libflowmanager/Manifest
@@ -1,4 +1,4 @@
 AUX libflowmanager-3.0.0-stdint_h.patch 196 BLAKE2B e429f7bc1c7cc3cee39715473a9a909dbe026b39e2cf9a0771ee8cf5ecaf2a370b009eb5a894a3b83607a48065f943e85cb9bb55a6e6d1c4d44c82b33bd4480a SHA512 8ad5151076f2086e6bc66f80d4523432aa90998543998f2f54d22a157fca15072879e6191142caed2ced03eae16fa099aa329aefee7154c1ab7e929ca6ae94e2
 DIST libflowmanager-3.0.0.tar.gz 405501 BLAKE2B bccc7b4bd83038e0f4016fcedcf7f8a808cd2e13f02bdb2e012cda5e2eea3a9cdc59df68e53a335a18004adc90f9308ca08be11ecf0f12429466d9671424c6d9 SHA512 7f6eebb996c50ffa7f2882e0448c95b88cbef433fbc40928a6d111a86c3006ef80cc71b4cb5e73dbe13753410cd88bfcfd32616a0969e417e5a832684b5f0aca
-EBUILD libflowmanager-3.0.0-r1.ebuild 626 BLAKE2B 8fb76ae3c61dc0e74ca215e2b33323d92aa48cf6b263a9766b462df97e8ac20118442e2f085b34271008d285a6c6b2bbaf793e3b1b4630c39288e18f816337da SHA512 3cd223aaab69624f742785bbdc8319f10561ecbea49aee8e0d33c63c27ed272d5c004f4b398828ec4e9ad977ca1376e14be0bad62069172a121b8590a7ebdc3f
+EBUILD libflowmanager-3.0.0-r1.ebuild 625 BLAKE2B 1570ad5bc4ad6b4c170809aaf2550ea6ede4903801f9663c023d4ee9491967020d838e150d14a3432ed00bedfc333d78344e81238983aec8769701fc935e10ec SHA512 4d1ebf01419df5d9a2db3b13f30aceb2b8b5b5d4000404c868294eecee3ae156e411df01cdae1f7db6c008a560d9740b2efde781eb822ac34fd29c4576db542b
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild b/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
index 6705dcc8dc91..b72a446e2c9b 100644
--- a/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
+++ b/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils
 
 DESCRIPTION="A library that measures and reports on packet flows"
-HOMEPAGE="http://research.wand.net.nz/software/libflowmanager.php"
-SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+HOMEPAGE="https://research.wand.net.nz/software/libflowmanager.php"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3"
diff --git a/net-libs/libkvkontakte/Manifest b/net-libs/libkvkontakte/Manifest
index 3510437e7741..e41f30018164 100644
--- a/net-libs/libkvkontakte/Manifest
+++ b/net-libs/libkvkontakte/Manifest
@@ -1,3 +1,4 @@
+AUX libkvkontakte-5.0.0-fix-warnings.patch 11751 BLAKE2B 5d8f45c2c8b6205e0475067e8dce671b1329f5775a799792792a53b9636f7cd707fafbff2af2cc197b45a65b899c9e23112acd93ac0d7657e0c0e18130d4eb31 SHA512 f1596051b35f999589f5c48347ba5f303a9af97fa8affc70189e27464579f50e583fcb3d7ea6286f9cf2a30306b56f05abc2146825620f6938b409bbe87af61a
 DIST libkvkontakte-5.0.0.tar.xz 59116 BLAKE2B 18b4b3c0eb7e408a94c1d2d3613b4c2ef3c485490490aaee42a35175c81453961773031030ba3cfdf9c29fec7f73f7670d93d0c9ac1f748b33dc66d497434c19 SHA512 bc7fa3d2d8a815c3a8b2265bf45500c10ac31383883a6a19802c5d01be5c16c1e72a8fe0c2c7cc086c9a7403ce001df0629e546caa872a2ae599e3a2650ef1af
-EBUILD libkvkontakte-5.0.0.ebuild 732 BLAKE2B e121c1d583e55199202d0714b8317d9dbc4f370406f2192060abfe9192ff753446a58c9f56ae13b45b294660de372b7545c8f91e000530a1f4d0385cc9dd1183 SHA512 6a6fdd2755cbdea3a5de58770d0866ae9d733c3f0dc2efda36b860b8835450d4412085a49989c92d7da7efa79cde956c5e3b37003979f7926e9ce8351ee12e69
+EBUILD libkvkontakte-5.0.0-r1.ebuild 800 BLAKE2B 9d09056a301aee1105291a7898528795cc2a3586206155bc96c8b6864486c0939c27fdab4b6230c274835a6b13f3b63221037f3a8d69ffe1c9b503598f0d1e56 SHA512 477b0889f7adf6b3ac681d78b099ea782e31b9f44b3aa819c74510143c1bc91c09c8a874994ebcf67500e04988ac48a32e621fa68ee91af67d5f112807638058
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-5.0.0-fix-warnings.patch b/net-libs/libkvkontakte/files/libkvkontakte-5.0.0-fix-warnings.patch
new file mode 100644
index 000000000000..36e107001d1b
--- /dev/null
+++ b/net-libs/libkvkontakte/files/libkvkontakte-5.0.0-fix-warnings.patch
@@ -0,0 +1,386 @@
+From ba1f7e7f7424df2bf96513c14f10d3cff47f48a4 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 9 Sep 2017 15:20:05 +0200
+Subject: use Q_DECL_OVERRIDE
+
+---
+ src/albumlistjob.h                 | 2 +-
+ src/allmessageslistjob.h           | 2 +-
+ src/allnoteslistjob.h              | 2 +-
+ src/cidsnamesjob.h                 | 2 +-
+ src/createalbumjob.h               | 2 +-
+ src/deletealbumjob.h               | 2 +-
+ src/discussionslistjob.h           | 2 +-
+ src/editalbumjob.h                 | 2 +-
+ src/friendlistjob.h                | 2 +-
+ src/getapplicationpermissionsjob.h | 2 +-
+ src/getinfojob.h                   | 2 +-
+ src/getphotouploadserverjob.h      | 4 ++--
+ src/getvariablejob.h               | 2 +-
+ src/grouplistjob.h                 | 2 +-
+ src/messageslistjob.h              | 2 +-
+ src/noteaddjob.h                   | 2 +-
+ src/notejob.h                      | 2 +-
+ src/noteslistjob.h                 | 2 +-
+ src/photojob.h                     | 2 +-
+ src/photolistjob.h                 | 2 +-
+ src/photopostjob.h                 | 2 +-
+ src/savephotojob.h                 | 2 +-
+ src/uploadphotosjob.h              | 2 +-
+ src/userinfojob.h                  | 4 ++--
+ src/vkontaktejobs.h                | 6 +++---
+ 25 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/src/albumlistjob.h b/src/albumlistjob.h
+index 0e91af0..70dc29e 100644
+--- a/src/albumlistjob.h
++++ b/src/albumlistjob.h
+@@ -38,7 +38,7 @@ public:
+     QList<AlbumInfo> list() const;
+ 
+ protected:
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+     void handleItem(const QVariant &data);
+ 
+diff --git a/src/allmessageslistjob.h b/src/allmessageslistjob.h
+index e714526..4bf067c 100644
+--- a/src/allmessageslistjob.h
++++ b/src/allmessageslistjob.h
+@@ -44,7 +44,7 @@ public:
+                        int filters = 0, int timeOffset = 0);
+     ~AllMessagesListJob();
+ 
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     QList<MessageInfoPtr> list() const;
+     int count() const;
+diff --git a/src/allnoteslistjob.h b/src/allnoteslistjob.h
+index 1228bb8..661107a 100644
+--- a/src/allnoteslistjob.h
++++ b/src/allnoteslistjob.h
+@@ -33,7 +33,7 @@ public:
+     AllNotesListJob(const QString &accessToken, int uid);
+     ~AllNotesListJob();
+ 
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     QList<NoteInfoPtr> list() const;
+     int count() const;
+diff --git a/src/cidsnamesjob.h b/src/cidsnamesjob.h
+index 9bd142c..c6878a1 100644
+--- a/src/cidsnamesjob.h
++++ b/src/cidsnamesjob.h
+@@ -40,7 +40,7 @@ public:
+     QMap<int, QString> names() const;
+ 
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/createalbumjob.h b/src/createalbumjob.h
+index 8d7ec17..09c68e9 100644
+--- a/src/createalbumjob.h
++++ b/src/createalbumjob.h
+@@ -40,7 +40,7 @@ public:
+     AlbumInfo album() const;
+ 
+ protected:
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/deletealbumjob.h b/src/deletealbumjob.h
+index ef1f001..84fcfb5 100644
+--- a/src/deletealbumjob.h
++++ b/src/deletealbumjob.h
+@@ -33,7 +33,7 @@ public:
+     DeleteAlbumJob(const QString &accessToken, int aid);
+ 
+ protected:
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/discussionslistjob.h b/src/discussionslistjob.h
+index 79e801a..63cd825 100644
+--- a/src/discussionslistjob.h
++++ b/src/discussionslistjob.h
+@@ -46,7 +46,7 @@ public:
+     int totalCount() const;
+ 
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+ 
+     void handleItem(const QVariant &data);
+ 
+diff --git a/src/editalbumjob.h b/src/editalbumjob.h
+index d9d76b6..eb52fe4 100644
+--- a/src/editalbumjob.h
++++ b/src/editalbumjob.h
+@@ -36,7 +36,7 @@ public:
+                  int comment_privacy = AlbumInfo::PRIVACY_UNKNOWN);
+ 
+ protected:
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/friendlistjob.h b/src/friendlistjob.h
+index 6a7de49..465a109 100644
+--- a/src/friendlistjob.h
++++ b/src/friendlistjob.h
+@@ -39,7 +39,7 @@ public:
+     QList<UserInfoPtr> list() const;
+ 
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/getapplicationpermissionsjob.h b/src/getapplicationpermissionsjob.h
+index 72b6759..4165a1b 100644
+--- a/src/getapplicationpermissionsjob.h
++++ b/src/getapplicationpermissionsjob.h
+@@ -35,7 +35,7 @@ public:
+     int permissions() const;
+ 
+ protected:
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/getinfojob.h b/src/getinfojob.h
+index 98df0db..19b8f31 100644
+--- a/src/getinfojob.h
++++ b/src/getinfojob.h
+@@ -38,7 +38,7 @@ public:
+     QVariantMap info();
+ 
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/getphotouploadserverjob.h b/src/getphotouploadserverjob.h
+index af65921..3a3e9b0 100644
+--- a/src/getphotouploadserverjob.h
++++ b/src/getphotouploadserverjob.h
+@@ -41,8 +41,8 @@ public:
+ 
+ protected:
+     static QString getMethod(enum UploadPhotosJob::Dest dest);
+-    virtual void prepareQueryItems();
+-    virtual void handleData(const QJsonValue &data);
++    void prepareQueryItems() Q_DECL_OVERRIDE;
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     UploadPhotosJob::Dest m_dest;
+diff --git a/src/getvariablejob.h b/src/getvariablejob.h
+index f80ceb7..5250c6e 100644
+--- a/src/getvariablejob.h
++++ b/src/getvariablejob.h
+@@ -41,7 +41,7 @@ public:
+     QVariant variable() const;
+ 
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+     
+ private:
+     class Private;
+diff --git a/src/grouplistjob.h b/src/grouplistjob.h
+index 29628f3..d41e1dc 100644
+--- a/src/grouplistjob.h
++++ b/src/grouplistjob.h
+@@ -42,7 +42,7 @@ public:
+ 
+ protected:
+     GroupInfoPtr handleSingleData(const QVariant &data);
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/messageslistjob.h b/src/messageslistjob.h
+index 0f67360..091ef60 100644
+--- a/src/messageslistjob.h
++++ b/src/messageslistjob.h
+@@ -57,7 +57,7 @@ public:
+     int out() const;
+ 
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+ 
+     void handleItem(const QVariant &data);
+ 
+diff --git a/src/noteaddjob.h b/src/noteaddjob.h
+index 84cc63f..6c37efb 100644
+--- a/src/noteaddjob.h
++++ b/src/noteaddjob.h
+@@ -41,7 +41,7 @@ public:
+     int nid() const;
+ 
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+     
+ private:
+     class Private;
+diff --git a/src/notejob.h b/src/notejob.h
+index dfeefc2..340eaef 100644
+--- a/src/notejob.h
++++ b/src/notejob.h
+@@ -37,7 +37,7 @@ public:
+     NoteInfoPtr noteInfo();
+     
+ protected:
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+     
+ private:
+     class Private;
+diff --git a/src/noteslistjob.h b/src/noteslistjob.h
+index 3ea51a7..d36e0bf 100644
+--- a/src/noteslistjob.h
++++ b/src/noteslistjob.h
+@@ -49,7 +49,7 @@ protected:
+     * @brief Handles the data returned by the VkontakteGetJob
+     * @param data A JSON string containing the data.
+     */
+-    virtual void handleData(const QVariant &data);
++    void handleData(const QVariant &data) Q_DECL_OVERRIDE;
+ 
+     void handleItem(const QVariant &data);
+ 
+diff --git a/src/photojob.h b/src/photojob.h
+index b8af5b3..b230c29 100644
+--- a/src/photojob.h
++++ b/src/photojob.h
+@@ -35,7 +35,7 @@ public:
+     PhotoJob(const QUrl &urlString);
+     ~PhotoJob();
+ 
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+     QImage photo() const;
+ 
+ private Q_SLOTS:
+diff --git a/src/photolistjob.h b/src/photolistjob.h
+index 4b38a12..a0c868f 100644
+--- a/src/photolistjob.h
++++ b/src/photolistjob.h
+@@ -42,7 +42,7 @@ protected:
+     * @brief Handles the data returned by VkontakteJob
+     * @param data JSON value containing an array of photos.
+     */
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/photopostjob.h b/src/photopostjob.h
+index 712906d..1f7b2ec 100644
+--- a/src/photopostjob.h
++++ b/src/photopostjob.h
+@@ -43,7 +43,7 @@ public:
+     // files.size <= 5
+     PhotoPostJob(Vkontakte::UploadPhotosJob::Dest dest, const QUrl &url, const QStringList &files);
+ 
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+     QVariantMap response() const;
+ 
+ protected:
+diff --git a/src/savephotojob.h b/src/savephotojob.h
+index af2a795..cd4ab85 100644
+--- a/src/savephotojob.h
++++ b/src/savephotojob.h
+@@ -46,7 +46,7 @@ public:
+ protected:
+     QString getMethod(Vkontakte::UploadPhotosJob::Dest dest);
+     void handleItem(const QJsonValue &item);
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+ private:
+     UploadPhotosJob::Dest m_dest;
+diff --git a/src/uploadphotosjob.h b/src/uploadphotosjob.h
+index 461f62a..d9290c4 100644
+--- a/src/uploadphotosjob.h
++++ b/src/uploadphotosjob.h
+@@ -43,7 +43,7 @@ public:
+                     const QStringList &files, bool saveBig, int aid, int gid = -1);
+     ~UploadPhotosJob();
+ 
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     QList<PhotoInfo> list() const;
+ 
+diff --git a/src/userinfojob.h b/src/userinfojob.h
+index 85e6b86..5090ab3 100644
+--- a/src/userinfojob.h
++++ b/src/userinfojob.h
+@@ -71,12 +71,12 @@ protected:
+     * @brief Handles the data returned by the VkontakteGetJob
+     * @param data A JSON string containing the data.
+     */
+-    virtual void handleData(const QJsonValue &data);
++    void handleData(const QJsonValue &data) Q_DECL_OVERRIDE;
+ 
+     /**
+      * @brief Prepares m_queryItems by several addQueryItem calls
+      **/
+-    virtual void prepareQueryItems();
++    void prepareQueryItems() Q_DECL_OVERRIDE;
+ 
+ private:
+     class Private;
+diff --git a/src/vkontaktejobs.h b/src/vkontaktejobs.h
+index 9429da8..af04aa9 100644
+--- a/src/vkontaktejobs.h
++++ b/src/vkontaktejobs.h
+@@ -38,7 +38,7 @@ class LIBKVKONTAKTE_EXPORT KJobWithSubjob : public KJob
+ {
+ protected:
+     /** Kill the currentjobs and its subjobs */
+-    virtual bool doKill();
++    bool doKill() Q_DECL_OVERRIDE;
+ 
+     QPointer<KJob> m_job; /** Pointer to the running job */
+ };
+@@ -47,7 +47,7 @@ class LIBKVKONTAKTE_EXPORT KJobWithSubjobs : public KJob
+ {
+ protected:
+     /** Kill the currentjobs and its subjobs */
+-    virtual bool doKill();
++    bool doKill() Q_DECL_OVERRIDE;
+ 
+     QList<KJob *> m_jobs; /** Pointers to running jobs */
+ };
+@@ -68,7 +68,7 @@ public:
+      * */
+     VkontakteJob(const QString &accessToken, const QString &method, bool httpPost = false);
+ 
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     enum JobErrorType { AuthenticationProblem = KJob::UserDefinedError + 42 };
+ 
+-- 
+cgit v1.1
diff --git a/net-libs/libkvkontakte/libkvkontakte-5.0.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild
index 9f64b55ba18a..db21496fe470 100644
--- a/net-libs/libkvkontakte/libkvkontakte-5.0.0.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="true"
 inherit kde5
@@ -22,10 +22,12 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 "
 RDEPEND="${DEPEND}"
 
 # accessing network
 RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-fix-warnings.patch" )
diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
index 29dcb26f0cfc..ae92cb592730 100644
--- a/net-libs/libmediawiki/Manifest
+++ b/net-libs/libmediawiki/Manifest
@@ -1,4 +1,5 @@
-AUX libmediawiki-5.0.0_pre20170128-tests-optional.patch 470 BLAKE2B 856433e48d50f6046d1d994cafc081d1afe04a7d82fe30476e129716ede33ecd26ee721fb566de4fd094be4d897a204a34102790225b49f8a31f26f23cccc4d4 SHA512 91e483c2483e2d07ed2b4d974f37c19bcbcd2c69ff9841451d4aa182945469b83dcdbe5025807ba83438cfcfbf4218fe32f7f6d5f5232cca913285fe8b9bc33f
+AUX libmediawiki-5.37.0-fix-warnings.patch 5020 BLAKE2B b00f572a413f09112cb9712efec8204b15ac5a77a6ca672ce5a4c0e53b2b4f7c329c6c792bc2d29a65afc131c8f17cf5b7ae14943296cad0b6e1e6275702a23f SHA512 2af979b26bdc224afaa9bd8259bc28085ff89ae0ec623620900b02e44467c13cc65d91c89789970f30048061b8fdfeff8b8be324b7e886f6700d12c3d1d6dcaa
+AUX libmediawiki-5.37.0-tests-optional.patch 470 BLAKE2B 856433e48d50f6046d1d994cafc081d1afe04a7d82fe30476e129716ede33ecd26ee721fb566de4fd094be4d897a204a34102790225b49f8a31f26f23cccc4d4 SHA512 91e483c2483e2d07ed2b4d974f37c19bcbcd2c69ff9841451d4aa182945469b83dcdbe5025807ba83438cfcfbf4218fe32f7f6d5f5232cca913285fe8b9bc33f
 DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993
-EBUILD libmediawiki-5.37.0.ebuild 803 BLAKE2B a0eb444e6b06ff097169d65496c0aa2e1d839ae93a7b8abbdbc5a9fc4e73220549faf8928e26f7279bab664c75b553685f4302c0bc2416d3a0cb232211cf8578 SHA512 01b0f277ce9c54f8e4667354418a86472bb0084e2c430bb7fb7179d34a79cf8533e3c1f4253703345afec928445b84f8ae72471cab03ffe9bad015c9d4d0fb20
+EBUILD libmediawiki-5.37.0-r1.ebuild 797 BLAKE2B a7928c3f7a37ceeb68e95d3d62167836d0c5ef4089ec10efbd8cc839e3d312747ab8ad637d0ecfc9613b5c7dea79a92238e26167fec63c4aacc8ca7c6a5d5d3f SHA512 8629c5f3b0bbde78deabc12a0fe1bad0ef2206b23cdcf98afa7039dbb91b55a0df80e6e042f13685852b6711f341b7d00786a4a5a0167d972b08d83285c46f26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch
new file mode 100644
index 000000000000..c57041dca7c9
--- /dev/null
+++ b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch
@@ -0,0 +1,192 @@
+From 8c11aeabf34985421cd229240a6fad3db8023156 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 9 Sep 2017 15:33:24 +0200
+Subject: use Q_DECL_OVERRIDE
+
+---
+ src/edit.h                          | 2 +-
+ src/job.h                           | 2 +-
+ src/login.h                         | 2 +-
+ src/logout.h                        | 2 +-
+ src/parse.h                         | 2 +-
+ src/queryimageinfo.h                | 2 +-
+ src/queryimages.h                   | 2 +-
+ src/queryinfo.h                     | 2 +-
+ src/queryrevision.h                 | 2 +-
+ src/querysiteinfogeneral.h          | 2 +-
+ src/querysiteinfousergroups.h       | 2 +-
+ src/upload.h                        | 2 +-
+ tests/libmediawikitest/fakeserver.h | 2 +-
+ 13 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/edit.h b/src/edit.h
+index 85bd590..a3944c8 100644
+--- a/src/edit.h
++++ b/src/edit.h
+@@ -178,7 +178,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     /**
+      * @brief Specify how the watchlist is affected by this edit.
+diff --git a/src/job.h b/src/job.h
+index 180822b..feda262 100644
+--- a/src/job.h
++++ b/src/job.h
+@@ -73,7 +73,7 @@ public:
+     /**
+      * @brief Aborts this job quietly.
+      */
+-    virtual bool doKill();
++    bool doKill() Q_DECL_OVERRIDE;
+ 
+ protected:
+ 
+diff --git a/src/login.h b/src/login.h
+index 196710a..4ea71f1 100644
+--- a/src/login.h
++++ b/src/login.h
+@@ -130,7 +130,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+ private Q_SLOTS:
+ 
+diff --git a/src/logout.h b/src/logout.h
+index 03fb1f7..1b05323 100644
+--- a/src/logout.h
++++ b/src/logout.h
+@@ -65,7 +65,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+ private Q_SLOTS:
+ 
+diff --git a/src/parse.h b/src/parse.h
+index 5732f69..e72f59f 100644
+--- a/src/parse.h
++++ b/src/parse.h
+@@ -85,7 +85,7 @@ public:
+ 
+     void setUseLang(const QString& param);
+ 
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     Q_SIGNALS:
+ 
+diff --git a/src/queryimageinfo.h b/src/queryimageinfo.h
+index f8c21a6..039c4a5 100644
+--- a/src/queryimageinfo.h
++++ b/src/queryimageinfo.h
+@@ -148,7 +148,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+ Q_SIGNALS:
+ 
+diff --git a/src/queryimages.h b/src/queryimages.h
+index 3211880..c8de5a0 100644
+--- a/src/queryimages.h
++++ b/src/queryimages.h
+@@ -103,7 +103,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+ Q_SIGNALS:
+ 
+diff --git a/src/queryinfo.h b/src/queryinfo.h
+index e2ff3e6..e23f50e 100644
+--- a/src/queryinfo.h
++++ b/src/queryinfo.h
+@@ -75,7 +75,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     /**
+      * @brief Set the page name.
+diff --git a/src/queryrevision.h b/src/queryrevision.h
+index b1decfb..190d026 100644
+--- a/src/queryrevision.h
++++ b/src/queryrevision.h
+@@ -150,7 +150,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     /**
+      * @brief Set the page id.
+diff --git a/src/querysiteinfogeneral.h b/src/querysiteinfogeneral.h
+index 516f7ed..1b31f15 100644
+--- a/src/querysiteinfogeneral.h
++++ b/src/querysiteinfogeneral.h
+@@ -81,7 +81,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+ Q_SIGNALS:
+ 
+diff --git a/src/querysiteinfousergroups.h b/src/querysiteinfousergroups.h
+index 74bc653..d6fb089 100644
+--- a/src/querysiteinfousergroups.h
++++ b/src/querysiteinfousergroups.h
+@@ -73,7 +73,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+ Q_SIGNALS:
+ 
+diff --git a/src/upload.h b/src/upload.h
+index 817eb5b..7f745f4 100644
+--- a/src/upload.h
++++ b/src/upload.h
+@@ -143,7 +143,7 @@ public:
+     /**
+      * @brief Starts the job asynchronously.
+      */
+-    virtual void start();
++    void start() Q_DECL_OVERRIDE;
+ 
+     /**
+      * @brief Set the target filename.
+diff --git a/tests/libmediawikitest/fakeserver.h b/tests/libmediawikitest/fakeserver.h
+index e847ac6..c6bb78c 100644
+--- a/tests/libmediawikitest/fakeserver.h
++++ b/tests/libmediawikitest/fakeserver.h
+@@ -61,7 +61,7 @@ public:
+     ~FakeServer();
+ 
+     void startAndWait();
+-    virtual void run();
++    void run() Q_DECL_OVERRIDE;
+ 
+     void setScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty"));
+     void addScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty"));
+-- 
+cgit v1.1
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch
index 7b910e028a47..7b910e028a47 100644
--- a/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch
+++ b/net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
index d1f6aed6c258..421ab0d9640e 100644
--- a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -17,11 +17,12 @@ DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_qt_dep qtnetwork)
 "
-RDEPEND="${DEPEND}
-	!net-libs/libmediawiki:4
-"
+RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-5.0.0_pre20170128-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-tests-optional.patch"
+	"${FILESDIR}/${P}-fix-warnings.patch"
+)
 
 src_test() {
 	# bug 646808, 662592
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 89efc7880ffd..7bd1882d72c6 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -5,5 +5,5 @@ DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b0
 EBUILD libnetfilter_conntrack-1.0.4.ebuild 968 BLAKE2B c1d3943def2e1b3d8eb61006a6426fb23ca0f9062522d8f197c8af3baa366181ba11f1e3ea797d9a461898d8fbdf40036425d36897e3b570dd3932d47f40b5fd SHA512 c1eb29f822d2ed62dea906fb0040b49a9edb966372959cd98a2297dcc88b718c2eb04d6b36d79030d2e473885c299795541a9017005f9f90d6fce176360b660f
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
 EBUILD libnetfilter_conntrack-1.0.6.ebuild 968 BLAKE2B b4e9b7a61352bfe98370bc1279307663e22f0aa642f12a8b76a2cf662b30cb12a5daaae01f32ce6fa3cbf7f7697b49903c0022b925d1f4cfa9dfd60ab30403e3 SHA512 df358cda920583fae2ae4f6e5a02f5ef06aef910dbb37222751949ae3b28acb8cac2019b5658376ee237865a3597ea286b4fb1fe2fa7cdd9f484301c544b2931
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 979 BLAKE2B f3cc5bfc79799b9e585d68e948d614c1f8c6370a38a551104979f3c111bf56c39ff7c8ed0d476b28246662c576f583f155f3a0ecfe188779c10c3024a191456d SHA512 6105474e9db8329ed22a6bc15f5ded6d7aaf548914e2df09601968028140ee890472ec63c8187984b985b543530569f491f6ee13caa50a1c023ac2d006a80741
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 978 BLAKE2B c22a0f8eeacff0f5908716efe68dfa89dca8a86a81fbcdb029d0ffe188b8c1d57147cffbf8ba525b730b61cb405f3d2522dc39a70209d950e7de9e61de6bfda7 SHA512 1c09a5f80586138c21b668e742e3cf13520381d8d3755d5da441dffcb048f2720954df1d034da82237127ffe780e25965a20201ee4c6f5dac662e691dc0a166c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
index c6147a21bff6..9d57a35c161b 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools linux-info
 
 DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index d92a8e19d4f5..db99ad268279 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,5 +1,5 @@
 DIST libntlm-1.3.tar.gz 518803 BLAKE2B 7cdb4a27c4598d935a7f4916359fc6b177eb6407f45d7b3832956fd9a0378cfa6c6e2e490577c843d3c92cdc283681b3b1fc796c4ae48b7f40a99b5a3551b5c9 SHA512 d375d472167e9c0f142e2415428f48ef692c9fcfe4d882ca442e0fbff86554a5bee23747ad1eb27f81d32ec2f3f5ff654e5c095e4b62dc25dc4918e6664966c0
 DIST libntlm-1.4.tar.gz 568414 BLAKE2B 2a622cd2d7b944128e29503845a3c9789efc9d14a93935ea24f9001d10b279969a8869f7ca68e6e36728638a32ce1ef693a5e8c28ab3bcaf702e114d4bf21dd3 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274
-EBUILD libntlm-1.3.ebuild 542 BLAKE2B 3233694f9494e874e4ce7e3db5689d7ce34d3fd9c8c5c3aaf3652846d6fa8d2933cfac27ab0724ff43a8ecceb037d373dcf9baa752abd728e3560a64e1af6407 SHA512 37d64d7bce82cdbf381e5ecc3fd713384241356721bf82690d90e5c0d802252f81b7c805e04490791fe7b2f86ff88cc59af3621139da73e6553400278fe636ba
-EBUILD libntlm-1.4.ebuild 444 BLAKE2B c8fe74e465cb9f3bb6da72b2510b361ecf041bf7ce3088a12ae2c18a137bd652b21b369fc1a27c4fabc75328417a8bfb8a698573dc53c7ed50fd77fdad9dc9c6 SHA512 8267837acd2eb6534f69195ed61b80998439d13b3da51bcb0d57a5760b868cb49c73196a1f83b9bfdfd96de864115a373837b690f81216d81bbb2956d7e80cb8
+EBUILD libntlm-1.3.ebuild 544 BLAKE2B 53a01c011e1d72199e2ef85ddeb6c19c948b0efecad8644929d312fcb0c61c05c10d03d022c7adc240ebde6a1673ed0f583e9a3a42c15531fbc0b6f03f79fb51 SHA512 9dd07a7c1ae43e096cc74d52104cdd2bfcaeb1de12708ef60c23767d477ead55c369f2e02ac0ed07080a39910921224e2380b660aafc104ab673905a12755eea
+EBUILD libntlm-1.4.ebuild 446 BLAKE2B 2f3d17d9c34759b64b775c5768c1de3a2fd2673b99d0696ccaa28ea042ea75219c3e496a046cc3aa486d43b85619b249332a7ad6884f00bfea324c1f81f21d0f SHA512 86a4668146889e56bf1b4c295d84b4c529f70aa671d0fa81e501bff29b84663911368cf6fbc4bddf02ebf27e28a4b8f65e83c4db6e88efb2bc19a60fe4dd38f3
 MISC metadata.xml 635 BLAKE2B 8697ed7c4c313f36a5087964d171e58998d853895da8053232ee8307f9d5679eb9d826aa8c923714d634d5e92f476929c79d812ce36ae553e5d9b7e702e26e53 SHA512 e802f2424b869d09a0d5a6e4488608a5a4bffe8c6d833add2f66cf37d928455362994e07eaccc07e6cbc013bef3d4179d1224d8c080b32ce4536e11a023e820b
diff --git a/net-libs/libntlm/libntlm-1.3.ebuild b/net-libs/libntlm/libntlm-1.3.ebuild
index 8b76bf766267..b78348b90109 100644
--- a/net-libs/libntlm/libntlm-1.3.ebuild
+++ b/net-libs/libntlm/libntlm-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -9,7 +9,7 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~amd64-linux arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux"
 IUSE=""
 
 src_configure() {
diff --git a/net-libs/libntlm/libntlm-1.4.ebuild b/net-libs/libntlm/libntlm-1.4.ebuild
index c1b2d5c8adfe..93be97556d4c 100644
--- a/net-libs/libntlm/libntlm-1.4.ebuild
+++ b/net-libs/libntlm/libntlm-1.4.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=5
@@ -10,5 +10,5 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux"
 IUSE="static-libs"
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index fd90665b1956..686123d3cf52 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -2,6 +2,6 @@ AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae
 AUX liboauth-1.0.3-openssl-1.1.patch 4483 BLAKE2B 4d2628448a1341cc41a676d5002c7f0f17af384fafde77687bc83235d90f4b6b853bbc9a4262fd4acaa0b04cb67d586bca308bb9c66fafbe7de1734fb39a4c1b SHA512 90ae75bbaf7296826f813df852263901ad8632579b5e5dd1e8b1edc4719d3f749ffc30e6348ffc2ddd5239de544c934382f52c4d62e90b3e655fd9630b5b4880
 AUX liboauth-1.0.3-openssl-1.1_2.patch 750 BLAKE2B cf07dc1722c41f55e1ea5d241c91bd62d4eb8c862a727cf350ea10ca11a24e195439599bf1e712158d6f0dbd113d5cce62d567b48883f23e505e1df6d077a34f SHA512 778222c9b5ff2a35447cc8c14f7868f011c3a3e938cebdd617471221e07278e82b70bc436dbcf28c4b7a558486465a0e36278d18718f48f57a2bb47e74eba957
 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa
-EBUILD liboauth-1.0.3-r1.ebuild 1583 BLAKE2B 75f926210d27ca8f62e08a7158e8f93495db1632018cfe84b9444214983d4e0622a37227a04c9c71ea6156ba8a525de9d3b242384a9cc15fd48e5847c9647a26 SHA512 97b3823d12a39a09f4d73559c89dbf4bbd3dd1e32a52099749afdbc597cfb5af62f42ab65493da0ce6d9c5dae2c7fe802138f449b9fdbca901625d5a46afab1a
+EBUILD liboauth-1.0.3-r1.ebuild 1584 BLAKE2B ed92aac210e196f18b9bba5301b9b410b06f2f21fad5f3a2132c2240a1709d36c16ed751ef443660e08052e11ccfe4ea498c4dd0870f0c1f56203dead9aa13ab SHA512 b9f89fe7be74da074ea549263674ba56e574682c03aa06659d13a2cb0aebe9634a9c2a746b8e79247e21654d8866f0d912399390ff0a50907faaac7151a093bd
 EBUILD liboauth-1.0.3.ebuild 1445 BLAKE2B af869f162f31ae9b2b487da42a476709f4726c3fa4724ce427b36a153ecf2daf0cb8f2e98448f50243a40f9810899a94b33b41ee27269dc118470e1d03b3c00d SHA512 a70d801add90aade10a12b5dd24446a1dbc36a9dfa28fbd3c90f3a7054b6a0a0c34830cda96565984b4b444295f557334b5fe149c99cf1e87b37a5af4b1b254f
 MISC metadata.xml 879 BLAKE2B 499e638089270b30e1fc4a15008592e036c05032719e05ef06cc4c897be1bebe3d4873caacec09f6c54f65240da2582fee0776aa7e0b89508e98c4a3a668f870 SHA512 05625ec768286997f291d95e40e024c692bb8dd3be2d2eea1c3d7c90b452b9a98988a2ca43a5c6134a0e084e0a4ae40af4a00e809092edbcf3a0630781657a07
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index 90acfdbc1fcc..66859ea39126 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
 	)
 	!nss? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		libressl? ( dev-libs/libressl:0= )
 		curl? ( || (
 			net-misc/curl[ssl,curl_ssl_openssl]
 			net-misc/curl[-ssl]
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
deleted file mode 100644
index 46f0bb800176..000000000000
--- a/net-libs/libosip/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libosip-3.3.0-out-source-build.patch 526 BLAKE2B 096d07ea4cf6c49793eaa4f8fa796626fbfa064020bd41f59b53a638b7bba823e1292bf665c89056aba5ea0e94123288769a2a5bdc8c02d65320e1b075e02e2b SHA512 772d88b7d18bba6112679411afd93be9473b17e808cc5987f582a43877fec9f288597cd0cc2555b45b04d631764bcd9d90350e712d028c9cca58629831b589b2
-DIST libosip2-3.6.0.tar.gz 598496 BLAKE2B 734242e556306eebbd1ca7f1c9dec3db5be9bc97453a71c3803ae4ee6e02e6426b1ff3a00caa8244369ac61857433b7a6976fc76908543429ef5a3bb3386f191 SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538
-DIST libosip2-4.0.0.tar.gz 644958 BLAKE2B 78dc5477b3f7ea8a750478804d0486a16dcf99101f1c38c4532f18f2dfd3b7c844728115973f8afcd42e384547c38de28660970b020b3df6dbcf854928573057 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961
-EBUILD libosip-3.6.0.ebuild 653 BLAKE2B 9b125b674bf8cb53545a9f4937c810d6069733952f70b56963988736da52423c9e5136e01b8a37029b9d3e8c8d89400334d577dc990161d87d840f1cabfc57bf SHA512 1ed7156a84235c329a296dbbf785934157d83171ca2a0a9090ec17ff14507f1104bacd2e12bc717ee08ac2102baaefb8175e3fbb8d378c765d34262062545dd1
-EBUILD libosip-4.0.0.ebuild 802 BLAKE2B d1c9a8bd0b9ffd25904a9527201d258caee652d6ad09f9bd70a5ddd8a5a74eb41dbf41de8d5ce5d95b9b8e3213914fa79738c313a81e7c1dc7bb5368cb3eb3c0 SHA512 c766065e2997a35b4d898ce69a0f6238ac5f02528f1c4d36cafa27dc385c35b1b4590ea1ce6418bfc9e68f83bee33fd6178bcb1a3a30ab48cb71bfe3195e385e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch b/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
deleted file mode 100644
index fa87b19d0e2a..000000000000
--- a/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixed upstream:
-
-http://www.atosc.org/pipermail/osip/2010-February/009864.html
-
---- a/src/test/Makefile.am	2010-02-11 17:51:43 +0000
-+++ b/src/test/Makefile.am	2010-02-11 17:52:09 +0000
-@@ -49,7 +49,7 @@
- 	@echo " *******************************"
- 	@echo " ****** starting tests! ********"
- 	@echo " *******************************"
--	@./$(top_srcdir)/src/test/tst ./$(top_srcdir)/src/test/res -c
-+	@$(top_srcdir)/src/test/tst $(top_srcdir)/src/test/res -c
- 
- 	@echo ""
- 	@echo "In case you have a doubt, send the generated"
-
diff --git a/net-libs/libosip/libosip-3.6.0.ebuild b/net-libs/libosip/libosip-3.6.0.ebuild
deleted file mode 100644
index 814555da67d5..000000000000
--- a/net-libs/libosip/libosip-3.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_PV=${PV%.?}-${PV##*.}
-MY_PV=${PV}
-MY_P=${PN}2-${MY_PV}
-
-DESCRIPTION="a simple way to support the Session Initiation Protocol"
-HOMEPAGE="https://www.gnu.org/software/osip/"
-SRC_URI="mirror://gnu/osip/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-out-source-build.patch" )
-
-src_prepare() {
-	default
-	AT_M4DIR="scripts" eautoreconf
-}
-
-src_configure() {
-	econf --enable-mt \
-		$(use_enable test)
-}
diff --git a/net-libs/libosip/libosip-4.0.0.ebuild b/net-libs/libosip/libosip-4.0.0.ebuild
deleted file mode 100644
index d941406553bf..000000000000
--- a/net-libs/libosip/libosip-4.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools versionator
-
-MY_PV=${PV%.?}-${PV##*.}
-MY_PV=${PV}
-MY_P=${PN}2-${MY_PV}
-DESCRIPTION="a simple way to support the Session Initiation Protocol"
-HOMEPAGE="https://www.gnu.org/software/osip/"
-SRC_URI="mirror://gnu/osip/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="2/$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.3.0-out-source-build.patch"
-	AT_M4DIR="scripts" eautoreconf
-}
-
-src_configure() {
-	econf --enable-mt \
-		$(use_enable test)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog FEATURES HISTORY README NEWS TODO
-}
diff --git a/net-libs/libosip/metadata.xml b/net-libs/libosip/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-libs/libosip/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
index 715119b52d61..14a3ba1bf1c4 100644
--- a/net-libs/libprotoident/Manifest
+++ b/net-libs/libprotoident/Manifest
@@ -1,4 +1,4 @@
 DIST libprotoident-2.0.12.tar.gz 571466 BLAKE2B 604dee2d33f7944615211ee3ab0a3ba610354bd604bcbf5296d58698ab963b5e667ea3e08fc2df62dfdb1e7dc7a336a57be6e61b6f410fdd7a96f3b46c35d70c SHA512 b8ba13ce9286a026062f47ffe3bf9407b408f64fbf0521aeebaf0e39e6ddf70cfbc6574f8e9c0f35fc2c2e5f9c4e71e200536665988f88c65bbdbeb9b7baed16
-EBUILD libprotoident-2.0.12.ebuild 751 BLAKE2B 6d134c86dd6758df91b90dbfde5cf6f140729139b295e00ffd1d5b15616e8b0f0e472cdbe477a7d821a3b9ee3247aeb53a7a7e97d7e39f5befca3077aa7f7057 SHA512 a4ccae31ccb7d796c267aa59b5d00a7e9c7cdf5c4fd33360fd0b7985d6f52845a3fba029738e25fcb63a219c984494934061bb6596893477a075daa1cffb1345
-EBUILD libprotoident-9999.ebuild 772 BLAKE2B bbf8537c89e7365956625303ffc21df4543bf474bc5cfab99f1c2e41cc5ce72e3b545b1f303e822b07c9838cee6cbec684132dfa8ed4cd46a208cf1c2bbe5be8 SHA512 06e3d718098e8fdfa17a7715920dfef8c5099f23e42d1d459d7690cd47a31b0a73f32bc7f0dd3ec40f3610eafce7057f389e758272788330727dc7ab5829d49a
+EBUILD libprotoident-2.0.12.ebuild 750 BLAKE2B 2983aae00b276a2a02b1e6c4ce7fc31759f35596ea38035f78ec6be5c3cc430cafad517f39c6909c03f37784fb17060269ab567378699216b3ed737e8c14b2ce SHA512 2e31e2aefa07348e63fd459c44ab68555e63a2194b0b33fbadb9895d4a51a447337bcc0d862d716765b716964271837b67d6566d1f5e45ee805cc031d9c0fda6
+EBUILD libprotoident-9999.ebuild 770 BLAKE2B f89f6d3feed6cca0e4e69d6656338e1dbb61e95223b3d37a575180f4e4f0e686e0719a7cf69de52b6dd20b370377bf2c30ba9694281d85745381c698efdd409c SHA512 0ad2d0ab2ffa956bcee2adfb7873d30f455dd7e75af76c910df54d327409b2267de44c3ec038cb743986634f7797e8469dbdb2cb7ff01575b9dde7beab069800
 MISC metadata.xml 360 BLAKE2B 17e614f06987241150e84b3738ef722bf680c8a9601307140767b78500a709849e71242774ecaa9c423771331365b4ba9e4293a859365527bfe11031339d91a7 SHA512 3de118bb358e064950487fffd58a49bb2fd5fc6597e6f3d0bf96a93d955e4879727fae386bdaf1a4a89388e471217903ce92b520edf257e1d1e66a6099e04b37
diff --git a/net-libs/libprotoident/libprotoident-2.0.12.ebuild b/net-libs/libprotoident/libprotoident-2.0.12.ebuild
index 0eb230f26ce9..e2e7b8979165 100644
--- a/net-libs/libprotoident/libprotoident-2.0.12.ebuild
+++ b/net-libs/libprotoident/libprotoident-2.0.12.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils
 
 DESCRIPTION="A library that performs application layer protocol identification for flows"
-HOMEPAGE="http://research.wand.net.nz/software/libprotoident.php"
-SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0/2"
diff --git a/net-libs/libprotoident/libprotoident-9999.ebuild b/net-libs/libprotoident/libprotoident-9999.ebuild
index 522c59fb2667..397ba5fb9253 100644
--- a/net-libs/libprotoident/libprotoident-9999.ebuild
+++ b/net-libs/libprotoident/libprotoident-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils git-r3
 
 DESCRIPTION="A library that performs application layer protocol identification for flows"
-HOMEPAGE="http://research.wand.net.nz/software/libprotoident.php"
+HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
 EGIT_REPO_URI="https://github.com/wanduow/libprotoident"
 EGIT_BRANCH="develop"
 
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
new file mode 100644
index 000000000000..1d401e12ea9c
--- /dev/null
+++ b/net-libs/libpsl/Manifest
@@ -0,0 +1,3 @@
+DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
+EBUILD libpsl-0.20.2.ebuild 1255 BLAKE2B 12acd8586de06566ec80715e192d1de1f13e0607157926a31bec2a926e1ddd776a0ff54d330f469f7f58d040c856862b754829500ddd1d0a993e2c84fc727d89 SHA512 f572e03390841e4a3e0a0664d23e275b9e00ca973ea509147fa8ff35d504f25b04a458e4fb068ec96d194f8004221d278a446600ace4c75c1afe5e5d1b08846b
+MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
new file mode 100644
index 000000000000..58adc0c67916
--- /dev/null
+++ b/net-libs/libpsl/libpsl-0.20.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for the Public Suffix List"
+HOMEPAGE="https://github.com/rockdaboot/libpsl"
+SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="icu +idn +man"
+
+REQUIRED_USE="^^ ( icu idn )"
+
+RDEPEND="
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	idn? (
+		dev-libs/libunistring[${MULTILIB_USEDEP}]
+		net-dns/libidn2:=[${MULTILIB_USEDEP}]
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	man? ( dev-libs/libxslt )
+"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-asan
+		--disable-cfi
+		--didable-ubsan
+		$(use_enable man)
+	)
+
+	if use icu || use idn ; then
+		if use icu ; then
+			myeconfargs+=(
+				--enable-builtin=libicu
+				--enable-runtime=libicu
+			)
+		fi
+		if use idn ; then
+			myeconfargs+=(
+				--enable-builtin=libidn2
+				--enable-runtime=libidn2
+			)
+		fi
+	else
+		myeconfargs+=( --disable-runtime )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-libs/libpsl/metadata.xml b/net-libs/libpsl/metadata.xml
new file mode 100644
index 000000000000..93c95ae3fa86
--- /dev/null
+++ b/net-libs/libpsl/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rockdaboot/libpsl</remote-id>
+  </upstream>
+  <use>
+    <flag name="man">Build man-pages</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 7fef97499fc2..0c81ca10ddaf 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,6 +1,8 @@
 AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b9d138b6e6ebf1ee8ae3e38fff1a8ac1f89cb088feec8297c8532fcea578260b0947946a18b6e3e8b87e6faf7643cc79a5200ba SHA512 cb8e90ef7d3b163c0e9f9991e7f219d08769f101de09f1cc17dd55fe768f9193938e45f8547e8a26f599d965eea05ff2f27c11af221384b08ab76411325dcfb5
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
+DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 EBUILD libsoup-2.58.2.ebuild 3019 BLAKE2B 927adec018c8e02235c0cc6390d1ff4c1c2fd9fe96757e3424389fa53a4310887364d6e4c1c2a375d8fe625cea1f0490b734e5dc6ffcb20a0fc821638344211a SHA512 d07cc7c0c4228f262a43c04edaf39260ec7f95a269969115f8efd3b7357f35054cec7913e46f3bf86837ed792301d0f6b47c96c84ac8eb802d1bea6b11350315
-EBUILD libsoup-2.62.3.ebuild 2929 BLAKE2B 8ced89e8e2d8e3d8f4ae2c62fdb3888cd1e792800271eb6126d410b5f2e79976b1498328619f1f275a6197a20b8ec2f1fb457d3170e646b791b123f3a41885d1 SHA512 663884ecc71ea24173ef1f24e6fdb08f143868daa45841f98ca78eeaec26eea145d291e1225cd848b1c85f8b6b7b45eff48f03b7d1ec13ad18896530a5c52907
+EBUILD libsoup-2.62.3.ebuild 2930 BLAKE2B 29db8ff029eef9df452555f5a7e3371f48fa2f38212ceb10aed792d95cf069f4fd947eecb52619dc451fee87cb24fd82f3f1f192e654941631d28ad5c3bd323b SHA512 652aa6e4355ad2855cf7f16482754b15c95c14ac4bb7bf4bc0e7b7d2bb5ee6a8793bf2686b179d9d152884f98b511dd53c8cc042e2725710871dd228338873c9
+EBUILD libsoup-2.64.2.ebuild 2773 BLAKE2B a00097a031304404192308755c586686bef456c3a885ef7e3e0135b35077b3a380ec5939a70712a5618bee50c036b50a78bbe9d2551c3667409c9419911112aa SHA512 ba5255214e453475cf25aba98ce9b1e52d3bb3edc039545962c5ac7e209f7ba35407558c847a2d83190fad8d4c0463288e1a1e0c701e62f75f6a11d0f64e6844
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index d32f74dcc10c..0fd9a010737b 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 
-IUSE="debug gssapi +introspection samba ssl test vala"
+IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
new file mode 100644
index 000000000000..be2bc815aed0
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_3,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal python-any-r1 vala
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+
+IUSE="debug gssapi +introspection samba ssl test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=net-libs/libpsl-0.20.0[${MULTILIB_USEDEP}]
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	samba? ( net-fs/samba )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests (bug #226271)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	# FIXME: workaround upstream not respecting --without-apache-httpd
+	sed -e '/check: start-httpd/d' \
+		-i tests/Makefile.am tests/Makefile.in || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		--without-gnome \
+		--without-apache-httpd \
+		$(usex debug --enable-debug=yes ' ') \
+		$(multilib_native_use_with gssapi) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable vala) \
+		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 3d76137f7302..ed6a478fdea5 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -3,7 +3,9 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8
 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
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
+DIST libssh2-1.8.1.tar.gz 858088 BLAKE2B 4e7358c55355265ec3c7d7ce749b01d74bc1c37ba73467401c24f0abb2b22da12ba938393f3cf7278ef30900c0cfa700ab71c4fd32a1d41eaeb6fb47669c1ee1 SHA512 f09ad9ed04d25305b966e7f8c210082fe06c2b236dcd5018b009bd0bd6aaff123d16559d280892a5060760ed055ffe295bc02dc6e8dd1e7b8383c6c703f09290
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
 EBUILD libssh2-1.8.0-r2.ebuild 1621 BLAKE2B ce45c14d1f62ca3fc41bb1c0b3f3c51bb7b752fce9f24b53b4b6b59567ad89a02a0191e67935d93969b8b464eca017c5e2d6025c4dc648eed07103964793a08b SHA512 472bd3eadc918e6d785ce0af09bce7a811236dbe3a62de12612556a66d7c89fc20322a47c4779b389175ed39041a1ad710fd8956c2d11a1f79685b2f862980eb
-EBUILD libssh2-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5
+EBUILD libssh2-1.8.1.ebuild 1621 BLAKE2B f3bea26503e369179cd8556d82441456a7e11ccea46ca0166f4e2f512f5ba6dbf2231e95deb3645fcc7973a1d0b48c522f32cf6863fc8229865687d5e4febd2f SHA512 d27e38c726d87b19f3107dc0744343d5618226037fe8a751a73d31b785acab40dc5101ec91d570ee601cede993587e451d63fd78b3943f81629854ad4be46c4f
+EBUILD libssh2-9999.ebuild 1324 BLAKE2B 2ceb2fc6efd161d8c2f42bc3a2bf28273d9084311f4749859a757a8d31663e7dd9806793bf1f00b8cbbb8524549ae154441459fb03e15daba8d84ad6d2d82a87 SHA512 59e65c232c435fc439bca3d2ee4f0010c50684aa3f7e519050e5fae309f25b0a27e737dfd6bbf6540a9c5b08601546979aa4824736becd0c0d5cf03700f9bd3c
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.8.1.ebuild b/net-libs/libssh2/libssh2-1.8.1.ebuild
new file mode 100644
index 000000000000..75e39f52b68e
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.8.1.ebuild
@@ -0,0 +1,59 @@
+# 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="
+	?? ( gcrypt libressl mbedtls )
+"
+RESTRICT="test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${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-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 4ed00d509733..456ca9203854 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -1,50 +1,56 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools git-r3 multilib-minimal
+inherit git-r3 cmake-multilib
 
-EGIT_REPO_URI="https://github.com/libssh2/libssh2"
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org"
-SRC_URI=""
+EGIT_REPO_URI="https://github.com/libssh2/libssh2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="gcrypt libressl static-libs test zlib"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="
+	?? ( gcrypt libressl mbedtls )
+"
+RESTRICT="test"
 
-DEPEND="
-	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS README )
-
-src_prepare() {
-	default
-
-	sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
-	ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die
+DEPEND="
+	${RDEPEND}
+"
 
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+)
 
 multilib_src_configure() {
-	# Disable tests that require extra permissions (bug #333319)
-	use test && local -x ac_cv_path_SSHD=
-
-	local crypto
+	local crypto_backend=OpenSSL
 	if use gcrypt; then
-		crypto=libgcrypt
-	else
-		crypto=openssl
+		crypto_backend=Libgcrypt
+	elif use mbedtls; then
+		crypto_backend=mbedTLS
 	fi
 
-	ECONF_SOURCE="${S}" econf --with-crypto=${crypto}
+	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 7cca6cbd4837..85c74fa2853f 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,9 +1,7 @@
 DIST libtorrent-rasterbar-1.1.10.tar.gz 3902542 BLAKE2B 3a78862ce2825c9da32ab38122db05c2816daa237559446a60702f562e971c5597210dfc2612235294cec3f60fa3de8cab3a0246887ac4779b01171a460f70f0 SHA512 414deeb9765bfb6072af5fa00ad836bfe3751622a80783ea84389e31355b342a4371f0dc195b2d27b154826e515b2e6063c8786f792afa347abba9caadaa5b2a
-DIST libtorrent-rasterbar-1.1.11.tar.gz 4044314 BLAKE2B 96192ffdcb5bd1888307c874e2685314db9a99438337b0cb67ef317a2fe54b4a0e8e28fcdf34a1656a9abb69cc79f9bbda22cdedf1b8f2ba4f1b5488922c87b3 SHA512 1e0449406ea34b226033e3f54f719c5f2842043c7e54107e847050c67b1c5e9d2cb5a08fbf0e81c2c6e31eda6fe85c5ec0ff8ca47916c979894f778fc3313bb6
 DIST libtorrent-rasterbar-1.1.12.tar.gz 3897237 BLAKE2B 0988b16d79df9499e2f7ab9d568ec560fa701e78fa0c6cc0158629d219259a73f3b2aa8b79d6f9c3a757f97559bc6b354148d5885b29f089a41893df65c92b11 SHA512 6f264ca9fcdcb93c4e16ced4b2657ccb19d47cbd483c3ad9f14909ee7de280b50c15d180c05ebd454236871fceca48cd79647bf89f8cbebf234b8f0f351aa699
 DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
 EBUILD libtorrent-rasterbar-1.1.10.ebuild 2385 BLAKE2B e463383b63362472e800c89ff9bf4c06d567999c552f4c5d5dbba79293e6af996721dfd9db56a60278343dc15836bba15ddc22885cba19056f438e417e5eb0e7 SHA512 54e4a0e6e3ca32b4866541fae61eb0d6024b89af47e086d74abb9cddd692d00d40e9d4d5514201f41cbc085d789a4d613f01d724caafdc827359d411822bdc76
-EBUILD libtorrent-rasterbar-1.1.11.ebuild 2387 BLAKE2B 1cfd0973db7512040e7c631b09f574c9edbfb44788802e66f241fd8704a4d82a374669344106c184dd93ad4299c6beb622cd0a8951b8cf9332b74f7ee62b5eaf SHA512 931b65e5c2e3d212095561599a6cbb9ae1e0d21e60c8f4ffed798602be2e86914fc6ea65325fda14ccbbd9c71363dde2eb7ff92e503b33d7533ed045e7be962a
-EBUILD libtorrent-rasterbar-1.1.12.ebuild 2387 BLAKE2B 1cfd0973db7512040e7c631b09f574c9edbfb44788802e66f241fd8704a4d82a374669344106c184dd93ad4299c6beb622cd0a8951b8cf9332b74f7ee62b5eaf SHA512 931b65e5c2e3d212095561599a6cbb9ae1e0d21e60c8f4ffed798602be2e86914fc6ea65325fda14ccbbd9c71363dde2eb7ff92e503b33d7533ed045e7be962a
+EBUILD libtorrent-rasterbar-1.1.12.ebuild 2385 BLAKE2B 244142352ea27de5ac88ce03ec9ed64421aa9feec919486b9a5040658694044e186f7370ea0e0c7a875e293045fe4cb0d041e366a08256c56e8117f7ae5f2196 SHA512 2703b8dfde95ac4d70773f3305c9c5d2984d5e85ad2162d20473584a8f141f3146660ac97ed46b4811b9f0b0aa478992a4d23890dbdc5d0d73f46a5947402bb2
 EBUILD libtorrent-rasterbar-1.2.0.ebuild 2517 BLAKE2B 04fc673ffdea6b03293d285baa95f57118348f314f3259e23bd4cef2c4babf81f52b839e8da2f363e5d73fb373395a65c6039123e6343ed4b3c8b109d05dd591 SHA512 50f8a2708c668643319519edc6e234a9dd1cd9b4be796d1d041de7574ed5d840f3b95a299b90812dc0bd4ad768ba9c6df0051ce3c4714d0ded3c6f8ebed696bd
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.11.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.11.ebuild
deleted file mode 100644
index 54f6e3e915b8..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.11.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_{4,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 ~x86-fbsd"
-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.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
index 54f6e3e915b8..a6d541b19872 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.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 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 5940994269c8..8f6531d4eaf0 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -4,7 +4,7 @@ AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab64
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
 DIST libtrace-4.0.5.tar.gz 954257 BLAKE2B 42d0940f18f836945fc50d86e1fd242e18a09c4dc07319f831457ebfd08a4ad2d4f7f1ae2a5fcd8f881011110fdf57f623a42d624ba07348f1b9de759769c641 SHA512 c9738af7a471f6c0a6a2a2595ea081beb6145b57792558dd66feef9e4601814a8f5d6be194c83ba2ce076571dfc2a86aadafaa30411d9ecc3e7b7d83fc7809ce
 DIST libtrace-4.0.6.tar.gz 969315 BLAKE2B 812100d7f0fe3def44404372c7b2287a2a9c9b3831cc2e3dee30cff0946d959089d44f201ba74aba57246242153e634806d899a108e18f195f5b6bfde8c0043c SHA512 8f888f57e4436d1aa7fc030212f7b356c58848151873569aa372c6cbcf62c5dd1ece4ecc5a98f6dbe8dc84a39d19abcbe42ff240282054b45cfce0c8ba048f16
-EBUILD libtrace-4.0.5.ebuild 1132 BLAKE2B a99e580d3d2c64ef7fc150ba55de23a7576030aafa5eb832c6399e44620928c65388f4ce6aa5b2d09e2e69fb3fac1b4c9896ccefceeec90ed48fc2113d83b198 SHA512 44933db0e20dfb03763bbc8a01bacad8e5459cecf606bc72f31cfb8ba06bc8220e385b4da968eceda1ac0116f1ace4e99bdd2822c418f590a1ec7d68dcf1a7f6
+EBUILD libtrace-4.0.5.ebuild 1134 BLAKE2B 65826d3c4d60e567d3d6ca954f9699f3c067f7430d35c9d98316ab159b1e0a1022aae36ad9272b15cb4970d05f61269f81ae98eda13107896187414ff7ec7bc4 SHA512 2ba226191a5cc7675a1c516df80a4e2a4848db5ed8f0f9557e31d361127abd51b426c52a6ade15851663a3dc28882420ecef03203c13a116f2c5d09c590badc5
 EBUILD libtrace-4.0.6.ebuild 1134 BLAKE2B 65826d3c4d60e567d3d6ca954f9699f3c067f7430d35c9d98316ab159b1e0a1022aae36ad9272b15cb4970d05f61269f81ae98eda13107896187414ff7ec7bc4 SHA512 2ba226191a5cc7675a1c516df80a4e2a4848db5ed8f0f9557e31d361127abd51b426c52a6ade15851663a3dc28882420ecef03203c13a116f2c5d09c590badc5
 EBUILD libtrace-99999.ebuild 1110 BLAKE2B 8de7818aa67bf32f231add5448240e41db4153983aca831afeddf714a6958aad8fc9ba9c507af436572e0c6ef4f92fa3cb0cc5c7b59d2b2750b717a7af8e346c SHA512 b7a560233c8231f40ca0469f35676b1670514e9985ceaea82a62cdd0dfb7b13906daa64a6f8de4888eecf9373581c4308ec20e2dae2fb662baf5106765a62c3e
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-4.0.5.ebuild b/net-libs/libtrace/libtrace-4.0.5.ebuild
index 14825e4a8334..c8291b01d7ff 100644
--- a/net-libs/libtrace/libtrace-4.0.5.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit autotools eutils
 
 DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="http://research.wand.net.nz/software/libtrace.php"
-SRC_URI="http://research.wand.net.nz/software/${PN}/${P/_/-}.tar.gz"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P/_/-}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index ef3f55c110b4..56e4b4cb5278 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -4,5 +4,5 @@ DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
 EBUILD loudmouth-1.5.3-r1.ebuild 1144 BLAKE2B c0f5f6d6d538cc0661c678a00fe31ad6370b444ee01aa999ef19b1bd2861a8e7647df192471eba6756d121a0ec3ccf5a7360eaa47e2db0682a95c4ee5ddeb34d SHA512 1dbd2faec2ffbbad86a1e651a679c6994b7d1edb3e84460f174f78fc8d333bdf238e7c3d6a6b251fb61144cfe6b34bc33f00f8d6102c4d1f5b7bf58d1ba4648b
 EBUILD loudmouth-1.5.3-r2.ebuild 1174 BLAKE2B 29524a97e8a1c4bcd2d57850615725f8ec2b927d84d261cd7acd410b0f57fd0cf21dc5593d6d80e40eca6ddc5a0acb224324adb27fb65ddf2833cb586c2dee0c SHA512 524c7f0e58c2561b1049c2cc8abf460fa086d152ec5654f1b87f189086bd73c9237bb8476a76f1781b4bbd12b6a2663ff27fa64f95558560d3cd2a50f92a4af3
-EBUILD loudmouth-1.5.3-r3.ebuild 1049 BLAKE2B 031225aacac8fb8ae4782d0820daa3d64c3d0c28c24e37f735e79ed3cc6e67b684643b3ac0d17fe06a7e1cdf29ed9efd6674cf2099e260fbdff36e7adcd184c7 SHA512 1d2fd45bee7c04db7f39bd9eb59023f0b88ddaa015bbc1ba75e149f4fbf5b71b0a167ca59a1c5940698b6ec4c34c20da0455b8dfda800c01c98da473da01d53b
+EBUILD loudmouth-1.5.3-r3.ebuild 1047 BLAKE2B 0b7af5c77bc0eeabc8128de330f1a96541f0a580f1183911aa9507a7e3c9e938d81c1b4606d2e80dcf25e10be5cb2d8ed21d7a74d79076be787a8b746e3d95e6 SHA512 d47529064327ecad181062caf726d414d7ccc2d40e5d81cba180907393869749fe82ae80c1f11512fa8ca834cd89a966730ef14de5e07e772b2708acc658d817
 MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
index 12a5eabfabfc..1d3b7e5de535 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index feaaca640738..8749fe7fd3a5 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 EBUILD miniupnpc-2.0.20180503.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190210.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
+EBUILD miniupnpc-2.1.20190210.ebuild 1335 BLAKE2B 534d019d5132850adef464fa7fb688ffbbfe565be9b1e5fe9d6e3bde04d1744f769dc2c80603f9e1331cae1c237a1b8c47cc383be79a1a6860aeb19d0e3eef0c SHA512 31e01b3579bcaa6fa29c536cd8ae153ba16e716f99458bf9ba3dc0e06ceeb7c40b54e20bed5bb8a261c2bc171a26e41bfba9ec80224d4bc11970ffb8387562aa
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
index b170db612f20..83d64c8f44c5 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index dc7caf46b6a5..9315c8f57646 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,8 @@
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-DIST nghttp2-1.35.1.tar.xz 1614460 BLAKE2B 86e078cd0fc285f76df5096c34ee3142268772cf690ec7c9abef7cc3d873ac583a1da5e331ec46138e05b5867f56a9a4e98210395d75377ff37956307c7b049f SHA512 fcd3f79f913afbeee1c75003bb39df918e6122bbf728b3ad4192d5849d8fb96705e04f5505465d63f25a565b2f1da6abd8fabdebb6e3347500f7abd31980861d
 DIST nghttp2-1.36.0.tar.xz 1629020 BLAKE2B 7c116988c22801688c50d6d514ddb904920cc54d3c3d141137e6ed8b2182ef4e670f0a0fdebaeabfe0df8cdea4cfd1ee3fb083628f035201f104de6f3614dd25 SHA512 4e0d5c5cdb4f1b7e5f12790850237f36649af4aa9596033392725972e4e0e5a33bb78bd1aa0735e35e489b523b7e9a236a7b5847dfca69bd7583fcab36c13c76
+DIST nghttp2-1.37.0.tar.xz 1628248 BLAKE2B ed5cdfda44b4e38a03d92352520eb765cc1da99080e0cd3e9d663efd5ef2ff219c6ccdbc16cfde001a8377afc796acef250913e1eb422ae2cac2eb95b8f98089 SHA512 67a4b9df3f7f0edad719011fa289d9aa9ef04f31ef3ccf826b861c8830ed24e0743a33b54ab66d198fec7edbf723852b38a2007b335d7f566f702f4b02297b0f
 EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
-EBUILD nghttp2-1.35.1.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
 EBUILD nghttp2-1.36.0.ebuild 1872 BLAKE2B 8e94360bbf5d914e4db55b362d60b8786a9158670b72134b47226c9d01a62b3b6004110ade64611dd653521092b3be2c19820fa9b5aa8430ff7e8da1efff62b2 SHA512 2a0c52c49d6d256e8b32c04100533cc73fed972d269a1d3ef3484159112537b24c8daea962893e031aeb4e4a49307fccb81c4ac6eb2d9d185df43fa617459c1c
+EBUILD nghttp2-1.37.0.ebuild 1872 BLAKE2B 8e94360bbf5d914e4db55b362d60b8786a9158670b72134b47226c9d01a62b3b6004110ade64611dd653521092b3be2c19820fa9b5aa8430ff7e8da1efff62b2 SHA512 2a0c52c49d6d256e8b32c04100533cc73fed972d269a1d3ef3484159112537b24c8daea962893e031aeb4e4a49307fccb81c4ac6eb2d9d185df43fa617459c1c
 EBUILD nghttp2-9999.ebuild 1949 BLAKE2B 56a3fc7ee584692bbf9219aaba3a56c0aa57f7b4479d6da0a12c77ce8b999a1db1aec3cf76203536cdd42254dd8c42ef2df63ba08fade93a0dc674502012858c SHA512 fe76714b538e6f49c44c3beb212f98b17644575a9b049981c44a4537d7501cf9b3f6bbdd2351a3c286d8c1e1c9acce09843eb86660b5ecfb38785ce920db4aef
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.35.1.ebuild b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
index 990e99d6dd0c..20f89187f0fb 100644
--- a/net-libs/nghttp2/nghttp2-1.35.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 0d987c3023c3..a5e0302a5f43 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,10 +1,11 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
-AUX nodejs-11.4.0-stdarg_h.patch 243 BLAKE2B fef871a9900e3987559cc29ae4c60394b6474cadaf6afee9961245b0938563f736d050294587900264821b2e13a99729333eb1bc38eee9fc77cec16a48a64675 SHA512 008cb557c9d94fd3a70dcf54ea260ed5ad457f62bbc689eccb668052c7195895c3c7f115354dc76da8f1ff0c6807bda9ca7bce62c844e37036c3916cea40286b
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.15.2.tar.xz 20232972 BLAKE2B 3ffaa0890ddec6b9d00a0b3f32fc62e55a665ea6faba6265df71be601f88a1c948011f908851f1cbb198974ca36f8626fa9a2b4b8827f0155e57ff48f3e25c10 SHA512 2d4ef4758d3a73a160b95249c7dce32307287ef84511f56c3077f18c0d87a53bb73b44dd86131a402c4e86686e5e7cb5aeedb2b075b8ab261fc43d5abbe70ce6
-DIST node-v11.10.1.tar.xz 22074212 BLAKE2B de4c224063050901a3898bb9d2a26dba8027b3722528c402d461f2ca892a80e230e16131e9c8b22d6fefbd44b79a6d78aef631934c80ed53f8601fd2d3405150 SHA512 8da793946d18c8368f12e786bc4fdcff0ac61237c95f896a49895d6433edcd42005d50237095fd2b1c69b51d56900d122528783338dbb97e5fcee9dcc9a5812c
+DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e8476334cb825e5727324c3202bc015f4ba39589608284d0f8c0b722079c06d1587de5299a3c81ccb7b0eacbdaccf84 SHA512 cf741f733af7a7e1fbd37b0f98110078494b4771dbdfccacfda95a5ea4cda6cdcea4f8d31dddcf27477213614e4ab6cf7d1a1f900cb92936333730737ac4f9e8
+DIST node-v11.11.0.tar.xz 22094004 BLAKE2B 3ca03a659fc1104bf280510277a74167a2a188ba0798c4723730fb850cae3d4ddc4d5f4bbad88dc9dde8b7f57b02f5d9c47d047bb15668e3488e0a002e225cfb SHA512 c89fd154dfbaa999806429c6e416c4fa2f0d5f3cfb9ac6de8b21f9195681ae0170325ae6fd7ab811f4f394d03c1d56db77ae1c730d5e8ff6a64b9a6dfa2286e8
+DIST node-v11.12.0.tar.xz 22077236 BLAKE2B 1cd7252983c0e444e0ce183a11af0912c994b2e36a8f50a86ca543f59548629fb3b857a0d106340f44124637e06cf90b2e079a17a30c2bd8386bd6575fac1fd9 SHA512 54d19ee6cb5127298276287f536dca9d4c9389038bb23fc48e8ef0246bcfcf59961ae704a94c68eb67104a230e3b23cbb7c8559aca83f542b35a46b2797d31e4
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v6.17.0.tar.xz 15853760 BLAKE2B f1872b2ed43c447beff2b3278e49f9f10bbef58bba2640f6ecd889facfa4c5e5ae142f3b30721faae615df42c0870d7c09147930a259fa81c161b29559e2a340 SHA512 8ae9bfa0336a7d0d9f4a372330de1f877354a3d68bdd6977285787f81999012e42faf4ccef5981fe565ea9e2f18c5490b857bab29359fdf906b5a9fb14628858
@@ -12,11 +13,13 @@ DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d
 DIST node-v8.15.1.tar.xz 18501532 BLAKE2B e6da98902d665997b2e85472424e00f817353dcfc118b1d309f1305099b145eb0eae33429554ab5d563366182b34b24ac78f8b78794f8d21318ebcd137622131 SHA512 23fb4e2580116a69a58514c2dc1f42098c7d594ea9d0cd6e7090f37e12e1805ca6546df66ee68fcb61b803e287ce34422f55129412f6bdcdaa97f515d9581e19
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.15.2.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
-EBUILD nodejs-11.10.1.ebuild 6531 BLAKE2B aae74f0eca235209b18c94ce80322e6566b4cb7f8ca2c197a4f5028db34735fa8c54643e4ac63734b714aae6097d147a7a4a937f7a49b25996f2a49d1b366b50 SHA512 c1238fb06883369eb2a6c4553920a60a4d9bcacf63c89ca226b35d9a872b3a75ac2996cccef87c17321d169f3242efa2819a39fe2efbc0dfc5d79cd1f35553d0
+EBUILD nodejs-10.15.3.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
+EBUILD nodejs-11.11.0.ebuild 6488 BLAKE2B d801002c9e520b6c783ba0228e2a3f53e17096d37b24893ce1bdad28979a34399aa5caf7815fd63ea51e3f8b29d1d5e602b8ee0994fd8dc3b16a9966e7d11234 SHA512 010fd966f7834e3f57e610fafb07c6f47c16111fb4fdfe70d574ada6ba20c53cbbde835f554a30c6c1393bf68ea66e4b919d2b61ab45540e3a18039d4467bc63
+EBUILD nodejs-11.12.0.ebuild 6488 BLAKE2B d801002c9e520b6c783ba0228e2a3f53e17096d37b24893ce1bdad28979a34399aa5caf7815fd63ea51e3f8b29d1d5e602b8ee0994fd8dc3b16a9966e7d11234 SHA512 010fd966f7834e3f57e610fafb07c6f47c16111fb4fdfe70d574ada6ba20c53cbbde835f554a30c6c1393bf68ea66e4b919d2b61ab45540e3a18039d4467bc63
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
 EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
 EBUILD nodejs-6.17.0.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
 EBUILD nodejs-8.12.0.ebuild 6362 BLAKE2B d2caec942c787ff4af79633f40d145d459df2e7ff7b15c7807a44086aa93dd3f21f4f0a84879ab61f9792d72c0855c3745400b6d791086184649bc22999e4f05 SHA512 b698140ab323e29eddfa4f3d579618206c4a31023ee25be2aff6ca03f321f4e9d3bde7735ac821093bdef62000e0d458e9fe4ae5cc9883b9bff9eb559135326e
 EBUILD nodejs-8.15.1.ebuild 6464 BLAKE2B 047682cbf31f62246cc571d5385918ca8563f83f11f659382ad660867fc3e8cd95bef0940fbb2b4adbcfa82a7e97fb34ccea4037be3eb8cdb3f07af3c6e8ebf9 SHA512 28aebffa55645c850572f8aac9d7aa0f0c233d0abe5b829f80a971e55a65f3b0621e69b52fe8ab2eb3000fe6b84c603bb7f99a56172bed0d9840830222e521a5
-EBUILD nodejs-99999999.ebuild 6342 BLAKE2B 113f302b886a321f5aa59a1ad480c284c559542bd435ee6fbea4e83a86525a0b1c0c09d96835cea806cca2ae5e63e158f44d312ff4605763682fa537b6d8188a SHA512 820923a87afedbebf874697187ee652d2fa0a0199b617d73d1b2b36e1cd321a22dc65648ccb85efab5f905cd4ebd03edb69c6da2fa4e32aa558977d793061c11
+EBUILD nodejs-99999999.ebuild 6396 BLAKE2B 05e4c668ad5f7e124c39ea42468b111c58eb66c02f3e14032b1492ee7db82d77fba250db27d819ecc58bb6944d3d1547413f0f2125c948ee8cd3ad0c15a6b4a3 SHA512 245ece7b475eb54bcea5ca2ac9137734cfde957a9ef1d02487da6fa2fe5e44e464ae59a470414cb251bd1d9cfe18d5bc073af27f27476ffd15cdb6e40e79a87b
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/files/nodejs-11.4.0-stdarg_h.patch b/net-libs/nodejs/files/nodejs-11.4.0-stdarg_h.patch
deleted file mode 100644
index 951c35989c69..000000000000
--- a/net-libs/nodejs/files/nodejs-11.4.0-stdarg_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -75,6 +75,7 @@
- #include <fcntl.h>  // _O_RDWR
- #include <limits.h>  // PATH_MAX
- #include <signal.h>
-+#include <stdarg.h> // va_start/va_end
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/net-libs/nodejs/nodejs-10.15.3.ebuild b/net-libs/nodejs/nodejs-10.15.3.ebuild
new file mode 100644
index 000000000000..959fdfa0bf29
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.15.3.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.2:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.34.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-62.1:= )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# 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
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-11.10.1.ebuild b/net-libs/nodejs/nodejs-11.11.0.ebuild
index c4b2df6f8bdc..010d4dffa4e2 100644
--- a/net-libs/nodejs/nodejs-11.10.1.ebuild
+++ b/net-libs/nodejs/nodejs-11.11.0.ebuild
@@ -39,7 +39,6 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-11.4.0-stdarg_h.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 S="${WORKDIR}/node-v${PV}"
diff --git a/net-libs/nodejs/nodejs-11.12.0.ebuild b/net-libs/nodejs/nodejs-11.12.0.ebuild
new file mode 100644
index 000000000000..010d4dffa4e2
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.12.0.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.26.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.34.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-63.1:= )
+	ssl? ( =dev-libs/openssl-1.1.1*:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# 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
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 23540898bdb1..98c1addd667b 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -19,17 +19,17 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.19.2:=
+	>=dev-libs/libuv-1.26.0:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.29.0
+	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-61.1:= )
-	npm? ( ${PYTHON_DEPS} )
-	ssl? ( =dev-libs/openssl-1.1.0*:0= )
+	icu? ( >=dev-libs/icu-63.1:= )
+	ssl? ( =dev-libs/openssl-1.1.1*:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -69,7 +69,7 @@ src_prepare() {
 	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
 	local LIBDIR=$(get_libdir)
 	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
 
 	# Avoid writing a depfile, not useful
 	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
@@ -93,7 +93,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	local myconf=(
+		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
+		--shared-zlib
+	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
@@ -145,8 +148,9 @@ src_install() {
 		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
 			sed -i '/fonts.googleapis.com/ d' $i;
 		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
+		# Install docs
+		docinto html
+		dodoc -r "${S}"/doc/*
 	fi
 
 	if use npm; then
@@ -185,6 +189,8 @@ src_install() {
 				"${find_name[@]}" \
 			\) \) -exec rm -rf "{}" \;
 	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
 }
 
 src_test() {
@@ -193,10 +199,10 @@ src_test() {
 }
 
 pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
 }
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 009c2f3c3e16..ccaeffcd33a7 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -3,6 +3,6 @@ AUX pjproject-2.7.2-libressl.patch 3446 BLAKE2B 47b21f621ffd1990e276459d9692ed7e
 AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082ff1c40d5ba383103371550d2c682578a9c57d58b4029e512ac5a064fae3a526bd6e62fb645ba45b4067c47fd148bcce668aa SHA512 438a61353c0200d3f230b81cc13f565a178d078b4580aa468a9241b5b95f5a2336d039f4aaf99cd57e7b1042f4c0a1cafd00c29191e36c08f2194d984811b8d6
 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
-EBUILD pjproject-2.7.1.ebuild 2612 BLAKE2B 19a3d988b01545ecf7c7682239ebf0650610d31d45fb39fb2e0d96962b1bc3cc3f76a6fc7b2d93fdd7f798710d92f69feea2cdae42f8517f67943b47fb8aae78 SHA512 00c6eaec1aaebbb6e7751c93eddb52dc3a0f329a781b3c715656b5a0154ae362ed0f11e1f7e066bf0a7fa40b3cc03bf99b040d6665608c5d30e39b7a03825a41
-EBUILD pjproject-2.7.2.ebuild 2753 BLAKE2B 126dde2738b6fed3554cdf49e30c819eee37608e272e2c8a1e48ab55e084586877bb03a549eff5dbe413a9a08ac9ddebeeb96f39c5ab57bbc1679e26b461ae1c SHA512 f4aaba317de182271d73ea91dec0e4fa8afd63353104eace94e513621d2b30ff30724d4fbd8cda0daec89709aa187714b02ea53dbdd8313b9007c02fd824265b
+EBUILD pjproject-2.7.1.ebuild 2614 BLAKE2B 10ee58a83d0ebce1fe52bfe395bd319e08a4128364f7fbf889d0d089daef222859992b12786bf0796d6bf77f599a9dcc9dc9800253d4e781069a9587efe07259 SHA512 2bd916ffdc6449e3fc62fd4aa1d3dee7634a97351b369e896384b46316e089185121c39efb8fa30143745c6c91ccd001c797cd0f13020481769dc3bf0e196e8f
+EBUILD pjproject-2.7.2.ebuild 2755 BLAKE2B efbca2a7da848ea23594811a1ae9636ac15010f1ee7228b821237076d3d497d0aa240c15cdce4f14619138acef073aa86670b5bfba051c027532c04e3a524bb8 SHA512 f1ccce719dc7b0e7c667cccd0c9137115089d0ef882949994918215068913369843391490ee407bd2c164204a0241b55b87c6b63b75c5160c3402d46fa42a964
 MISC metadata.xml 1096 BLAKE2B 03a918c911b8a3c8bdd0aafaabc820b2750dbf5a3b7573ffe987e71ee8edad4a369e7c15845d4ad748150c8972d646d44f6489a9a54e16895dee7a6048b5eac5 SHA512 d2547bfdc7aced6f242f7493a39425f4c2ba5881ab2cc6b8da386e84c092780ab0f876dcf947436150a5060faedc3a0a55377ad389f3a53f6142ef188b321a92
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild b/net-libs/pjproject/pjproject-2.7.1.ebuild
index b245f2b754bc..2c434a83d12c 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools flag-o-matic
 
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="http://www.pjsip.org/"
-SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
 KEYWORDS="amd64 ~ppc x86"
 
 LICENSE="GPL-2"
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild b/net-libs/pjproject/pjproject-2.7.2.ebuild
index 2b77f3de1c31..141fa9edf647 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools flag-o-matic
 
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="http://www.pjsip.org/"
-SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 LICENSE="GPL-2"
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index b9459d331b27..4fc40d6b991a 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -3,7 +3,9 @@ AUX srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.2.2.tar.gz 634049 BLAKE2B 1f650c5d8ab470829212b9c4a1082eb1de4480c8bad4b787a63a2b9c06cb7c8c0ad3a80a06ec5b13e629ec2d18a025ff36e3dcdaa9de8359805e3ff4c1b4d963 SHA512 cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a
 DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41668f3b3db76055917cff767b6d04b1fdd97b676772fbb561f36f3d2f712e1d1165a26033f728c1bf9efdc SHA512 1f8fdfc0e1d92bc8c477651982c23afeacb65e2293a7225227927e1b6f71a01355a3311600097d77b3df638503e4856acbcb52ed270b650480f20b98c1be5ec2
+DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
 EBUILD srt-1.3.1-r1.ebuild 1347 BLAKE2B 99c91c175f9c3102e1b29a6f9802c4a73576c2840c5d815494632a77c2ff9334a17ae2cc4b5709132de4dd52bc7cb0db482fa6f5c6f85dfe532e03cefdeed543 SHA512 76c669ab9a37339d041a28fdd888fbab0ea1e36f4f29705fa262b7d68a4cce1d80b9f3e29289f342b951d20a61f65b0b074a03b42cf1ec62fe54ffc1f2d064b5
+EBUILD srt-1.3.2.ebuild 1220 BLAKE2B bf8406e8cdd7a583a0406626c0bd6e1e7316e30b70a8730790af91d98ad52e0231a60f09f61649f2692c3b92ffbecea782909852b4dfd0f69b25407731d03017 SHA512 05f7746a3dc8f589f5c2b28f22e875507eb9a8cadcbcdc07abfd15125c5df589541f0ee4f6f64b335d0978775d28fb4e21382d4234dc5820bcec28874c6cf7f9
 EBUILD srt-9999.ebuild 1314 BLAKE2B 190493cd65e60dfb2131cd64910dde9b4d62b10aca1dba5143dd1a34d5f353c22b89b9cfaaae03a3cf3b8f27ed31304aa10533f9c062d396a57be7943e3bd138 SHA512 4c7857ebec342fab43372b5baf7af31455a6a82addff0b5bdaba4df78f733abbaa75f4da5d263313962db51464ab496aca797d00a500bf1f8b0400c9dea1c596
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
new file mode 100644
index 000000000000..416d89756e91
--- /dev/null
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/Haivision/srt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gnutls libressl"
+
+DEPEND="
+	gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
+	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GNUTLS=$(usex gnutls)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index b7fd7836026c..d2625573a68d 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
-EBUILD telepathy-logger-qt-17.08.0.ebuild 679 BLAKE2B d1b7346fd1571bc47abbff22e0cd3d5b6976b18ca170fe34b865a0051aa9272f2f02e4c3c453e9112fd7313197f6bb765fe0fa9d61d3c52cde4063ed032d39f0 SHA512 112d8d5f3c00f0001444867c588811ee2b6938e13f64372c870868c28c4cf0bc0dd6d19471cae2bd3ed500b23387491e10d46fffb5e57f4d67bc0e63b533b608
+EBUILD telepathy-logger-qt-17.08.0.ebuild 686 BLAKE2B b8c9b88ad9889e5219e42d65507517ec9810a6712ca3715ddd6ef00f8a16691f4e9765d6277b878b8944638dc37c9af3223264155d8b5cb6f38d10ed3ecea04c SHA512 52be4907bd28015bb10837ef78efd7198d60339c26dc0989b13acdc12455a3c73e5dd4e60a83ef6c500178cc9744b295518bf36fbcfc744b281a231b47a87c40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
index 01442832b5cb..5506d98d64aa 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 inherit kde5 python-any-r1
@@ -17,7 +17,8 @@ fi
 LICENSE="LGPL-2.1"
 IUSE=""
 
-RDEPEND="
+BDEPEND="${PYTHON_DEPS}"
+DEPEND="
 	$(add_qt_dep qtdbus)
 	dev-libs/dbus-glib
 	dev-libs/glib:2
@@ -27,6 +28,4 @@ RDEPEND="
 	net-libs/telepathy-qt[qt5(+)]
 	sys-apps/dbus
 "
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index eb0b84125a65..35fec6a63ba8 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,7 +1,7 @@
 DIST wandio-1.0.5.tar.gz 385535 BLAKE2B a7911ab14ff9911ef19bf35b6e50d3f2e6dd0fa06f5689b6c353cc5ff2ee93175d7e758657f79fd35e7aff29fb1a4b4c343c30ab1e00a118ec3056ba9129cd60 SHA512 3bf2b4362355bb3db047ea12055b96cc6fdd759b4efbd9cf1caf05133ae9e7e1fab5f4a7e5eadda45d7c1b4dcf9aba1cf3a4c04bc23694934aa8aa67ec31e480
 DIST wandio-4.0.0.tar.gz 385706 BLAKE2B 7f6e7855a06ae2c23138598c5cf16c9a38f57932d488cf2c9d0fda2fe54e971b8e93b5768a487328afc2079add7f269cd8f0203314b06eb3d256f8739828c6fb SHA512 8ee4149439411e8ca784a434766c5c35144fb49c7166c2f135cf47625011815e2b27af5b61d75d6a4f9e64ab1091ce1cfd4ef114e34b57e0c53029be45f9369c
-DIST wandio-4.1.0.tar.gz 436883 BLAKE2B 5cf3db3a95baad23bb9947461ba064cdf2b4aa8a76e2a7c4e4831ea50a9db719b1b1b7e82d1940b1e29a7af17e17ad0e470ad52604b09e5e9fbcd27cc861397e SHA512 ced4cc50f60e89a1c068430fb5a039df367d356f96d33473e61ef73ce16d43df3f89307a606df7e251e1f09c06e6fa5ddfaa07571ae98b89393de11b7d811661
+DIST wandio-4.1.2.tar.gz 409755 BLAKE2B 90bf4cf9bdd6cdd87668614c91bbd5fd8dc7c526a8e985737d1dced760209be205052221ebfe9ebf92b7c05492298da275498aee1e3817d73235488da9ee2cc1 SHA512 0d74aec9fe2faf678d369fec420f56ae78eedc5f38b70b403034fb030a9c0d1d5a54225b111993ce59b79d8e02ad49a2b0ca4697c7910149f2ae54379d9e19c4
 EBUILD wandio-1.0.5.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.0.0.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
-EBUILD wandio-4.1.0.ebuild 764 BLAKE2B 992100864195fb4acf32b455a7ae1df1f20ae482e2d2d1f4fd9285f3c2c9a6b9b2365c098549fbdad78fdfc8237a9a22db7820b379b40849f492c47a0002fd65 SHA512 95214899630dc4955ea538797349108cf545f4656652c2f939af6b98fd546a4c45cd07a0018c8551a8d69a48a844798f2a9e5251e9edf0c37d04fc3b30cf0e8a
+EBUILD wandio-4.1.2.ebuild 760 BLAKE2B 0882091040df94b87a0fd6fcd299ba996706dd57e69c6ba1f1661a77bd9f919e0d5cac8aded697073d79a3516f5937973467ae389b6c06c9939627728c81e8f8 SHA512 32a42584bf5d8a5366d51b24e8bc0a204ff94b9918dc13daaeb4fd33c729eae676b283eccca967cfe05bf16d5a34aed8b9af8728ca024c0d3525f992d8abbe22
 MISC metadata.xml 325 BLAKE2B 83c3a11757f54887d9fa3ed48c2a9c5a5ababc6070875778a26157b04624c6411d406f810a1c9c02bdc6355675e41a130cb21cfd987aea39e1d2aac8d23c2895 SHA512 f6baf388df040729e65cf7b578f13650917d22989b89ba4adeaeba332fdc78fc8f3661fc37c238a495c75f4cc601c2642f13e2660e73b6e36da8db39dacb052a
diff --git a/net-libs/wandio/wandio-4.1.0.ebuild b/net-libs/wandio/wandio-4.1.2.ebuild
index 3a063f9e560e..3e738af7ca8a 100644
--- a/net-libs/wandio/wandio-4.1.0.ebuild
+++ b/net-libs/wandio/wandio-4.1.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
 SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
-SLOT="0/3.1.0"
+SLOT="0/2"
 KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 http lzma lzo static-libs zlib"
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e7924dab7ae6..4d8b8eb361e5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,7 @@
 DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709
+DIST webkitgtk-2.22.7.tar.xz 16777676 BLAKE2B 3be5559fce7a07828a7c2a4742218efa5a8434b6e019301b70b969718a3679336b6cb6cf4270bbead814e29c7c19a7c4bf8223df2aa86e1a799364fd9bba393e SHA512 c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126
+DIST webkitgtk-2.24.0.tar.xz 17894000 BLAKE2B 55b43ce104c976f73f9fb71a9c395f0636de5547f62f829c098a709b28668b78dab06f90110e387c5c6f33e2c5033cdfafd6adcafb83d03f77b361d315881397 SHA512 7a1444b22fb59ecdd638344acf3525f1ef9204215a568e185f2ac7f4e43cf89c7be307be31d51ec46231bbf5e9470e48d56395873d7368aca8022ff5c4100dab
 EBUILD webkit-gtk-2.22.6.ebuild 8591 BLAKE2B 2e4fe708fe0f447b8dac402502121436e74349efc97dd431523e520c6224a6f106df6f8b1003161136936d7170945a158310e5e6b1713364f4906ff53d940432 SHA512 ee6190bbcfe0d606d008e8fefe794924a7d4775f7fb607969979f881e85d303d9147f5fe7984c41b41ea51ddf9951137b37bc3152b0666ec21498642b1e63642
+EBUILD webkit-gtk-2.22.7.ebuild 8593 BLAKE2B 8fdc7760528157cd87feb2b8f8c96cc1ad62e68bbdcad93581502478b9799382a6feed8ad63cde0201c9a2674247572d1afe20d752ffc4aa7b04a7946260eeee SHA512 e2596a89b2c2b9efd4c7fab362bb5eb9002c678ddfe3b409041f0d29754bf61a51b6e43d4d195f67b3c6aceaea0a291e3d0a389562cd654011463df1a780ace8
+EBUILD webkit-gtk-2.24.0.ebuild 8592 BLAKE2B f6c61fa416e2499aa91cca91ef7e2c041a743e58531108d9ac5a1b5523d30cc807c93898b155b9327f835fdc45f42cce081f7928e9a001918b728fb01a797ec0 SHA512 0cef52d139318c3a12e7b951a603a7bf476cda1eb37767e6dcb3216d09cfbe663f98d22ee1e91bf0e7c3cb8532efad9f905082f56e37458a289bda776f80d6cc
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
new file mode 100644
index 000000000000..a75cb189b4f6
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
+REQUIRED_USE="
+	^^ ( opengl gles2 )
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
new file mode 100644
index 000000000000..f77fdc38578f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.0
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index c3f01604ad03..70c18614403e 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -5,10 +5,8 @@ AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053
 AUX xrootd-no-werror.patch 486 BLAKE2B 031cf2f55d47c0cd65ca7caa1fc2ef787b74cee315f43039710ba44b311d1e850ceaf7a97e9a6ad760b4cb413b03dfbabff652fde1a1b6a6c01c7b0ce734ede2 SHA512 9a866518836d61416ca4e40587dc9fb81121c7b2c245b9d26053058cef6d2ec75b94c687929378e1ed7287432a99f91888f4a138536447dd934ac03e484f5a4f
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
-DIST xrootd-4.4.0.tar.gz 2146909 BLAKE2B 4ea84a0c395984cf3ca0f072d3dab080a128e8554f20f7347f9622430b1adc8bda279fa3c8cd587260affe432700332ce7cbb6f512bc29d7d7921b2c6a349bdc SHA512 3e81285b97b928830538f358daf358538609d1678d5beb23b8c0f8fdda7ad22895cc96ba0aaadf55892b7cba08a60182fee19e27af3225b638cb209a4146bbfa
-DIST xrootd-4.5.0.tar.gz 2172752 BLAKE2B 0e1251f9b064e5bf5e0bf9df0575a9605c4437eddecca312bbfad5ce91b9e3e83ff14a00b7ba1b3e3305f1bd00b5dce151241293441852da95f439788671c4f7 SHA512 0ffa982b872ac94eae1e26d1ebbb94db46f607fb4b0f1d4a2261a7d34dc7715b67cb7c7beecea300f82578bf4773d18e9b86c55b32dfd65ab2e48f3cbb03f173
 DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
-EBUILD xrootd-4.4.0.ebuild 2000 BLAKE2B 8734736459d1058c63f0719d304bf832854b2d4e880bee58de1626c7b0d81913793bbaf910991df25a6aadcc08d6e99dcb214849bd908139b9cf47e92f39e135 SHA512 1330f545925b50a3be116ef6ecb9fe28bdf1afa3da77527c9903d7a9dc403824905cb9c18febe581bc37589e80b8a14066a02e6f895f04c54b0e138d761442dd
-EBUILD xrootd-4.5.0.ebuild 2602 BLAKE2B ffaedff2f1b50f2fc3950f771f80365f3dd239704d37ee93de4cd8eb60e066c8a542615b85f7ce1b9775ccb48d41d6223fcfe56ee750623e3daba2c430465e25 SHA512 594dfc5e60edfc965b8ed82ddda1f112b96d9ec5dab5adcf911d45ba4ed276cbb37a31532c0f3d1b1d251abe440557df8b7338628f0bd2a5c62c778e48c68892
+DIST xrootd-4.9.0.tar.gz 2517614 BLAKE2B 5f1ce6f599fdf5b1f9b4fa078d9b306be241757f95e9b5e9bc0a6f06450a21315778428d8c1d1ffd28ef0841bc50fca387036740bb707d9a96b7f07e94e15540 SHA512 a956262a8adae4c9cb9a91275d4207943cf43251fc61ade111c91152c62baf06c1cbdf1d659c6d792703045a4c2a82bac732220ecfd2fa707e445d6fc66ee047
 EBUILD xrootd-4.8.3.ebuild 2593 BLAKE2B e0aef6a1c55d34fc4175e4f57acf99083f208ea0283b49c988de16d58176c8e63b5bbdf8378361be34313b5a3734d6d362c64d02b723cd56b903bf655f72b0de SHA512 75526b8954ceba00889d4649b01f0995c758998bdc4b11af5d11f826bbd7319e112b368997ee144aee8299a74d5ee38ac3732621faed9b75ecb4cd6afe518a9b
+EBUILD xrootd-4.9.0.ebuild 2603 BLAKE2B e73ab288f2dbf0482364e083c8d93cd21523d13242a8a3fdf5053d6fd0147de2b21f469bc1bdc45667cdcf52ec24ef17e2634d837e19263aca9e40cbf0bed7bb SHA512 4366482e0c0c7d6ef657e51dbe14978b301f389ffb3b9a67d39ff3c8e0e8980cb6ad8176ca1691c4e04bce4838731a4625e3980b1593a23469626ea08d69a163
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/xrootd-4.4.0.ebuild b/net-libs/xrootd/xrootd-4.4.0.ebuild
deleted file mode 100644
index 0ce88643fb1e..000000000000
--- a/net-libs/xrootd/xrootd-4.4.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils user
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc fuse http kerberos readline ssl test"
-
-RDEPEND="
-	!<sci-physics/root-5.32[xrootd]
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:0 )
-	kerberos? ( virtual/krb5 )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( dev-util/cppunit )"
-
-REQUIRED_USE="http? ( kerberos ssl )"
-PATCHES=( "${FILESDIR}"/${PN}-no-werror.patch )
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd*-4.so"
-
-pkg_setup() {
-	enewgroup xrootd
-	enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_CEPH=OFF
-		-DENABLE_PYTHON=OFF # TODO: install python bindings properly
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake-utils_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-}
diff --git a/net-libs/xrootd/xrootd-4.5.0.ebuild b/net-libs/xrootd/xrootd-4.9.0.ebuild
index 9e8e5f1338bc..d0c6576d614a 100644
--- a/net-libs/xrootd/xrootd-4.5.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.9.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
@@ -19,7 +19,7 @@ IUSE="doc examples fuse http kerberos python readline rbd ssl test"
 CDEPEND="
 	!<sci-physics/root-5.32[xrootd]
 	sys-libs/zlib
-	fuse? ( sys-fs/fuse:0 )
+	fuse? ( sys-fs/fuse:= )
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	rbd? ( sys-cluster/ceph )
@@ -40,7 +40,8 @@ REQUIRED_USE="
 	http? ( kerberos ssl )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
-PATCHES=( "${FILESDIR}"/${PN}-no-werror.patch )
+
+PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /net-libs
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)