gentoo resync : 21.07.2018

29 files changed, 637 insertions, 40 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 989280aed5ef..bf65a26ca1f1 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 4b7358ecda68..23ad91435c4e 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -9,7 +9,7 @@ EBUILD courier-authlib-0.65.0-r3.ebuild 5163 BLAKE2B 6c096213af78df0374243ba9c78
 EBUILD courier-authlib-0.66.3.ebuild 4465 BLAKE2B d2dd6e77898e81a731678e37c9c3a438a83fb5497d978b50eb02074438b22a63b2ffe37a3eedf7457209d94e1ee02d616cb72145cc87673ae307420a6a274554 SHA512 0738d4d20f42b55e5425142f215c3f10fbce26a1c4cd42b0a93c94b6de9d6ca657ff2891e2258279a0fa8c7ded193739c15ccba9dbbb74460e15b6685c8d4323
 EBUILD courier-authlib-0.66.4-r1.ebuild 4516 BLAKE2B 6babad0243712dc97ee8e717460962482bdf7f31f9a5d059d35f5e876cd1e8aedac11f4606795ccc9b86f414445126b3b6faf8c9cb6a6eab001e0567a3b12257 SHA512 7d3f38818e17602829e6ff0f30f00c32abbaffec7419fd482a973bd30239fce34933b78ed1fab7b6b149771ed4d3e36da43eb2eaf4caf994efcf624956dc02c4
 EBUILD courier-authlib-0.66.4.ebuild 4507 BLAKE2B 7ccddf9fe24f3c2787bdebf26ac5cc721ed64b6a3acb94d778a51dbd5ac177f08af4e07406d4bda38bf30dcacda24a4ffecfbb878b66c4115edde49ec153eb07 SHA512 f23af0db15399330915a10eb8cf24dae2724c1eba1810ea010db6ebfe6b98127c4ccf4e7b122c7ccc857381446eb18eb81d62d9b9aec187612a3344f80751cad
-EBUILD courier-authlib-0.67.0.ebuild 4560 BLAKE2B 0f6e95e479106c135f25227f998c6f66082661d27cec454c63a7814be242a3c96a024bf3b4fe71ee0d7d26860dbea14f031c9d3ad5d3f8f27136eaa247b94e24 SHA512 45919327d442a889a1c7803a64d2b93c9549e01aebbb72d10670002bb2b9d5dd8a6cdac11e68cefb237b4f5f665b76604ef5add6f3a63dc947b2388c310aa2bb
+EBUILD courier-authlib-0.67.0.ebuild 4559 BLAKE2B a6ccafc2841c77b7f20d4a9345d538b981e6720ef7ce8c3c2c7a6945150cd5443061d1966de7852ea95e0adb7df06cd9d2be6188b52aad285f906e56c91e19aa SHA512 8e2d0c01762c859d77db022637afae695d6f412bdc28e272d6e0431fcec53ecce8e66a573387de80ad7316889af114eff202d96ac55ee7d9d0b847a9db28d47b
 EBUILD courier-authlib-0.68.0-r1.ebuild 4560 BLAKE2B df061f092e834802c5c9b7ed00dfe2dc4689d125539ceea03d19dfe0cd5a2d98369cf38254b592d86b522767631699d582b35791a462a32c4c0e67f0d74400df SHA512 7951967aeda9b1c3a0fa51ce74e53a98605db8216b276bf8b3d19deaffe2af1bd2b2273dd8d1d11fa07836c0f0baf0a3858dcb45f0e1ff67bcf2c6a35347bb86
 EBUILD courier-authlib-0.68.0.ebuild 4560 BLAKE2B 0f6e95e479106c135f25227f998c6f66082661d27cec454c63a7814be242a3c96a024bf3b4fe71ee0d7d26860dbea14f031c9d3ad5d3f8f27136eaa247b94e24 SHA512 45919327d442a889a1c7803a64d2b93c9549e01aebbb72d10670002bb2b9d5dd8a6cdac11e68cefb237b4f5f665b76604ef5add6f3a63dc947b2388c310aa2bb
 MISC metadata.xml 405 BLAKE2B 825e1751581d92e1716769ead19217a1fbd01e31acaace5ef73a51fcb92ef7737e6e73fcd5d3fb124c586fdb39bed2c837b0057547581bd0529ea9034504c21b SHA512 ca3fcfc719c6c05c2f693a1e4896f7788acbfd083dce4358a94e1c0227b7d50d4e06f657ba80236a574b052fca6c03bce45a256bd65aa963915f4f577a413bbe
diff --git a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index 951b69d639fd..fd7d8f6786c4 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index fd4b4c231afd..be1daf83aa48 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -4,6 +4,6 @@ DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f7
 DIST courier-unicode-2.0.tar.bz2 446215 BLAKE2B b5e24f47f1714b71aa2fe176b4517eb49a04780a62f025c5a6546353a03defeedef5cd19f69a35a2646edbf88b4774abcf30c718fa4aee8f17feed6d3f947172 SHA512 32fe0aae62d7f7f7ac6832b28515b83642753c6bd881e95494254b7055686dc38d85488aa26a99d82a5b42aa5cce308bccc2b471580603f690ed6e405cc91e8a
 EBUILD courier-unicode-1.1.ebuild 440 BLAKE2B 22249cf6ba2a420b508cf69e49373178f275c7859bbc5825414ffdb3f3ef4be761225f698ce0692d16f8641c8e12e346667b710ae9252b5fee83313252d57a3f SHA512 3e2e121bedf09408d04c80666d840fcc6716b26b6adef9089d9c90e0b7f0ad9e61625909136a91491bf5adec8229e5e0548ccc5874cb88aec67c7e5031ef57da
 EBUILD courier-unicode-1.3.ebuild 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
-EBUILD courier-unicode-1.4.ebuild 477 BLAKE2B 2907f16988561ec6d663bcd311ee4b9a2ac34cdefbe4c486d324d3f6f6cf4a9aa8f5146f97ab97f09e6739a48797997814b0ded111c45f747b11d8ebd4724a6f SHA512 478ec4301b74cdbeb76f627dbc6c46605ea27314df686e236a04c290537f22b61f9a17ecf51a7c2641b363f4a2c6a71b41354a1cd13ff1a7f229d0d418d6f0fc
+EBUILD courier-unicode-1.4.ebuild 476 BLAKE2B 771db130fe65e6706575a479e41da3c7d682c22686ad5b6d653825dbde257ebb4be4c8eb517f63bbde86f980d794dc076a68e7b260959b3be0eab9c2b3cf6745 SHA512 fcd044aa0ae0369605ce07b06ea8da6dcb7fda9b6c11890c18277941371ef7f1f59d07e96fcafeeb1cf82f57054036d0c6e9e104c39588f77b0653a41299739d
 EBUILD courier-unicode-2.0.ebuild 482 BLAKE2B 9fe175a175903d8482aa7e8656e2c86f2eecc404a84559a2b7f9a986fd3481f56ccd69e25704cbf3af19f82d070858efbcd38dfffb3448f3f3eceae7eaf1e826 SHA512 8091fb06b485407bca3119709ac8b71d209ff2dad451c632ec79e66ab72b7c1c6c69e3f7e4b348ab2d5d43b660e502bc0ccbf4f6686624b4bcabeb6909ada654
 MISC metadata.xml 398 BLAKE2B 5a29532863617f727864e5a02b31d9170bbe09d5bed8641c94aad759997613832940cdffdaf8ed31c44b41b3c5e769ba220b5e6fa53c9d3540d9646e9c31a492 SHA512 78789db4f9e2b92e56c3833245f64c31bc274f6986b70af9c3bda21e5c6d3c6b3987a6a97e0ec73aa619d71ee814fa6a263ed8d295ec7473481134769414396b
diff --git a/net-libs/courier-unicode/courier-unicode-1.4.ebuild b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
index d477926f5430..3d7b8fd6cb3e 100644
--- a/net-libs/courier-unicode/courier-unicode-1.4.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 22a532facb73..c626b27a2ed1 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a
+DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4
 EBUILD gnome-online-accounts-3.24.4.ebuild 2471 BLAKE2B d5748c5b547daaba2a7eddd8141219d00f102f3522bfd3e7d03547db3a7114a9fb739a7d93a642fdcca6a549734ca4c20bd724fbd2d72b9453d8eae407f143fb SHA512 a7356397015414a0a4908eef03f38cb96286268bda14a82bb996ef2df1bdfde5969b0761b0f4a7ded9c4e4d065f682f16f60559b3af6b946fdb53cfc6b56531d
+EBUILD gnome-online-accounts-3.24.5.ebuild 2473 BLAKE2B f589b5a55606011a556628ec04375cbc47b330100665409a693f8eec7ba15c23de2323b6e5c0f269ca8fc71a118f8a6b493a410b7b7890d569050b353d6b73f6 SHA512 18b212a9b3b3896252eff5d6455adeadea67c8a7f036c2e7018615aec0cd7002babbc431b2d4360d50752a1a5937f7ccd5226970b7f95b7ae61cbc9f5077504d
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
new file mode 100644
index 000000000000..4acaf6e21902
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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.44: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.7.2: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
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+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
+	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-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/grpc/Manifest b/net-libs/grpc/Manifest
index b6b78125b6f7..bd16db687c6a 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -11,8 +11,10 @@ AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec59
 DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
 DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
 DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
+DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 EBUILD grpc-1.12.0.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282
-EBUILD grpc-1.12.1.ebuild 4150 BLAKE2B 211375c9194684d63812417e4701ce54588237d65350d2d8bc956b5106b352f9ba204ffb174d8e7e8609851b282c816a008aa792e28e067d98a30a31db8f8591 SHA512 8531b6975d0f95dcfd8f1231caa2b6135a1f1ede25ee0ec2156719b3f238adaf9a5301e5cc7832e9b7fe62cc668fc2beb84d28e55ba16a8c4f3d099cf98e25d8
-EBUILD grpc-1.13.0.ebuild 4259 BLAKE2B 6c034723907f6f1c464cac41aefa1762e36db3c027ec2708a851f5732dbcb8350266169d09b71ee10fa3830613252af657cf7690ec0c792d69155b598a9062c9 SHA512 701c7179e1b8adb308bc9acf6b892970d4fa2c261e13fbe56a3eb58c347709b593743b3a0adf239b78562bca3d00e71439cff9a768ca1b168c48bdc1fd8a3340
+EBUILD grpc-1.12.1-r1.ebuild 4259 BLAKE2B ca43c1322b2b3b372de13bfb27e671c21cc6754eb161a8bf81756001c71d8af9885739950732064bf925a402a4d1b754d78f84b737dffe956dac86a946c2468b SHA512 21febff464b1551c011da6fa9db30a3ba63b9b62b7e6eef425890e4814ab7de11e8537d81fc525ebe2841cb91e3e31feba199634ee49c5b6073456bd365e12de
+EBUILD grpc-1.13.0-r1.ebuild 4368 BLAKE2B 349d192044bd3faef859aaeb4b6d5dcf466c5f29daf477563d0a0c2709e57b60548b4f96f2509b5234b166cb2ef58c6dc7b802a1990b0a2d2eaa230641872941 SHA512 147de0ba938be55d3b0592a547cb535c07ae8c4daba5381f6d02e1b3228d4116334e5e31119482c5da9b01df523edecdbe6715f127e180b937ba961404f6222a
+EBUILD grpc-1.13.1.ebuild 4381 BLAKE2B 49dd3565bb52ae69ff98e90bc74a241082835bd48e280b048f92be0947184b3870a242761c7adca42679cd0549254a9cf8b79ca6d99af8aa1d403b1ed88fb3b0 SHA512 a428bc0e88112227b9526d0bb431b9f0eb4fef2cfd8dcfae1c9df6cb6b3949423533dc08d37202e9822889139a6f41256b6530a8d95bd3f88b3102d1a22254ed
 MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/grpc-1.12.1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild
index e57c672f4837..6c9403c76269 100644
--- a/net-libs/grpc/grpc-1.12.1.ebuild
+++ b/net-libs/grpc/grpc-1.12.1-r1.ebuild
@@ -83,6 +83,8 @@ python_prepare() {
 		ln -s ../../../../third_party ./ || die
 		# ./grpc_root -> ${S}
 		ln -s ../../../../ ./grpc_root || die
+		# https://bugs.gentoo.org/661244
+		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
 		popd >/dev/null || die
 	fi
 }
diff --git a/net-libs/grpc/grpc-1.13.0.ebuild b/net-libs/grpc/grpc-1.13.0-r1.ebuild
index 824ec4b1aa05..b3f51b4ee149 100644
--- a/net-libs/grpc/grpc-1.13.0.ebuild
+++ b/net-libs/grpc/grpc-1.13.0-r1.ebuild
@@ -85,6 +85,8 @@ python_prepare() {
 		ln -s ../../../../third_party ./ || die
 		# ./grpc_root -> ${S}
 		ln -s ../../../../ ./grpc_root || die
+		# https://bugs.gentoo.org/661244
+		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
 		popd >/dev/null || die
 	fi
 }
diff --git a/net-libs/grpc/grpc-1.13.1.ebuild b/net-libs/grpc/grpc-1.13.1.ebuild
new file mode 100644
index 000000000000..620789c5cc90
--- /dev/null
+++ b/net-libs/grpc/grpc-1.13.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+# should match pinned git submodule version of third_party/protobuf
+# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
+# also should ~depend on same version of dev-libs/protobuf below
+PROTOBUF_VERSION="3.5.2"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="http://www.grpc.io"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc python systemtap static-libs tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-${PROTOBUF_VERSION}:=
+	dev-util/google-perftools
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+	python? ( ${PYTHON_DEPS}
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		tools? ( >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}] )
+	)
+	systemtap? ( dev-util/systemtap )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		python? (
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
+)
+
+src_prepare() {
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+	default
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare() {
+	if use tools; then
+		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
+		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		# absolute symlinks will fail
+		# ./src -> ${S}/src
+		ln -s ../../../../src ./ || die
+		# ./third_party -> ${S}/third_party
+		ln -s ../../../../third_party ./ || die
+		# ./grpc_root -> ${S}
+		ln -s ../../../../ ./grpc_root || die
+		# prevent above symlinks creating huge SOURCES.TXT files, bug #661244
+		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
+		popd >/dev/null || die
+	fi
+}
+
+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)"
+
+	use python && distutils-r1_src_compile
+}
+
+python_compile() {
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_compile
+		popd >/dev/null || die
+	fi
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py doc
+		mv doc/build doc/html || die
+	fi
+}
+
+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 doc/. )
+	fi
+
+	einstalldocs
+
+	use python && distutils-r1_src_install
+
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_install
+		popd >/dev/null || die
+	fi
+}
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 16bcbad7514d..d94f29918c2f 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,6 +1,8 @@
 DIST libisds-0.10.6.tar.xz 724120 BLAKE2B b6d3f42d4ff84c377c9425dfd84a14ae97ccc39ea4bb96169e3a8de21b99dd6e5ceda39a6d4a574ccb418561dbec2507f72afc8b6f185c34ff92202abcc49441 SHA512 602c4e7f047dedff131cda941d02ea41fca7b8ea80eb668ab8f7ab2626a013ddc1a86f1e2c7b5759adf266c7c22c515284e6d4fdd9fd594ad310bed1be6016f4
 DIST libisds-0.10.7.tar.xz 724840 BLAKE2B 73d93b518271cbd08787a38da454ceb8fa6c2d421b0291c61cded8f1438d44c5607d1e90d75714c3d76e0886ac723e38dc2a41d60284a58d567abdcba76becd4 SHA512 ba2ef11c2983cb3bc8f779e7af3fb8319d38a786911e68c6b53c25aff339b4630bdf78886825ea3da671e87f689cab376cd9e41398f3f74608af932abe7a0023
+DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
 EBUILD libisds-0.10.6.ebuild 1160 BLAKE2B 5f4d4d1805b282a16e7967af3c0a60c16ea7a3460b065222c4852c0c86883e9773128435f22ca9386a1c21ba5f75c5657f5ea592eee710c3bed4e27c1f21c09a SHA512 dcf884de16b11260aa3db9436a3298c2dd4e36a3f7b25646e336654da908faebf1cca5b2fc61784c87f2defe56f13473ea578269fae972904652c15b85af15ef
 EBUILD libisds-0.10.7.ebuild 1160 BLAKE2B 5f4d4d1805b282a16e7967af3c0a60c16ea7a3460b065222c4852c0c86883e9773128435f22ca9386a1c21ba5f75c5657f5ea592eee710c3bed4e27c1f21c09a SHA512 dcf884de16b11260aa3db9436a3298c2dd4e36a3f7b25646e336654da908faebf1cca5b2fc61784c87f2defe56f13473ea578269fae972904652c15b85af15ef
+EBUILD libisds-0.10.8.ebuild 1161 BLAKE2B c6cd8879338b6b0cc099cd750035bb73308db49faebf0c5a980fd3c821e77c3647b34e8367b4c3fd7178ee416ea18cf8e462405140ff93a1053419daa9ab7ea0 SHA512 b53e2d5f10cafd816a22a4962d66bdbbf14cc3a5d8963b3737d9211ab311f088a71e6fbe48270518bf6594c0526faf52901496c766607bf905498f7f78994176
 EBUILD libisds-9999.ebuild 1208 BLAKE2B 996a41fa67545b9ea3b26f69d101de67ec7d38bb2a5bf001f037c6f706296a3ec09816a05f1d19b2abd3586cb606b5bdcace401e4f4e684e5a72ceb94455ecd1 SHA512 440120e6d3d583780020b4c2e22a8f0598c2c28ec81da44c4df4c4018142e0051fbcf9aa7fd0e69ecddadbd3b09f8f4b38441284c7b8ca784f7efc162ab5847a
 MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
diff --git a/net-libs/libisds/libisds-0.10.8.ebuild b/net-libs/libisds/libisds-0.10.8.ebuild
new file mode 100644
index 000000000000..1470c31c1070
--- /dev/null
+++ b/net-libs/libisds/libisds-0.10.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Client library for accessing ISDS Soap services"
+HOMEPAGE="http://xpisar.wz.cz/libisds/"
+SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
+KEYWORDS="~amd64 ~mips ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="+curl debug nls openssl static-libs test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	dev-libs/libxml2
+	curl? ( net-misc/curl[ssl] )
+	openssl? ( dev-libs/openssl:= )
+	!openssl? (
+		app-crypt/gpgme
+		dev-libs/libgcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=net-libs/gnutls-2.12.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!openssl? ( >=app-crypt/gnupg-2 )
+"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-fatalwarnings
+		$(use_with curl libcurl)
+		$(use_enable curl curlreauthorizationbug)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable openssl openssl-backend)
+		$(use_enable static-libs static)
+		$(use_enable test)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 7dddcddb766a..87ed5a2233b3 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -7,8 +7,10 @@ AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a
 AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856ad2c0ebaf68dc99b8a375158a112c47e0dfad7763caff7b0f7da8ce5b1ebfcb79a6cf3cf72636605dfd4097fb711 SHA512 82e0c48f2fc42c8df4a21009b9afac18ca4aaa14db822c0c85b4ea420434391dec3b5da90261d7afe01879354b43ef425c7464c9fe98a407a4b232590e361117
 AUX libpcap-9999-prefix-darwin.patch 394 BLAKE2B b54df9fa5f1d796ad4739b2ae4ea55a8b66fc2ba434438a0e17cbd7ca5bfaf5d1611e0d8431be45d3fb80dbd61bc2bda2b6fa50378da4780154b4ce523a688d8 SHA512 bfd560b1bba72a84c5afa1cdf166944e9ede10cb817c7273941b3fc0838ca2676adfd143c0e8873f234de343aabb2177f46f2cd062738d2837d42a1da7370083
 DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
+DIST libpcap-1.9.0rc2.tar.gz 820710 BLAKE2B 0c0a56769ba1dd8a4698f3ee14be9f831603e8553aa55991ad032522c93d001adca4874fcae5cda6174b8c9dc532b3a88abcb2a1256efa907cdd570c691f09bc SHA512 d1f04bf7dd6f3fd0bad0e145563af52084736227af447c1ace4fd47deca0529041457d4eb099c50e77671e0fc3ab2eaef089e98e26a8c89ff900801e7082b330
 EBUILD libpcap-1.8.1-r1.ebuild 1952 BLAKE2B 5bd058d1c738a3e8b19c3b63a9b7c7860dd7ddeebaf547c839fe4c99f0a543724a94af0f45f71b33ab9a47f02801a91aa0e6d11cf9d8df2b8af8f2fcc3a7648c SHA512 cd158b14c41661e28f87dc2ce6d82d037ab243fbbaf231057943079c23ed1116591262adde4a314ff7b9717969b3f722e33990598f7a93bfe47b91c1b2b4c70c
 EBUILD libpcap-1.8.1-r2.ebuild 2014 BLAKE2B 946e33f229507957e49927fd17cca8bab97b40aae6f26f94a0428961aedd9c6c1f795e574fdd406d419e4b3388176226d15fce66422c055660c34a61ae2a91bd SHA512 d9a4f50d26a7bb0ea07ae0ba9e8f01174cd22abe9f3df6db1af7fbd4e9d762d6f0e48891d3a117ef72fbd8bfca63fd80bd8864c3352d5ceaa937ad59ae9f5497
 EBUILD libpcap-1.8.1.ebuild 1927 BLAKE2B 5e6b558d87a07b874c3c945848d21694930ed45899c3d9675cbc76d87a0cdd5048b00737b3abaefeafb579d4b925f588b363dfcf6c2639d249a27542bc92abe7 SHA512 29f28f19b0a258b0102a3d1ae611673d51f1649667b8816aa4dbcb36c91866cef2ea09c9bd03adcb74a524fa587b44de5056308d901d381e7bebe041dcc40c45
+EBUILD libpcap-1.9.0_rc2.ebuild 1814 BLAKE2B 57ff3e23646cb9a4dd371d75e62fb038173f898c468c8d34c7da05849f097d0ae9c67f8a48bb799528c8ff3fdd78bb0ae41965ca782ac98abb468fed2f706b5d SHA512 69fd6345d365ef3972a96afdae8a873d8d38bf14be5dd9c80eeea502a700625c16848bbd828c7f6f0249a0cadac4d3f32fc9cd88c282f19ff22ce13c6afe6fd8
 EBUILD libpcap-9999.ebuild 1505 BLAKE2B 0071ca57d3c8d1dd7601b5b52e3e3fbb9f45fea0afb9361557856b31bf1ccdfd6d408c1adf46e54d619f55a99eccc18faff6919f5412782960012102d0ec240d SHA512 06600088a52b75baa2c2a4aa90a5c6d8dbae5cbe54d5b74d5702d0adcf762a72c6546ff151b2750a45fb1e7fa20f621c0d9e59e83cc5f370cf91762a97a72e24
 MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
diff --git a/net-libs/libpcap/libpcap-1.9.0_rc2.ebuild b/net-libs/libpcap/libpcap-1.9.0_rc2.ebuild
new file mode 100644
index 000000000000..93560ef4a407
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.9.0_rc2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal ltprune
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink static-libs usb"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+S=${WORKDIR}/${PN}-${P/_}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
+	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
+	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > VERSION || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable usb) \
+		$(use_enable dbus) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+	prune_libtool_files
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index e30533703f5f..25b5d9dbb757 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -9,5 +9,5 @@ EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770
 EBUILD libsrtp-2.0.0-r1.ebuild 1911 BLAKE2B 02c26044260d022738fb2ef726181f05b1ce5144d03e5a7efbdf371908ea2985aa373188f319034b8eff65f0e9d0fc290d8bfdeab564f5e75e502bd9bb922cb3 SHA512 8ee91195f444de10b1fcce602943d099ecf7ef4b2e4cae9d92c41fb71842db6395ec572bd298669069138f4525ae4008480c36000525d02f16ce8fe7ff5e757f
 EBUILD libsrtp-2.0.0.ebuild 1711 BLAKE2B 9b3d9549d9b491a8049770229bb364671f8c89e63281b84d57050d0092072eeed9bb402073c012b44d16c0b9a45c3351b6b0910ef9d7d60ce26af383c73e76c8 SHA512 68343d3a4f86f72f6881e885a89110360e7e342ae65fac94706c0e08fcd6af7a0d00bf3cdff91f11cb77482e86ddbe7b041df7c4a9a59b54caa79e2346fa9c62
 EBUILD libsrtp-2.1.0.ebuild 1888 BLAKE2B 745b206204bd6b9ec77ea27a94a024154f0b495f57656e4c432de9a928fc043fc67408184a70af66a256cc17ae49c50d430a987350134193c2d3870447fcfb91 SHA512 b6999a6b65f2d0536504273644e99de39d9a8787021e0d16a2a205afaee2ca9e3487a41202bddb1e67c298e585e8fa84cf26699aa769cf259d31e5a6e8c18513
-EBUILD libsrtp-2.2.0.ebuild 1851 BLAKE2B dbe6659a09a18039d93b1f4018336ef8f32c8c3beffa2d52e81fcad14589742ee245a950210a912c8298a8660507bf032cecb02bfb0a8a573602d1c51169ad3e SHA512 1b2b919949ee53b5c35549a49e62b8b8ff09a0e498c6ed996d727edb2399e42066c7638aacae52c25aacb1ea0ef819a53649d01cfffb5483902bbd652d84ab25
+EBUILD libsrtp-2.2.0.ebuild 1846 BLAKE2B df425613aa38b8c5af2ea2ef48efdba68be6b6c124c748760fe071f1f8282b78356828c79bb47147ea3dc3863abac583347638ae79aab0af8b8914678aded144 SHA512 c8eba2c9a27f98459b8b66756e748e9a970effa9eb9a19226b686b8069c2c7cf9a4a77eaae5dbb6eb4c42f1d7eeb44beebfde9b8d2d07137c52e104d598db401
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 05aa4830df6b..6f0a9d03662a 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 0df6aba9caac..7a956ae079c0 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -2,4 +2,4 @@ DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d898036
 DIST libtorrent-rasterbar-1.1.7.tar.gz 3951887 BLAKE2B 4729a718f5ce5bf2a41506f18f48bc588ad863ea8e640dde6f9e0a35bb909ff651fca3c8729668b25507fa3928218be579964c683d9d6bf3dc1c3abcce0f9452 SHA512 e35e95eec55a69b81c1d21f73e230dc4de7502b5adce99193c01b0d89a04b0f484788ff235d3f73cc77eeccba8d8d441fac92aa76a17afb56bafabd318b4a75e
 EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2398 BLAKE2B 319dd61c379cc1e0b92f938c9364eb9af477e017fd2595ccf6bfde65a05bb8d7d27ac3ed7396233aedb24a1b02296e33fd66d42af74bc8b31f1ee97efc6c5a0d SHA512 ba767f43b744e9f1a50c7a559b91a8b45009a1b08820852c9a005d3d6a2c7f6114a6091cbfed2df34e9e7bb2c75ca10873af69bc067356913774f027b27dd2e4
 EBUILD libtorrent-rasterbar-1.1.7.ebuild 2402 BLAKE2B 56c5cd008f5228123a10ff5947d181fade302610184e6f5e17061f67644876f3b7cfe1531a0844ec16ecfd2b7c2b506e12566f06cbe4fd9e51e27a67f5426b83 SHA512 7381f9f833bc83d01504b4d47312185d6459cd0e9ec4c49999e31c877220260326db5136d7d6390d014af52a5abd20ec9523f3491b8bb91a4af5d068d1453a19
-MISC metadata.xml 527 BLAKE2B 3bd0290e624e222f59731d8c5806b8a4185d637adba56e1fbdd83a7b65156a97fa39743d8d9ea7ce9d8bc6fd0500815d39090b9b53e5c77e40f03b61ece94843 SHA512 7dd3d0492dd77ffb05fa50b96253d8e7cc01c86b9eedf3891a5b8b09e49ef8d51747890a874609c077d95d5144f949bb31db9bb40e0ba520a3917a548db129f3
+MISC metadata.xml 444 BLAKE2B f9abe9123b6f4b841accff6c9eec879a0aab90abeba75ec1d08b1a97d179e18645bf47d2f0ba039fafe43b3340a5c67479c67e09fe25910429fe6fa382c0eb20 SHA512 5d8a3bc354ddba410e8b394303f4faebc8072738f1ac1d44b7a3af02116c8a67b4edab39e730c35c313c8abc44703fc7b22709766e62da9aa46de15ea2c3d962
diff --git a/net-libs/libtorrent-rasterbar/metadata.xml b/net-libs/libtorrent-rasterbar/metadata.xml
index 7cac58e92207..486018d1ae1d 100644
--- a/net-libs/libtorrent-rasterbar/metadata.xml
+++ b/net-libs/libtorrent-rasterbar/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">libtorrent</remote-id>
 		<remote-id type="sourceforge">libtorrent</remote-id>
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 93d8ddbdf3e3..91972435f75f 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -2,7 +2,7 @@ DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe6
 DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
 DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
 EBUILD nghttp2-1.29.0.ebuild 1855 BLAKE2B 0793576995532dc0626a55ded3a58a9c821a8f982f7cf02457145893cd953f1d369454830f7882fd971cac20b7bfda05fea27e9012367433dedfec0b3e302022 SHA512 e52fce760a93bbc0dcaa3f1625bb7a3cd9abccd969881ed17e4e33d5f4a0bdd3f4ec805667c1f4dd98fdcbc3427fb3f0e60083543c80a0864733f4c358ce19fd
-EBUILD nghttp2-1.31.1.ebuild 1865 BLAKE2B 0c3885e7442978d0bb8b80620a8a720fe44763795accc7672d98c6bf5af0340963a3448e21da00558971bb4836c5fc7d7b9676646c289992b98051e4ccb8f306 SHA512 f72b769c28f8ab9d599e4d06a3d8d0f31a8f5a05550f8adf7b29db826e117ae393ae14f23ea7bd490bdf85a5d82bab4f9f31451412cf044fa320f19a0bc84c14
+EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B 7a7dd9bb67e6f900d02ab38353764655ac32b5f7d62f44cbb0d6daca3e476626666330a27e85abb2297cc507206767f26fd7566c7e01b079d4ae213d552e2e4f SHA512 879b31dee79958bc567f0730718dbd2da3046e5a1104f8b619d2fe19f8fd3729dd3892a3e5c1856ef9cecb71bd4a2034e32ca99ef9121499ca5606bed06cf3ed
 EBUILD nghttp2-1.32.0.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
 EBUILD nghttp2-9999.ebuild 1937 BLAKE2B a3fbca3092493aa311acca430b3c741f3e5b7f2b573463a2f90c10c12c6e83a6a18c53ad993c5333895596862da9112ac8c8eac8ac63def6876dce426abb0de4 SHA512 5f978d788a709eff86996a1a6a080162d7c6d762c09fda34138001bdf32ae203cbe69556658271e1c7462f9c2405dc35e4619d41b5ebecedb0088f82d5611289
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.31.1.ebuild b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
index 7513374f7f4e..26138c1a2905 100644
--- a/net-libs/nghttp2/nghttp2-1.31.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 31e10d930eaf..60348afb462e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,6 +3,7 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 705ba235f707c750971a64ea3d
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.5.0.tar.xz 19700916 BLAKE2B eb687776a4e51f9eba30ba0ff293bfb9a7f30443191bd2023edd6d41e973e58c13c8d783a48fa34e500769e9b8846b45abf28e5406bb443e9df1409a382a15bf SHA512 f22774d604e552fc105054aea531486ec84995e3e20c482c098dff5ddbcda41674423a98ee86f3a44245d3cb3e57a9c7c7ff31baf9539576bb1d3b74cf1a983d
 DIST node-v10.6.0.tar.xz 19741864 BLAKE2B f94ba788b4510b93e4ec556d0452da713e380621d9b3cc65a47fb0ac91766b4b25ec1f6dd06f35f621dd2d18781186a2a90aae7d728803ae221c08dd015139ba SHA512 c9434d8ea362aa8ea41053013bbd69fc5b5f4e133f9662419947919d29c246950ffad4d262cf9a252bc9f8a0cc63676947c8f0b83135a120c031d71ca37f4fd8
+DIST node-v10.7.0.tar.xz 19770604 BLAKE2B b869f11c3b14dd078f5d8b228108ff60dbafa5e3ee3948b4323bf86233ecbfe8a6e06c24d8545fa364d3880997c298fab834b33660f2cffc7bb0f7e34744e9a4 SHA512 ceb70f79a3251a6243082f17a1c96617df7c40a6e1e3a24ecdd9e4d7f1203562d586e7a85a1e8e642df1de69839a9c0ea33e4a753643c5e8a1b502fd1f2debaf
 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
@@ -14,6 +15,7 @@ DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd096
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.5.0.ebuild 6339 BLAKE2B c1642519de2c47f964c1a8f32ed4cf5caa2fcaa42d0ca3bee0189d1662fdb170b0ddf80e9a2fbbe7bd51d146623aff652d5c6ef7030a94257c90d76eb63992af SHA512 8e276ab90bf81f0f27da9f8b1d393ed608f98dab610ff3b6c48674e9bcad3a4fbe3cc5da8efb2e1aad4c04a19a4b6be1b7638af295462f8e99c7c7938125f04c
 EBUILD nodejs-10.6.0.ebuild 6339 BLAKE2B 909a1b6e0fad010c2422482d08ccb7ee170eeba8976d1c5928824bf54d61ecce2468998bbb2a8f5024ff1d2ffbb98922ee49dbac4116ab91279e3da296cbc259 SHA512 98a3c5a57a70b8089ef98f09d06f0dd6f520c11c1cf37b41202c4e64b73eff566cb09f2dd43e9d4516fc0013c3ab61c8e260d59b4180d6ba790baf2d66691286
+EBUILD nodejs-10.7.0.ebuild 6339 BLAKE2B 621f278c58c4458cbe593f28e9082df4726a6864b97e81fa157db6ddf01a6cfe6bcd0b4955091253c53dac08e3c42664c13f42dacf5ee457f57610b7fc8c6332 SHA512 da4d8791c425ae98d7ae29a696b007e5d000b670f63c4c0f55739ecc41105648b62c8093fe6760b08b53d6f1edaf433e186dcf687cc0c9691d771885aaef3efc
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
diff --git a/net-libs/nodejs/nodejs-10.7.0.ebuild b/net-libs/nodejs/nodejs-10.7.0.ebuild
new file mode 100644
index 000000000000..f5919ddd574e
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.7.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.22.0:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.29.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}'/" lib/module.js deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	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!
+		dohtml -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
+}
+
+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/openslp/Manifest b/net-libs/openslp/Manifest
index d9d252a88827..d2fbb1a46039 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -12,5 +12,5 @@ DIST openslp-1.2.1.tar.gz 886195 BLAKE2B f4ccdf37028d41b6e405768f1b3982b1eaa89e8
 DIST openslp-2.0.0.tar.gz 5424646 BLAKE2B f63560742cb3f679d052fb48b0afdd7cc7995806d77ef93f01da3cd80a884a840d0b678927685d4f4138358dfcf10e93269217643e399d7721571251c31fcbe5 SHA512 e7627417d45d5d0cc83d6e13d62fe192702ce7b763f1b4fb51aa5da8285405b16a34c3ac4f0a1ecffdf59557b29ec7d24925941e56ddee277c8897162f597ade
 EBUILD openslp-1.2.1-r3.ebuild 1023 BLAKE2B 9129caf5bbae1f3c6021d089f87f2b91f763acd0deae8927103aa4878f3590043345c2ab171de10cbde4fd1552c5a13efe4f75ea60e5846b84ce048d80f95781 SHA512 f9e0e8dd843444a33c38f711fada3f576db0bf25b6bad4165ae1b019fb1e70f9f7d96445975afabc5d31ed233a7fc35524969bd6c93e6a9ea2df87af00624675
 EBUILD openslp-2.0.0-r4.ebuild 1072 BLAKE2B fe26811ff5d4ee7334d1f53741955f757d3a9f26977038b63599a1d3898b6da67d3129aee1d6ac281164a3c16dc4b15688d5850dc15c8374f9e469c5e7f00097 SHA512 c22179f59218873aa99fed9100e456d5e33229c4b51436dc457b0589ad179ff65317400b2a92dafcf4ebb90295f5b9e41c1a92981978a13ccfe236574b64c9e3
-EBUILD openslp-2.0.0-r5.ebuild 1132 BLAKE2B 303f2eb68810f74d92fcd8141c05137c93452efcc8a12a09808748a361a48bdda4764c76c338449667cbc54ce7b573c4318f88e2c73b69b55797d06e0f0714be SHA512 cd160030d9f88f52513b94144252b63b868a787517d2ac54fcf5ad0d5e6f557315096ed28a8ee856fd93f397caf1981d78ff1822c03fb2d3b22395e1b440e2d1
+EBUILD openslp-2.0.0-r5.ebuild 1131 BLAKE2B 01f1e145d3e206ebc9335c8bb9d9b5a0f88797f63c249cfe9bd56dc9f85a092d380dd437007e94154aca1e7a86389cba78e69d4c5279a142c35c40447c298666 SHA512 1d0ba0e6fce38cbf35a77aa3bc39044454c582c10e69b4c5ce38ba58335daf4c37a4e05c965cd99cecab7522a2156cd14be2ed49d620935a5c8fad76555c93fa
 MISC metadata.xml 336 BLAKE2B 8af4358f9a3d06983df228c81b3add5373b04fe7a322d0e5045d3b1224b4311ccfb27b7ab3f19bb6ecc4a12e8e061b7ba4435e70a7371b9018990748aa036e44 SHA512 2aab4978f409d1ceb235b846e06bae2c750c68c69f54f6d5a3f96b30be24c6262cd085b741cc193d8d60a4486581817347ab5b3bcc84d43da48dcc2c215df84f
diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index 1b765349b633..5871635b5544 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index bd12de89f2a8..cd5bf25f9a58 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -9,4 +9,4 @@ EBUILD tox-0.1.10.ebuild 2214 BLAKE2B 5d2003fadd0af8870610f10f0f5f1ff310de209e9e
 EBUILD tox-0.1.6.ebuild 2250 BLAKE2B e4fdb58e9a9861eaf3420e05228d2dcfb213ea2ed839562394cac6207afe3a97947ff34c8c31c9c737669758d49a9f757eb03fe99da98ed134d4d96a90dd5f7b SHA512 3566194ff9f4afc1ccb95cce44ecc47b13c3ad1b0ee8eecd6acbfd4e122deed63342ccd23eda9202070aba9f59e21328e610d454a2209edc3d513d54ed2963c1
 EBUILD tox-0_pre20160904.ebuild 2237 BLAKE2B fbdd8f30956ad73dcd398468e537260e0597c8b6f1a6f3d75987167b1b16da38a0c3e9b1159d25e6f58b4ecbcb4d99dc63870c71cb6c3d2dcd4d9863efeb452a SHA512 123f25a734fbd69c6d48d594359264b1ddfe9ad2423ebf8bf5f768e352e38b9d59d3be42932d6709340900fcc45131d5496bf0f474ea9ed70753a3d97c841543
 EBUILD tox-9999.ebuild 2146 BLAKE2B 8388e75e8cce0532cd18c3053b5fcda8adccc155c5c426e5ca5457ef4e842b379a1eabc13b789929dd2df4b2e6875265b8469c40f90ff1d6ebe4335d335530b2 SHA512 d4f6aee075b56a8e034488c3f4b0808544dd718751a4cbcaf2ca81d6fdf04b4b4dfaa68f17665faa7457af36398769ba26d73545b1e1a6ee803001eeb9ce36dc
-MISC metadata.xml 930 BLAKE2B e54a2153889dddd0337eba9a0499119a8b9d1768e3404aa7a3facf3475c90efae2b4bc79885020ef61202d707e7009e892234655e01750d9e108b2b62826b31b SHA512 0c874f5e77438cb34af28003a832f8422d3c0baa41c563476ae1cc67ba82b5dbea9cebbf28a96e05828c7163e0bf6f27721ad3dce6fcc82a14b6ffd7d9c058cf
+MISC metadata.xml 731 BLAKE2B 7c279eba74cd218439392afee1509adcdc022a54a87545f98fb1b9fadecd31efc383a1fd6e44bcf2db53ae82b3cfdf4fb2d14d427d94699278ff978250510b0e SHA512 952aaa54d9b72cae58e6ac6852435a7394fee3805d5772c223dc48757066d457efa1094682f2afa5056ef782a8c2ab61b45e724f1cf80f33643a57152f75a8b0
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 578a876b40a1..0dc9808e046b 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -1,14 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zexavexxe@gmail.com</email>
-		<name>Zetok Zalbavar</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="av">Adds support for audio and video.</flag>
 		<flag name="no-log">Log level: 0 (no debug info logged)</flag>
diff --git a/net-libs/zmqpp/Manifest b/net-libs/zmqpp/Manifest
index 10565ff96367..7aa41433f352 100644
--- a/net-libs/zmqpp/Manifest
+++ b/net-libs/zmqpp/Manifest
@@ -1,4 +1,4 @@
 AUX zmqpp-4.2.0-multilib-strict.patch 496 BLAKE2B a91028c19591f329832ed81798a96bb153ddc56e9344161fbab1ce24cfad1c04ab461ecc35b008e9d7a1c80db798d79d3569d514d5c1f419209ae6e01887a0c8 SHA512 2696c95f5ae7dc5a36141b756ea73c0fcd50b9ba7c3e4e9ff3187d0bb76c22bc52fdcb334e748e27a2f1fd6f71dc7ec97b60c73b6733f0d1c598c63c041d0fc1
 DIST zmqpp-4.2.0.tar.gz 102942 BLAKE2B c72e807e68aa9142e3e7f06a1c9207a4477538b6ffa1a9077d70dd4f7f2a7c17809bc9f71a478aad4cb3204955252d6468cf14f1aef014c062a08e7f68b2f1d0 SHA512 a6b767278d85f38e5d78a958980782f15e3214db169ec2da118216c002657e525783d4ad3b9043d742801acf77b9b070ea12c18ec0e311e01f13d90d409277a7
-EBUILD zmqpp-4.2.0.ebuild 773 BLAKE2B 68b73ee1d0455c0f63eba2fe3e1b6dafd48e5ed4178236632992706b77a4d1f9646a707f1f2bab260c01b31f1142254ef9450cc044c8fdc846ff8e5c3440036c SHA512 e98ae794bbc2736d622b5d7b150a77e8cdc07b115eb7dde0b10822802d04c64609ee84600aeb93e0a033bdc31807356a72eadd00eb7ea2bf354262b1f6c0dcbe
+EBUILD zmqpp-4.2.0.ebuild 763 BLAKE2B 18adf26085e21083a3c2633da4efe152bfa878107ef1498005c0c980f4683d02fe778d61d5d4553e6a9da71983e57016cf940385f3c36894e99a2e4e4977dbf7 SHA512 90e4619d39ed3fdd557c2ca49823a01d58efd0bd62ba1bf2dc6b87d50a24556a9e61869b606946d601bbe6ae0288841a19cc240803f289d45057892e57755d11
 MISC metadata.xml 340 BLAKE2B 449dcee565bd94118423698d1b0a0775ed49e399489904411ba41257fca80b6a6ff3ca4cb735571e4b64d7441ad1603de687ee113498b2193e323d16d4f12c16 SHA512 603c91cf185cf470c55b427d8aacbab2e7b2298e4e1d49f3af5fc50257a4eaf7b3ed301a134696743b550db32ffab956efa17c25c7d2a524a7d6d65b230841f9
diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
index 4eb86e192ea6..b78adb04f7a4 100644
--- a/net-libs/zmqpp/zmqpp-4.2.0.ebuild
+++ b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils
-
-DESCRIPTION="ZeroMQ 'highlevel' C++ bindings"
-HOMEPAGE="https://github.com/zeromq/zmqpp"
 if [[ $PV == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/zeromq/zmqpp.git"
 else
 	SRC_URI="https://github.com/zeromq/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
+inherit cmake-utils
 
-KEYWORDS="~amd64 ~x86"
+DESCRIPTION="ZeroMQ 'highlevel' C++ bindings"
+HOMEPAGE="https://github.com/zeromq/zmqpp"
 
 LICENSE="MPL-2.0"
 SLOT="0"
@@ -23,15 +22,13 @@ IUSE="static-libs"
 DEPEND="net-libs/zeromq[static-libs?]"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-multilib-strict.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-multilib-strict.patch" )
 
 src_configure() {
 	local mycmakeargs=(
 		-DIS_TRAVIS_CI_BUILD=OFF
 		-DZMQPP_BUILD_SHARED=ON
-		$(cmake-utils_use static-libs ZMQPP_BUILD_STATIC)
+		-DZMQPP_BUILD_STATIC=$(usex static-libs)
 	)
 
 	cmake-utils_src_configure