gentoo resync : 03.11.2018

34 files changed, 616 insertions, 459 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 97d320f467e3..53960ecd51af 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 176c672cc815..fad69f25ae5f 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -2,6 +2,6 @@ AUX farstream-0.1.2-introspection-tag-order.patch 4840 BLAKE2B 29b1a54b403977a53
 DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec08569174e1919b78d6529a5a8c9672cbe95074a282fc8632069ea90eaa9b4fd13714be117ea66d368e69eca785ce796a15a SHA512 7d9ddde5d17205752a17298fb90cf855a828b2ae58746fbdc7e47749cee5e5eac4fd56f97f58251a5d253901cdd555e9cfade6016b6d92df99daefbe850e2910
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
-EBUILD farstream-0.2.8-r1.ebuild 1805 BLAKE2B 60c9a9e789c6cbf48ff33e53b1a4bb7d0e59d88f7f3b8a71254d3b18809fa79667836c60f55a756c7d271ef09e40b173c7c573e6ebb530aaa97bd992d382da45 SHA512 99f415b8069ebfe61bcd65d7679d61d7c12188e3c95955bef8ec0fcff71a2ec9cb3ee5d3bed6db3b0411080c1bf625e210530d855a2f9abee716029128316ab8
-EBUILD farstream-0.2.8-r2.ebuild 1828 BLAKE2B 2344f6d75489a3b8e80deed6519d4f6e2da828413ca37603db4369f3c4beae1f0461fee294ef4a98df48f6f88e8407a94246d39a412d1274a1d9345bbdf4a665 SHA512 139b9f3cf63894eade81da0bdfa9242f3921c02a0f87b8371809d03ebdb08bf14fac4c92a19d4cf9e9e9848b96b934dca43d3a1d8c5bec9ea3d400b57a1ce826
+EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
+EBUILD farstream-0.2.8-r2.ebuild 1855 BLAKE2B ea92e0e3ce8ba9ff2311ebb4f8770c6e490d244ecb2bf4c669e207c100d562d38cc9ed6f3abc989598676844e03d0d579780c3a89ff511141da2f433644fc825 SHA512 67b3fd28c39b270362e0464468e15fbe850a039b12579cd46d1a60bc7ac7a5fe575e60cd67a5bc929a76d9b2a5860a92467619c8af2e87099e1c5e15e473c5ed
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r1.ebuild b/net-libs/farstream/farstream-0.2.8-r1.ebuild
index 3c16cfb12872..ee9b123f673d 100644
--- a/net-libs/farstream/farstream-0.2.8-r1.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,7 @@ RDEPEND="${COMMONDEPEND}
 "
 DEPEND="${COMMONDEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.18
 	virtual/pkgconfig
 	test? (
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index a37762705792..49efe0757aa3 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
@@ -36,6 +36,7 @@ RDEPEND="${COMMONDEPEND}
 "
 DEPEND="${COMMONDEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.18
 	virtual/pkgconfig
 	test? (
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 366e682de0ad..97e48aa50969 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -10,6 +10,7 @@ AUX 0008-grpc-1.12.1-allow-system-cares.patch 2049 BLAKE2B 4f7e352f3efca21cbc918
 AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec598a67247dbd064efd03cea660444ecb3afe3095e2b7c1c67b2e83423762ad1580636039e27004fe34c8ff0c3bdc9862a3c54 SHA512 dfdafec8efc8fc0f4bbcdcbb036fb7ee746c917c8dfe18338dbd20be40efe8e1b3fe77c6f66f0b050f6d078aaff81a78477980b63ad81288cae474af8c723420
 AUX grpc-1.14.2-gcc8-fixes.patch 4258 BLAKE2B 211847b5f493076ecdc13eef9567f5f088dfb1f0e1b7c61b69b6daeaeafa638262aea525063ac5a4612e12cb378d1231d30eb1ed86d781b6ee43b20d4fb68353 SHA512 20279e231042fa01ad0dffbfd731e2ea17d9ff4240a21204f672f88a4dca7302f1e8a4f4dbffbb4a5c2d321f47f735ef0411a2e2a44472494b518741a044ac4f
 AUX grpc-1.15.0-fix-cpp-so-version.patch 4772 BLAKE2B 96efd477c385c7a4714025081288576f8ef4fbba691257e3638e85b850c20b1db9a72de6fb9f85a8b6b3f4f990dd4456ada838ce6ccd01d4bb5043071926eec9 SHA512 49c5da5883a6e8aac6d37fb1920b6b8af23ec9f45c1dd9c337e1a9455adb1eded0ed3763003818ab261fd367e38b705af0dd409d01b97060b1e5020228acef2c
+AUX grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch 3039 BLAKE2B 1da27e75874229261115b174b168e0b478add3c844c58e81a84bf74b699447310decda09e0cad89056a3f5d7fcc8d0bb1835889438ee8efab89471c66a77b69a SHA512 a6f59a3b518310c6150439fba5ad058048540f0f84152406f607873248e3e0d95cc0077b634164f4bdf391427c847614dd88e2ddac9feded0aa23044ea58c051
 AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462005a0add69abf463e93f7d414360135d399dea3f7cbb282150f1e03a6e2df33ad9965327392aed32d76c2875f976c3 SHA512 ad46c4187604212d628004cc783a69d95e4378e83e2673fd99265f2929a000429a269abdb98936ad5611fe9d99df581ff5f122f51661227d13d9e7145ee0a40c
 DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
 DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
@@ -26,5 +27,5 @@ EBUILD grpc-1.13.0-r1.ebuild 4368 BLAKE2B 349d192044bd3faef859aaeb4b6d5dcf466c5f
 EBUILD grpc-1.13.1.ebuild 4381 BLAKE2B 49dd3565bb52ae69ff98e90bc74a241082835bd48e280b048f92be0947184b3870a242761c7adca42679cd0549254a9cf8b79ca6d99af8aa1d403b1ed88fb3b0 SHA512 a428bc0e88112227b9526d0bb431b9f0eb4fef2cfd8dcfae1c9df6cb6b3949423533dc08d37202e9822889139a6f41256b6530a8d95bd3f88b3102d1a22254ed
 EBUILD grpc-1.14.2.ebuild 4484 BLAKE2B c0f9955324ad0eb424d222c087dc44a02db8ef2e247fcd8f38001b43abbd22768fb67ada639621656b40d2ac3d9a4661bb1fa4bc7da96d757502b4aa7ec9c79b SHA512 93d275734afa05b8cf6f89e6da44702ee5dffdec8da4c9cdbeae3d73cfd1e2c154c656bb3d0dc87201f07b2edcf64e9d4a0ae4d990f0fe40cdf17e84eada62d4
 EBUILD grpc-1.15.0.ebuild 4479 BLAKE2B b5df046963596a10c1f5abb586342082cdc0e580b5ae9c0a954268f9d778f11c33ec8665cfc25649083a3436cef3c4f971ae41fb909f129f1b237addb7868e17 SHA512 d3a9f8577b02f682f6fda677fc3471ea10bf2a9f2eefe13f7cd7e9848389a9f58cd2562b00ba38ac82ee176ec3418f4a469ffcd12995b53df513ca7b69c09fba
-EBUILD grpc-1.16.0.ebuild 2262 BLAKE2B ac0c4adcceeae649ab001cbba3cbfaba41ef6f2adbdd390f9529a903b22e2cbe2fc80ffd5ee733b4d861b5357fa8464ffbb5ef492f87677a0b0073144350fd02 SHA512 f566a24204dd62fc652ec02fc1c2feb95119004070559986f1abfb527dd535308d60da643fd4ae611ddf1492a5e5de5d80820f11284ac7432f7ded2fd41e62e4
+EBUILD grpc-1.16.0.ebuild 2335 BLAKE2B 9e582ec97af56e8ca5fb9edceeb05100d49567402622c4cc3c53e0d01bee8a5f5bd4a9035a0ade265ca6724db8f23163dce4e8fb6911b42b08b83d13abc07b1b SHA512 71c377f53a6b734f636f86e0e0a8fb7657e95ab1fb5100ce1ea0ea5b4f745c5fcc94af3797cbb2b0aa18d825b4791e429dad8732bd14c0c276a53cf0d54c4f6a
 MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
new file mode 100644
index 000000000000..fd9f91419542
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
@@ -0,0 +1,70 @@
+From 0892788776d60d92a0cddcd22078779166b736db Mon Sep 17 00:00:00 2001
+From: Dario Berzano <dario.berzano@cern.ch>
+Date: Thu, 5 Jul 2018 11:27:20 +0200
+Subject: [PATCH] Prevent shell calls longer than ARG_MAX
+
+This patch we breaks the relevant paths array into multiple shorter arrays in
+order to make the shell calls succeed.
+
+See grpc/grpc#14844.
+---
+ Makefile | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 54823a31167..25eb092d996 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2946,8 +2946,14 @@ install-headers_c:
+
+ install-headers_cxx:
+ 	$(E) "[INSTALL] Installing public C++ headers"
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
++	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
+
+ install-static: install-static_c install-static_cxx
+
+@@ -5278,6 +5284,8 @@ PUBLIC_HEADERS_CXX += \
+     include/grpc++/support/stub_options.h \
+     include/grpc++/support/sync_stream.h \
+     include/grpc++/support/time.h \
++
++PUBLIC_HEADERS_CXX1 += \
+     include/grpcpp/alarm.h \
+     include/grpcpp/channel.h \
+     include/grpcpp/client_context.h \
+@@ -5325,6 +5333,8 @@ PUBLIC_HEADERS_CXX += \
+     include/grpcpp/support/stub_options.h \
+     include/grpcpp/support/sync_stream.h \
+     include/grpcpp/support/time.h \
++
++PUBLIC_HEADERS_CXX2 += \
+     include/grpc/support/alloc.h \
+     include/grpc/support/atm.h \
+     include/grpc/support/atm_gcc_atomic.h \
+@@ -5376,6 +5386,8 @@ PUBLIC_HEADERS_CXX += \
+     include/grpc/impl/codegen/propagation_bits.h \
+     include/grpc/impl/codegen/slice.h \
+     include/grpc/impl/codegen/status.h \
++
++PUBLIC_HEADERS_CXX3 += \
+     include/grpc++/impl/codegen/async_stream.h \
+     include/grpc++/impl/codegen/async_unary_call.h \
+     include/grpc++/impl/codegen/byte_buffer.h \
+@@ -5406,6 +5418,8 @@ PUBLIC_HEADERS_CXX += \
+     include/grpc++/impl/codegen/stub_options.h \
+     include/grpc++/impl/codegen/sync_stream.h \
+     include/grpc++/impl/codegen/time.h \
++
++PUBLIC_HEADERS_CXX4 += \
+     include/grpcpp/impl/codegen/async_generic_service.h \
+     include/grpcpp/impl/codegen/async_stream.h \
+     include/grpcpp/impl/codegen/async_unary_call.h \
diff --git a/net-libs/grpc/grpc-1.16.0.ebuild b/net-libs/grpc/grpc-1.16.0.ebuild
index 31caf4ced501..b3fac81f326d 100644
--- a/net-libs/grpc/grpc-1.16.0.ebuild
+++ b/net-libs/grpc/grpc-1.16.0.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
 	"${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}"
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 0c9fec29b744..030be3a8ea73 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-vnc-0.7.2.tar.xz 447088 BLAKE2B 539cc9214735cf73c6e578029b33892c3e2d0d1dc402f82fa6d8d107c9a410e551020d9201192b69e50b75bb8297919ab0961752251dcf0bd75823d7426e01b5 SHA512 b95b1da6ff512c466feaa6efc831e9c36c5a77390b518c647c60fddda9dd850eea8658174682ae135b95bfca7bf2b4e85a5e5ac9adb43e3ddd7aa690288655ce
 DIST gtk-vnc-0.8.0.tar.xz 448984 BLAKE2B e9de98a969297832ff6eaba79707a44494b20d944264ac6902596f882b95e8ab1bc6b7eb25e040d17f939d678a81eec730f983942db38d73c81751fc2afd45df SHA512 9b66e4028e56b01af8d0ded5b833fc6c0ba752ac72cd664293b0009868bbec0bc8750b619ece9786eddc06155e390ecccc4c5bc84717c49ac4bd866e6febd8e3
-EBUILD gtk-vnc-0.7.2.ebuild 1487 BLAKE2B 4aafa14d0d026398814a54f15dafd16d2ed594f31be836d6e1c31a8250fc5b55777e72b0bf191e14acbe382fee29ce41497cf5d18345055ff2e9be6eae7885ab SHA512 fa79e09cc5ef8d380f56a8c1bff4b498caf6348d32ba6e0862cd64458db489d923dae423897c846de4a73976fd81d9d079bdef7cc5960a2858d8a0e76765dadf
-EBUILD gtk-vnc-0.8.0.ebuild 1652 BLAKE2B 56a2454b09a91851c9d850f903ab53d880f4a748c1bb3f4ad43e24fc5567f7427d98b2c8df01530efe930f8ba73a4071cc904f32a4729003ab596051de529dc9 SHA512 0e6365d2864201fea24da1fe8f527eb52d66578710b043709f3439118703c2c32672a01e0d0e888f540e8e281e0270f8558b3dce16fae78a7414a2f6052a20e2
+EBUILD gtk-vnc-0.7.2.ebuild 1505 BLAKE2B adf616b435a52abe1b2d19a9cb46fa0604b0da89d0cd23ff4b6fe3293059723719642a86365ab83c2b20cbfa39f4ca9ab2a7497970b788674c1b9831199adc0d SHA512 5bc465dfb2f9c9038afd28576f70715f6abbde76075b494f3955fc2ce58d2b38a2766599797702c4e64d4ee091e4e339f2deb094e87d524a8204084646c9b328
+EBUILD gtk-vnc-0.8.0.ebuild 1670 BLAKE2B ad2b87c1b2b9058e9358f281d171f8c2652b2753d6cda8078f83b2eff2eb5b8622b1c19657b861a9fed1cd04031477ae9bb7c4bcc6c611eb966c4de5a256f365 SHA512 f028c55af206e8d7c61a6af4269dcebce79741501fccbc51de3e54e367246c0f1b1790180edb13df09647d77363d2cfc248bcdd69cbd27330a065ef16047f644
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild
index 15f91f6c1a78..eaa330565575 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
index d974182179d5..7adbe4ab1f1d 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 1d217d5613be..deb2eb9ab760 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,5 +1,5 @@
 DIST gupnp-1.0.2.tar.xz 421792 BLAKE2B f89bd5f345637718a90fcd90bb4b0a17cf143042018d6a529a6cbac9c411218f1b014b5eee2a09e888e0dba195a1a8a31c078f0be749bb1b6d059a665c4ca2fa SHA512 a22082b10725abe233a8b3212a988a7c7e52a617aefe2029f25572d371560264cddd15eab2ad4637880b4be3b4bdb85dbc5c47c8da338667152c86eaecd7e165
 DIST gupnp-1.0.3.tar.xz 422912 BLAKE2B 900a2a81982a50239b26ddd5df3f57caac1ee66103e857b9014db7dc694e303c1eaa0633cb467887f3370e97058abc221bd0175c9df11ca4af31e3f802145a66 SHA512 f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448
 EBUILD gupnp-1.0.2.ebuild 2011 BLAKE2B 42671e326dd838016cff57ccdd59ca52eb4438bba27bd54eee5cfd94dc6a239d0e8385878477076ac2db85084401b1bb4d14ea7d253e24e3f3a2fdd86e5ad710 SHA512 c3dee380560695f76e4ad94fc473ba1ade3281d7006692b7a155073304c1abc0b4e3df0173ef56f1c24609253c504566b2505fd278e6c3b827f08bd2a5243ea3
-EBUILD gupnp-1.0.3.ebuild 1956 BLAKE2B f7cc3da9c110e79de91a6adf9bc2a2ef5aadcabef22f51dbd49da3bbeec31fdc8b2e3696422f101194e9dd532aa1a64e65f87b76eaba3dec479c27d802037cae SHA512 82c0b8231a22b25fa52bd8a2717b2a6c1a5e916e1e8cfedd4f5f14364a538dafee7eee6efaec4f36b32c9bf7395e101519c9fb37df8617f3dee69c16d9959534
+EBUILD gupnp-1.0.3.ebuild 1957 BLAKE2B 39893024403be98f0df39efb7cfb1927f82c4fb312aa21b160aa2e48dc7b50c2a048f31ee09932fe4380116daa6848cf9e05e19d5b25d3117801f7633659b7d1 SHA512 7c4fc535159979c758ab5643b81274386949dbae0d695b58d0b259df3e682a6999cbd91687a55f7da5018c40864f898a36f841520d3455656797b8a21d950086
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.3.ebuild b/net-libs/gupnp/gupnp-1.0.3.ebuild
index 7d734ad14af9..d9f07afd5dd0 100644
--- a/net-libs/gupnp/gupnp-1.0.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 multilib-minimal python-single-r1 vala
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
index 4ca43309d3fa..dcd39b985534 100644
--- a/net-libs/libasr/Manifest
+++ b/net-libs/libasr/Manifest
@@ -1,7 +1,3 @@
-DIST libasr-1.0.1.tar.gz 403110 BLAKE2B e2d4a1b233d9d714198e20c2358ef3dff78c0e86ddebe6cf44c0baecd2fdc54a09bf1424541026886461d5b1d006aaf2d16b567b6f3cd4e87f3fef3d42c43b47 SHA512 94afed300327622e597d3678525b0d30a0a4a812966040a92a7b7b73beebb2209c7e6931cea07841aba745e14cda6df0dea9a7e098a94121768850e1d0e8d5ef
 DIST libasr-1.0.2.tar.gz 406428 BLAKE2B 527ad44cc4202dd195d6376cfa25b5d8946f24df9c64b91b3468ee961b6d3228f8a3d38c94299e630df7088ae0bf7b16bdb560521124f2a3ee77edb2e67539d0 SHA512 a4825a30130f70a452044c484871ac37459e1c1e6659c4c38dead7d3abbdaecb3517b7accb46586537975fee033857566fd279ecf97ae87dc80bb6bcdd467d3e
-DIST libasr-201505061057.tar.gz 405953 BLAKE2B 0beb27054f2410c7f84251de39f9da63f47889e9444cedd83621e05486f40a6f33f1fb27e3f4dbd84e31e9214bbbf2736b1ae5265e8305dccd7afe7707df4ce0 SHA512 f3a5630fea9493c1638de7508cbf4c8d99db8bc5873dd874e48e05378ca551e6982590fb3ede6ea73ed5384eaf8968ebee0919a7c9ea463384d3f94f5c880f16
-EBUILD libasr-1.0.1.201505061057.ebuild 500 BLAKE2B a04645eda671c2231f7a25e4825607f9f03c2e7ecb7b11ea4d8aa89229dce3af38181fd0e3a36b76da96b96c1497da9c05b195e8f19240a3cebae74f21ea404a SHA512 e37efa3f5f2e9be31c8da61044a0c0c0a4daa510ec66219a99c1aa9b316d51162f0beede5f775fb3a1e24dbc050fd542b6eee0f0a7dd5952986f6b40e6ba462f
-EBUILD libasr-1.0.1.ebuild 386 BLAKE2B 09060a5e59c7981ef3c00546a174a3974afd9d1b1be7dcafb9307fb25f66f981cb7d697c25bbfa080de4bfdad8df2f9cc1da2e7986ec040febb2aaf4ff4ce415 SHA512 87a940c391ca5de9b19e5a43a75113e3016813b542df84f6d5d8ec19d2c4a4d27d4d6767f1c89158429c5fe2b009033e39b5715eb789567dbe82106562790d8f
 EBUILD libasr-1.0.2.ebuild 400 BLAKE2B 79809730d0c8ac358b44cdf8201eb223f62997a77be49271d8a95d9bdba04a42fd9a0002f074b858e356e5e97f23b22f7ba104a88c8860d9721efb10367b2342 SHA512 bc790a9487ec9c6d66f9c13ed70cb9c3790946534d6290d57cbceccdc44cfc06f4182097e31d03d622bc599400310c7802fdae3bd54d6555d6079b0403c3df14
 MISC metadata.xml 331 BLAKE2B fb0ff46381f7fa14f0fd15ffda08e378a5a88e9771ce464ad813e4c8cf7d2146ca45b2c2cc8c13756bdae2413758f7cba2c68cf4752405359f311eca700c7fbb SHA512 dedfef00a1e0f26438a1e0fbc9b53fc64566bd6def05260410d21aa3ff941ef0c5c9dbc205b3516052b0409943acbfb431e4702c87d1c94e9950ab9492f68850
diff --git a/net-libs/libasr/libasr-1.0.1.201505061057.ebuild b/net-libs/libasr/libasr-1.0.1.201505061057.ebuild
deleted file mode 100644
index c5c2c51038e3..000000000000
--- a/net-libs/libasr/libasr-1.0.1.201505061057.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD"
-HOMEPAGE="https://github.com/OpenSMTPD/libasr"
-SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 4-)"
diff --git a/net-libs/libasr/libasr-1.0.1.ebuild b/net-libs/libasr/libasr-1.0.1.ebuild
deleted file mode 100644
index d8319ee927a2..000000000000
--- a/net-libs/libasr/libasr-1.0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD"
-HOMEPAGE="https://github.com/OpenSMTPD/libasr"
-SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index cc25373280b9..10efc9d700d0 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -2,5 +2,5 @@ AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b
 DIST libsoup-2.56.1.tar.xz 1806416 BLAKE2B eb10d76a92912dcf8f450d6e8449e2aec26936ca1b706d16351ead4174f0cc107e6a2b43b96bf75c16106f8f4b24620bfb07814162390eba195b8a9f56a338fb SHA512 5ac087eeba346c27e884a2053a4f8afdb2fc6e432527f4494024a7edc4eccdf145188a3faa64e3f4bdd98af2fcb98914e494b4ed24f92cffc2ff1485dce7d693
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 EBUILD libsoup-2.56.1.ebuild 2715 BLAKE2B dafb5214b815895ed1f566c2404b3d57534713a57bc5cca21152c74ef34ffc14809b9da6f4b2caccf5b363f8ae9347e5843d7f8c87b24502e9d711f97826d7c7 SHA512 4ff03d9e87cbec65d8d11a979165832700fbc89a48e8b84dc86222ad8db8b491bf997dbdb8c1e6b4054983c11e96b7d14c4d91b7d0ed84b2a66e430aa725bbf0
-EBUILD libsoup-2.58.2.ebuild 2968 BLAKE2B 25d4ac1bf549a436a2474af06227968e42ef757b880d8b3e507581a2365240415250f5935bc7ac621c058a9518ebc6b36a0eadbe26e5fe74b6faec8d36d8d7e1 SHA512 d9bf7ec92692f5e817aa87d6dac19938b3a6d927fd443763021a98945b3a7bcce5237877af6d492f09b8813495dc61f2d26c6b1448bbf9163eed09a124479322
+EBUILD libsoup-2.58.2.ebuild 2986 BLAKE2B 02abc879d257bc02a4b864d14001f148c7cacc7973b67710e261fa4d605a559f55304e45c2bf4e335960bf113663b7dec7503bb90254e9123349988351fbdc35 SHA512 fe4435ebfce99c48b5c006d5cd1e9bfa4f7bdd2bf64e5ea75ade402971e04cfa9fe872122a5d2bb7e9f277782844b4c4e59b5b0e88c23690c5382fa6465568ea
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 1e532f9606f5..86606ab6b6aa 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,8 +30,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-util/intltool-0.35
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
+	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 0883d3fbcb78..893901602d0b 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,15 +1,8 @@
-AUX libssh-0.5.0-tests.patch 446 BLAKE2B dab1ad97c37e43f25ca6acb3aef57542f4f0e3059618240da0f600ed0aa364dc9c0eee92dc1f6ac848b11da2f69fcbb4b75b0393727774b928202f7f3685853f SHA512 e751ac1c3749ecbd8ee2f960ad09e861763cbdb9bccc7c95ae27ca4768e8c9ae5ab55342151a2799f8f937e63a8729bff6f04cec166bb9830b99f8f690da4825
-AUX libssh-0.7.5-add-macro-for-MAX.patch 916 BLAKE2B bc24cd008159c9c20ff75dc17842921ac1aa920d359aede3bc933c54024790ad9869ae44f9a81392cb73f967b6af69848d5e1c6ee2ea17c81edb8cb798c89b8a SHA512 9a9fd719cdbe42f0b2520104af4bd31d24721cb356d40a70870d2f95166c16e2c58c4a9568958a051214fa813fcadc55477c6a743d65c301ee27a83fc8abc119
-AUX libssh-0.7.5-fix-config-buffer-underflow.patch 742 BLAKE2B 5db1e2be05b45914bd832d1c3ecfa850ab2dfa88baba5566c41e8acf783a8dd0cf118851344dc8ddba39393532bede4d8a6134aa81d121da18bff9c1b4ffd27c SHA512 0e6ed4f39637b5bc3476225b1cbd28891e668609e681b4b55343c37d6a7f0c5be0f71ce684b6a83ab5e5f14cca3206d0752a17cab1138fdf274656ba36a764e5
-AUX libssh-0.7.5-fix-config-parsing.patch 1076 BLAKE2B f710d58d36ec529c9390647b1a53506defe4a480463e899f8d7aeb8fe7d0d463b80f87ab6ec35fd89afadadb5f7698ac3e33a6f5693092494bfb1cf43886a9e6 SHA512 45d21c11ce242d6f2a86fe1fe96ed934a06d0dd54b9e2af6ad873bbec1b0db91cb884879205f42c1006740a4cfc1c16723180f447640e96e8373b39be8828aa5
-AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba651342ac2b3dba52ef191271de37e741b2cb82da11c2f9cfb19d64a6befe9ebbab8d8525bd75c9213dee56c32023340db92e046827835df7ae SHA512 29bf9b43c8ee2f65c65040163fc9f250f35d5ca77ace5db2782eb8478dc14d9d16c0cf0e991025443a701d3d60124f83134a35e7cde6fae20932e3d2ff4b6732
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
-DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
-DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
 DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf8720a7619f3fc310a3d724cb7e85bcf81d31761c3fe4e3c29010b67d3fc81cf391d5c2f7e051cb8cc2400763248 SHA512 73d685bab2e88ff6b03c95cc13f1bd341bce4c527353c7e4870865d236cfbe23dfd2d198a1ec1531aed1afd700ce8e5b738ec68ca9152a4b6ae63dd6cbbf0d51
-EBUILD libssh-0.7.4.ebuild 2510 BLAKE2B f644104dcf0707121f141a2b75bdb57935daf4a01d897b5ffb96d6875e681aecfd9730cd02d6330acdf96256f012643659951ca4cd97e2126bf6991fa88ab14e SHA512 1a7bf07e67bb6caf4a183095347fc512dcfcb98a729db2cc1416f39a3bb201ad3046eec7c82c3aa07c7a9f3c5e6b3d3e908a4d32252b0697bdc76173f287a8df
-EBUILD libssh-0.7.5-r2.ebuild 2720 BLAKE2B 76d98f803d58cdea91439451e4842c3079bc19c052845d4f18d27fbd94faf4f3028c244b9ccacbfc27edf87490cbad7af73c3f540f012b3c597ca3596f65c20e SHA512 80148669a5bdb2b0a1cdfdd295ef833ccd51270cfdc2986109b2a6b1bad5da3908642c89e929fed5dc2fda20d8104b3dace60c0d87c7c6450bace22d091efc82
-EBUILD libssh-0.8.4.ebuild 2959 BLAKE2B 57816055c70eba2227d28b3fda732b8dea5e9a6051264148e5e9f799bf28c7056d5f814abf3cae9359072cb3c39a54c589a79832741ca7ba9e4ea07daeef36c9 SHA512 27cd551e09bab6ad5551f9c0c11fe6501d6ed638762bf59d1d3728b042a21d63bf09f6ebacdd2ab9fc2afafe1b74b05e9c4c9f43ab11ba369c4d77ac2f410439
+DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d4132a589e053f43f5de64bb764d9263910837a53be594e64595483ed9516dcbf20abc5071e9a8154b8bb75f6f4c SHA512 f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
+EBUILD libssh-0.8.4.ebuild 2957 BLAKE2B dd4df344d463601b948ac65ee55b23f5586384eb43941614fac7b77c16c2c20c0feac5e3ab78c98e8566f07cf6ab6a06e1a32476183838950adf39a3be2ab6ff SHA512 3aa65824678b47784712a1b50fd8c2a78e1ee069150bfb9221896a599704d732b40541492d5a26a9b5049d271a34a958a5fde0d8338e820c3f63bfedab46a7f0
+EBUILD libssh-0.8.5.ebuild 2966 BLAKE2B 9eed97687ac93fa78c65d9f6d0c939fd91ffeec0452ff76f5efd5ee64b21eb62075f09d52f674cba7d6b3e1acbf39e53311657530ea54202da7914afd365ed94 SHA512 af0724b5943b3c11f667508c8a232c5cf2dba642d6d72b0f4e307f5d93a26545ede0ce3dc1546d675c37b91c9367e1c6f45341d2ce42e32a907781fd324715d9
 EBUILD libssh-9999.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
-MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
+MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/files/libssh-0.5.0-tests.patch b/net-libs/libssh/files/libssh-0.5.0-tests.patch
deleted file mode 100644
index dde770ce5b2a..000000000000
--- a/net-libs/libssh/files/libssh-0.5.0-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/unittests/torture_misc.c
-+++ b/tests/unittests/torture_misc.c
-@@ -195,7 +195,7 @@
- #ifdef _WIN32
-         unit_test(torture_path_expand_tilde_win),
- #else
--        unit_test(torture_path_expand_tilde_unix),
-+        //unit_test(torture_path_expand_tilde_unix),
- #endif
-         unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
-         unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
diff --git a/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch b/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
deleted file mode 100644
index d9226d697000..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 310d423d36ae7bb6dac5a2ae2fb7b57bda72dcb5 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Thu, 24 Aug 2017 17:27:08 +0200
-Subject: [PATCH 1/2] priv: Add macro for MAX
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-(cherry picked from commit de35212789d11086621e176a11399de0d75ab3a6)
-Signed-off-by: Mihai Moldovan <ionic@ionic.de>
----
- include/libssh/priv.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/libssh/priv.h b/include/libssh/priv.h
-index 5a74915e..c3373c00 100644
---- a/include/libssh/priv.h
-+++ b/include/libssh/priv.h
-@@ -263,6 +263,10 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- #endif
- 
-+#ifndef MAX
-+#define MAX(a,b) ((a) > (b) ? (a) : (b))
-+#endif
-+
- /** Free memory space */
- #define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
- 
--- 
-2.15.1
-
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch b/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch
deleted file mode 100644
index 7ff03263d198..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0cffb88b80b1e8b7e292646b955e9b9ca02315c4 Mon Sep 17 00:00:00 2001
-From: Aris Adamantiadis <aris@0xbadc0de.be>
-Date: Thu, 8 Jun 2017 00:22:02 +0200
-Subject: config: fix buffer underflow with unrecognized opcodes
-
----
- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 519926e7..6187c90f 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -218,7 +218,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
-   }
- 
-   opcode = ssh_config_get_opcode(keyword);
--  if (*parsing == 1 && opcode != SOC_HOST) {
-+  if (*parsing == 1 && opcode != SOC_HOST && opcode != SOC_UNSUPPORTED) {
-       if (seen[opcode] != 0) {
-           return 0;
-       }
--- 
-cgit v1.1
-
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch b/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch
deleted file mode 100644
index 3596cf02105d..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
-From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
-Date: Sun, 4 Jun 2017 11:54:55 +0300
-Subject: config: Bugfix: Don't skip unseen opcodes
-
-libssh fails to read the configuration from a config file due to a
-wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
-effectively skipping every opcode (and therefore every option) from
-the file.  The change fixes that behaviour.
-
-Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
----
- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 6478fc5f..519926e7 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
- 
-   opcode = ssh_config_get_opcode(keyword);
-   if (*parsing == 1 && opcode != SOC_HOST) {
--      if (seen[opcode] == 0) {
-+      if (seen[opcode] != 0) {
-           return 0;
-       }
-       seen[opcode] = 1;
--- 
-cgit v1.1
-
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch b/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
deleted file mode 100644
index 931d63360a12..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 4893f9515da2696490e6bbe9aaf51f2ef9678b0f Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Thu, 24 Aug 2017 16:28:39 +0200
-Subject: [PATCH 2/2] ssh_options_set_algo: ensure we only set known algorithms
- internally
-
-That way, we will not fail later on key exchange phase when something
-unknown is negotiated.
-
-Fixes T37
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-(cherry picked from commit 895055ab38e7716390019aae5e11771a88b99d26)
-Signed-off-by: Mihai Moldovan <ionic@ionic.de>
----
- include/libssh/kex.h |  1 +
- src/kex.c            | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/options.c        | 11 ++++----
- 3 files changed, 81 insertions(+), 6 deletions(-)
-
-diff --git a/include/libssh/kex.h b/include/libssh/kex.h
-index 1a5b6d41..23594985 100644
---- a/include/libssh/kex.h
-+++ b/include/libssh/kex.h
-@@ -41,6 +41,7 @@ void ssh_list_kex(struct ssh_kex_struct *kex);
- int set_client_kex(ssh_session session);
- int ssh_kex_select_methods(ssh_session session);
- int verify_existing_algo(int algo, const char *name);
-+char *keep_known_algos(int algo, const char *list);
- char **space_tokenize(const char *chain);
- int ssh_get_kex1(ssh_session session);
- char *ssh_find_matching(const char *in_d, const char *what_d);
-diff --git a/src/kex.c b/src/kex.c
-index 519d79ce..f0c9d067 100644
---- a/src/kex.c
-+++ b/src/kex.c
-@@ -281,6 +281,71 @@ char *ssh_find_matching(const char *available_d, const char *preferred_d){
-     return NULL;
- }
- 
-+static char *ssh_find_all_matching(const char *available_d,
-+                                   const char *preferred_d)
-+{
-+    char **tok_available, **tok_preferred;
-+    int i_avail, i_pref;
-+    char *ret;
-+    unsigned max, len, pos = 0;
-+
-+    if ((available_d == NULL) || (preferred_d == NULL)) {
-+        return NULL; /* don't deal with null args */
-+    }
-+
-+    max = MAX(strlen(available_d), strlen(preferred_d));
-+
-+    ret = malloc(max+1);
-+    if (ret == NULL) {
-+      return NULL;
-+    }
-+    ret[0] = 0;
-+
-+    tok_available = tokenize(available_d);
-+    if (tok_available == NULL) {
-+        SAFE_FREE(ret);
-+        return NULL;
-+    }
-+
-+    tok_preferred = tokenize(preferred_d);
-+    if (tok_preferred == NULL) {
-+        SAFE_FREE(ret);
-+        SAFE_FREE(tok_available[0]);
-+        SAFE_FREE(tok_available);
-+        return NULL;
-+    }
-+
-+    for (i_pref = 0; tok_preferred[i_pref] ; ++i_pref) {
-+        for (i_avail = 0; tok_available[i_avail]; ++i_avail) {
-+            int cmp = strcmp(tok_available[i_avail],tok_preferred[i_pref]);
-+            if (cmp == 0) {
-+                /* match */
-+                if (pos != 0) {
-+                    ret[pos] = ',';
-+                    pos++;
-+                }
-+
-+                len = strlen(tok_available[i_avail]);
-+                memcpy(&ret[pos], tok_available[i_avail], len);
-+                pos += len;
-+                ret[pos] = '\0';
-+            }
-+        }
-+    }
-+
-+    if (ret[0] == '\0') {
-+        SAFE_FREE(ret);
-+        ret = NULL;
-+    }
-+
-+    SAFE_FREE(tok_available[0]);
-+    SAFE_FREE(tok_preferred[0]);
-+    SAFE_FREE(tok_available);
-+    SAFE_FREE(tok_preferred);
-+
-+    return ret;
-+}
-+
- /**
-  * @internal
-  * @brief returns whether the first client key exchange algorithm or
-@@ -668,4 +733,14 @@ int verify_existing_algo(int algo, const char *name){
-     return 0;
- }
- 
-+/* returns a copy of the provided list if everything is supported,
-+ * otherwise a new list of the supported algorithms */
-+char *keep_known_algos(int algo, const char *list)
-+{
-+    if ((algo > 9) || (algo < 0)) {
-+        return NULL;
-+    }
-+
-+    return ssh_find_all_matching(supported_methods[algo], list);
-+}
- /* vim: set ts=2 sw=2 et cindent: */
-diff --git a/src/options.c b/src/options.c
-index aed2dda5..34fe9cc7 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -164,7 +164,10 @@ int ssh_options_copy(ssh_session src, ssh_session *dest) {
- 
- int ssh_options_set_algo(ssh_session session, int algo,
-     const char *list) {
--  if (!verify_existing_algo(algo, list)) {
-+  char *p = NULL;
-+
-+  p = keep_known_algos(algo, list);
-+  if (p == NULL) {
-     ssh_set_error(session, SSH_REQUEST_DENIED,
-         "Setting method: no algorithm for method \"%s\" (%s)\n",
-         ssh_kex_get_description(algo), list);
-@@ -172,11 +175,7 @@ int ssh_options_set_algo(ssh_session session, int algo,
-   }
- 
-   SAFE_FREE(session->opts.wanted_methods[algo]);
--  session->opts.wanted_methods[algo] = strdup(list);
--  if (session->opts.wanted_methods[algo] == NULL) {
--    ssh_set_error_oom(session);
--    return -1;
--  }
-+  session->opts.wanted_methods[algo] = p;
- 
-   return 0;
- }
--- 
-2.15.1
-
diff --git a/net-libs/libssh/libssh-0.7.4.ebuild b/net-libs/libssh/libssh-0.7.4.ebuild
deleted file mode 100644
index f33086923326..000000000000
--- a/net-libs/libssh/libssh-0.7.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-${PV/_rc/rc}
-inherit eutils cmake-multilib multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/210/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-)
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	# keyfile torture test is currently broken
-	sed \
-		-e '/torture_keyfiles/d' \
-		-i tests/unittests/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_SSH1="$(usex ssh1)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_STATIC_LIB="$(usex test)"
-		-DWITH_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc -r doc/html/.
-	fi
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.4.ebuild b/net-libs/libssh/libssh-0.8.4.ebuild
index 9d50b41535eb..407643de5b53 100644
--- a/net-libs/libssh/libssh-0.8.4.ebuild
+++ b/net-libs/libssh/libssh-0.8.4.ebuild
@@ -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/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.8.5.ebuild
index 95aba9f77ea6..7b660604f3aa 100644
--- a/net-libs/libssh/libssh-0.7.5-r2.ebuild
+++ b/net-libs/libssh/libssh-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,25 +8,37 @@ inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
 HOMEPAGE="https://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/218/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+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"
+fi
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib"
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
 RDEPEND="
 	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		)
 	)
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
 	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
@@ -35,20 +47,15 @@ DOCS=( AUTHORS README ChangeLog )
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-	"${FILESDIR}"/${P}-fix-config-parsing.patch
-	"${FILESDIR}"/${P}-fix-config-buffer-underflow.patch
-	"${FILESDIR}"/${P}-add-macro-for-MAX.patch
-	"${FILESDIR}"/${P}-fix-internal-algo-selection.patch
+	"${FILESDIR}/${PN}-0.8.0-tests.patch"
+	"${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
 )
 
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
 
 	# keyfile torture test is currently broken
 	sed -i \
@@ -58,42 +65,43 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DUNIT_TESTING="$(usex test)"
 		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
 		-DWITH_DEBUG_CRYPTO="$(usex debug)"
 		-DWITH_GCRYPT="$(usex gcrypt)"
 		-DWITH_GSSAPI="$(usex gssapi)"
+		-DWITH_MBEDTLS="$(usex mbedtls)"
 		-DWITH_NACL=no
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_SSH1="$(usex ssh1)"
 		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_STATIC_LIB="$(usex test)"
-		-DWITH_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
 
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
 	cmake-utils_src_configure
 }
 
 multilib_src_compile() {
 	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
 }
 
 multilib_src_install() {
 	cmake-utils_src_install
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc -r doc/html/.
-	fi
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
 }
 
 multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
 	einstalldocs
 
 	if use examples; then
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index fa9ac337d5e8..d18691367b0f 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -2,16 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-  <email>kde@gentoo.org</email>
-  <name>Gentoo KDE Project</name>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
 </maintainer>
 <use>
-  <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as TLS provider</flag>
-  <flag name="gssapi">Enable gssapi support</flag>
-  <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
-  <flag name="pcap">Build with PCAP output support</flag>
-  <flag name="sftp">Build with SFTP support</flag>
-  <flag name="ssh1">Build with SSH1 support</flag>
-  <flag name="server">Build with SSH server support</flag>
+	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as TLS provider</flag>
+	<flag name="gssapi">Enable gssapi support</flag>
+	<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
+	<flag name="pcap">Build with PCAP output support</flag>
+	<flag name="server">Build with SSH server support</flag>
+	<flag name="sftp">Build with SFTP support</flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 6daeeb1a5d1a..96266f7cceaf 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -2,4 +2,5 @@ AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a58
 AUX loudmouth-1.5.3-skip-gtk-doc.patch 394 BLAKE2B ebcfed350077bcb67b0f7da9d0c9a31fa7483d4d927323490920f7d56b7cf78bcb6dfe04b4f59a36fac07c24267653ce8bcb2e17f2e19f4d2ad7037dca0844b5 SHA512 02ec191f33dd5601f9d875d3a5d0e1bc5baf904c18ca47c90280f860ee1449e51dbc7f2be841de85c8baf23d615574592ca8f9a913ae6b5dacd2583497bf8889
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
 EBUILD loudmouth-1.5.3-r1.ebuild 1144 BLAKE2B c0f5f6d6d538cc0661c678a00fe31ad6370b444ee01aa999ef19b1bd2861a8e7647df192471eba6756d121a0ec3ccf5a7360eaa47e2db0682a95c4ee5ddeb34d SHA512 1dbd2faec2ffbbad86a1e651a679c6994b7d1edb3e84460f174f78fc8d333bdf238e7c3d6a6b251fb61144cfe6b34bc33f00f8d6102c4d1f5b7bf58d1ba4648b
+EBUILD loudmouth-1.5.3-r2.ebuild 1174 BLAKE2B 29524a97e8a1c4bcd2d57850615725f8ec2b927d84d261cd7acd410b0f57fd0cf21dc5593d6d80e40eca6ddc5a0acb224324adb27fb65ddf2833cb586c2dee0c SHA512 524c7f0e58c2561b1049c2cc8abf460fa086d152ec5654f1b87f189086bd73c9237bb8476a76f1781b4bbd12b6a2663ff27fa64f95558560d3cd2a50f92a4af3
 MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild
new file mode 100644
index 000000000000..ad185ab77e8a
--- /dev/null
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Lightweight C Jabber library"
+HOMEPAGE="https://github.com/mcabber/loudmouth"
+SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+
+IUSE="asyncns ssl openssl static-libs test"
+
+# Automagic libidn dependency
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	net-dns/libidn:=
+	ssl? (
+		!openssl? ( >=net-libs/gnutls-1.4.0:0= )
+		openssl? ( dev-libs/openssl:0= )
+	)
+	asyncns? ( >=net-libs/libasyncns-0.3 )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	test? ( dev-libs/check )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-skip-gtk-doc.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use ssl; then
+		if ! use openssl; then
+			myconf="${myconf} --with-ssl=gnutls"
+		else
+			myconf="${myconf} --with-ssl=openssl"
+		fi
+	else
+		myconf="${myconf} --with-ssl=no"
+	fi
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with asyncns) \
+		${myconf}
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 78bcb9512c4b..4abafb409fc6 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,8 +4,10 @@ DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b9
 DIST node-v10.10.0.tar.xz 19960760 BLAKE2B dc16e2afba4be727c5169ac5cd77324e0e8d7270c96da141da21a175cfbd64a38f7b51b86264396f3866174abc9095f7c840303208f7193739a1970818d4ff3a SHA512 482518a72cb0bdd5d987a7855856eadaa4fecea933ff7791918edf3097588246782d86b27568c06764ef9f2bca62b64a4d65e4cbd0e934931a72dc5719db7446
 DIST node-v10.11.0.tar.xz 20144576 BLAKE2B 956d940554748f420589adab0f14bd6fcc6a4781cdecd537abd6eb9aa43e9cf754ef009b20d416f1ef4c9a01ef91a27a59a8c080c1c0a49a59388f75713d6286 SHA512 00a678a829de9b836e77dd0806799029b657cf000369ca653540d7e1b82c3895da43dbbfe4d3c2b3b2b1e711bf55b3835a351fad18affdd0c25dcceea8e3406c
 DIST node-v10.12.0.tar.xz 20185168 BLAKE2B 1a827ed08222900ef196921a57d64466fc558412bb27a26759553686c69d59d8e6686394a484156d254a01030077b09c9abfec87a7716aee06dbe9937a861efd SHA512 3b59bbe7b795e7a85520f6b4691806d8939d26cc2a5e5d22e6406d3d373ee7758da225bd25b6f6b71b105e3d7ef4c58220bfa5e558afd0cd873fbd7d6ba9efc4
+DIST node-v10.13.0.tar.xz 20184740 BLAKE2B 4c063889341eb2aa128096466cfdc2c91631a760ec7dea3e06b30990252cf6575b96a6d61dd1ba467c8d134b75ee51c897d4ec5c8f60b64ba51d3bc4113df63c SHA512 90431414f45c858efd6ed6259916b778e29712b57bc758f12fa7d7fafe5073c85fc379e56c86795936515f4c4f772ac308d3f6d0569c46305a7d49dc55c884c8
 DIST node-v10.9.0.tar.xz 19987812 BLAKE2B 4a5bd257cd527500b691b15d177bde53158b5e46e710ffeaa45224bae821cfaffdf59f24ad6bdc822cf468b90c1a4422a2f82d29e1d4b2dc0f838e3e0ab5b4ac SHA512 19c7366b4c9d1e255b5ac56e974ff86b9ca87c363534b467ecc3c59e170b891e86c479a2bcda6647c6df686b018caaedea84270e848b93a4f1c80ff04af12461
 DIST node-v11.0.0.tar.xz 20142548 BLAKE2B 97fc14392c449abde0c2b4ef27f020ac215747a5cca327b07ed735dd9867a01f1a64bfa19a62758111b0fbdca92b5536c15d7946bf968b5c3eab9c0b55f7dd26 SHA512 232243f37a8344775b2e0302601ec23310a8915e0913dc0cb0133df75cb7aad315ca0a6d039f8f9e6ae0d9f98aa8049532d80d470cf9ea0e309f8183be870000
+DIST node-v11.1.0.tar.xz 20207100 BLAKE2B 7ee0912f2fe99ccd2136c6719833b54af59099a2093a8698ebad7a55d4adfc26265e1637b1933e873552c9dbb50387d14c22f6e6785e9b02e866dcca9211c4fb SHA512 faea85516db2063f32ec9c6762ede0e29c8094ea4a52e030d6842df1f42b132d86515e01602510a717c42a69a2684e3758a9f08a4236dd8dd4e0171d71db3380
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
@@ -16,8 +18,10 @@ EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d95
 EBUILD nodejs-10.10.0.ebuild 6353 BLAKE2B fdb46cd02319dff1cce1b3c19523998da5b7d6ea69058f9b9f3763f093614a84b4dab91151797ce32d529b41d227a051ba489b3c41cffdf3597816bd1a9b926b SHA512 58a08d3e3d69784c41dccb32a3a7cced78e112ae8f30d86ea0d865255292941f953bca23a22bfb8a8a66135a688fe4c87f6af87f0526dc716ce177ab0f41ec66
 EBUILD nodejs-10.11.0.ebuild 6353 BLAKE2B 844b108d90a89a4fc70e1294b3e1efc4181a3555787a3446806ed62b79685a07544184da74face287074af67d2ec8abb9b1a91f3d0370b0d48d7185d1b7015ed SHA512 606e610f800ce9792d689fc813fdc09270ced425b4e76e07e8767853c33041f69d5cfa117976cf583c2bb811cfabf9ab2f86a287ed25b8bff9af4618bcd92660
 EBUILD nodejs-10.12.0.ebuild 6414 BLAKE2B 8f684f966fbc4e4a01a11dfae5bdd8ffd67ddbf896c229cc885e08e7b6360d07e3f3bc4eeee7086bde006d1098714c7077b777fc01d67383edfa37ffefebf147 SHA512 4e5782138680633590896771b5f548952a8b2f7665d0040d00bb37779616c44e3740bc808ed5a51114bcdd7b51d70a35183a1febf78eeaf53680137ecccd84b7
+EBUILD nodejs-10.13.0.ebuild 6454 BLAKE2B 56df71ab1dd8368bc99a7d2ac7a33a350331cc712b843233506a459b8a3457f32be5907e3d61cab8a60256a234bf67713b92b5338eb9c640c93cda159eb6f1d6 SHA512 b496a2c70f32e0cece70d182d7c1b069e498c83f6ef35c1141c4787ef10f51869febf7370e042970b79a46fa48f51c5490d9352dd53e87dd875afefdf95008c6
 EBUILD nodejs-10.9.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
 EBUILD nodejs-11.0.0.ebuild 6414 BLAKE2B 61fc56531db35943990d97f4accc37f8b469ab6948de7e4759d90e0fc875148769853d1d2dc2935f5538cd7c45f3576f9d274232552821b34bbe845d3ec19c01 SHA512 2b4c09b4c2961bc4803fa673a0a03fee0e6225fd81ef552061f75de9b8d142b0f3fd1df24da61c526fc1ec81e7873cb282a535e8d6fd83fc2d7b4f6eb9a692eb
+EBUILD nodejs-11.1.0.ebuild 6414 BLAKE2B 5cf2d61e52cad51da6989f3beac179f8d9fe5f37e055ec72c4acbc8e809b9c3d11d6233586e9979b8e9c920df5b65ca615f4904a1d400931710c3fcf6bbacdba SHA512 c1b13320e0d0755a4439d76f7e5cdef77653ab22745bdf1a63eae14c0dd30b9631fb480ea5f3353cd09f9ae48494e390607250af8a3a851ac657253f3447a659
 EBUILD nodejs-4.8.7.ebuild 4424 BLAKE2B fa72291c5b44ce0ba1a592b329be2cd9afa3539bf8419be567c457ef223d4ef3db32ae612795da32345c69bb8b141c350b312989df2869fea37e5ecd5afe44bd SHA512 461f777fac4899b55829edc55961ac021cbe6569fcec87bdb842c8a8b3db117ef74b0ec1e1ff01264f74ee71153e6a771d94d9bbea8fee753c1ea53b8c26dc9e
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
 EBUILD nodejs-6.11.5.ebuild 6079 BLAKE2B cae909f4065caf36f168acee12b6fd5a9a2c6fc1c612ae78d8ae2470043a75fbe4be1c0c7975c9d5e3546d334b55ea6d3644320eee952eb17b852e8417db5cbf SHA512 2a78ae710fe19eefc05f47b98ed7a3fd0d0ab84430ffbfd30e3134f0dc9ca80d811f9caa47e61fc99a840b589d05f3b7393e7495b70f36b982637504abf984d5
diff --git a/net-libs/nodejs/nodejs-10.13.0.ebuild b/net-libs/nodejs/nodejs-10.13.0.ebuild
new file mode 100644
index 000000000000..763d9f78f284
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.13.0.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.2:=
+	>=net-dns/c-ares-1.14.0
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.34.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-62.1:= )
+	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-11.1.0.ebuild b/net-libs/nodejs/nodejs-11.1.0.ebuild
new file mode 100644
index 000000000000..4bbb68a8177c
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.1.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.2:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.34.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-63.1:= )
+	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+
+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-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index 6ed01d2c54c8..380866413f56 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -3,5 +3,5 @@ DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca4
 DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
 EBUILD stem-1.5.4.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
 EBUILD stem-1.6.0.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
-EBUILD stem-1.7.0.ebuild 1368 BLAKE2B 05517311fd06cc2d8be9fee630872b6c5d709224b4d7053faade360fe1e5060ab9ed7d0fc60efc36736c1b186e74ab55cc8fb8daa35c062d54a785d172748044 SHA512 8e1a04b8089da0d90cb057eea67c94622fb304b47db9e38c604f8d827e7c5e43600332a169c90e52140bafe6b1cfd48a918eb680b1229018de7be2df72bdd5cd
+EBUILD stem-1.7.0.ebuild 1369 BLAKE2B 66637a43defc8025695cc1431ceb39a5ba3586f810d0d2d3cff6957f3c75a536de9308a2c00eae5bd1b35671c255e3731173181217b04ebaa241189296a4569d SHA512 6ee574e8276e7c446962604daf8896736461fb021c1eccd4c4db37ac85328d842e24929b0fdd5f4553f8f2ca8ffc12317fc94b18d4dc15dbeada6041dd5f91c8
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
index 8b3cd202ca92..1d52757c667b 100644
--- a/net-libs/stem/stem-1.7.0.ebuild
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
 
 inherit vcs-snapshot distutils-r1