gentoo resync : 22.01.2019

57 files changed, 1129 insertions, 1134 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c8d34578c518..f29dbf8e94e9 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index d4e158429b0f..ca81c551e5e7 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,8 @@
+AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
 DIST glib-networking-2.50.0.tar.xz 435380 BLAKE2B 02eea0692cf20c9b1df8efc7e65eb144675fa307851450d461a73df6ccd55cb2ad4e8db5790ca8b0a38a14e30391e583dada30e858154e7c5b7fa0970658410a SHA512 a1e9d28a546f83d461057f088ca2467a32be110f444c8ede1cbfeb20244637d8d5fb5b5b0ee4485feb517beebc3536671442bbfdd3ba01663b52e6da138bd7fe
 DIST glib-networking-2.54.1.tar.xz 441232 BLAKE2B 4697ac5fe248d12839d2a3c1340e2e699fa2ea65a9b5d741c50d069c904e82eb23feb89d648bc127959d9ac15e18d3a4cd2bd8b08202d48d33937affb9df13c9 SHA512 8356d835914e33df43f4f2bb6a915ddcd48dd0565e4d5bc1f1d692e9c3124ee4421b99f87f2586f74e9fed24ef7421159f3242fd1eb7bd74950bd25e860896ec
+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 1963 BLAKE2B c09dabe4342375fc8a72c51f3308d018d9ca4a573c2b2a50ecfd686b68b6235949718767271279836ec9d673a74e773e2280fb91e3d07c59209d6c463e2a9b48 SHA512 b420e1d7bc6ad9d53321056bf749bd67198c6ba382048b129912cb701de1316a9c6417bfd462f865ee0f915d0aee36168735efc8f782bf5eb14d98cc7852fd0a
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch b/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
new file mode 100644
index 000000000000..c3802392e3b5
--- /dev/null
+++ b/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
@@ -0,0 +1,36 @@
+From 7fd8c24182ea054d6d890b6f6325e63458a10392 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 17 Jan 2019 21:03:06 +0200
+Subject: [PATCH] tests: Disable test that fails with gnutls-3.6 (or in
+ general)
+
+Tests for TLS 1.3 are still problematic on 2.58.x releases; should
+be better once 2.60 comes out, but the changes are still being worked
+on and would cause regressions for real world programs right now if
+backported.
+---
+ tls/tests/connection.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tls/tests/connection.c b/tls/tests/connection.c
+index 6087efc..accca78 100644
+--- a/tls/tests/connection.c
++++ b/tls/tests/connection.c
+@@ -2017,14 +2017,10 @@ main (int   argc,
+               setup_connection, test_client_auth_connection, teardown_connection);
+   g_test_add ("/tls/connection/client-auth-rehandshake", TestConnection, NULL,
+               setup_connection, test_client_auth_rehandshake, teardown_connection);
+-  g_test_add ("/tls/connection/client-auth-failure", TestConnection, NULL,
+-              setup_connection, test_client_auth_failure, teardown_connection);
+   g_test_add ("/tls/connection/client-auth-fail-missing-client-private-key", TestConnection, NULL,
+               setup_connection, test_client_auth_fail_missing_client_private_key, teardown_connection);
+   g_test_add ("/tls/connection/client-auth-request-cert", TestConnection, NULL,
+               setup_connection, test_client_auth_request_cert, teardown_connection);
+-  g_test_add ("/tls/connection/client-auth-request-fail", TestConnection, NULL,
+-              setup_connection, test_client_auth_request_fail, teardown_connection);
+   g_test_add ("/tls/connection/no-database", TestConnection, NULL,
+               setup_connection, test_connection_no_database, teardown_connection);
+   g_test_add ("/tls/connection/failed", TestConnection, NULL,
+-- 
+2.17.0
+
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
new file mode 100644
index 000000000000..0bb5dd626f75
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+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}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/meson-0.46
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-disable-failing-tests.patch # shouldn't be needed with 2.60
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use libproxy libproxy_support)
+		$(meson_use gnome gnome_proxy_support)
+		-Dpkcs11_support=false # deprecated, functionality should be available without it; removed in next version
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 817d0eba2e4c..3cfc8baac313 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.0.tar.xz 1531200 BLAKE2B 104429ab97647c2b006c4f95f803d8be8f2d2a91b06f2b145b126b1ab34253c8870ed9f8a3b5be307cae3fc55a4894cb1e9479c680d1c14a558d525d962bcf01 SHA512 b5f83544aca0cd24dbc778a492e0da4ca82eb6acaab375daaf7aa1482acfd31c1ba82c1afc127a8890a63e883ac8a1f277da906819573d672d2d3da7f582c02b
+DIST gnome-online-accounts-3.28.1.tar.xz 1539480 BLAKE2B f4d842025c9c55de70f4d613c6193cdbd387e20f167c61cc52b36c0080da6b9e9a45fc4f8452cfd0a573395ddfd513b984910f3c5d802ef2979041db7a2a8203 SHA512 66cfc8a0e193bf4eaf49fecb15e166b2c565c3c164b8de1d191fc7c966d6cfdb19d662dd0bd0b6b80e3b6a7680796aa6d54700b9002b4cae4fe919bb681a8f06
 EBUILD gnome-online-accounts-3.24.5.ebuild 2564 BLAKE2B 3079163a311a3cb7284649ddacf36d303263ec2b7fde638724be5f27f69c3c85b6533ed2a2898f4ab85c2a60762d58c7e69fcfef61d9f428f9653b4c974997b1 SHA512 ef3cebd5b5c97524941f40289daf0e6aaef07ae0821ae5be05806fb95f77ff82e2a72033cf541d4badd4b1b8dbbc12d701f2ae93ab6cc76f5f241c11baaf5087
 EBUILD gnome-online-accounts-3.28.0.ebuild 2553 BLAKE2B b9cc26dbf86975f4a7188196c6cd0b4923285ee0c214cb56624d5291c2bc8349a5b1f62afc5eef6842af9a5203ab2a8b4ad7d5ffcfdbc4e1956e1b1cd80a41cf SHA512 9f8ff4145a958dfecd96f4e07ea9cea2b0a47dfb362f97359f330786180a7e852b17f32bed0ada41b4728983611302774cb323c7a19a598dd185de0d8e15917a
+EBUILD gnome-online-accounts-3.28.1.ebuild 2554 BLAKE2B 9e8ac9b06d7fb93d5b8e776006f085011668c67bfed1ef52b8f868a87024e0836dee827009f4a9c9d26af42700943ec00e358194e5e31578ffee0f8edd425c57 SHA512 750d3170ebdcb35630a226e9aa094a6d50026f0c734417270faf69a182efe8d4e0e1c42a30576a0955827953df6d4329a68cce75d7a80f30fd4846f27de3b20e
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.1.ebuild
new file mode 100644
index 000000000000..7631b7086b50
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.1.ebuild
@@ -0,0 +1,97 @@
+# 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" # telepathy"
+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/telepathy-glib
+	>=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
+"
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+PATCHES=(
+	"${FILESDIR}"/3.28.0-glib-2.58-compat.patch
+	"${FILESDIR}"/glib-2.58-compat2.patch
+)
+
+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
+	# telepathy optional support is really a badly one, bug #494456 - now default disabled upstream - revisit soon
+	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-telepathy \
+		--enable-todoist \
+		--enable-windows-live \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable kerberos) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+		#$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index ec0aeff828be..45ed02dc2798 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,7 +1,9 @@
 AUX gnutls-3.5.19-idn2.patch 1569 BLAKE2B a6b309be79e09bd873f3ad305a4517c675f127bb54df6d9dd22854b8a8591a1551b3163bfb8596296b323a9a15008d5676ed132e1eaf36e59c6267c81f2552e9 SHA512 b39a091b55413b1be9042b898eaf37c57d6cc3485bcab25169b68b1c19f249b2489609afc5fe08f7103800687c01b1580124dd6433013ca9f89e5a5e47c4cd3e
+AUX gnutls-3.6.5-build.patch 1039 BLAKE2B 68db1ec474c173086b3beac504aa5cb6966c963e18cc8a2afbb3ba1b9399ddf405f2afa52124049edacab4a2244f00d4dbdb5028257dcfd69ccb37ae6d8455f6 SHA512 718e2d811251396facc5be449bd1390c305202c554ddd74498224c988a8f4f2d6141664be2504f833a598aae505198ad6a3c4cf5ace89739638488198d43818d
+AUX gnutls-3.6.5-libressl.patch 1844 BLAKE2B b86f019f07cad8369a57cc829d45098be27feaef9898e0029ce3e953653ef0cb65b3b03c995fbd61eb5a2553044a08091a4a0cc0483ce2399bb5f94ab4c625cc SHA512 7a5831992a46c8a894ee4fa29c290fdb010407a749065c7dda1e67a1d2dda0940c03400f3fcb3c74dbea54835fa805575c749b43fcfd3121557ddd0bab95d142
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
 DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce
 EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c
 EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
-EBUILD gnutls-3.6.5.ebuild 4098 BLAKE2B f0252c6227e83959a75651d588f7ebc0196f39e9dc46777df184591bd775c43829b368299cb3a359c6563e315e4760184689ba14efea77deb2182846d5ee453a SHA512 839195aae4cc28f7067d39ea158d9de17e432a68b960656b774a2fa260ca6117bd4b4d48940ce545673bcc2fe218e1202ad78b4de57639cfe69f88349cac5d95
+EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-build.patch b/net-libs/gnutls/files/gnutls-3.6.5-build.patch
new file mode 100644
index 000000000000..00c11da4ae7c
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.6.5-build.patch
@@ -0,0 +1,31 @@
+From b7fdb4125e4eebc5af2155b6d36cf17339a3abf5 Mon Sep 17 00:00:00 2001
+From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+Date: Tue, 25 Dec 2018 14:44:11 +0300
+Subject: [PATCH] tests: cipher-openssl-compat: don't call
+ EVP_CIPHER_CTX_init()
+
+There is no need to call EVP_CIPHER_CTX_init() after
+EVP_CIPHER_CTX_new().
+
+Fixes #658
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+---
+ tests/slow/cipher-openssl-compat.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c
+index a4cb3522d..64adf25a4 100644
+--- a/tests/slow/cipher-openssl-compat.c
++++ b/tests/slow/cipher-openssl-compat.c
+@@ -106,7 +106,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ 		if (gcipher == GNUTLS_CIPHER_AES_128_CCM
+ 		    || gcipher == GNUTLS_CIPHER_AES_256_CCM) {
+-			assert(EVP_CIPHER_CTX_init(ctx)==1);
+ 			assert(EVP_CipherInit_ex(ctx, evp_cipher, 0, 0, 0, 0) >
+ 			       0);
+ 
+-- 
+2.19.2
+
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch b/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch
new file mode 100644
index 000000000000..16cac8c13b98
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch
@@ -0,0 +1,53 @@
+From bfd036b31f2a47ae40e104b2ea1a0e095900cf52 Mon Sep 17 00:00:00 2001
+From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+Date: Tue, 25 Dec 2018 14:43:56 +0300
+Subject: [PATCH] tests: cipher-openssl-compat: don't fail if OpenSSL doesn't
+ provide cipher
+
+LibreSSL does not provide ChaCha20-Poly1305 through EVP_CIPHER
+interface, so let's skip the test if cipher is not available.
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+---
+ tests/slow/cipher-openssl-compat.c | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c
+index c9b39d026..a4cb3522d 100644
+--- a/tests/slow/cipher-openssl-compat.c
++++ b/tests/slow/cipher-openssl-compat.c
+@@ -38,6 +38,19 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
+ 
+ 	success("cipher: %s\n", ocipher);
+ 
++	/* decrypt with openssl */
++	evp_cipher = EVP_get_cipherbyname(ocipher);
++	if (!evp_cipher) {
++		/* XXX: fix version check later when LibreSSL fixes support for aes-ccm and chacha20-poly1305 */
++#ifdef LIBRESSL_VERSION_NUMBER
++		fprintf(stderr, "EVP_get_cipherbyname failed for %s\n", ocipher);
++		return -1;
++#else
++		/* OpenSSL should always work! */
++		fail("EVP_get_cipherbyname failed for %s\n", ocipher);
++#endif
++	}
++
+ 	for (i = 0; i < 32; i++) {	/* try with multiple keys and nonces */
+ 		assert(gnutls_rnd
+ 		       (GNUTLS_RND_NONCE, orig_plain_data,
+@@ -88,11 +101,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
+ 
+ 		gnutls_aead_cipher_deinit(hd);
+ 
+-		/* decrypt with openssl */
+-		evp_cipher = EVP_get_cipherbyname(ocipher);
+-		if (!evp_cipher)
+-			fail("EVP_get_cipherbyname failed for %s\n", ocipher);
+-
+ 		ctx = EVP_CIPHER_CTX_new();
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
+-- 
+2.19.2
+
diff --git a/net-libs/gnutls/gnutls-3.6.5.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild
index 0e4f46b96b24..9d141a5165c5 100644
--- a/net-libs/gnutls/gnutls-3.6.5.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.5.ebuild
@@ -53,6 +53,11 @@ DOCS=(
 
 HTML_DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
 pkg_setup() {
 	# bug#520818
 	export TZ=UTC
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 48ca6d3aa3e1..439133d6442c 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -18,10 +18,9 @@ DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cf
 DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356
 DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385
 DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06
-DIST grpc-1.16.0.tar.gz 14442543 BLAKE2B bceddb5cc9b3439523523f16e0a34b45ddcd1b4bfc00556639b6d0ea84b886c7a9b3204b73605181d76997b42ba1a3ec3ccb95f43a0396a5cb96c7ea7644a800 SHA512 af088500bb7055f91a856efc91a718f3363a3047bc568e6419dc5776037d9a20493772b34d75a78225fb6bfc339da6493881c6744f3f98607bf9d3c7f91bfb75
 DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
-DIST grpc-1.17.0.tar.gz 14639325 BLAKE2B 4a94d2072de6ce055a910015fa2ff4e9be898d0a51e907091c77eac15c6d49cfd76bdac0bfc8c1a69462a4c04273785f17ac91214b3c6e5cdcf3b249831597e0 SHA512 c1c6a1c668975e454abd36fa13550ffd40e04e752a2a5090541463c20683ad9382052d22874115f2772ad9c0dda74c4dfb1835176b07ea69a1b99186afeb5cf7
 DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
+DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD grpc-1.12.0.ebuild 1530 BLAKE2B d2abeea3fa12c68427d1ac0769715e85bc73393b0b08ae57a42cb5ef88d4126fb0993e7f3b4efc77667ba63239793cd436da8e8fb9d006d569b6f2ba3338f5af SHA512 4758b67f830e8c2d40add0d6f8fb2aae9b5856c8e0ca02a78f1ae0b7fbc974a5a0f066da252f1e10111fcf99299b12881632386bde9c511b7f54d2b961612811
@@ -30,8 +29,7 @@ EBUILD grpc-1.13.0-r1.ebuild 4366 BLAKE2B 7c2638c2c350bc552ccb75da9b4ea08f520a54
 EBUILD grpc-1.13.1.ebuild 4379 BLAKE2B f3bd95162997f25317d26beb9b37d73b126c25f0b004cc687e05bc40635a43545ed4d7c11a657028a0e0b6b89b9d066b6f297373cf9445f071beb813ca76b2fa SHA512 33a782024f2e2299cb07647f9baf9188d7b7f53d8875ad86ce59224e74e10761dc58e1bc1e2f6da1fc35a2d8a1fee0581686a3be8d6c757b3e58104c3598d9df
 EBUILD grpc-1.14.2.ebuild 4482 BLAKE2B 527731a7613488f4fd344d8d3dc4d072dc86105ff8f8c98598b9ea91a4e488010180f150b61e8ec5bb253be3b6660ab7da8f3c16e099279c17b44900ef67eb25 SHA512 9add91a48299c56be331aa6a20e456a364b27cb4d79c21b0f3fe89ae8c72bab26ea96584cbcaf6a0aac31d5991ce3f51e243800312d15375687103a234187ad2
 EBUILD grpc-1.15.0.ebuild 4477 BLAKE2B 924634776e7258bf0d1e407bf3f98edb0af932c33a7e9ceba65f39bac58990c64951fce51208363ba4ee5d6f76a3d8102ba7d84c238d7312c04b577de3bdb451 SHA512 142a6d60aa75fecfe27195bd222dce80e40dbcb57b3e868b38619df923f6cc968e296d520f6f60e76443d0e60f0c2868fd55ab04da2ac5579287973b4f2b4e38
-EBUILD grpc-1.16.0.ebuild 2336 BLAKE2B 227d1fdde55627d925b99eb32e07ed909a8fcc7264a75807cd71fdbe91fe56e8e40ae0acf87575b2d9185034b11a416f814b2e71571dcee2d1b507ab01e7eec3 SHA512 7a597c9c5243a306a90687b0414540dda5498c64062fb4c485458ddcbff70c9340bc282b564448c26fb33fa9866906356be9b15aed08ea501c3eaebfa08963a2
 EBUILD grpc-1.16.1.ebuild 2336 BLAKE2B 227d1fdde55627d925b99eb32e07ed909a8fcc7264a75807cd71fdbe91fe56e8e40ae0acf87575b2d9185034b11a416f814b2e71571dcee2d1b507ab01e7eec3 SHA512 7a597c9c5243a306a90687b0414540dda5498c64062fb4c485458ddcbff70c9340bc282b564448c26fb33fa9866906356be9b15aed08ea501c3eaebfa08963a2
-EBUILD grpc-1.17.0.ebuild 2360 BLAKE2B 833456fec4fbe906a7aa95d4207cbe7abce79f727d7df6341297f9762eb41e9099ebd75900bc4fa112204410292d846ee8194d5bfe5c927b0c11afb7b9af30eb SHA512 86ab9cdf77ca6510665aa6897db580218b0914f7f682244ee155f4468f183d3cdf2f0ee3adbbf1c4390d0809a1bec6c9848a664c5cfe8a0b2cda97d8275cfae5
 EBUILD grpc-1.17.1.ebuild 2360 BLAKE2B 833456fec4fbe906a7aa95d4207cbe7abce79f727d7df6341297f9762eb41e9099ebd75900bc4fa112204410292d846ee8194d5bfe5c927b0c11afb7b9af30eb SHA512 86ab9cdf77ca6510665aa6897db580218b0914f7f682244ee155f4468f183d3cdf2f0ee3adbbf1c4390d0809a1bec6c9848a664c5cfe8a0b2cda97d8275cfae5
+EBUILD grpc-1.18.0.ebuild 2360 BLAKE2B d77a48e16f5718d2ea5222aca1802954498ac77e14446e8c6eb1ab8817b01332608f6b6b3d34ac4bd612de4e22bdf9004c87b8ff4c0f285628da2c556349f96f SHA512 8ba9de98288dcd43938cb080945e2c692435487105a33b39f08fe7a95fe03a598fcdaceaf93cf543a859b3b052c8f56f6f30d624f5ab79031fa973599fca5b0c
 MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/grpc-1.16.0.ebuild b/net-libs/grpc/grpc-1.16.0.ebuild
deleted file mode 100644
index 4cfb0e21799c..000000000000
--- a/net-libs/grpc/grpc-1.16.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	dev-util/google-perftools
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.17.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
index 306060617908..9334110878bd 100644
--- a/net-libs/grpc/grpc-1.17.0.ebuild
+++ b/net-libs/grpc/grpc-1.18.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
 
 EAPI=7
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 86a3e8fa2ed0..c27d92f65df2 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.73.zip 32303580 BLAKE2B 1484fb2df66627db12e52459091e163affcb2a73913657467503501423bbdf2da12651567cae517b3f7d0d632f997a37c0b244b1cda811046d078477c990d581 SHA512 171214b285e9d89108271da52c010cde81fc6f54de5aaa678e10b273857f91e6afb301fdc6e91fa836b6aa609fb75131c2247dd5f4b79f41158db2f4917b55bc
 DIST gsoap_2.8.74.zip 32304642 BLAKE2B cca698d25c837fe70969379a63f849e7623b7bb3c6e4f1fd4e22b159f03a17214981eaf6d9f632a85a6cbff87b4f1ac6411896bb86c083720a94d2bbfd8501ac SHA512 85284b88a94f07f433ffaeb9031c24d4c9c3eb82f8c590fa257cf9392fa0382cdcde5b3d5c7df903c6ddec41b876643b21ea24d18186b03db9dc8a4d6e8477ad
+DIST gsoap_2.8.75.zip 32645773 BLAKE2B 120d79a33f90881ef5c4486ffef3a7713770622a65832be9997edeebbd4beac6dbdb6dfd876eb86f8622a1693908e6f56a47b48179fb37fdb12d313e2929ea7e SHA512 f5ebbe307b9125eec2284989a7ec1c16ade93df3b091ac44768750010bf51fdd9199ba96dbdc5b37b105bdd1156a0f90f41fdb407408d62b2c7750881db8b949
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.73.ebuild 1789 BLAKE2B 923bac516c7b3640f758c73e40d77459905a44eb123a48988d52d34785ebf7b1f81980003ee77bda640915f9f915101cc5fdd1960314efd6268d986d55d822ab SHA512 c1aedb4c6f0d4aad1b22e49e3ac203b99e7f0060942b96569b4d3797811bd1a0325880140f5bbc961b5a34d3d6e497d33aeaa18ead81241da7350f141e07d756
 EBUILD gsoap-2.8.74.ebuild 1789 BLAKE2B 923bac516c7b3640f758c73e40d77459905a44eb123a48988d52d34785ebf7b1f81980003ee77bda640915f9f915101cc5fdd1960314efd6268d986d55d822ab SHA512 c1aedb4c6f0d4aad1b22e49e3ac203b99e7f0060942b96569b4d3797811bd1a0325880140f5bbc961b5a34d3d6e497d33aeaa18ead81241da7350f141e07d756
+EBUILD gsoap-2.8.75.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.73.ebuild b/net-libs/gsoap/gsoap-2.8.75.ebuild
index c0cdf5ada9c2..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.73.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.75.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=7
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index ffa37a5f0bff..5cd014fc824e 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-av-0.12.10.tar.xz 370552 BLAKE2B 0ccbbbbf88ba48e926634efcf550924b77a8fec1a1e660dc4f6aabdeba12db87c7e2dd4ca6875e34ae313e90cb9ee715c7176f29d6456a68799b68fdcab763a0 SHA512 dbecef1f725dd05e1d4f7f9dede02f26a022d8d3c98ed2344d28746b74fb81703026df8cdd7ed0f3060b55a5da6d88def1e92a80e1f1892ad7c0806124ef5269
+DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7
 EBUILD gupnp-av-0.12.10.ebuild 884 BLAKE2B 947b39a8e30f1f4adecf6d37f68d12d6db9b862470370fe0dae8f845e24e1966a60eef1c2309fe70d8417c250cf7543da6e9d2434c7375305eb5577614ad48d3 SHA512 3af4660bcf16c591283bbdacd5e99ef67b1c58b52a9eaafad415c779eea1d31ffc7115712e8913ab48071c3ef6b37679a5e01151692521e749b221eb2af8fe48
+EBUILD gupnp-av-0.12.11.ebuild 883 BLAKE2B b04a5eb73e63f0a58c7baa729cb0304705876498926d7020ac0f7a7434c9b1b19ffc877d16ac9485dd95d4adadb2957ce939f16c880a4b15e86de2747cd0435e SHA512 ed2281ef701ca32ee9a7e2286be472ece67ad815d5f6439b7031153caa6eb9b443d44175edf025df6bb883725f021a1675bdbd66c304f94971f08fc6454bf87f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
new file mode 100644
index 000000000000..62aeb5dc34d2
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/2" # subslot: soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=net-libs/libsoup-2.28.2:2.4[introspection?]
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-1.36:= )
+	!net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	virtual/pkgconfig
+	introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 028c66246d8b..c7e668dd118a 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,6 +1,3 @@
-AUX gupnp-igd-0.1.11-disable_static_modules.patch 250 BLAKE2B dcc3697895faa8f525b07797e44add4a553ea7e9f750c0464543b22116489ade38086f0f4e29527409c421d40c98d09cf668fa3558e9b365030b1017025b46df SHA512 93e656357e1191972f14cf0e23a1a6eb5929af022e431e1c37f0f1196b6fbed874bcb27f1b787b634308bdcfbf9c7c5375df83385669ab6989c6eb2e0f891d86
-DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c SHA512 4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
-EBUILD gupnp-igd-0.2.4.ebuild 2356 BLAKE2B 95f1a6eeace04555c56bbb17e88ea6675f6adf54db31ff056d981d4c5031a05a4801e26a2712a1378f36e37436860312928d4c047640500a349b2248693d6aaf SHA512 85fef8ef5215049f27531d49f3eba0b74078c13786f8c4d88d255c726101c9f652ac8dc11097654ed23f846736ad18524cb5a0f63576ed9d965618dada07ae87
-EBUILD gupnp-igd-0.2.5.ebuild 1181 BLAKE2B 45490842810ee17427fa4bc8f70d07b220c71187222bdfef173fca789ec9a99e9a934d8c3da0116dc83cba19fc9ed9f2c0399db165c65fb84379f7244add1ca3 SHA512 f13a0190a3b3859439b091961b4beb0c08680890dfebcddb499bbfe89f0fdee307910e395b43496a0c7c92b399e1a43a236b8d85536810f639add6ac8d484601
+EBUILD gupnp-igd-0.2.5.ebuild 1180 BLAKE2B 21dd3249375595ba1c3a4196843f6afe93086a99468565c2a182af316618c60153841c7d59a9ca452cde44a83ce9af08ef5cf03b5fcaf7a4d766f8313825f3a0 SHA512 9f8f63f26d2db72b3435a109457d40f81f12344120398c66c90e7ea515f8b67370e340c1d99f71c12067b25347be46e651360d05d8d801cc21e6c1b998860367
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
deleted file mode 100644
index ccd4b8da2fea..000000000000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -27,7 +28,7 @@
- 
- igd_la_LDFLAGS =					\
--	-module -avoid-version
-+	-module -avoid-version -shared
- 
- pygupnp-igd.c: $(srcdir)/pygupnp-igd.override $(srcdir)/pygupnp-igd.defs
- 	$(PYCODEGEN)						\
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
deleted file mode 100644
index 2b84b9c579f7..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit eutils gnome.org python-r1 multilib-minimal xdg-utils
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-0.14.7[${MULTILIB_USEDEP}]
-	>=net-libs/gupnp-0.20.10[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-0.10
-		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
-)
-
-multilib_src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--disable-static
-		--disable-gtk-doc
-		$(multilib_native_use_enable introspection)
-		# python is built separately
-		--disable-python
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-
-		python_configure() {
-			mkdir -p "${BUILD_DIR}" || die
-			cd "${BUILD_DIR}" || die
-
-			ECONF_SOURCE=${S} \
-			econf "${myconf[@]}" \
-				--enable-python
-		}
-
-		use python && python_foreach_impl python_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}"/python \
-				VPATH="${S}/python:${native_builddir}/python" \
-				igd_la_LIBADD="\$(PYGUPNP_IGD_LIBS) ${native_builddir}/libgupnp-igd/libgupnp-igd-1.0.la"
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}"/python \
-				VPATH="${S}/python:${native_builddir}/python" \
-				DESTDIR="${D}" install
-		}
-
-		python_foreach_impl python_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
index 7f0c4f8d162b..92cf19cf3430 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.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
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 205ee5ba3dd6..4f7b21bbaf73 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,16 +1,8 @@
-DIST libmicrohttpd-0.9.52.tar.gz 1244489 BLAKE2B b8736bd50afa9531ea5377f082c8085ff189fad32cca5c07db14e4a1551dd2330630a06cfadb022b212385c2b01e4469c66e727c3e1c2035c131d99760962171 SHA512 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4
-DIST libmicrohttpd-0.9.55.tar.gz 1308328 BLAKE2B 5189bcaf2f29fdff9fdd3d7dfddd1b5e5abbca016c4f55a7e0a176b505cd6e3aa5868260615c922937856cfb9c6fd77a4edeab829c669b4f7751d5512e8c538b SHA512 b410e7253d7c98c40b5e8b8dcd1f93bcbb05c88717190e8dae73073d36465e8e5cfa53c6c5098de60051a5ec64dc423fd94f4b06537d8146b744aa99f5a0b173
-DIST libmicrohttpd-0.9.57.tar.gz 1332713 BLAKE2B 52e46726b220229ae722b4b94478bcd657e5edf1a836fa412b3365d8a2ca651887e62badd095f42f4fe41ad92f07e4147c812aef1c03dd6fba72a4acc6b1581a SHA512 996a59b1bc950320f21df095d3e24e1e6a6e4204095eb84e7dc5e5ed296b1dbe553459b227ba6cc93f60721f1975f778ece8c7c1c10e9168d030fba46675eed3
-DIST libmicrohttpd-0.9.58.tar.gz 1333687 BLAKE2B ef3dfb4684f2c387399d9044eb46de70c387b89bc4600529a9cdad7f2f31a25e0b0996b91d03cf42421979279781161b72d35eeb94d4bb101dd4d73bb6181bb7 SHA512 f68268bb0a0776ac0654a682fc598f4778561c2cc775e7315505c0e2f26f0633590d01f157984d348fdcedfb63d31d39add760a4ddb041694330015293d161b6
 DIST libmicrohttpd-0.9.59.tar.gz 1396234 BLAKE2B 9cb2d52dd39bdc6c54267751e21a224ffa926f4200b392a28009c6f717b5059580884f4de1bb272f49f7c48bdae276df2832b413cc60db77222b7b1278ba6004 SHA512 2c9080ebd520631b5ab6eed42770c7911079365c7bc79ea74fc5502ebc370fdaea9a84a4d9db7cbd8ba1c4797c7531e127e3b73ad8d38601d700529f2bab84d5
 DIST libmicrohttpd-0.9.60.tar.gz 1818383 BLAKE2B 693da0a02e289000bb657d843cd577311e97ca4d8cd698d659410e669295314d429eb9679eedac98398420f3386c1fa6800c33b883481120ea199585412f8e83 SHA512 418afc302e93ac93141c2457c2bf03c6a1da4a16ff19aa655312f9953e1d0b132b0dd983fc36ccc703688b0acd68fc0900f5927efcada354a10078ba5e577325
 DIST libmicrohttpd-0.9.61.tar.gz 1823891 BLAKE2B d7704f36790b7f14e03a02b7fbc5eaaca5fc22702f1fadfc94f9fe05329505d5bf9422a1ff38daa1f33c82db3e1196a8db754227574cc2cb9441c08a50d65d72 SHA512 d409ca2164a55b0eab948a8a4a17e0d6547942039354f593b293a286a3cae247bd67d7de4ce0dd4f1a3f3684948250076f582a8086546eb72598a43d7f41a27d
 DIST libmicrohttpd-0.9.62.tar.gz 1837529 BLAKE2B eb06d6ee05af2b37909ad1c60e16de29d94278a7ffea6e7b98391330e3778950537f9c2d6b057186b4ed45af66853570c0a386b6e9b1f0164956bd0856ecbaa5 SHA512 337f29dbc5e8c30132c17aad6142f21ea1c794b0ce80a3fc4c5e1e14b3dabb300aa410bf9413ef9e65d5d486fcfedbc3716725763a1fa28b4687c9f2aa3158e4
-EBUILD libmicrohttpd-0.9.52.ebuild 1187 BLAKE2B 00f635699d0ecabd004a9b9003cee412425207baddd3a4d54510aba6f4bff6741bf6400d527f4628b1977c5358460da5e4aee13dbba6dff14cec86c81e371d16 SHA512 74a4a07e0beb590bb10064c50402f504df59e4fdccb837f844b47d72e9ce1795fbf78f02e3ca7ef5948bffdc171e90240e5e98eb759fb756c5fc06eba7cf12e3
-EBUILD libmicrohttpd-0.9.55.ebuild 1195 BLAKE2B e9133561165018a4c03134cebc940c4d636d789dff1dbd76a4c635bcb47a20aab909ca05ae5641bf4a1e25b2165fcd02312fab7d0c7608b4f0ce39ba0e053993 SHA512 a319e69ead4556143002662c33ac17954b6cfef74015739eadd31e2ff81c8ca36a9421201d326e8448e8efdda4de9ad6c460f9fed684993d4009bc75c522b8bb
-EBUILD libmicrohttpd-0.9.57.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
-EBUILD libmicrohttpd-0.9.58.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
-EBUILD libmicrohttpd-0.9.59.ebuild 1264 BLAKE2B 0e9f9332f4cd3750e01203fbf17bb95faa259198e759d038ec157a1e00d920b64fdfed2db39bad6518d6883831ef5e725501c6e4a1b89b1c9d6f6cca8233251a SHA512 20a5c232312809e36d79fe9a475c3d82885c4045c2b9763eb21fc1aa7a973d3bab967042a24a7ac03891b1ca23787aa06d24125d41c47b7ce944e7889d71c232
+EBUILD libmicrohttpd-0.9.59.ebuild 1263 BLAKE2B 2ed2aa3c175c488d14b03e19651678166ba24b0d898ec901100622cc6841600a4ab8a056dafe90aa74dc3d2dcc1357a8d1664930f6cda26634c483eb71f43238 SHA512 91694bcc81e890f44600139f54bb1c1ab0fe05f70810ed826522bb338a0dea714b2ce2e0a2f76a41d7ed2d95846e84695dcb0df9309ca3a87eb5ce15776bb3af
 EBUILD libmicrohttpd-0.9.60.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
 EBUILD libmicrohttpd-0.9.61.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
 EBUILD libmicrohttpd-0.9.62.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
deleted file mode 100644
index a31f258f10f8..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
deleted file mode 100644
index c669e3a7e3c9..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.57.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.57.ebuild
deleted file mode 100644
index e5946aac12bd..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.57.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild
deleted file mode 100644
index e5946aac12bd..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
index bc481246c49b..19abf491bbfd 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
index 11a3a50b53b0..49a9d8ffbcb4 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -1,5 +1,9 @@
+AUX liboping-1.10.0-do-not-quit-when-ping_send-fail.patch 1408 BLAKE2B d589a184ca80421c7d64fde5f2912ac8d85aab4e65626cdbb510414de2e8c701cbbe6f05a2ef156ed9d0cb86d55afa2992fbae6832b52f9cb91ec1a9e46d8b93 SHA512 61fb689791b3a69d99c8d2811fba3a47eeeec12fb19ce2e71485d428895321bd4824e6b94f7bfd215d185f3d948a7525b27a04b6b32a30e3968e7c8297aaa37e
 AUX liboping-1.10.0-gcc8-fix.patch 887 BLAKE2B c40500b5183eabe352e4a8b15c06f051de0240f1aadc43848e4f2b82c6e4feec44eed993d579ff04a1295eddf39bc312280396cfe3e1517c359f81f1a25f5230 SHA512 073ba6c52cf2c9f414e79a1411b7d7d4250c06dc32975bb96fba5df35ecf863e50bc3f8dd2c8b965e77890740b5414511bef2007f831d778c8527f27da87e834
+AUX liboping-1.10.0-no-werror.patch 240 BLAKE2B dc51e4dbaa3259d9e751d00be4d61f637b4f47a13c6223c648982aa771f03faff0d3969bb6f8508b20f30878a9af98fb2d9d26dccb4bca3f3c5b7786c577e113 SHA512 3babdd13fb89757002e415150d9ab4c679cde1982edecac67cb7fd3ad28e69bd796e705aab4f1e765fd6519ffa8746662bdb22c790ca609f80f3eb742cf1dc9b
+AUX liboping-1.10.0-report-right-error-msg-when-select-fails.patch 963 BLAKE2B 94ae49152a81164aeb73a3498a9c2a1b2c901b578387cd8c4a376e0f2583d63aded21d9d22552d5804b332faaf9770c961e7e9f2a7312406aed3de68c5afddfc SHA512 506e28def5b7337fd6f883041ee4b69b1bfd4151b30fce5dc330d4d08fed4333c951e5a58791b5fe5d5f65a2126a4268e7bd902715bfdb663f54814cdaa13348
 AUX liboping-1.6.2-nouidmagic.patch 741 BLAKE2B c8ee54176ded65740d5b035a4f572b45b42f8c4f6f99b723eef7c73d459c4b38907570c3da3dc54c2b71a360164ed1d84dce44a2053050c7ef13f72a13b36ba7 SHA512 d991b2871091c3e92d6b194bfdaa77db34455aec3c32087fff0a02ccee0e1f6fa0e0453a61d28a0fc9549644359f91425efef0b94e37c033d4d43b12bbd7b07d
 DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8
 EBUILD liboping-1.10.0-r1.ebuild 1359 BLAKE2B b07c09f90235e14eaf13c68d2df9e6dddc79177d22f5d672867dea40c13608a71c032bb7e26b8f02c854eaeb4b91f3dbfd576ffe0134b66600050fa75f642627 SHA512 9180bae51161c65b53769a32af2212ecb92188f5509a666a520a0febdca44f1821ed2a88309e0aa12dd0c1fc44196fab1891b2e73a7cb12e39b154041c000733
+EBUILD liboping-1.10.0-r2.ebuild 1529 BLAKE2B 4aacb2f0bf3824ff7791723657231e477b099302f90489f1d47e5db709a707821ae983287d6241a553b87196098632f6c77a8ae2afaf2cb4d1b06ca47c7564b5 SHA512 b48d0773d0f409dfb676957d7a5fe6d84154bb6bc2beba7a84c5e8cc77f3ccf5898d3e52c76aef2c4cc8234b86b84be84b336af032a122541c8ab20f4f32840a
 MISC metadata.xml 717 BLAKE2B dfa3179582723dc5deb92ec7a8c0bdb39151f99ef68cd5033dc867811574c3b46b1390813caaf65aa18d5e3fea13762b7f5d38069a775c703ee6e849275fe00e SHA512 ef68e308920311969fc83de9e82e6e97648b5376819a5a122e1aa4c68ef3f6ae0bad6dc95a28eb4629f8915c4658facbeabc7740df090cff2598b5ebbd049edd
diff --git a/net-libs/liboping/files/liboping-1.10.0-do-not-quit-when-ping_send-fail.patch b/net-libs/liboping/files/liboping-1.10.0-do-not-quit-when-ping_send-fail.patch
new file mode 100644
index 000000000000..ba0b13eeab9f
--- /dev/null
+++ b/net-libs/liboping/files/liboping-1.10.0-do-not-quit-when-ping_send-fail.patch
@@ -0,0 +1,53 @@
+From c768cc2270d49247357aa6c527f4c8fe2f81d493 Mon Sep 17 00:00:00 2001
+From: Florian Forster <ff@octo.it>
+Date: Thu, 14 Sep 2017 08:35:27 +0200
+Subject: [PATCH] src/oping.c: Don't quit when ping_send() fails.
+
+It appears that sendto(2) sometimes returns ENOBUFS when the upstream link
+is saturated, causing [n]oping to quit.
+
+Fixes: #28
+---
+ src/oping.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/src/oping.c b/src/oping.c
+index 36cdf16..c087c80 100644
+--- a/src/oping.c
++++ b/src/oping.c
+@@ -2042,7 +2042,6 @@ int main (int argc, char **argv) /* {{{ */
+ 	while (opt_count != 0)
+ 	{
+ 		int index;
+-		int status;
+ 
+ 		if (gettimeofday (&tv_begin, NULL) < 0)
+ 		{
+@@ -2050,16 +2049,11 @@ int main (int argc, char **argv) /* {{{ */
+ 			return (1);
+ 		}
+ 
+-		status = ping_send (ping);
+-		if (status == -EINTR)
+-		{
+-			continue;
+-		}
+-		else if (status < 0)
++		if (ping_send (ping) < 0)
+ 		{
+ 			fprintf (stderr, "ping_send failed: %s\n",
+ 					ping_get_error (ping));
+-			return (1);
++			continue;
+ 		}
+ 
+ 		index = 0;
+@@ -2086,7 +2080,7 @@ int main (int argc, char **argv) /* {{{ */
+ 		time_calc (&ts_wait, &ts_int, &tv_begin, &tv_end);
+ 
+ 		/* printf ("Sleeping for %i.%09li seconds\n", (int) ts_wait.tv_sec, ts_wait.tv_nsec); */
+-		while ((status = nanosleep (&ts_wait, &ts_wait)) != 0)
++		while (nanosleep (&ts_wait, &ts_wait) != 0)
+ 		{
+ 			if (errno == EINTR)
+ 			{
diff --git a/net-libs/liboping/files/liboping-1.10.0-no-werror.patch b/net-libs/liboping/files/liboping-1.10.0-no-werror.patch
new file mode 100644
index 000000000000..3682622cf10d
--- /dev/null
+++ b/net-libs/liboping/files/liboping-1.10.0-no-werror.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,10 +2,6 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
+ 
+ SUBDIRS = mans
+ 
+-if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
+-endif
+-
+ include_HEADERS = oping.h
+ lib_LTLIBRARIES = liboping.la
+ 
diff --git a/net-libs/liboping/files/liboping-1.10.0-report-right-error-msg-when-select-fails.patch b/net-libs/liboping/files/liboping-1.10.0-report-right-error-msg-when-select-fails.patch
new file mode 100644
index 000000000000..ce1eea036b33
--- /dev/null
+++ b/net-libs/liboping/files/liboping-1.10.0-report-right-error-msg-when-select-fails.patch
@@ -0,0 +1,33 @@
+From f9115d65b561adeb6d36ded952949f065ad0a572 Mon Sep 17 00:00:00 2001
+From: Florian Forster <ff@octo.it>
+Date: Thu, 14 Sep 2017 08:37:23 +0200
+Subject: [PATCH] src/liboping.c: Report right error message when select()
+ fails.
+
+After a successful call to gettimeofday(), the value of errno is
+unspecified.
+---
+ src/liboping.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/liboping.c b/src/liboping.c
+index eca5c16..5253e8c 100644
+--- a/src/liboping.c
++++ b/src/liboping.c
+@@ -1465,6 +1465,7 @@ int ping_send (pingobj_t *obj)
+ 				(unsigned) timeout.tv_usec);
+ 
+ 		int status = select (max_fd + 1, &read_fds, &write_fds, NULL, &timeout);
++		int select_errno = errno;
+ 
+ 		if (gettimeofday (&nowtime, NULL) == -1)
+ 		{
+@@ -1474,7 +1475,7 @@ int ping_send (pingobj_t *obj)
+ 
+ 		if (status == -1)
+ 		{
+-			ping_set_errno (obj, errno);
++			ping_set_errno (obj, select_errno);
+ 			dprintf ("select: %s\n", obj->errmsg);
+ 			return (-1);
+ 		}
diff --git a/net-libs/liboping/liboping-1.10.0-r2.ebuild b/net-libs/liboping/liboping-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..e9ae55f7b8d6
--- /dev/null
+++ b/net-libs/liboping/liboping-1.10.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools fcaps perl-module
+
+DESCRIPTION="Protocol independent ANSI-C ping library and command line utility"
+HOMEPAGE="https://noping.cc/"
+SRC_URI="https://noping.cc/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/0.3"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="+filecaps ncurses perl"
+
+DEPEND="ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0-no-werror.patch
+	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
+	"${FILESDIR}"/${P}-gcc8-fix.patch
+	"${FILESDIR}"/${P}-do-not-quit-when-ping_send-fail.patch
+	"${FILESDIR}"/${P}-report-right-error-msg-when-select-fails.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
+		$(use_with ncurses)
+}
+
+src_test() {
+	if use perl; then
+		pushd bindings/perl >/dev/null || die
+		perl-module_src_test
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	if use filecaps; then
+		local _caps_str="CAP_NET_RAW"
+		_files=( "${EROOT%/}/usr/bin/oping")
+
+		if use ncurses; then
+			_files+=( "${EROOT%/}/usr/bin/noping")
+		fi
+
+		fcaps "${_caps_str}" "${_files[@]}"
+
+		elog "Capabilities for"
+		elog ""
+
+		local _file=
+		for _file in "${_files[@]}"; do
+			elog "  ${_file}"
+		done
+
+		elog ""
+		elog "set to ${_caps_str}+EP due to set 'filecaps' USE flag."
+		elog
+	fi
+}
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 70e92cd716b3..341a1ba7c2f2 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -4,7 +4,7 @@ DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf872
 DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d4132a589e053f43f5de64bb764d9263910837a53be594e64595483ed9516dcbf20abc5071e9a8154b8bb75f6f4c SHA512 f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
 DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
 EBUILD libssh-0.8.4.ebuild 2957 BLAKE2B dd4df344d463601b948ac65ee55b23f5586384eb43941614fac7b77c16c2c20c0feac5e3ab78c98e8566f07cf6ab6a06e1a32476183838950adf39a3be2ab6ff SHA512 3aa65824678b47784712a1b50fd8c2a78e1ee069150bfb9221896a599704d732b40541492d5a26a9b5049d271a34a958a5fde0d8338e820c3f63bfedab46a7f0
-EBUILD libssh-0.8.5.ebuild 2962 BLAKE2B f888f5dbea50bc9b29053ac917b314043df8aec8389a5c73f2c2eac7d8c942fccbbba06f9f5e0d29c8c6564bf9c831d3dd11856268a1da8cd339a18beddfcc29 SHA512 b16d211e4f0a7b6bb05dd421125029fcf9f15fe99d1909ff0c740d1c4cc8082bf17f0c6f83df905f6985612509bd1a71d49e881b0932a188d0c0f8c1c2dd99fc
+EBUILD libssh-0.8.5.ebuild 2961 BLAKE2B bffba63d69df2dd451e8f197e0f06d6b5d59a4b0d70f2f677f5df0ea395050ccca7b728dc06a107f01443a80445dad269e0e50517c8847093c21c65cfe632612 SHA512 ccb18db2538bd67d1ab644b9fd6db7cb595c38ed013e9de2d0b63dea41836aeed6b0d4976a037ebc0ab5f2dcaab576fa8d5ccd841c3464d0664f08e83cca2a18
 EBUILD libssh-0.8.6.ebuild 2947 BLAKE2B a05a939e8d1f1f5168aa583030d44c19fef3eee261d782e13a8906eb7a7d3190d732f07efb5a2f6c3fd2750344a71e184c8cbde4d6fbfb0cced27d0995edb916 SHA512 afea1393ad93357142d8480ad9af757d78792cb991113f5f453381206fdaac3eb84a0ff75d735324a7c7c253b09d8484c2752b85f05d2c85899ae91e37878857
 EBUILD libssh-9999.ebuild 2897 BLAKE2B 45f5872ca4ccd8b8e51d45ee218dfe82367cee5018dfd34e59e8f453ec1d480244632431e3d911efb55ec1c8d2707114292804bcb18e909a2132f2a3ac72eb7f SHA512 4e974acf3d5a821f11822d4e36a8ed8b965ebe1b047992a7b1b344764043d8f81f925269766e98bc61a61615b6d61f24bed7cd5e9a19795bffe75f810f284dd6
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.8.5.ebuild b/net-libs/libssh/libssh-0.8.5.ebuild
index bfa5efa28109..230827a4e3c9 100644
--- a/net-libs/libssh/libssh-0.8.5.ebuild
+++ b/net-libs/libssh/libssh-0.8.5.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 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	inherit eapi7-ver
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index c213ad26d3be..6973bac821b0 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,5 +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.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 2385 BLAKE2B ad385b92bab0e665924966ffd00d3a4122e96223e18c302cb3a18e6eb281dcfc1684b5bfc686de0f2f64e054d8d58b2046705afd9494bd83a54bcd8a6d04a1c9 SHA512 4c712d84550b7bdf0999ac713c87633d6d4c512f01be616939ad313894e965c0e3ff200349bd63814ad4a2a12eb74e8099c4bd158fde0afdd32ecbdc991231d7
+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.2.0.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
new file mode 100644
index 000000000000..c18af82cf1ac
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
@@ -0,0 +1,110 @@
+# 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 autotools distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}_${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~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
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable 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/libtrace/Manifest b/net-libs/libtrace/Manifest
index 535aaa2af0dc..5940994269c8 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,8 +2,9 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815
 AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa5204e95e7aad330c9b3afcb033e65a95c135b09b054a7741f902b2aefe31fa5b953d62a95bb41ff227b3281956e55c6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
-DIST libtrace-4.0.4.tar.gz 949490 BLAKE2B 63b4e3bee7502deabbb07891ffe81fbed81f6b3b6c8b78148b035565fbb4e9f8302ee8f824e35584e68c453e61b0459f5a602b471330e6e0abae747a80f65872 SHA512 255a0654f762f9185ef70969225a160c017d50e0b01d1e90c31f555c1ebf5ce6509931f0c78bbed183e670d6acecb68e23efb8009a0e236fddd3a8f032401def
 DIST libtrace-4.0.5.tar.gz 954257 BLAKE2B 42d0940f18f836945fc50d86e1fd242e18a09c4dc07319f831457ebfd08a4ad2d4f7f1ae2a5fcd8f881011110fdf57f623a42d624ba07348f1b9de759769c641 SHA512 c9738af7a471f6c0a6a2a2595ea081beb6145b57792558dd66feef9e4601814a8f5d6be194c83ba2ce076571dfc2a86aadafaa30411d9ecc3e7b7d83fc7809ce
-EBUILD libtrace-4.0.4.ebuild 1125 BLAKE2B 521d0d7b377d1afda49b921083b9f1c4a4dddacb55f3f921c62c81ff58720509d1eaa6def73cca5851daf9575e8dad062d0794a52f3acbcb4f64a72b3a5b1619 SHA512 3dc77a8bb40b9da727a9e8524f1249e32f25fe71ad2e9780a987c8e7223270b3fbcf6071398068894ccce638b35528077e89785acbdf912e9800d2043e1260ef
+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.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.4.ebuild b/net-libs/libtrace/libtrace-4.0.6.ebuild
index 30734d72f4b6..c8291b01d7ff 100644
--- a/net-libs/libtrace/libtrace-4.0.4.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.6.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
+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"
@@ -54,5 +54,5 @@ src_install() {
 
 	use doc && dodoc -r docs/doxygen/html
 
-	prune_libtool_files --modules
+	find "${D}" -name "*.la" -delete || die
 }
diff --git a/net-libs/libtrace/libtrace-99999.ebuild b/net-libs/libtrace/libtrace-99999.ebuild
new file mode 100644
index 000000000000..c4061e17a7b9
--- /dev/null
+++ b/net-libs/libtrace/libtrace-99999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+EGIT_REPO_URI="https://github.com/LibtraceTeam/libtrace"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc ncurses numa static-libs"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+	dev-libs/openssl:0=
+	ncurses? ( sys-libs/ncurses:0= )
+	net-libs/wandio
+	numa? ( sys-process/numactl )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/doxygen
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+		"${FILESDIR}"/${PN}-3.0.20-tinfo.patch
+		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+)
+S=${WORKDIR}/${P/_beta/}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ncurses) \
+		$(use_with numa) \
+		--with-man
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r docs/doxygen/html
+
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 47de03f1fd33..e63adf0d38ef 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,3 +1,6 @@
+AUX libvncserver-0.9.12-cmake-libdir.patch 669 BLAKE2B 1906637be7180a884aa3daf8e6c670181a639a9646488830e3e84cf71ed927e656f51edd097145fac9c554d2f8af796300906ade5c3a5d910a49c4c486a8475f SHA512 e6833922d39ad13484a3ae96eb2ee5cda3ce52d41e0a0ea88281221f5378e7effa8f0a8eaac593e111e8e0b64de0f458d17df496fbdf124f2fbca2806f52012c
 DIST LibVNCServer-0.9.11.tar.gz 1413739 BLAKE2B e295d3aef7181cd767676c4e55130fa65ecf8ea92a659b6de82d2cc465f1c9e1a587839942fd89882126dc8ec54f9de20a78e799ea194f9ae227a82ae705721b SHA512 e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
+DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
 EBUILD libvncserver-0.9.11-r1.ebuild 1921 BLAKE2B e324d043474b5575867592f07106ef8c6054004aed2dd46a1ac433962538b0203da3315a1025490de760960d58102935fd925ef77287af597ac18b363590c5c2 SHA512 33159e0e940be618bc4267e62f34555cc48726fab8db08097568e911f3fa5efdb1391ad0ee054e92db785811368943a601ce6434456177a0258c044431c9eaab
-MISC metadata.xml 1077 BLAKE2B 16327a9dae79b066ec42f185ecde73d18bbf19bcf14d4bf4cee2f298e252ad442f0f0ff6a144d05ab1df21807c343f69d9c67fdd789f40ea2b024270ef2ba8d3 SHA512 9a6e708b40d590b968d4cc534661f52cde4848edb93fe5775b69dd20ba8d1e794cbb284a63d9c674936a1530f520f559546c78f457853b61b4489b8f264084b9
+EBUILD libvncserver-0.9.12.ebuild 2118 BLAKE2B be428e8c0cdfbe531387cc043fdd24d430056ec2a22c86df35306ca49f606c8a1b3c45e93810c99c5b78b5f1b532931585c0e93a67e94b189cea63cbf3c04d93 SHA512 ea14fead9a0fcb4b82c81b0fec80ef4ef67116604957ffb931e27ad9b743a881e793b9b9bbfea127bcb2b5000c63999948e167f72c6ea3d690ac93a98dcdc432
+MISC metadata.xml 886 BLAKE2B eb2d3707e1c536735a10b97c885e8787d1039449cce85e93e4ad485bcc92ca786a538aa10cce2888657cb2764c5793c6d86516b5dfe16970ce54e23803c569f1 SHA512 40d57c413847589b5e3b4c4edd7743bcc3461624abe129c7cc558178e1af8ee7585c3a1edb776c884a2d8b33b99bf9d67e4e6fa44c774692e66b2bab074fe06e
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
new file mode 100644
index 000000000000..35ee26dc7b04
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
@@ -0,0 +1,22 @@
+--- libvncserver-LibVNCServer-0.9.12/CMakeLists.txt
++++ libvncserver-LibVNCServer-0.9.12/CMakeLists.txt
+@@ -666,8 +666,8 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
+ 
+ 
+-install_targets(/lib vncserver)
+-install_targets(/lib vncclient)
++install_targets(/${CMAKE_INSTALL_LIBDIR} vncserver)
++install_targets(/${CMAKE_INSTALL_LIBDIR} vncclient)
+ install_files(/include/rfb FILES
+     rfb/keysym.h
+     rfb/rfb.h
+@@ -677,7 +677,7 @@
+     rfb/rfbregion.h
+ )
+ 
+-install_files(/lib/pkgconfig FILES
++install_files(/${CMAKE_INSTALL_LIBDIR}/pkgconfig FILES
+     libvncserver.pc
+     libvncclient.pc
+ )
diff --git a/net-libs/libvncserver/libvncserver-0.9.12.ebuild b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
new file mode 100644
index 000000000000..2ec6d6f5d76c
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-multilib
+
+MY_PN="LibVNCServer"
+
+DESCRIPTION="library for creating vnc servers"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+# No sub slot wanted (yet), see #578958
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl sdl ssl static-libs systemd test +threads +zlib"
+REQUIRED_USE="!gnutls? ( ssl? ( threads ) ) png? ( zlib )"
+
+DEPEND="
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	gnutls? (
+		>=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
+		>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+	)
+	!gnutls? (
+		ssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( >=dev-libs/libressl-2.7.0:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	lzo? ( dev-libs/lzo )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( media-libs/libsdl2 )
+	systemd? ( sys-apps/systemd:= )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PN}-${PV}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-libdir.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_ZLIB=$(usex zlib ON OFF)
+		-DWITH_LZO=$(usex lzo ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_PNG=$(usex png ON OFF)
+		-DWITH_SDL=$(usex sdl ON OFF)
+		-DWITH_THREADS=$(usex threads ON OFF)
+		-DWITH_GNUTLS=$(usex gnutls ON OFF)
+		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
+		-DWITH_GCRYPT=$(usex gnutls ON $(usex gcrypt ON OFF))
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+		-DWITH_FFMPEG=OFF
+		-DWITH_24BPP=$(usex 24bpp ON OFF)
+		-DWITH_IPv6=$(usex ipv6 ON OFF)
+		-DWITH_SASL=$(usex sasl ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index 6c1ab10cbc08..d495570cbb38 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 If you don't know VNC, have a look at the original VNC or at Tridia 
 VNC, who also have commercial support for it.
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index e6894ae54ee1..dc7caf46b6a5 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,8 @@
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-DIST nghttp2-1.34.0.tar.xz 1612432 BLAKE2B b5a53d5ffdb68e509cebf50993c3b9de4e597ae9079db505db6e6df67c1eb5f4b095f18dec9f1b946f05b83f3db8ba15e5e5cd7efd4921a94350bd47533a9164 SHA512 5ddc4ab443c51ce286a656d2013421172fc37608f14c0a7ea02fa9e5a0dd155e162d5602b55f34dacc69709525a9a8110dc4c42d92607bbad1951075d094c6a0
-DIST nghttp2-1.35.0.tar.xz 1616224 BLAKE2B b594e386b9a9dcd62dd75686a9274b30d3b9be5b1f2aa4dccb6543bcece60cda931bd6e16c5122ac946159547c1aafa6a02f2f013a3b38837194d4cf9a14ba64 SHA512 4e209bb6e388ee9c3440a88eb28ecb4a69e0047b089e4d028bb911dd69518a970b5b06ed6fff06594adca53dccd42443733faad909d347dd8d8e919055356e2f
 DIST nghttp2-1.35.1.tar.xz 1614460 BLAKE2B 86e078cd0fc285f76df5096c34ee3142268772cf690ec7c9abef7cc3d873ac583a1da5e331ec46138e05b5867f56a9a4e98210395d75377ff37956307c7b049f SHA512 fcd3f79f913afbeee1c75003bb39df918e6122bbf728b3ad4192d5849d8fb96705e04f5505465d63f25a565b2f1da6abd8fabdebb6e3347500f7abd31980861d
+DIST nghttp2-1.36.0.tar.xz 1629020 BLAKE2B 7c116988c22801688c50d6d514ddb904920cc54d3c3d141137e6ed8b2182ef4e670f0a0fdebaeabfe0df8cdea4cfd1ee3fb083628f035201f104de6f3614dd25 SHA512 4e0d5c5cdb4f1b7e5f12790850237f36649af4aa9596033392725972e4e0e5a33bb78bd1aa0735e35e489b523b7e9a236a7b5847dfca69bd7583fcab36c13c76
 EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
-EBUILD nghttp2-1.34.0.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
-EBUILD nghttp2-1.35.0.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
 EBUILD nghttp2-1.35.1.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
+EBUILD nghttp2-1.36.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.34.0.ebuild b/net-libs/nghttp2/nghttp2-1.34.0.ebuild
deleted file mode 100644
index 990e99d6dd0c..000000000000
--- a/net-libs/nghttp2/nghttp2-1.34.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-werror
-		--without-cython
-		--disable-python-bindings
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.35.0.ebuild b/net-libs/nghttp2/nghttp2-1.36.0.ebuild
index 990e99d6dd0c..20f89187f0fb 100644
--- a/net-libs/nghttp2/nghttp2-1.35.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.36.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 2de76306355e..04789b44cd8e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -5,6 +5,7 @@ AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.15.0.tar.xz 20217588 BLAKE2B ef7f626bd3b13b11a1cbf21f5c6a2ce08567dddc2fb525c5f10e02f81750a648245c2eb88535d8aac1b055a13d12f9ead72d55c4ccf68062940da09d582344c3 SHA512 6c10ae4070cd8b89d4d31ee2137453fa582cef85c6f002c78d5029ceedddf5caeee8e28a4e75dfc632c3af3c8e2acec403ab17a927ba51fa31175d58b45cbf49
 DIST node-v11.6.0.tar.xz 20410716 BLAKE2B bf6150a42070f714dfa5a38da70a4ce6b6a81ca5b9aedb84e672dff5244676ce77ca771ee46d34adc7cd7b84a0fe91537f9cbd3841a95c4bee67a894d4e8b4e7 SHA512 7e3ee41a5de8395669796cf8f81a9e8f584ceda480b54874fceb057ccf8aa5b986239ca842b2dbd796dd1a97f9e2111995b334278f6d7bf38421a84c4e883c65
+DIST node-v11.7.0.tar.xz 21218124 BLAKE2B a7e69dc8d6ee2f42ea78ec9c4d623b56bfbc2e130fc6b7d33038ce79f03d7b92e78545fa26bb2dbd58c1c25677f0b224077822264fd9cec49e71f18517098563 SHA512 eec2d5e67d94314f1a09f3a1c3407d6b12e9decbdff99d41eb487c4ddc1929fc5661be0b6fbb180961ecb6094311630b19faa0af031d82ff8de7ae213ee35ab7
 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.16.0.tar.xz 15854256 BLAKE2B 0c70ce154639cbae12e0dfd6e7d5705999badb5872d71f388a3bb89f2830ddb096761aed47bdc6e310f2088fa79070d8a3427361206d74f686d86b27f929a4b4 SHA512 e9a222af328c8afb47b4b9c0f39ca5c1e45c5590b2064b3a8994b25f63acd041fba591d390e5a617db08d1212de15c438c66000ddcbc65cd071681311fa3591d
@@ -13,6 +14,7 @@ DIST node-v8.15.0.tar.xz 18499412 BLAKE2B bba68517358cea14e9ba7c0c14b3f30caa00e3
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.15.0.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
 EBUILD nodejs-11.6.0.ebuild 6532 BLAKE2B c656a13b096d7925e7649e6ab1a4884bb484dfd55475c7fc951a18e27614667e47a945da30adbf9a9c15bb0dbd986cecd9deb0aa5af15ff6553857348a087d8c SHA512 a7743833916e53c7f10856d6bb5825d50a34d8a2f2a2ba4172d34c275249a4c076472b1bd1d452ffab425955c173560dc3339f6ccf94103619ce84f3ea90c773
+EBUILD nodejs-11.7.0.ebuild 6531 BLAKE2B 5d5288b5d2787c299542605b32788187eab4107bddd80dd807e7fc46be19fabef4e59a2218be074849c13c09a1dde9e1a81e254789cb31ca3efefd3c88961646 SHA512 d8045148cfe83f9d76688d99840bfab4c32cc3b4ea3260c83f46c41bc2698715d52d0f99b564a141a1b61729da72aa12ba48507a38d29eeef9d0902ca5dca8ed
 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.16.0.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
diff --git a/net-libs/nodejs/nodejs-11.7.0.ebuild b/net-libs/nodejs/nodejs-11.7.0.ebuild
new file mode 100644
index 000000000000..95473e1a6cec
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.7.0.ebuild
@@ -0,0 +1,210 @@
+# 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.24.1:=
+	>=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.0*: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}-11.4.0-stdarg_h.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/signon-ui/Manifest b/net-libs/signon-ui/Manifest
index 976a4e67e4a1..afbf87fc10cb 100644
--- a/net-libs/signon-ui/Manifest
+++ b/net-libs/signon-ui/Manifest
@@ -3,5 +3,5 @@ AUX signon-ui-0.15_p20171022-webengine-cachedir-path.patch 925 BLAKE2B 5ead2d7a7
 DIST signon-ui-0.15.tar.bz2 60278 BLAKE2B 9674dbfb184249a8a88fbdbe07e6e1c3d070b3e7ca42666a99ae5cdff31ceefe6a45cde533d77234194dc294722999c48ac16dcf6fe0e67a6ce7d53c711edfbc SHA512 02167d48cec3efbd1b0f39f65732742416b46e638a888a74df02bbfeb6deaefdd81549c8cee1a80ecdc8a9f9d0363a6935e8f105bec40bb798af5cc19a74bf03
 DIST signon-ui-0.15_p20171022.tar.bz2 55849 BLAKE2B 6b97b3f673fb4494c7e32dc345f6c4697acdb19305b9459fe954d88983e4666211926921dac70829435706cdd9a41f36d36241a73905b2a795873c2894ffa8d7 SHA512 d0a4ca222de00abf4000905d917799fc6f9e04a2c3f49d0d0882dc4e90fdbcde14da91f355d10f8a3feac03661febd321ea6de1df227fa5a3c404eaefa7c2d60
 EBUILD signon-ui-0.15-r1.ebuild 1015 BLAKE2B 7e3ca87104cc40d0be5869601f4e7582143ff15d587cd32bcf840dd489524fe6b38604521395e7307283eb54ad5a40a77a595ef53f5609e9aeda69a153b4cba6 SHA512 341e8d25a797d7bb92a04137c73dfcb64775184b9aeca531a1d440b862c8cbe2fb33154671c2649c663adfcafb2d9f255a29bc4163d8008be7345ec29a04d738
-EBUILD signon-ui-0.15_p20171022.ebuild 1161 BLAKE2B de493e85187efc72ed06013194e156ab4f54ded6829419724046c8f5a3d2a75a07b61b7a590ec832b5d3b88ed4f0339380cd24af2af474aaf65a7735c6527a64 SHA512 6d33b042f91dff7c1f499235eb6aede2d3eee530fb124aaff14280ff1085e3ea6a05d6819b30ff09d94b668e36f0177e38ab29e708c8cd7b77bc3f174a927a49
+EBUILD signon-ui-0.15_p20171022.ebuild 1160 BLAKE2B 108de57952e2c97b81c3bbdb07554704c54c411d9cbf10761a2fb9802a3583644db9ebd2c0b57574ec8d0fe38873d19bab99ec3e687434801aa0930b31c4ba2c SHA512 7a637e0ad853a59c8445cceda227ee4805312c56fdecc400a0f487a4d398c13bed1afd4a5e9a037178d5350437f44dd82682004fc459a5b8db934340ab2d07e3
 MISC metadata.xml 326 BLAKE2B 896ee331ecb5fc149dbd576756e92fd439e6e5b3364e487de418428eb47502cadbb7826c433ce8bf348a7c70e5215dc073aa75a93b8a853920dd9fbacc139927 SHA512 5fae353739749bdc5a688a5819992063f045818006124b8cefbb4ef6a3452d91122931aae8286627b9121f893b97e66a44caa732edfbc2aab9301d8d039b0a7f
diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
index 0be0cf2ea2b4..77124a8d3ecf 100644
--- a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
+++ b/net-libs/signon-ui/signon-ui-0.15_p20171022.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=7
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMI
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-qt/qttest:5 )"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a34ec5ef9a05..7feb7e0982ab 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,3 @@
-DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
-DIST webkitgtk-2.22.4.tar.xz 16752132 BLAKE2B a60f1c6168ba1ef19c931030017a58a640f0ff4a8d5bf97b278fff50f86374d5e10e06d95837e90c5a653a4c226095321ae86fdd64e61d846821979343b7350b SHA512 a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f
 DIST webkitgtk-2.22.5.tar.xz 16774560 BLAKE2B fb022febf72727d59a1ca9490c8de48ade5a07ff3688b6962481608b9e0d27319282c842eb214783021745c1beb893b8842036c62542874e011f2ab60d275f17 SHA512 fcea9fab3d71869cc10e322b1b63864a9594624f6aa3e29efd8b47e5ca639145f8c2cdb299ecb51eadf3ac1238dac06b4b7ebe94969b2f61a21cea8b609007bc
-EBUILD webkit-gtk-2.22.2.ebuild 8125 BLAKE2B 0997d124840b3a57d57b685c98b87ff38f6999c632faeb81297713e48f0f5bde97a876b2ba68effab319111c979b474fed5e7c1204926005b6216770bcccca95 SHA512 b05263a65622920e6d16df475bc413314ea80d7afcf3c7beaba0ce7ff257fc364582729d915cdbb9cfbfd110a10d68efb61912e998115b6a96abd2cc6886e5b0
-EBUILD webkit-gtk-2.22.4.ebuild 8352 BLAKE2B 26bf2060a808a3ff02f427774a57eafa36482d3f1131b787f0c9b6cf96d24f5554edc80e20428fd822456f640352150f824e48f4b3a996f8977cc797a2c209fa SHA512 948e181817faa73c0e2677897d8868933fa53255701d77444588a90c45f4f5e35a2a7d89198ac0f452b3105126a1067b7d791d9235742f6ab61f29b010de19b4
-EBUILD webkit-gtk-2.22.5.ebuild 8479 BLAKE2B 52007fb04e051641b129984a772246071fba8aa6ffdc78c6b67417c4081ab2b22662f4d3397da3fe2da87fafab7f7b3e1672d35a1b2e002552760ab7a12dd707 SHA512 8567fc73e99b8d5a3b7947f9fe03d74f52dd6b4e630917029b409f6e80bd8f8a71cc9535f09d38ad05dc624d7e3f31993bfedbeaa569e399195859260a914ac0
+EBUILD webkit-gtk-2.22.5.ebuild 8591 BLAKE2B 2e4fe708fe0f447b8dac402502121436e74349efc97dd431523e520c6224a6f106df6f8b1003161136936d7170945a158310e5e6b1713364f4906ff53d940432 SHA512 ee6190bbcfe0d606d008e8fefe794924a7d4775f7fb607969979f881e85d303d9147f5fe7984c41b41ea51ddf9951137b37bc3152b0666ec21498642b1e63642
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
deleted file mode 100644
index 4b4d6c0314c3..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 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
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	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)
-# TODO: Raise gst-plugins-opus dep to 1.14.4-r1 once we can, and eventually drop the blocker from epiphany; or remove the dep when older than -opus-1.14.4-r1 is not available anymore
-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.8.3:1.0
-		>=media-libs/gst-plugins-base-1.8.3:1.0
-		>=media-plugins/gst-plugins-opus-1.8.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	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
-}
-
-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.22.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
deleted file mode 100644
index 3b79a2603968..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2018 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
-# Review on bumps if fixed upstream and adjust accordingly:
-# non-GL builds are broken - https://bugs.webkit.org/show_bug.cgi?id=191997
-# GstreamerGL gets built even with GL disabled (thus requiring opengl or gles2 with gstreamer) - https://bugs.webkit.org/show_bug.cgi?id=191998
-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
-}
-
-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.22.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
index 09e09a0fa793..24f6c402a5bf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
@@ -21,7 +21,9 @@ IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +intros
 
 # 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 ) )
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 3372e0dcd98e..49f356b7f5fc 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -2,6 +2,7 @@ AUX zeromq-3.2.3-unused-variable.patch 4012 BLAKE2B 8ce02ae0eb5696977e65ee286874
 AUX zeromq-4.2.0-dl-backport.patch 897 BLAKE2B 50f413fe321240146a6d27e1aa9cc27220984720d2dc41724cf2cc11a322be5d1d37764e52963c0d1b0de7bb754223d4c3102771f9d014c4a9593f6e83097b97 SHA512 db7ef6485040e158aabd2e5f5c49fbc02ba918415b3cd670baf7287a35ec67a8dd4d3509c30f7a00c88582e544f3cef886f99ecf218656cc8c3cd285fb221256
 AUX zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch 1317 BLAKE2B 70fe7193f858b58c05b64a98db8f93f6c468293098abab21fac4e0aa5c003c3803823447e05c01c01eecb12c01fa9945913b2ee31179355d733ce0477372fdd0 SHA512 d75375a201e98be533d04cd29997cf28e81d3af958fad91acf5e8d9284c7b3d3d7d7b6a593fc752f6b50048c21d1fb9a7fd99d449f155e509fef9d35260f7188
 AUX zeromq-4.2.2-optional-libunwind.patch 2246 BLAKE2B 7a9eeb5ec8c5d0dd1f8a8d7832aae5c54e9b9f6e8757b3defae513f0c7b7f689b79c58da397631c4a93324033f363de54b563466eda814e5bd4887714d2533d3 SHA512 275175d2ed21654a224b55b7508dbee9e362929fa31fc33e8c20f303f6280a8416275143896e3541492b8d6187a559c805a38b31eae5ac14083905a50d5b8bdc
+AUX zeromq-4.3.1-fix-test_security_zap.patch 1008 BLAKE2B 17f5a316601af1c8e7c307a964f69bf0d59c55ee0a9076eee4a909768307cef8be0d901d6ecae10381505b96bda95f20ffa0d1bde09e8c1bf6f0fc2959e9f065 SHA512 e813dc7488c5a81731f5649b2ecc533e55c4a3f69b904a1fbf2446ad6282ece96a64850b70f675c6cb0e20636c4654786ffdc99742ae1325c16469735e7ea616
 DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
 DIST zeromq-3.2.3.tar.gz 2072758 BLAKE2B ee295219e4709396f5a7e2774f8f6e53ad081c8b83302d9fe163d5523b6060401251c9ecc0bd423168ccbe156d6a0e26454515cf50780e5c8a07f9f6f4d50ee5 SHA512 34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca
 DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
@@ -13,6 +14,7 @@ DIST zeromq-4.2.2.tar.gz 1236437 BLAKE2B 7104f8ad28cc00f1ba6d6cb5dbb9aa466971c73
 DIST zeromq-4.2.3.tar.gz 1326780 BLAKE2B f76ff6461e5a180221b1fff471e795a457fe4f26ec1ca725438aff4e240be7da80e42b2aea49845b5712e1d63590f64bc681f9a793bcf4d32fe0ee08bcab482c SHA512 8ac588a7a4db9d65586dd7b501999edac151e1d03056c1014d7ded6cd4bcf5bb4f81252b47d89d60c3ad7d527685218992bf5853b4656c0702e0f64c2d77712b
 DIST zeromq-4.2.5.tar.gz 1409447 BLAKE2B 9309cff20192c4e0d9e34992cc3168c219ae63e8258362483d15f3315436324454603739393d2fa2628fb4cf7a94954c1643de07c3a28e86933fcd53aa2e0fac SHA512 4556cb50d05a6d133015a0ba804d6d951a47479a33fa29561eaeecb93d48b7bb6477365d0986c38b779f500cadaf08522c4a7aa13f5510303bd923f794d37036
 DIST zeromq-4.3.0.tar.gz 1487771 BLAKE2B 3783eb2505c2e42fc2c03cd9a280b0e2a70758d4046bd0c5b0f43a5a0630655ff06665c30fdfe222fb077ff966a9d5e0c762f65370804dee2eb25fa8215d5e2b SHA512 593239f66c4157e596874832378c9405d79c915a5895503bdbc87304df0ab49311b96f92ba6492396b4bf25d2007689099730995f7c335a51fbf42a9aafb02e4
+DIST zeromq-4.3.1.tar.gz 1490122 BLAKE2B 95d0a1359e85a3868ae0b1cd4f711d9715ddc07d21fbb7799c6beaa269aa77fb68e087898033f8a515be974a799c1ee2f2afba1f50b1bc806255750b95990367 SHA512 b80388a3703993425cdd73054139a8e2895aedb9992ea68d6eadb4ea39b9af576ea14f306dfb432e4c24535feb6b293f82fac5679b655d258f0f921f2b71e772
 EBUILD zeromq-2.2.0.ebuild 1290 BLAKE2B 41766c48411cb623c574f20b72d9190877c0f4a53708c132863986059b620f0175a46fa3ed840dcc38298419642f186124289db64bbc9c092dfd896788c26eb7 SHA512 83c7f2b4f30aa15b44c2761c879762cb8cef3e19ba84f9bc95ab6e8f7bb0e3d01c0fbf91688be12ac662c231929793544d7769f2dafcec718f2e22764b76b9a0
 EBUILD zeromq-3.2.3.ebuild 1520 BLAKE2B 81d008fa3fab31485ee72e5669479f7a730b14c2f20af29dd51e9bda168ee4dba9057a43214addec88f6b6c5960899898351b234f352464854a63a79b0d0fbe7 SHA512 1bb6da7c444a4377fe716d6a0702d12b2e23128418cd38820d2093da7bf0b14d9a3d7e85b17e283ec49bdedf5f5214d6723b23869d431c8fff82b816d3499fc4
 EBUILD zeromq-3.2.5.ebuild 1469 BLAKE2B 0c63cffa55d6ce54d430dfd3f4997f1426a80aec72e5778cdb3ba833c383d2c5d487824bda6ab413c7750de790755f266d3c69b79f8cdf6ae982fde417fb95d9 SHA512 85a0a5c8184dcafaa29d93e59568fb569ef015fc2f1cd7c26bd5c66f0333050c04505587e6922691641d43b679c34eac13dd7ced4cd2955a5c2e926ad559bfbc
@@ -26,4 +28,5 @@ EBUILD zeromq-4.2.2.ebuild 1217 BLAKE2B 9de51f8af0843322ca7aead2aca32e7b6b862b02
 EBUILD zeromq-4.2.3.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
 EBUILD zeromq-4.2.5.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
 EBUILD zeromq-4.3.0.ebuild 1426 BLAKE2B de8dfe1881fbaaa65164d25f7e769fb239723ea75474370d740be9e242812a7ecb5a89ba98f391e9cb932541fe57dcd0b14379269f4b2bb8de2fd224b93efe83 SHA512 820eedcb8e46aa6fb3f1ef60e544d476719e93626669a382800618da104c78c88acf8ac2d372a3a50f5a493a88472dbb07d4430251e569b2caf8af56af40b13f
+EBUILD zeromq-4.3.1.ebuild 1471 BLAKE2B 99c8e8d5c8a48ab1faf2da2377cfe71960a087f09fcd81f56d78dd8145599edd3a47808b641795674f6b29fb2944acb3dea5a429284ab2bc847a6a4d5c269c54 SHA512 774e83699c205e4b6250976a5224e5a23a1311918ede6d7ccc1b099237cab1204a02d79e9685fd6b4a85c53efac966e8f77f2a150e09f67dff12c7d5a00dca2f
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch b/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
new file mode 100644
index 000000000000..3c89024b84bd
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
@@ -0,0 +1,25 @@
+From 4147957a5eec57ec7a2a416dca74c3c0299a3432 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 13 Jan 2019 13:08:10 +0000
+Subject: [PATCH] Problem: test_security_zap fails on architectures that
+ disallow unaligned pointer access
+
+Solution: use memcpy instead of doing pointer arithmetics with casting
+and dereferencing to fix the error on sparc64
+---
+ tests/testutil_security.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testutil_security.hpp b/tests/testutil_security.hpp
+index 90999118c..437bfb298 100644
+--- a/tests/testutil_security.hpp
++++ b/tests/testutil_security.hpp
+@@ -345,7 +345,7 @@ static int get_monitor_event_internal (void *monitor_,
+     uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
+     uint16_t event = *(uint16_t *) (data);
+     if (value_)
+-        *value_ = *(uint32_t *) (data + 2);
++        memcpy (value_, data + 2, sizeof (uint32_t));
+ 
+     //  Second frame in message contains event address
+     zmq_msg_init (&msg);
diff --git a/net-libs/zeromq/zeromq-4.3.1.ebuild b/net-libs/zeromq/zeromq-4.3.1.ebuild
new file mode 100644
index 000000000000..aa6d19413532
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+
+RDEPEND="
+	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+	sodium? ( dev-libs/libsodium:= )
+	pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+	!elibc_Darwin? ( sys-apps/util-linux )
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	pgm? ( virtual/pkgconfig )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-test_security_zap.patch )
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable drafts)
+		$(use_enable static-libs static)
+		$(use_enable unwind libunwind)
+		$(use_with sodium libsodium)
+		$(use_with pgm)
+		$(use_with doc docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Restricting to one job because multiple tests are using the same port.
+	# Upstream knows the problem and says it doesn't support parallel test
+	# execution, see ${S}/INSTALL.
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+}