gentoo resync : 29.10.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
commit: bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree: 3559b3e11424f5529527f2474d8a977a91ee3389 /net-libs
parent: 8b2628ad8526c806375e7b157889e4274b70248b (diff)
54 files changed, 1034 insertions, 1135 deletions
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 6930ac2d0811..e096e659c9e6 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -10,7 +10,7 @@ DIST axTLS-2.1.4.tar.gz 1316768 SHA256 e53dd20e2b619349bc48b631176a38742ea600333
 EBUILD axtls-1.5.3.ebuild 4658 SHA256 f901a46ab6f16c6baf8252a66da40a399a2d63966d35e23262e8690886cff1ab SHA512 49d2cd35f692d828e16b56bb6eb0ed2cdc45329fdbf1641fbab53418e237141ad233121e3d1aa663df146ab13cecfefa6c2318457cbcd6f2cd8db1aa9046b2f9 WHIRLPOOL b32a55c7eb1859b54dbbd708b17c03d178dde85cda22affbd958ad4fb9b3eb154dd09af355e2b193762acd5d9080303b7d9ccba5f3607d942092f617aee9cb56
 EBUILD axtls-2.1.1.ebuild 4666 SHA256 0ea032ed20353314b1003fec2ad5c38dc2068b35618e29a358fdbd4bd6bee7e6 SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a WHIRLPOOL 7b3b6ad47f4e8996a924408573d941d266b85d6bb7f4d6ef081710b0b73d1079b081dd1c80e3f3d7dcfc327f3e17e61b5be4d71712bf5537e4fa9e04350c47df
 EBUILD axtls-2.1.2.ebuild 4666 SHA256 0ea032ed20353314b1003fec2ad5c38dc2068b35618e29a358fdbd4bd6bee7e6 SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a WHIRLPOOL 7b3b6ad47f4e8996a924408573d941d266b85d6bb7f4d6ef081710b0b73d1079b081dd1c80e3f3d7dcfc327f3e17e61b5be4d71712bf5537e4fa9e04350c47df
-EBUILD axtls-2.1.3.ebuild 4683 SHA256 9dc2c17e47dc46f1c165599bbfb728e4ffc82eee01f488bd3d19075725059d30 SHA512 bc0d776ad2356009fedde4315e53e486c0a8638e913561a9f2f44260f8f17eb0bc2e42f3e0748a57369a03beed5baf08780d48d75627452d533d1c63fab70c14 WHIRLPOOL 1714109e079c897014cce988b47d9f573fc154e816d71cd6c20e533a59f73883e9e8b4f818e490f23ad7569610e6baa15eec59cc3fbc859177e297d1f0e8ad07
+EBUILD axtls-2.1.3.ebuild 4682 SHA256 91e6a87e49bebcf0e0c301843cf391a56dceab466451150d8c433b79a582a5d8 SHA512 c41e249e8f39c37f1fb89d0f9bdaf5b9c8e7596d3154eb6c32f50b47b5c9f46353221e3f8ed6d8092019e0bde5ab2a4d1da049be2d756aabe40a4c1b1c6c536a WHIRLPOOL ee87624d92a35d7e6217ba867350f58f7cea196a4529b8dfbca94eca1d4f5cdf00dfa1ef13aa0d65268ba7163b5995793335608f260736aa4d0469c46a3d3c47
 EBUILD axtls-2.1.4.ebuild 4687 SHA256 d7b0e29aebb94fabeb10da317c96e63b17d256534f6d9a5299b608b0058bfd1a SHA512 e266f60307098635db515eca0e6dc4aaed14d6c0ebd9b11184afe8bb34a20a1eee9367e8ee8e44ce843811d13c39ea7ba8b114657cdeeaa9c74656175ed33dda WHIRLPOOL 18e066109fe414be7573a7608f987696a67fec31a70dfc73302b7312be14d3061f6bcf20c8b2588ab00213a6ef3165fb2d4930a75c02b9d0d47e87845d6d151b
 MISC ChangeLog 4099 SHA256 968a536c0b0b7b0546c8e34bb2f9e47ec46d73eca507e0d48c128454bf6b6cee SHA512 c6f21424f63f68d6adfe2b61e9599bb69dca9538785ff1dcdf6bb9817c409d62e672f9c27f01dd52a563ccc2af88a708bd5bf9d7b5b2a386bcb0000771b73d37 WHIRLPOOL e76ca51d2ff1cab28833a0fe9f4bbdb542aa6f53a65b707d784fa71587ee2f4980e5fbc2a19bb250b759a42f8c19fe5917d9ae21917e4f1dfc79293dddd91597
 MISC ChangeLog-2015 7324 SHA256 9bcc860808864b9a4cb5bca7831ccc105b7c448ab68b6b7dbab264775207d797 SHA512 0fa7eabb3cb882ed1e93be4605adcaad8f19c251cba71907767348b9e5b11a3f645f9189703b58299290850cdcf8ac8cb54e5ac86c9f87003bc46bc167ccfcb2 WHIRLPOOL d40ed5f71382b38b2d1dba037d99fa1b796a0b6d67ce3f60d1c1dcb1738f9c5b9c3d90429924dfd448ed2a61819937f01bc3777b7ed954d917d2ff8901287cba
diff --git a/net-libs/axtls/axtls-2.1.3.ebuild b/net-libs/axtls/axtls-2.1.3.ebuild
index a701820d392d..48eafc5ea5bd 100644
--- a/net-libs/axtls/axtls-2.1.3.ebuild
+++ b/net-libs/axtls/axtls-2.1.3.ebuild
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index cbf0a63198b7..6a39901979e0 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,11 +1,5 @@
-DIST gloox-1.0.18.tar.bz2 700080 SHA256 16730e7fd4679e098a6d6c1f94ee72aca825e8f40e6744f5921ac32fdf22548e SHA512 b8387796914e237fa07cff17862f8eafad8506173a3bcd7a659158daf845a33606b3ec58822c2f0f8f629aa1ee68a2ac58489dba83516cb7da264da3678317a7 WHIRLPOOL 6b38e7e3d480083fd98fc4d5f8c2402faf1c5242d3201c29d40995cafd2aadafb20780c7219a1a55497ab95754ea1c5b8f79756fed9f2f3b84780dc060f4b1d0
-DIST gloox-1.0.19.tar.bz2 700335 SHA256 88466ab52ca99bfb22a74b738d9713a9cda0b06e539108354156ba408a5283f8 SHA512 6f62773aeb24631ea5edbbf2267275f9e6005bed240dfbd121784238709d85097a096d16b3cd7cb45d34b2daeab026dbb3b84994c504ba03180d9dff90f9fbb5 WHIRLPOOL 98586156b3a88807b3f1aca25b9fb06f17581b4a1e834cf1692b406b879f4f759ec424dfb36527bc0945774a798647a8b033a9ae860960b4f214f9a35051c00f
 DIST gloox-1.0.20.tar.bz2 701114 SHA256 0243086c0f4f0440d6d8e55705f83249a4463a1d75a034be42b5312e8886dea8 SHA512 b94269487875ae32631b5b15eeebe3293c6b8ab4080a6e15926c575305841a609a5e4da25bff266806ef4b65c1db14e9a9e5dabf8af8b174773cbdc37cfa12f8 WHIRLPOOL 872fa9587d9ab1a07197c40790f5ae72748df6f7d835a206c92da5819456118c8c7dc2f70fcf289e2840b272051436f204503ba12b143a33a48c4f150a36db34
-DIST gloox-1.0.9.tar.bz2 670206 SHA256 143dd50e1edc4eb1d304fa28bdd6ab9e53b60c37c1726dd0e34c06c51f9a453e SHA512 a3fa7acc76fdca0421030e71b6a13ca0b04589946df2a781609f1bddae5329299d68ce99a4a94a0760206b112759636379ce67d220422b99302fc799964bfa22 WHIRLPOOL 414eb34fa3ec11ae929f84198d95ed0da9de0739655ae1188ac3eb03998de5cecb9c165ad284496b405b49126236b628dc5b4579e855b10377add145fabb63b1
-EBUILD gloox-1.0.18.ebuild 1034 SHA256 61c818f5145bbe91e873a81712338bf642a094d9bc7f59019329c37153310de3 SHA512 1715e363458fede6ded96566ea70f380ca8875417ca911f4873db3e4c5d501e180d836a24ed398ca252553df4159f70faa00342dd0465ee9b6aa4a877aa551f5 WHIRLPOOL 130183e5b50f61b239757c77a7ad23f28335889fc0bf0252647f6e0135a2d2e483c2e7e5e5d3778d7c9ecca6e887eb71b63ea5537d3b16cd051271db989b24bb
-EBUILD gloox-1.0.19.ebuild 1058 SHA256 3c5015335debdfd8dab125c4e128f78c542e1d348a507d58b2fd1e281e571364 SHA512 37f496c9a2f2761c58b2b3d3350b8639b54fd31be7736964ed5ab7f6e7f1b3cff9bfa4c3411a45f27419b7f17a3e006cd8e15bb040129b65b0fc80b9d97cfbe1 WHIRLPOOL d1341047bcdc7e1dfb6ebc06ede45bf7f5fdb796ffef72846891ef0f6b6c303b49cf061f57449ffe9fce09c24322f4d948f11bc5de02439a396d4cac50114c55
 EBUILD gloox-1.0.20.ebuild 1058 SHA256 3ee0f23ecdf031e1a6e4d9646c16134d52d8c0ff6bd2db7025450185d2e36c0d SHA512 93f02a2cc0551d23a629409480740f80dace9796621b8e5f1097babf9af7f936ee9b8ef81b721d8ca25e7f64ce4aaf9329407674699bcbbbeafd9d2964ac5a1b WHIRLPOOL 50f29ae86cac7757d1ac6c32ad63f034e45ac53df2ffe5c4c7d8b2ba864a3e669e23e3651c151588899fd90785dc3726554a509218168e71ca7040fc5660038d
-EBUILD gloox-1.0.9.ebuild 771 SHA256 567cdc83bfa9d6e524d1ee6fdbfb1121998d58f3405c20c559c665b26243a226 SHA512 0f984b9e82532ae6edc411f6fc12845e1b8aba67bd028d68175bccef38f1f229eeb5fe5112040a5afc2ab687ac85709cfd591f0075aa1a1cdacc84249fad24a0 WHIRLPOOL c99deb08640777a81828020e6b25ffb55e5a2996b3ddbf82e491a0b403006571dc0f0a837e20ebfe30e487f2afa14ab07f10fcf96e34c62ad870004964ac62ce
 MISC ChangeLog 4397 SHA256 7a433aa21474a7ba55950b036ec79db78060bbdf0c723b6918be6394cf6c0bf1 SHA512 40adbffdbbbe4c6aecb99651475bb07e49962b49c53dd7d144780a0139bf1fc2aa565f161a7334eb580fbf0043911d3dba350f1100fa72bfde949e61bfa0ec06 WHIRLPOOL 611017cf23c3810a47db94448d522405d68c480d2f5d556dc5e99c0c737cb5815e6150874b47d60e2b0ad40bd62dc43316a84eb55350b4c5a459ab209b727956
 MISC ChangeLog-2015 5113 SHA256 9764305b6c484a602dd7b7d4878a5c04a3999f645aee62a7af86137974739397 SHA512 2d31099ee1c33d0f9a0d2793f23e2536000c4785609c788966d2c425792635363f441afb7a3395cbc8a7f1885f1fce89070ce541203be198d3d112dddeff5465 WHIRLPOOL e44580c9b663914efb5bbbd458b70a3f63b567c1018b6a25415f24b1fbcbadb2b70a38e27d89987f5c06b8b30083985d9ed94011fbdad054a0b4914cd96ea1be
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-libs/gloox/gloox-1.0.18.ebuild b/net-libs/gloox/gloox-1.0.18.ebuild
deleted file mode 100644
index 7472539b1e7c..000000000000
--- a/net-libs/gloox/gloox-1.0.18.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn )
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	econf \
-		--without-examples \
-		$(use debug && echo "--enable-debug") \
-		$(use_enable static-libs static) \
-		$(use_with idn libidn) \
-		$(use_with gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with test tests) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-libs/gloox/gloox-1.0.19.ebuild b/net-libs/gloox/gloox-1.0.19.ebuild
deleted file mode 100644
index b645b9a04135..000000000000
--- a/net-libs/gloox/gloox-1.0.19.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn )
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	econf \
-		--without-examples \
-		$(usex debug "--enable-debug" '') \
-		$(use_enable static-libs static) \
-		$(use_with idn libidn) \
-		$(use_with gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with test tests) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/gloox/gloox-1.0.9.ebuild b/net-libs/gloox/gloox-1.0.9.ebuild
deleted file mode 100644
index 3251794a33ee..000000000000
--- a/net-libs/gloox/gloox-1.0.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/_/-}
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
-IUSE="debug gnutls idn ssl zlib"
-
-DEPEND="idn? ( net-dns/libidn )
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_with idn libidn) \
-		$(use_with gnutls gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with zlib zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 88e936d26af7..97cc5979ded4 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -4,7 +4,7 @@ DIST gnutls-3.5.16.tar.xz 7559812 SHA256 0924dec90c37c05f49fec966eba3672dab4d336
 DIST gnutls-3.6.0.tar.xz 8024972 SHA256 2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03 WHIRLPOOL e8e479d7a0adc14c969b7364f58505f68ed92054fb8d8ba862f59d9ab64578e83ae02309ec9b5da2e63fc5dec799d86e434abc32394dbf414dc46bf46b15b0c8
 DIST gnutls-3.6.1.tar.xz 8064408 SHA256 20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed SHA512 1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23 WHIRLPOOL aa859108083d7b6580b6e9c6dd2f4cbf43bb444114339ca68bc7bc45a1238b7793b50e95fdd26fa9592a8892881fedd79697999111f568f3a56e32be91996e65
 EBUILD gnutls-3.5.13.ebuild 4239 SHA256 1a469cfd52bb5ae35dd8c082d92da70eb95df5d31d6408ebce877e4ee5414367 SHA512 7a3ab4ada4edc640dac61f6fa7054d4ef1b8e3c434634cbe6edfbc1d7a99694e9612c5d2f6bf39c57389ef55f73f602b90c3a4e472ae3a0e571d83d6bc54fd42 WHIRLPOOL 7558a9899237bd14695304d52e108b0aaf314e489d5635a7180dd063c0c09e95b0ac17482759f59c7a23f38d2188a6030f9ea9fc2bb82d8e45d33247ce933970
-EBUILD gnutls-3.5.15.ebuild 4341 SHA256 41d87ba00de0d1e4410a9fc6b08c275ee698c05fc991131dc87a389b27e3edb9 SHA512 46fd00d54ef3db933d62b1c51290e24e7f7c4972925ede37fd6083e421fb90bb8adb215d446fa201661703020555c443c38090fda2086976b3e8d679221c317f WHIRLPOOL 7ebd1870bf98d39d0bf2d5652f7da5294c4ac1d6df9ad402f2f642e967bba8c5060a092534733d1984088b2978ccd0a0c08adbc4c71df490b6fded931bb6fe62
+EBUILD gnutls-3.5.15.ebuild 4340 SHA256 8d70a35114e01ff61ee54e4f9dd1c8298c8941d81e20a16a9d5f5675c3e11752 SHA512 a014fe4d78c5c76ca379f95be2588ea54c373feeb4269866e7d79b6d10c22e3b063e0e7fea50c44ab3ea491d7a435ee223f92356a9e7260788c8495894e436da WHIRLPOOL c0572c2bea42bf1ffe125321c6315d3df9e69af69b565dc37e14c88b15d99facbb19c43617eec0c6e8f12e287298c9aeaa90c5f28717ae3be3a485b98010ec27
 EBUILD gnutls-3.5.16.ebuild 4348 SHA256 60325da7c14160c32e04a9debd687c857ec204b66f62067b56c8b31b3d7b7f8f SHA512 9937ce68b1e6322a60ad8e03b1e75dbdce825444aa879e563a77002040ac0d26b6b98739ac5b1f70827d93621f873e1f822cf5bc58f1766a7d70207781e75b83 WHIRLPOOL a71d1bfc14f273791af793de045e68810bbfd8c4c0ef0b0d734efee7e8ff283aa87996d91ec97a9331461dca1b7f331db2283fd1136e6ed57640852c83d3f53b
 EBUILD gnutls-3.6.0.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
 EBUILD gnutls-3.6.1.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index a227bc366700..78d20075ee59 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
 
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 563fdefe9040..916267b1acd8 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,6 +1,4 @@
-DIST gtk-vnc-0.6.0.tar.xz 439104 SHA256 9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433 SHA512 38d37753bd8c88d112c046eb8430383b073b6516c72660b3e53612986a6772b72e3e6037f61e7a3700980ab1509c1f44fbfe0b80594c8a5e5520df166212f158 WHIRLPOOL e156f368a9d70e90077253b031db49f5f58e2f248b3e15bc11340f01f6bcbd342cf08dd9810c8ee447ab372159d09c3353aa5ce6195f67c677e7c43a563a75c0
 DIST gtk-vnc-0.7.1.tar.xz 444380 SHA256 f34baa696615ef67666e8465b4d0ac563355e999a77d2cc42ad4625a24f7aab1 SHA512 5d62f60e1c9fe70f93a9d21c529145459f0d59d588631597d533ecba94864271d1095599db9447ac4843814be61af7a7c947f69e5a9cd26db7e811f2c4e95f0c WHIRLPOOL b4736926bbd8ad49c6b2dd2a1b921a35a9ca5b8987c04b03ea588efe09b3db20eade41204d0a0542ee683efd6d2ec23636c13bc2e214ed452d885aef1302902a
-EBUILD gtk-vnc-0.6.0.ebuild 4272 SHA256 cd9d2c1d0ac45f531199575435c401bda98a722bb7e13e4d662080973094070d SHA512 b2a232de413a5be9ef4f0ff8764ffc533f6c6498b3348da255674942e8d474f93327b584db6697afc926cf827808ad0f3334b44d2baca94a1b49fceb4d18ed41 WHIRLPOOL 5ad6090b08b6e471e605dd42a5cf47d148fcb2789b8ab3b781345f314a256934a35e38396270d1e1d6611651a0310b6fcc127b6876da399eef81d378d0900a8b
 EBUILD gtk-vnc-0.7.1.ebuild 4272 SHA256 cd9d2c1d0ac45f531199575435c401bda98a722bb7e13e4d662080973094070d SHA512 b2a232de413a5be9ef4f0ff8764ffc533f6c6498b3348da255674942e8d474f93327b584db6697afc926cf827808ad0f3334b44d2baca94a1b49fceb4d18ed41 WHIRLPOOL 5ad6090b08b6e471e605dd42a5cf47d148fcb2789b8ab3b781345f314a256934a35e38396270d1e1d6611651a0310b6fcc127b6876da399eef81d378d0900a8b
 MISC ChangeLog 3566 SHA256 b3fe6a69fac240ab4d92d7f391665ca02dd0d3d0b5219dfdcd54bbbf0b1d9254 SHA512 6120268845595f9fa76af003600818ce924d6426b611ca086a64449a9cc7fafd09906a0c2ed02e3e380cd1a9a05ae8d2d78efeccd08befff5f944de832874ed0 WHIRLPOOL fdafc9210492328154646791c614402d2969949ca23c5c6d0594e643bf54b9533db20533ab73f3ad9d2dcd7a402233143f8ab02b9a15cf74911eb3ec085b71b5
 MISC ChangeLog-2015 18144 SHA256 2e2e10e3799768848762378e009823ba9a184d506ddd268bbe1207082343a913 SHA512 32da60bfd0f5b28e97eace4df4ca280041760ad64a179394549681fc5de85e1cf6f77b53ad4f07b705773e7ccf0882d2ca0d7410d9457f5fec497527f1360c4e WHIRLPOOL f4ea0319830cbddec3c8a0a2a30e3614ad78ae0b45e7f1f4f231690680397a7b97a63f92a5479d15f3d2ff36a1239b8ad8f439511d734dc238246196122efa68
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild
deleted file mode 100644
index e8d0f456c9b3..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multibuild python-r1 vala
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vala? ( gtk3 introspection )
-"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.30.1:2
-	>=dev-libs/libgcrypt-1.4.2:0=
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-3.0:0=
-	>=x11-libs/cairo-1.2
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	gtk3? ( >=x11-libs/gtk+-2.91.3:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}] )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-compute_variants() {
-	MULTIBUILD_VARIANTS=( 2.0 )
-	use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-}
-
-src_prepare() {
-	prepare() {
-		mkdir -p "${BUILD_DIR}" || die
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			python_foreach_impl prepare
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant prepare
-
-	# Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#744393
-	sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
-		-i src/Makefile.* || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with examples)
-		$(use_enable introspection)
-		$(use_with pulseaudio)
-		$(use_with sasl)
-		--with-coroutine=gthread
-		--without-libview
-		--disable-static
-		--disable-vala
-	)
-
-	configure_python() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			${myconf[@]} \
-			--with-gtk=2.0 \
-			--with-python
-	}
-
-	configure_normal() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			${myconf[@]} \
-			--with-gtk=${MULTIBUILD_VARIANT} \
-			--without-python
-
-		# for gtk3, python support is via gobject-introspection
-		# Ex: from gi.repository import GtkVnc
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			python_foreach_impl run_in_build_dir configure_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir configure_normal
-}
-
-src_compile() {
-	compile_python() {
-		cd "${BUILD_DIR}"/src || die
-		# CPPFLAGS set to help find includes for gvnc.override
-		emake gtkvnc.la \
-			VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
-			CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
-			gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
-			gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
-	}
-
-	compile_normal() {
-		gnome2_src_compile
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			local GTK2_BUILDDIR="${BUILD_DIR}"
-			python_foreach_impl run_in_build_dir compile_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir compile_normal
-}
-
-src_test() {
-	local MULTIBUILD_VARIANTS
-	compute_variants
-
-	multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		cd "${BUILD_DIR}"/src || die
-		emake install-pyexecLTLIBRARIES DESTDIR="${D}" \
-			VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
-			CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
-			gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
-			gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
-	}
-
-	install_normal() {
-		gnome2_src_install
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			local GTK2_BUILDDIR="${BUILD_DIR}"
-			python_foreach_impl run_in_build_dir install_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir install_normal
-}
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index adb11981b8ca..ae5f9cae0bb9 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,3 +1,4 @@
 DIST libnsl-1.1.0.tar.gz 209148 SHA256 a23cfcf7f29f168b95e821d01217600096c05be8cd5c085450cb4f160425277b SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd WHIRLPOOL c347bbd72b75d1e3ab0069f802da8e4e4e4931a8a61b4abed1dd664c4576e7e22e96c012858c684ec79a981aea84460eae3a2ccb8e94aa7bfecfdd99c3e54730
-EBUILD libnsl-1.1.0.ebuild 788 SHA256 b3161b67dd23cf274629a7ff5d296e430e5fd8069ce80f4fa39b0cdc6cd2f7ff SHA512 17ba18e3557194108af91690365e5df91a05ac4719440d76a798f10a08000b809808e7f4e39f1d7b91ac32ca400d20b4aaa7e95c69a53111dc852f47fd736f61 WHIRLPOOL 2b9ab19b211648d304c4e3615d8fc437b054cf0df7d2416ad7a5ffaee3e6a0b1ba6949f8d16111556a8da8aa8564a86105f78474efa1b80d97b3d41f2fe903e6
+EBUILD libnsl-0.ebuild 508 SHA256 270e32435767db6bcac69667faf7283f7c759275666a6ec77b824bb000f87306 SHA512 8eb53fa8435bc495128897d323db8f6bc41808e01d2f59797ab901bd3b773952318917bef83e7ed7d89764fdcc6075e210dace1a164d909aecbaee7c53059ce3 WHIRLPOOL 4ccbcfe7942a3124790b9aedaa88559cd5085f4ffd4ad49e223350daead23851b11d23932b72f20e55e820be83dc0474c5c284fb2c56d5a715029bea1e0e6fb0
+EBUILD libnsl-1.1.0-r1.ebuild 736 SHA256 e1b7fdf9602adf1b615b24ec279fe49f973eb1add9e45aa1b6ed411d1bb5d900 SHA512 a3896d15411f106cad1e17252c43a7e36c1922be50af348a8cbb5e8ac435d883a56969d36da3880c5a9ec1dafaeebca8c29ff4cfbee6785029bb3c7c981f3136 WHIRLPOOL be3b7a23937bc2eb6f4f064183f9c70c864ad67e55fad101844e98f352cf2297850408bcea4f3b7c6f3aa941b88b976da4b8699c3883ab8c511507b307a53716
 MISC metadata.xml 379 SHA256 ebf32af5bc074fc17a37c93745bc34847424be60d6d5d23a69d88baabc554bcf SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753 WHIRLPOOL eab5963365c94d28e5e60cc0b4eaee3d576bf8cc3372eb739f0fcbdbf4f3c37fc1af7c90b39866e476fdcd2d529b7e78f2bbcc1d3b938c047702d09db3141fa6
diff --git a/net-libs/libnsl/libnsl-0.ebuild b/net-libs/libnsl/libnsl-0.ebuild
new file mode 100644
index 000000000000..f5c68293a69b
--- /dev/null
+++ b/net-libs/libnsl/libnsl-0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
+HOMEPAGE="https://github.com/thkukuk/libnsl"
+
+# Fake version to help portage upgrading.
+
+SLOT="0/1"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+DEPEND="<sys-libs/glibc-2.26"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libnsl/libnsl-1.1.0.ebuild b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
index 3abda843bf65..407fc963fdaa 100644
--- a/net-libs/libnsl/libnsl-1.1.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
@@ -9,16 +9,20 @@ DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready versio
 HOMEPAGE="https://github.com/thkukuk/libnsl"
 SRC_URI="https://github.com/thkukuk/${PN}/archive/${P}.tar.gz"
 
-SLOT="0"
+SLOT="0/2"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+# Restore keywords and stabilize together with glibc-2.26!
+KEYWORDS=""
+
 IUSE=""
 
 DEPEND="
-	!<sys-libs/glibc-2.26
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
 "
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+	!<sys-libs/glibc-2.26
+"
 
 S=${WORKDIR}/${PN}-${P}
 
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 4b749f4f1553..60223255bc6a 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -7,7 +7,7 @@ AUX librsync-2.0.0-search.patch 358 SHA256 3a94ba9d2b0847d0dade733c9f4f456f910f2
 DIST librsync-0.9.7.tar.gz 453802 SHA256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef WHIRLPOOL 7cf5cc675c4bf4e041d9132f0a8311f83e827bfa7dd75180f3153cabeab41a94011e1a9b56e63a61dbe119444e2c24a39054986d97b686db99293ad9177b2bf7
 DIST librsync-2.0.0.tar.gz 155049 SHA256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 SHA512 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0 WHIRLPOOL a09e76a712ca21a37bc3d06cf2f97a0e7201cfcf82c18cbebf3f07bfd453ac3503d18c900b7c1136e0319ec7f3b7c4a6c43611648c78b31fe13c7298ccf016e0
 EBUILD librsync-0.9.7-r3.ebuild 879 SHA256 10d0895baf99f03c235de45ee3d334759e433dc23a3444e4e4d7e9edecc2c864 SHA512 9c47fefe790a75f0b8921ae400bfc811e8376dcacbd50a4399b49cf390c56dd942dc9f535210f5228606c4069743f1399eb6add6dba7182bdbce89935f02bf8a WHIRLPOOL 784d22288456cf9d994beb650a6631f3e4e0c17d1d22b673fcca2aa611aa81049f0e0ccca09883d5a90348f2f84c6f15512cd92df62a5cbbc62ff67020e4a1b2
-EBUILD librsync-2.0.0-r1.ebuild 832 SHA256 61bc81220dd35d2557856fe94a26d62d0cafed7f50cabc0b0a627fdb9c226fc2 SHA512 c2b8e301e3a81c8d06f8dc00f874075fdcc6f0b112825dc3d0fdae45d09952f17b43b10b8452832d20deadd94333e9ea79d0f0890e58b7cedf94fcb724529b47 WHIRLPOOL b4caa81ee12c84ac60fc7b628f2fbfc007ac9456f01b32d236187eb4eec501320890ece7decade2c1953eb086dc7ae8fc5b0ef617cf1b798f11947277e796abf
+EBUILD librsync-2.0.0-r1.ebuild 830 SHA256 1467809bcff3d5ed61653ab67ce4ce145f71174717b7833c7831fb9e84f0f1d6 SHA512 460aaf5472e2aa2dbe1cd3e6962529df47d4b47c03780017e5aa29cde6dc61ca00c2522c222f506b178c87a2b1ba6d8d6c515e5d302e66a945cdac3079356216 WHIRLPOOL 3c72a93d56dae52717b44105ebe7925bd31d60e304df07e87197220c30a501489ae433d5d50030254b1b680b78dcd817fe524c043e9aabd8370062c8202a82ac
 EBUILD librsync-2.0.0.ebuild 764 SHA256 cd23c43d8611be927f3ff3d7c6500e2c07eeba3aebd44c694dafacba84afc616 SHA512 6a838f1028a13fc27a224fc3be357efc647218bec0b2fd6d0a147118ddaa56f65da13801bddb616a5a1f63b3b9fa3ba971df51c379d985285815cbe8d0ce2f86 WHIRLPOOL 8d2c72e537d85ebe6731cbe01173ba5076f94a04d7183e1b45d241afbe10e09534ba141c9a85596818b8edfa778493b810c66eebc6892bf84bb1a75be5a5ec89
 MISC ChangeLog 6265 SHA256 f7570dcc522328911493ce9390eb94c934819f1fdb527afbedabc0cff0e18a3a SHA512 aee1a18202c634b5e69186f161ec8682bd6051b3c24f44302579b9ed753d710c062f500d0fe3e66ef4418e7122fb574188f6da74e238608dceee7c67dffa08f8 WHIRLPOOL c29ce69104b65ff1588ce5e6266224dbecde9503e437654e4ed738794107c6ae6f3ae8b1136c7da847881566bdc29bc41304c2e1ef197449f1e8d8fa25e8a92f
 MISC ChangeLog-2015 6029 SHA256 89da3593c12b4488f605a06b090d097763499cf690588d88003ac46669653bce SHA512 3156822c3f2131358e41252515b0957e0ce7d9ed49ffd66cc3a7a2572a75f6e89e67f964981e1dfc1e961f5987b508a672f67a6d3cff0a88ed2bfdf6063d2a31 WHIRLPOOL c3cbdf9e6a55298c24b97f7d5f0f0f003bdbc4b6fb79343f7f55668b7590ffbf5ca46aa57ee8c120c8d5846372b185150ea35592173566ed2af7654e996b008c
diff --git a/net-libs/librsync/librsync-2.0.0-r1.ebuild b/net-libs/librsync/librsync-2.0.0-r1.ebuild
index e4f6f64ddb5f..6cfffd0e4a3d 100644
--- a/net-libs/librsync/librsync-2.0.0-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index b63f7a3b8016..87b1fcf8e3f6 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,8 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 SHA256 b1e018828b83454a752d197d5c9db6332584bc94a8eb5f20f55e9ce9b0729299 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d WHIRLPOOL 262f38233ffd5a9834d4513fa5f43d555245a8148e2b4b6f923cbf0b4c5a30e79e2fffa43eb1001effb32b1e3b88d9ae55c9489959e87f96e64776272a3e496c
+AUX libsignon-glib-1.14-default-opts.patch 1714 SHA256 7390b1ee3502fd80b2e7865ace1d2f9288990bbb3ea108019c7d477c924dc87c SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430 WHIRLPOOL 3ab8ce2320b33495ab630b6f8c3285c5dd62426d687e60804abb313973e9db9edcf30f0e5700b2b4865b2f110345e28dbc184cf52ecf80eb0a2279ca5eb4a4cd
 DIST libsignon-glib-1.13.tar.gz 51601 SHA256 8e0e450e719c16f79d3c3aadb98656ed5967a2f2cd24c1d9cd5747e670a087bc SHA512 aaae6a37a113685eb36ddccd497e387617cf0900506638cbafbac282c4d63ade41f4c915ad6f04214c58af580b70d9062ecf3e1618b6f5fe07dad50c5dc125a6 WHIRLPOOL 8f0d1d51588e42c9fac51883a9ecb08b6ad4949fc8f335c2259f967ea8f3555b04b3ca46f323b20591a2bc85dc1b5bba3968fec1be3e4dfd7a9464e2c5d6880e
-EBUILD libsignon-glib-1.13-r1.ebuild 1684 SHA256 9481a91440927a361f0960bb7358c7651de3d9a69f5a8730636f3459bbc6edf6 SHA512 4f43d6b4061b0d2198266b8859b3b495d348ec9f918563eac22f486862c812767019bbeada1125937af3f39781501732b16e0aa2f20b0199895210da7caa4d37 WHIRLPOOL af5e0769bbc28d2a14be6de100ad63282ef4487ca4b1c6a9b13de64550241c2e2254a09fd174f40f9e0358c2990f397f5db4d63e1864228de6e2183e3eaa19ee
+DIST libsignon-glib-1.14.tar.gz 54019 SHA256 99db552f250d0853c468a3f03872123bb7102dbdc91e15a7a4855f7a47dd2fca SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d WHIRLPOOL 17ba0ab1a2cb64d0021aadc1a516d3ac85b86439ffb4d11e6c0ee87c6b39df84b82a89c29ff66e7547ad63137861479b86c91ad960ee4ee40d3f494a56621c78
+EBUILD libsignon-glib-1.13-r1.ebuild 1697 SHA256 00d9251ff29ed866539e7c9d916370d41adde35d43ef71c4a446cec36238b5e6 SHA512 c19bd7185b8aede936c4cf1b0fa6ff237538b7a3b9943670529defb637f116adda61bc7beee5b6acc750f420763afb5eb3d8836cf0c4adbc7b49931ba62b4fa2 WHIRLPOOL cf9561f48a7a1b3e2a84367de81c5632e85c4ce87f98597278975f2528a5d6546f741c31b4d7a1966a29ec3f354e3f8ebc2128c9692f63337b7f2cd92dba7178
+EBUILD libsignon-glib-1.14.ebuild 1754 SHA256 867853043cc92ba99ef70041e12949bea2ed75f9c55a7181cabb976a930aa379 SHA512 8e2dc163b9c68ad2ffd36f5763bb476dd3b43b71979bb601664e2c430416687515c09b01ec27171a09a93dc3dbb4483bb44c287bcae43147c31e04624f3fa907 WHIRLPOOL f9381bc1f712a03c02aa53e9c3b90330aa89954e76542a2cf0716099829f51cb8842fee5662fe4bb4e738e29b6a15dbe8aef08f39de9d05a06bc9251ae2c9b70
 MISC ChangeLog 2717 SHA256 4cc25f89a1e21f313f5ab4b8f2d155b08a414a52e6a01ab0819c5a7153e1d3d4 SHA512 7ad69f6734bd5c6814a7b31f991b04b30c241968c137142dd26eefa775afc683aa3f18a1a838e1cc1ee43fccff7edc05ad75e45671becbb86684822aef213ae7 WHIRLPOOL b060bc259883b87b137cc532d9f9686b4f4303983411a1126ba0c5e52002c7b200bb7ba71e918de6b0ad2022f0d02861579051b8a4779afcf424ddd26149ba83
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-1.14-default-opts.patch b/net-libs/libsignon-glib/files/libsignon-glib-1.14-default-opts.patch
new file mode 100644
index 000000000000..5dcf8cc45695
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-1.14-default-opts.patch
@@ -0,0 +1,45 @@
+From 4982923fdc7be9978d3b089fb443bcb0e20243eb Mon Sep 17 00:00:00 2001
+From: Alberto Mardegan <alberto.mardegan@canonical.com>
+Date: Tue, 21 Jun 2016 13:35:03 +0300
+Subject: [PATCH] Build: fix value of default options in configure.ac
+
+GLib assertions where always disabled, even if the --disable-*
+parameters where not passed to configure.ac.
+
+Quick reference:
+http://www.robster.org.uk/2011/02/07/autofoo-ac_arg_enable/
+---
+ configure.ac |  9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 364f9f2..3cde223 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,17 +63,20 @@ AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
+ GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
+ 
+ AC_ARG_ENABLE([cast-checks],
+-    [AS_HELP_STRING([--disable-cast-checks], [compile with GLib cast checks disabled])])
++    [AS_HELP_STRING([--disable-cast-checks], [compile with GLib cast checks disabled])],
++    [], [enable_cast_checks=yes])
+ AS_IF([test "x$enable_cast_checks" = "xno"],
+     [CFLAGS="$CFLAGS -DG_DISABLE_CAST_CHECKS"])
+ 
+ AC_ARG_ENABLE([asserts],
+-    [AS_HELP_STRING([--disable-asserts], [compile with GLib assertions disabled])])
++    [AS_HELP_STRING([--disable-asserts], [compile with GLib assertions disabled])],
++    [], [enable_asserts=yes])
+ AS_IF([test "x$enable_asserts" = "xno"],
+     [CFLAGS="$CFLAGS -DG_DISABLE_ASSERTS"])
+ 
+ AC_ARG_ENABLE([checks],
+-    [AS_HELP_STRING([--disable-checks], [compile with GLib checks disabled])])
++    [AS_HELP_STRING([--disable-checks], [compile with GLib checks disabled])],
++    [], [enable_checks=yes])
+ AS_IF([test "x$checks" = "xno"],
+     [CFLAGS="$CFLAGS -DG_DISABLE_CHECKS"])
+ 
+--
+libgit2 0.26.0
+
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
index 83bffcb79c46..7a39014192a5 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit autotools eutils python-r1 vcs-snapshot xdg-utils
+inherit autotools python-r1 vcs-snapshot xdg-utils
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
 HOMEPAGE="https://01.org/gsso/"
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 IUSE="debug doc +introspection python test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE} python? ( introspection )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -40,7 +40,7 @@ src_prepare() {
 	default
 
 	if ! use doc; then
-		epatch "${FILESDIR}/${PN}-1.12-doc-disable.patch"
+		eapply "${FILESDIR}/${PN}-1.12-doc-disable.patch"
 	fi
 
 	eautoreconf
@@ -83,5 +83,5 @@ src_install() {
 	if use python; then
 		python_foreach_impl run_in_build_dir default
 	fi
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
new file mode 100644
index 000000000000..fe543c511282
--- /dev/null
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools python-r1 vcs-snapshot xdg-utils
+
+DESCRIPTION="GLib binding for the D-Bus API provided by signond"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +introspection python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/signond
+	introspection? ( dev-libs/gobject-introspection:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	doc? ( dev-util/gtk-doc )
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+# needs more love
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-default-opts.patch" )
+
+src_prepare() {
+	default
+
+	if ! use doc; then
+		eapply "${FILESDIR}/${PN}-1.12-doc-disable.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	myconfigure() {
+		local myeconfargs=(
+			$(use_enable debug)
+			$(use_enable doc gtk-doc)
+			$(use_enable introspection)
+			$(use_enable python)
+			$(use_enable test tests)
+		)
+
+		econf "${myeconfargs[@]}"
+	}
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl run_in_build_dir myconfigure
+	else
+		myconfigure
+	fi
+}
+
+src_compile() {
+	# fails to compile with more than one thread
+	MAKEOPTS="${MAKEOPTS} -j1"
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index b928b0b1a75a..b1ffce166234 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -24,7 +24,7 @@ EBUILD libtirpc-1.0.1-r1.ebuild 1430 SHA256 ca48870a784ec70469da77ace428b8e3081a
 EBUILD libtirpc-1.0.1-r2.ebuild 1806 SHA256 4d210c54a776163be8031cd189e4e714350df79210b1200181ee0971c84ff4cf SHA512 e7481fadedabd7abaffd842caec5c675904eaa7831952f51c58a2f9a417bce561d8dd67817c97755a2d1f8971a79e78e4107f1a9b669a62d36cc1ecf35d4475c WHIRLPOOL 7768d9236b74d236891bbb198685cca430465c05b38e6ec931ccb79caf9d43b4bffa7d51c093f526eee591e1de00cdf7da8b1aedbf44eb94e197fdaa4cdc7ff9
 EBUILD libtirpc-1.0.1-r3.ebuild 1800 SHA256 85866973a4da6985132a995961fc0fdbb3e8950fd6af8a7e6140b166b3ec1deb SHA512 4ec32de659a18443beb10475739887d08c7f922ff8c9533ff0898ac2e430785a0502d6e858130469638a80764e89d4d4ef15251011f2efc2a738d025efc8d913 WHIRLPOOL 3b784a1daa5ba6f3583c3aabf9f044a712b5dfa4303c2b6e70bf5f96250ec053d641f6da14aa3ab86ebcaddd914a5ab06f888f4e1805756d1c0984d0e6cc5fba
 EBUILD libtirpc-1.0.1.ebuild 1332 SHA256 3853ace7ed906426ad4c143ac5725d455099f1dc9475cfa18958bbd8789a6582 SHA512 694588932991003e27c95a2d80333624ba866f232324d1605b152d3b48a9486c73cbaa145cd8299c0d3bc61e8002bcfce001d91654f5499466f1092d3a42396f WHIRLPOOL 04a6d31a3b26696bc34c5c510ad5150cc9e8874f134da48d8622f5b47aa40672ae559fbd171f5f437a96c009824f8af9d9db0f26cd712ff921a034bf4a409bc0
-EBUILD libtirpc-1.0.2-r1.ebuild 1636 SHA256 d674b14a2b9bba4bb1a992ac603cd4897e067321cc9a6edbb2de5964636351b3 SHA512 20ec130077184b8e9a1b86ea3d9fa79b21ad8885ceebcaf575dda50b38ebad616e9b8365008e803900004a324942170f498ce2b547ef596999fb7b59377ae529 WHIRLPOOL 531faa01e558e8d0f390e2ae03c6b5eb4ca891ee4514ceebf447a2f6f144d2c2ec514ab6866c3a661848509e981d4460d2fbd84ad534b86e6ece0165b475a644
+EBUILD libtirpc-1.0.2-r1.ebuild 1634 SHA256 507ee399070de12758edbf13160b72050d1dda903704dfb902cc69ca93b07fda SHA512 aecd8ccef3b5c6970d6e20ec64e1af46eee7b3d9790c3ea846e492d1ca2fd5ea849cc77d7d0b2f66d15ff16d9509137a4fab1e25559ba491c86e70da1bbc1e55 WHIRLPOOL 37d5638aaae0f96e68aa60df197a8a72dbe2daa1d113e68d5538998175458753ec22ca456c6fb6438ff3fb10b2eaa848cb45d6627abf32476d0452ef049040a4
 EBUILD libtirpc-1.0.2.ebuild 1565 SHA256 3a05578fdd1c861b31f7746cdd2dbd959a69833ffa8c00d1a6a5eb9d3f21ba65 SHA512 39c50eef8a5844a0a7f4327bb5ff04e0bd50fd3c1b01d47e1c56d7c622c8a13eb675ee81108baa80beeb8637be11b665e00b2198c37cc6d5821070973258f572 WHIRLPOOL c92c58ab6aff6e52b591fe3670f85ebe60998e9fedf46da4c73ff078852f6863f4cc30f069bf98d62ec96e505d653ab0ff45cd196ab36796899e22ad7abcd490
 MISC ChangeLog 3619 SHA256 66808f3ec40599ff543cce805e725d0e9d986c06b88d995a21d496016881dddc SHA512 052e389398b2377344603a809f1074ff58c7f4c23ed0fff485e86a42506d3fab02dc5bef607907c30161692e3606e2f5f0630e5676f64f38b91de95cadbba259 WHIRLPOOL f28a3b6934034a6b620ae97cae64e833011e30326d8a96e6b1581fdcd11b5a147e59ace3f69b1fb4375e7bca6cc901f868b76e616cb5c2e3db47ff3c3a895b62
 MISC ChangeLog-2015 7643 SHA256 8e9dc2f8d3f72cdc3e8b5546cf3f2a84bf8ffe18945d1e890fecb4ec56fa11f6 SHA512 dd49b196ee86b22d8de0e424b9139893a7f4f78faed33c3a7b4397e4bee11d95adfad9cb7af497ea6277e770ccb4f14d735af9d257b87aaa8e1cd87603414400 WHIRLPOOL dc837e6a157142e0661512cc03069feb411dfc07a5e7c6da2826e47adf4bd4263c86ba48712ef3ce0bcad5f05dc34fc9a3c6875f9b553a64e21725b551761e5f
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
index 7dcf52cf8b7d..a3acffbdaeed 100644
--- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 3e6a098e99a9..9c0b609f0e8e 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -3,10 +3,8 @@ AUX libtorrent-rasterbar-1.0.11-fix-abicompat.patch 6021 SHA256 044eb8da13db68c1
 AUX libtorrent-rasterbar-1.0.11-fix-test_ssl.patch 652 SHA256 d9177a04bc6ec89988676c5655f90ae417293bd1476769f26280cef8c7b920f8 SHA512 8f9eaa341cf947f318956ad1876e8606ebb53f68222f4290cc35336c3985e92602595c21a0a72d82aa5a39d0a68738e5b9baab46b6e27c15ac047397017cd24c WHIRLPOOL b4cbaf88cad85b499bc28cb76dc3812913f3b9485a99f6a0818d40844a3938f5671e0e50958218fc5fdec6ca0c622b8317cafafa614809e04c879bef376f5ae7
 AUX libtorrent-rasterbar-1.0.11-move-header.patch 1277 SHA256 76b30ae734a927ac8fc868186461c8d69bb64ff36b2d59b6f5dd4a6f9affdae6 SHA512 ed919e9aa249a7ddd81df601616307f08338f7f0f674b666ea9eb2cbfbb28bf70c114a0c316cda136766e5df226666386c527e82b70aafff0cdc33ebf874a706 WHIRLPOOL 038ef7dfdbf69ec9fb6c6201f4a02c841eb1e82185201613d9d44b67199479e2d9acf9ee6da450d0c4a173ed89ce42e1fce106629584bd9c3b464f4ce1b09e5d
 AUX libtorrent-rasterbar-1.0.9-test_torrent_parse.patch 1240 SHA256 c736e1e6641b19d47f11b13e7e732a6344357c47b1c65aa6108ed9eaae641002 SHA512 8e6cca0ac5d1e1b43e771921c64258b61e5c3c1249ae9c1b80d784153d919aff1eb7ebf3141a7bc5b926553b2c3c027a5659703da52b9f901c77bb288436edbb WHIRLPOOL 8ed51aa4b0aecb65c886f73cc1276e845a7e1527a76cc623b49965754018f399721d0f19a5c40452927a69ac390439b40ecbca5c09f68d131f5d935a0c4bce10
-DIST libtorrent-rasterbar-1.0.10.tar.gz 3324494 SHA256 a865ceaca8b14acdd7be56d361ce4e64361299647e157ef7b3ac7e2812ca4c3e SHA512 08976239ec12e2d67a974dadf3f16330f48e4b6de314f9d97c5fbbdbc696b76b6b1f8e20ceab6830d46d17b1bfd7e2fe4048fb1a5a97ece12c242c0cd0f7ded2 WHIRLPOOL 1e4ef2fb41eef0b825bd7c8c665638e3f689c3cefca3caa18a01c328caad9d31cd417fb49d25a7d55da6457a89e35a891427d70fb4f4d070c74be2e2e0347a60
 DIST libtorrent-rasterbar-1.0.11.tar.gz 3325786 SHA256 828d686770346f6da2c143c5a2844c5f5e407eb4a37982e90022763508abd62f SHA512 770d16b241174ae4b121af9b2ac7bcde8b14c6ed99352b827b760a3cbdc2c0ebd0d505319762897720c5f72acdff506ee9948ac1140e6d4591805eca5439b184 WHIRLPOOL e56bfe0830cfc7776436552171b14b08913d99a2c726c9eefa828027caaa96d9c3d97e6442a3b53f315eaa3e7e0f68175d813dbab1d6de1da5937054fc6cac9c
 DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 SHA256 103134068389155a0f2bccaca72a57765460eb8188495089dcad280dcf426930 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7 WHIRLPOOL 1f78afceb67a69418d2afac915616812fe3a223c548ba2baf7e643fc5e63c79bd87998473ac4b6cab6ac0093d7f43ac91bcfba41c9d6ce0fc1ac46914fce74d2
-EBUILD libtorrent-rasterbar-1.0.10.ebuild 2431 SHA256 c2b6473d53562301ec57d3ea147d30a61715b5ba3ca027f9c2c90bd4c63c6f44 SHA512 44a727e1e5f8fc1e18d1ba64807fc822e166afb1e2b7b274343232f526972d865c22feccd593dcbdcc488557f139a7aeb6a85bae4cf2e29f8c271a204dfd6857 WHIRLPOOL 8a8ebff96da931f3c402189b1d040998a14f578efcc5efedb5d4b80f71ff3ac94c757c76e6ff0bb832c8bb4dc8cd93b665ed903f05675c10cc1f3f931302ba8c
-EBUILD libtorrent-rasterbar-1.0.11-r1.ebuild 2623 SHA256 5cbf92b7321c8ace0bb9f09219c049ecb09631fe00394d4b4e9840f318bd1362 SHA512 486a328d3ee6cb6d434a75f3368995a28b85193e9aa3b8a761d52c710e201112b2a9a89fd127ae87370d2eebc5cc06c4122f792c21d80c0d698c1125f673bd77 WHIRLPOOL c3b2a633fdc1535e3da2381c79a49da4baf0a94d06dca1a4483cd46388c3c3ae8a2aab04ada68e5895c1226b87bc2d479fc9cb71b2e050aaf0cfeaacfdd8b838
+EBUILD libtorrent-rasterbar-1.0.11-r1.ebuild 2618 SHA256 8a4286cfbcb5a575d2062710e5ac9b4d00310d36011494c0eeb85b15b308293b SHA512 d4ee432b201653ec0dab6623240786bb62be6f46481f53b6732393fd17da6764cda81f5d58cffc8ab16cbeee3332ad9282e173b513096983417a9c39e7f9cd3e WHIRLPOOL 08f251293ac973f961ea17792519462520f35380c5098f14d1d1a05a8213d7a3d044582557eefca76ed150f0e8b03608703391917741ceac6d2c9d9a382e9a52
 EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2402 SHA256 40233eee2963010229498247cf8081f1307a6ba51ab3b028ca009b9706365bd9 SHA512 2286e415d754cefbb77fd85ab0bad0ad50811c75c936c2446d09350b9ed2144c39fc8b14c7ec2862fd3c61cce0dfd96ff8e633c03aeb29991331834b0e2f4f52 WHIRLPOOL 2a5a7e0fc15bab29016e6f6942935ad9ac4bce2e40a5ced46e9a93c5307803aff78e74feb79501026a9e5d89ef7e7aed241dc011581b3143825e18ee6b222819
 MISC metadata.xml 527 SHA256 e53fe78e5ff72e704f0119e0226da2416169291e7a840340c811dd123d72538e SHA512 7dd3d0492dd77ffb05fa50b96253d8e7cc01c86b9eedf3891a5b8b09e49ef8d51747890a874609c077d95d5144f949bb31db9bb40e0ba520a3917a548db129f3 WHIRLPOOL 8f531637c7660ea459f60795f94db29f575552fb6a015283c9253d01d7c7140028b645985109e838bdb45ecab9e43acb57b58269c8af69523e3eb7ba1f07f06e
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild
deleted file mode 100644
index b5f9a0b39537..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 eutils versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/8"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	geoip? ( dev-libs/geoip )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch"
-	# master branch
-	"${FILESDIR}/${PN}-1.0.11-fix-test_ssl.patch"
-)
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug statistics)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable geoip)
-		$(use_with   geoip libgeoip)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		myeconfargs+=(
-			--enable-python-binding
-			--with-boost-python
-		)
-		python_configure() {
-			econf "${myeconfargs[@]}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	prune_libtool_files
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
index 2bdd886902f5..cc369c61d8e9 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/liquid-dsp/Manifest b/net-libs/liquid-dsp/Manifest
index 35d5d6ab2160..870345898b4c 100644
--- a/net-libs/liquid-dsp/Manifest
+++ b/net-libs/liquid-dsp/Manifest
@@ -1,4 +1,6 @@
 DIST liquid-dsp-1.3.0.tar.gz 1036160 SHA256 b136343d644bc1441f7854f2d292bfa054e8d040c0b745879b205f6836dca0f0 SHA512 d69df2c15ea56cd84be9f77383b9914daa52e89e1136aa84fd14dff7690e98c4e29bb5c4e570cac5ef826b884b8fa382e5d806a711d22b6d5c4ddf5b93a0026b WHIRLPOOL ec0605293e5e0b8b1e276390b007ba8be871f23fdaafa6ec3e5dfb5fd54d1ca5c95b69b807ac4a91db63c673c0cf9df999db3c98bebc556fd4547b13388c8858
+DIST liquid-dsp-1.3.1.tar.gz 1047182 SHA256 e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73 SHA512 6da76030fc346e3fadfe70e72be14d1f2ff198d3e9bb5ffb5f4d9b89945686d2474d3bb4911a2b923aad22feabebf2744d47afbffabab87737fe46a24af68917 WHIRLPOOL ab032dffb7ba600b18a2e8a414e2bd43c416e0b7380247c73d03831626598a0438f88032e6deeac7db5fa7f2690c556057faf9467532d63a84ec8d17acc7ac37
 EBUILD liquid-dsp-1.3.0.ebuild 1045 SHA256 23849fa64dc9e5e1f29545ce062d120497e931f8f529ed07405caf9f12936bfd SHA512 949fbf9e3e1e2b7e3f63e6636d41817d0be9942611adc37d02595b4a2cc7df998186fae286f9773f5f193eb6e6c9f1ae6461664d05275c4af3c3289795fb0d2a WHIRLPOOL 4eada6c632c3a566c72a39947603f2370083d2ea7ee1e1023ab3088a3d602b386f3de2167ef6a9950f94e3c393df6b5edc965aaa63bd8982729ff5832db9915d
-EBUILD liquid-dsp-9999.ebuild 1045 SHA256 23849fa64dc9e5e1f29545ce062d120497e931f8f529ed07405caf9f12936bfd SHA512 949fbf9e3e1e2b7e3f63e6636d41817d0be9942611adc37d02595b4a2cc7df998186fae286f9773f5f193eb6e6c9f1ae6461664d05275c4af3c3289795fb0d2a WHIRLPOOL 4eada6c632c3a566c72a39947603f2370083d2ea7ee1e1023ab3088a3d602b386f3de2167ef6a9950f94e3c393df6b5edc965aaa63bd8982729ff5832db9915d
+EBUILD liquid-dsp-1.3.1.ebuild 1045 SHA256 be353111bdd6dad6e45727a6ea234160d73cdc1d652ab6ea561b6df7ff0f4444 SHA512 4786e55d4e0a11792ae681df6dddbc232d03e20b0c40cf871992936e7316432de56fabf03a3ff9051166591e74edba3330dcf0988022d5484d2fb00aead6a8e3 WHIRLPOOL e13c26141c4780131d1b97b9b16bcae171cc436180b66d9976516f13e1dfd1ab3b4787af8c5332daad1abc50ebc2d5c4986f08c230230042745022f84ece587f
+EBUILD liquid-dsp-9999.ebuild 1045 SHA256 be353111bdd6dad6e45727a6ea234160d73cdc1d652ab6ea561b6df7ff0f4444 SHA512 4786e55d4e0a11792ae681df6dddbc232d03e20b0c40cf871992936e7316432de56fabf03a3ff9051166591e74edba3330dcf0988022d5484d2fb00aead6a8e3 WHIRLPOOL e13c26141c4780131d1b97b9b16bcae171cc436180b66d9976516f13e1dfd1ab3b4787af8c5332daad1abc50ebc2d5c4986f08c230230042745022f84ece587f
 MISC metadata.xml 416 SHA256 f60116722af97d8e553abadbd27a86ac435f442686be454193bbd15fe806fe02 SHA512 7dee49689a60f0b24a9435987f3752f53c36c84187e19850bcbe5e2d14b1fd7bf52c3d8de83f91f3e25b3984bbbde9a08150b24d6b62552602ef145821bc95fe WHIRLPOOL 2d23541e01c8d5e76001b1cf4f5565c68bf7b58bfdca10608990fed73b57598b43fea954a92bdb43b0408172cf7c6aab838051ffa62b71589cc08cdc84758a79
diff --git a/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
new file mode 100644
index 000000000000..968f83948b9b
--- /dev/null
+++ b/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib
+
+DESCRIPTION="digital signal processing library for software-defined radios"
+HOMEPAGE="http://liquidsdr.org"
+
+LICENSE="MIT"
+SLOT="0"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jgaeddert/liquid-dsp.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE="static-libs"
+
+DEPEND="sci-libs/fftw:3.0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	#without this rather odd looking bit, it installs libraries into /usr/usr/$(get_libdir)
+	#what is super special is that if exec-prefix is unset, libdir is lib64...
+	#but if exec-prefix is default then libdir ends up as /usr/lib64 in makefile...
+	econf --exec-prefix="" --libdir="/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	! use static-libs && rm "${ED}"/usr/"$(get_libdir)"/libliquid.a
+}
diff --git a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
index fcd3127de23e..968f83948b9b 100644
--- a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
@@ -17,7 +17,7 @@ if [ "${PV}" = "9999" ]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 IUSE="static-libs"
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index f2033018e4b8..c57a33323a07 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -12,7 +12,7 @@ DIST loudmouth-1.4.3.tar.bz2 366818 SHA256 95a93f5d009b71ea8193d994aa11f311bc330
 DIST loudmouth-1.5.2.tar.gz 115940 SHA256 c3dd7b5690a7b6ee4768d71d2bdee4615cfb73b6eeaa342d6a931a5160e47421 SHA512 54c3eb7ef99604d7e2d5560dc6e5be176a188e6a0d82ae6c2f488e30f06553039aa03d6f818cec25f354479a2624f60f2233d7e63b54f331e934d554de9bfc87 WHIRLPOOL 99fd7fa00f08976242313c2bc11e9edfbe1aeea9918090347a1975d5ece438892afbf3b5c16ffe79b1c0a10b28f35f62937d45a234e63b26f051466799fd7685
 DIST loudmouth-1.5.3.tar.gz 114676 SHA256 12972fcffd9bbcc4a3b2b9fbf4b0e549f7b4caf0f11c8d2af2059087ce4e8792 SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7 WHIRLPOOL 0a7d4a01ec4f0ae68f58f3267aabc2eb9f7eb0e812232a8ecd3664dd5c99ae404c4825bb5ae01f36a1cced48a9aaff67c4a92c23541e2e1fd9f69c4a67962007
 EBUILD loudmouth-1.4.3-r2.ebuild 2498 SHA256 df24c25a75f01711e7c1260ee09bbd383dce86b6e18c2241f0a8fccdef573e53 SHA512 2d0122e816ce11214c6ee00641535d0d9148c1412ee660fb361930e4cea95bf4866fbd68e340c57ec593afc94487a0aaeb1160ee1aff69a41f87138245cf7f4f WHIRLPOOL a9e1c8e8c2ba49b95c8f43b170bdab29288d176b01bfb50878cc36ab9df9ec0425be5808c9495ee76f841fc6e9550ef0e23002c2966827e1fe3430e23907607d
-EBUILD loudmouth-1.5.2-r1.ebuild 1165 SHA256 823877bbd602976e8df023dc4a997cf16d3b208719254f391a3a26dd829ab23a SHA512 7b536b1265090ac5d7bcb6d2460550a36fba4306a964feb5e54c37322187def0e566a85a977d86b6f3be1d6e34e2c3d2de6a988f3e278c26beec280378b15e3c WHIRLPOOL 44b08f38277ba84e0407f992ea1dd7774086b01dd39b60bb48065fa36edf362a2edd941068f781e10060b2c4d574ed0ef506d680e55c458ed32f3c4f37ec9318
+EBUILD loudmouth-1.5.2-r1.ebuild 1163 SHA256 63efe87e8c14e062c809b8050281b7616e060de4460c5429c9c9c80a838f8c21 SHA512 42b8edc99b62273da907fac0a35d95c7085478c9a0da3ef5a047f4372b4fcf632bd3fb2a12c7669a694c40c0690d527dfcf212e0ad4f1e551b52f56c9abdc493 WHIRLPOOL 9b0d529e00a90460f89992f93ef851649d108691aa813339eb210a32d0e6f0da7c99b9b1e1af3eaf38434be9499fd6d94cf8be462a7a817fbe64cf15ee61be23
 EBUILD loudmouth-1.5.3.ebuild 1166 SHA256 487caf946da6057b07075c3a9fc105bd747a8ababc75dda3b59786f7b5958a6e SHA512 7257a30439d6a17b92a04443405ea7ae10b83ad2621a411f25e1e6d593e8252a07012a5ded42d2645c39d45c9494b137fb77585c7bd47379ce128886f6e6ecd1 WHIRLPOOL 183d80e39a847257bcd2805ede690686d9dc0696ba5c1245913930e53b3ab1ef3466a28e1dbfc50c33a76af0509b16fb9c89dd5a601ff86151243abc360b3916
 MISC ChangeLog 4063 SHA256 863df6afc9f522b1f1a4af210e924437080027d82fca2fb2de38946af8e25160 SHA512 25144a9ded7506ae171913e1c1c945c19a88c27eafca6b9874ff18bdd42153b5b6cd256c3a97bf45b5f58d0542161fc4a51a971e356d13b9379f0f4878a14e96 WHIRLPOOL 2ff7e6f2b309b0517d07f873f18052654149d20c7083b3402d6ded7a690334b001e4451a6d40e8d83310fa9b10a94eda56b0baaf47c22c331c11aeda8a3f4a79
 MISC ChangeLog-2015 15204 SHA256 5feb983262f60ea734d8e4c754d13a37fbd8c12750d047fa362420a1875e3cfb SHA512 e71849c239afca32e7cbd4939905806252dab8af6a67751b480116bfb5f0dd06da4e8fd8f6ee4f1b02ab49431ac71904c0cfcb58e6bcbbc96bd110ec1fdf9a97 WHIRLPOOL 89cf0a8db229015f6478357e445a11201b595ac5e2adfc32c9e3a94309d4258a6c7191e3eac02ae07518bef9256485b4a7cdde414bd06a4ad167504c31f0c968
diff --git a/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
index 0059fb3c90fc..1ff3a71e5dfe 100644
--- a/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ppc64 ~sparc ~x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index fac37c4a2bc1..aec60702dacf 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,3 +1,3 @@
 DIST nDPI-2.0.tar.gz 19280901 SHA256 a42a60ebd64bc8606f780204222893027f6dce0e3b460d7be655e5e065f5f3fa SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44 WHIRLPOOL a19c55ae82b99d7a7b4e79a9327832dcb77c8cf62e18a2ff875399580d6157e74358d929025be5ca11b63a969f1cc950b222959b092026286adfbc35fb7c5194
-EBUILD nDPI-2.0.ebuild 470 SHA256 b478e6ddb31c0ce00b16a30819b7310b94f74f25368129a86fba99b19e009140 SHA512 1c00cd3c03d09c3cd8c9d0697a256cd2cfa86067c1494840aa1cb53a524f7bc20fa2766d0310e06596c02d7cff97a6d8dcad8a8fcfa885df29d49c3cd3969b7f WHIRLPOOL 858a0c898b5a0eefe8467fbb1643318f2fd9df9c39bd5e55ec4e25d681531dbac30db49216e13844a7414009da41e92bb08d2d74be32be881d6b3a248309e3f2
+EBUILD nDPI-2.0.ebuild 628 SHA256 02f25de7899b870a28a80e89bc2d65fac226bda544d1bdb74ea220f8591d3eaa SHA512 45282872ef59f84d486bb8ad5c32dfc242a248a8ebc90bea46eee58691a53d22156a2bcf0b06371fb882e4092499eaf4cc72c468bdc6e5ae0a64322bd7f4f368 WHIRLPOOL f87f8f990d9a409d0eb2d102882fa42c6c514395f853ef5ef66184d83229f7a1f41975a98e9b31ecbc31478072e5db28ae9ea9d8de01193f85e70998732a80a5
 MISC metadata.xml 297 SHA256 b4c003997bc1ffe5f90ee46d9a04fd12320ecd3b75ecfcf00513bbd4e876d03a SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a WHIRLPOOL 9b163f7b6a619339fa565bf36b2fbc993c56ea05965c1428e2670227b392519c034b0f0bd553dc577b7fb7f0663a39de796a77e12964d273dcb2c9449d9eeb15
diff --git a/net-libs/nDPI/nDPI-2.0.ebuild b/net-libs/nDPI/nDPI-2.0.ebuild
index 7d4217d49afe..f512638e13d6 100644
--- a/net-libs/nDPI/nDPI-2.0.ebuild
+++ b/net-libs/nDPI/nDPI-2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools
+inherit autotools eutils multilib
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
 HOMEPAGE="http://www.ntop.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="static-libs"
 
 DEPEND="dev-libs/json-c
 	net-libs/libpcap"
@@ -21,3 +21,11 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+	prune_libtool_files
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index dcfb4b567b6d..f581cdcf128a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,12 +1,12 @@
 DIST nghttp2-1.10.0.tar.gz 2086580 SHA256 192dc031e71e182240079befae9db7e64c9951da3a83c7a438f57cf76145b6a8 SHA512 4341f76ead38ba30e0dfda492e2e0f4c842f453e235fa90ee55b1e556092828236f21c6b212d0099cea005f149e4be3e63ad007009dd5228999101e563009a6f WHIRLPOOL 603391b0d15883cd9db734a0e4bb7d994c17ae4209d5251504e29cc59e0ccf67488b9340acefdb6d6603e9e7d3b0a0491ed18330edce4d20adb0ed19ffc5b975
 DIST nghttp2-1.19.0.tar.gz 2159530 SHA256 b67946ad211aa3f7c91f4d866f47b056e821da8e31ab4636130d59be87f53016 SHA512 50f45082f725c237a0e1d25af57992b9cded6c9b68f0aa95c44c16eb4448e05b14e06c853032924d03034115286163de0ad684827cfa5d70896656868fdb4e01 WHIRLPOOL d6178a31aadfcfc3547ab4b0f58ba8f5b34a95ebc1168b7f03b4bfba58a03737b061eea020c264a2da882f0f6541620cd001e62919b82f5b1ada552402c2fab0
-DIST nghttp2-1.25.0.tar.gz 2213656 SHA256 23fe0c97505a73154bbdfd2fcf47f5fa652ad8be4a88c3a4bfe8ff517026ef0f SHA512 2264b073ddcf1852c9f9c6d104ecba3c6b08385d6933f89f01b0ba915c1715c6a963da69c96eb4eb41622994bac6cd222d24c4dc8e152a45787f06d17693e809 WHIRLPOOL 28fecceefd294d2a7950cc740e01898db6e5901fbf8357f7f3c5cb6170909451be28924de28c1fb2d97fe60a5acfd1599a260aef3bb3ab5fe4173a05fef818cf
 DIST nghttp2-1.26.0.tar.gz 2217713 SHA256 daf7c0ca363efa25b2cbb1e4bd925ac4287b664c3d1465f6a390359daa3f0cf1 SHA512 fd6733e5d30fde03e7d2662df1adc0267f1ff3b3a0fbcd10dd9609b7eb149a94a8441b78aef0f4d34d3c0bbc9a11fcbef1ceb1f7da44091f998f6be93dee3b9d WHIRLPOOL bdde085e730b945b5253b1a3df160d990f72f524b3201bb3b3b4a01a7ed7911c9c35378e957b999135cbaeb694001b7e9410d56901f4cb3badeaa77fad66bf37
+DIST nghttp2-1.27.0.tar.xz 1546064 SHA256 e83819560952a3dc3c8d96c46f60745408f46f5f384168c90b9e3dfa53b2c2c8 SHA512 8156ae4084155d000d1655d43790698b0bf89af3ba3a360cedf6a5744aa2ca9485094e65e09da2850ed6dd55479fe33de0948b734b987c85a63f0b3c83dbafd1 WHIRLPOOL 787adeca9a023714c1cfb8c6a2ccf2ecc429c594482d42768c1e55650a3ee70d84f5704dac2462e5443bfa168684db952fdbe61fb555992ae54bf7a3262b59dc
 EBUILD nghttp2-1.10.0.ebuild 1772 SHA256 7c2b5ff443d23e99f3a289bdf14d1bc623ade04be5d9c1cd88cb55147bc1570b SHA512 65a431e382cc6b7494674b0c662f1f18d0c3fa0b6ca7bb16dc3ad0f60213f51113a73aa1252680c63d687424bae54bfa2fc813501e90ded0cd08e06cb6088809 WHIRLPOOL 6698754715eaf7bc775893276855c7eee5c0048a1b32a027482a56dddd6eebfdafadb75fd4f124aae9e8a8d51b859197d94eaa5a61b376f5f9f5dbce7eb7cfc0
 EBUILD nghttp2-1.19.0.ebuild 1815 SHA256 6989f5c7a2fbb209a14511e8621c44a809ef93756d1254c93c65050eff2bfb26 SHA512 f27e9ccb9a772a90026d4293ff53e6758de29d8baa02e02b2d8a69c987ecdf81f08c7e66153078c0f4e33218c4e24b84123c4a0908860aed7574a07e211b84a2 WHIRLPOOL cd08c25e82d703d67c14f05cdffc8470ac4df61b5ed48f570391d59bdae84f60e4aa355a2b9c3761f7eb5e7003d4d3ac41d94e4ec45555e9d09175b29920c422
-EBUILD nghttp2-1.25.0.ebuild 1823 SHA256 3c341c11522c55965eb1ed3b4096ca2d7b9002dd2ef29dfc8b400203d28b12ca SHA512 661fc8bd70b382b614ceadf16d161816347f7b8b7bd32484315da185d801e14f15fb5dbea58a569c1a0107584598ca5558697de45259740ebfdd36754aa97751 WHIRLPOOL 51af28f103f7c3863d59317a4d97a79f1804d6fdb4bb9a45b5a43fdd96010f14fe88a9b47ad5bd79fde45a99f009fc5a3e274a5ea8fe3b237efb86dc1706b0d3
 EBUILD nghttp2-1.26.0.ebuild 1823 SHA256 3c341c11522c55965eb1ed3b4096ca2d7b9002dd2ef29dfc8b400203d28b12ca SHA512 661fc8bd70b382b614ceadf16d161816347f7b8b7bd32484315da185d801e14f15fb5dbea58a569c1a0107584598ca5558697de45259740ebfdd36754aa97751 WHIRLPOOL 51af28f103f7c3863d59317a4d97a79f1804d6fdb4bb9a45b5a43fdd96010f14fe88a9b47ad5bd79fde45a99f009fc5a3e274a5ea8fe3b237efb86dc1706b0d3
-EBUILD nghttp2-9999.ebuild 1893 SHA256 07a5a2b19a50b027208f3423a1a8499e157440854518b50a116d28e69f263b47 SHA512 9143dc336a572ac1fe9d1b1fbe690f240681bea7ba01271430d44bee0885441fbe16210237605d3b200762c8c84b5100f43ff20b24c1763401ca08850dc55936 WHIRLPOOL ca87e899ec6032f30b96c95791148e2dcfcd53245f445302980c72d6ec4e2ca3fe95b08472c8c61f3f1e623a6f43668be4c6d9e79b1a4ecc8b154b60bcd291c5
+EBUILD nghttp2-1.27.0.ebuild 1815 SHA256 042bd52370a528af7c037ebcbfeafa84a17a39264054c26eebcaed3f4bca13f3 SHA512 fd44ab40a68379bbef08e3471a38db2509b0f8f6fd29db8928e0310ee758a35c1c6b5c032b442aff437020df1e079af59e849aa83e3a019dc9ea6d7fb1c564c6 WHIRLPOOL 2e85cd6caa181d21b64dd620839ca44b9054db01b314cb68adab15e02f62ad367420751fb4a098215a95533132aaf0fb77482138626287c2409051ae09ac1632
+EBUILD nghttp2-9999.ebuild 1885 SHA256 073a5e228d5b7f7fa0191c503c1d44b27f595da6cd71deda1fc890cafb5beebd SHA512 567ca5388d045641606ad995c5b033202bc171247027ee6e40a836db617c5f94faf9294bb5f00a8c726f27bfeb2e8c0002253ead9c0e5d4f07d6b4adaf822ef6 WHIRLPOOL 469fd7cdae0e4b4ffc9436b1384c4c1c87142d659f49645bb4ac7f1055bb4bcb3e13c306d2c4120050b6acdaf65be698fc01196dfa5e34dbba9a0924b12bf5e0
 MISC ChangeLog 15393 SHA256 347706c6b7f4e9b63fda2e214c671bd97aea620e056d466c0cf15049ffa15829 SHA512 4ffb21fa44cb81d33795c10cca5c3c2371b999e58f5f8d47befb1767bd393095d47aabfa342c37756404497f8be5c898cb5d2acb031ea118b9114d0bb69503e0 WHIRLPOOL b04b8e526e202e87aef3f1d74356ad337cb7125ee49f6e355748ab30adb1eb5068257bb7b92ccade82d43be201945357f30f417b10d9bd332cdf0d5b16e337cf
 MISC ChangeLog-2015 917 SHA256 99d727240f9129cd302bef401cd6a15104db2d8300977f7f9c3354ab2da1cf65 SHA512 09e2b3352017e46a884b09f3e592df066950a1091f62c56a725d807b99e31a153509f4a73d175dedba37bf5e5f416c19ff20699e7a9faa1f5631990d76c7c4cc WHIRLPOOL 5b0b4221bfaa365808f87b6b34ddc92d3e0f9b9bf29566b47a916bfc8a72564e58d09516da727e3702b85d4657be659737b2f08fc94b82d50eea607704e68337
-MISC metadata.xml 548 SHA256 303c9bbf4763404a0c7daae66b2f7ec61dd051ce0d5a89e6e6213ba306276295 SHA512 e29edcb283ef5de42e4dec4456a03af0b3ba09e7827c81ad312e42d5bc1348794076c5c28edc9d19de9f50e6035077c89fe7db6ba1454c19f182e7fd73dcb4d4 WHIRLPOOL 9e991e25ff814ef8b57fda6652e4c6fffa39baaaa99d68fcdf351d067bbb48ac4d463cf00b27fbd4411f48372d5c702a3867ecc9ae8d27db15471d920d999d26
+MISC metadata.xml 544 SHA256 f8f00ff71a175cead9c0dde6a46cbc2346b7b674470f4aee6699f279756b5938 SHA512 81588ca1912525e085b71baaa8512b22ff47f7dc2834115c12ccfdc86d42e62048cdf53c3cf2e91d9af50a02dfec352f3b3e0abb47c27fb9056070d553007afe WHIRLPOOL 479a8bcaa3aad6e07212227e89b2f53862382c9e4776bb0b2b214f0c9b4510dbdea9bb88eb0731ca988add13329e65ecb360ecc0fe97c5c19cb8247c41ed5680
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index dccb46fd26a5..39dbfe2a8944 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="utils">Install nghttp, nghttpd and nghttpx</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">tatsuhiro-t/nghttp2</remote-id>
+		<remote-id type="github">nghttp2/nghttp2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/nghttp2/nghttp2-1.25.0.ebuild b/net-libs/nghttp2/nghttp2-1.27.0.ebuild
index 3ec4b994bb7c..73177fc62199 100644
--- a/net-libs/nghttp2/nghttp2-1.25.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.27.0.ebuild
@@ -8,10 +8,10 @@ EAPI=6
 inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+	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"
 fi
 
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 6279f2410cbb..f340b41cdaf2 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -8,10 +8,10 @@ EAPI=6
 inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 	inherit autotools git-r3
 else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+	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"
 fi
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f18321b1817a..b8c3484c67c6 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,23 +1,18 @@
 AUX gentoo-global-npm-config.patch 1511 SHA256 a6575286a4f0c3b4db07c2f353d2e6c093eb3caba6cd0d3b11e546734b16bfad SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f WHIRLPOOL 7e748dd02dd248fde544ee088fe4e7b295919f5da1fcaf9511071c716d073ed45380831677082f9748c3802b7bdc6004b78275f39d29f1396330a1b196c5f1e1
 AUX nodejs-8.4.0-shared-nghttp2.patch 3143 SHA256 024374b359044dad8737fcbaccbb6f4968077d3cb8815fbccfd92ad890a4736f SHA512 ccdc2f36114775f497de8487eb187b11d50b6eb3b213d96837029803e864f8faac4a8f0f7d3bdfb42e038ac68ce55dbf6992df1bca5beb9fc9d14a18bd9bb878 WHIRLPOOL 1ca6f20c6f83925ef85437936b068dbf57ebc1d71e319f386c5d3b10f138d527178f74da41381ec5e0979206f7befe3120d7fa1f8eb7c7bbaabdc1e860195937
+AUX nodejs-8.7.0-shared-nghttp2.patch 3162 SHA256 45206aa8cb8832521218a6dc28db0877427a3fc6093311d778e61c21a01c1760 SHA512 e9a142f95c5d5758332b3652d8a821940f541c29664b2788909c20d2b25a61294e2eda712eec1332abb81f5f3d55470c2127585644e3cc9c05c3fe5cb510f54c WHIRLPOOL 1c9a3835e708011abb2306ab760efd2029aebc0f6cf82725582c5ce090bdf0d38b3ad523006e93f0bea4c001ac346371a2ed0c7e3536dcd91d7048f06a1e0df6
 DIST node-v0.12.17.tar.gz 19938029 SHA256 ddea5e253812f167608fbdda6ff29ffc30dc6f669cf2f6e4249938d28b9cd44d SHA512 86c22b17f57018083b07096beeca10e6dfa7569b3d1a25a3b12dd82796db3c9536e6136e0dd0ff62b4de116413f3722b36ce396faa46d8640f80ab09ccfcbca7 WHIRLPOOL 5fba1f95de0a7dbda7e7649bc0f8553cd8595eb87cd27062efbdc59a54673e7e1e6f80191abede683a686043a81d82b76e141aa765b98e3dc39e015aca98e41f
 DIST node-v4.6.1.tar.xz 13295568 SHA256 fe2a85df8758001878abb5bbaf17a6b6cdc12b3e465b1d3bace83b37fdf0345a SHA512 4eb2acbe13ee2373922420e3238be63d2108dacba640438bddbdea12ec2de9c655f33db611e4c0654b66bf4fdb844a7b6554a823aac73171b17599096856abdb WHIRLPOOL a6d21cce7ab8c430528682f78a6e6492f753c87949b7b1bdc15dc02911559cd89deb45329c2ba32da57b776dd4feaabec8a3e7a59a78094cfb079261b6475c76
-DIST node-v6.11.2.tar.xz 15665456 SHA256 04af4992238b19124ea56f1bcfda36827613a24eb3b00fc3b50f261a415a26e4 SHA512 9ea203e402b5d57fb5d30cc4e9e59e9dac5303134d687888ee5e7e004388054086d82dd9097408bb3cfb25826dcefe720b75052542f8c88867de382efe91b3b8 WHIRLPOOL af8467f21b812fa2f6e723dbd7be2579257175cc7a826a1863044b69f8384a74bd9da2a7096cf29b6f1e7cfbb439ce179a66c45e063edd60f456dad0410aa42a
-DIST node-v6.11.3.tar.xz 15684012 SHA256 5f09b77010cb3ec4e321ecdc30beb6b49d8a2843155b7f0ad97202ec308ab6bc SHA512 4afad49499d05f97ba45a27ea64d5ab514b276af5cf3b362a9c418dda8619dbf22baa1c958c2ee48ca576ec350f45f2fe02bf18aee91d82d44126c92e9ba547d WHIRLPOOL 65f1478794ad4f183cc7937987a9add24271c1641d6ab00d337c4415da606bde8378b557d2ac923f1d50b87b4aa06ba3b79488ed49a6f40e54f6c5852d41eb75
+DIST node-v4.8.5.tar.xz 13316060 SHA256 a48aeefc2b4fae0ea6410a8045ca106af244223012eab003bd5cb00aa3b50d53 SHA512 64d936ca14648b5648dedb41f2ee8d39466788762d335fbfc9ce4cb7484d05b6c24ad912fb4b1579a08f466be50b129a96be700fd89cbca5e1de84baa63ddd12 WHIRLPOOL 8d74323f38b4f55bf2e95a628005cbb65c0f4ea0e5dd55699408e26b724ff65fd0a7f674399ed92ac3a56592064133daffcbb37d7076b8da33d28b4d17d61410
+DIST node-v6.11.5.tar.xz 15699404 SHA256 1c6de415216799fbaeca82304b3fef87accc7101ebf2ead7d5c545e0779e8aaf SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 WHIRLPOOL 6e572e34d473544624734a54243dc41101e91d045f2b9cedc0c1a65c90584deb163efb422a0c992689ef9878cc5b882758795ae4d902c1c5b20468d8fa2151da
 DIST node-v6.9.4.tar.xz 15519264 SHA256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce WHIRLPOOL d1bcf488ed1aae7959303b988c9467fc5d0930166c7bfe0e441392763e19f788496971c07560a9f62586bbb2be7ce741ece8346140d665d29593b9b8f649b002
-DIST node-v7.10.0.tar.xz 16751724 SHA256 dc34dd15524ba821ffcae7b245eabe8631e2614d5e3cb8ff08fbfdadf5919f21 SHA512 d9bb8b4e17c41a9726bba0e32f0cbcdec9cde920457242a7170c8f8fe37aed21d77a0340b7b9bbca2e60cfe5a41da65f0ce7dc295b0a7a823c9e863bd232171b WHIRLPOOL f7cd2a6a4aa6a5dc6c5f59be6897c13f4bdd1230e1324d97704ed32efcc65685d0d5b180e0f0018f9564bd4f4e6df43c0b90a289d5e5a92937e60a13d0281bf3
-DIST node-v8.2.1.tar.xz 17897168 SHA256 02c46d8914540eea73d0ad33bf9f371a28aa0dc8c5d740948491fef044ad8c8b SHA512 8d84998e8408b89e003929d7fce89c31703aea59ca5826246422d4d1935941730b0b9907a8a9af088ec8ccad60d8919da04104037083a2363daf118682a3b82a WHIRLPOOL dbbf430699f88b1c86b1a818b9c2fe424d3c63eb36c2b85b54de78954d8f01dc47a2f66a6cecf30c43e8ab29236f0a7509a26afc4586501abcda4494a78a21c7
-DIST node-v8.4.0.tar.xz 18265792 SHA256 5d5aa2a101dcc617231a475812eb8ed87cac21491f1dcc7997b9dd463563f361 SHA512 7d0d97ca64db0bf87f1892490f8b7758a879d2ac22532b69e8e0ee5c04bd11073fd917353eeeabdcfbebc83540715d8c520ec9bf9ea1afc82d8ee7b6caf819f1 WHIRLPOOL 23f50be06615350564577349f6388d6563cbcae9e9b0229133baaab30852be7c759fbb4f265816ab999fa2bfa8666b47fb3ba438e09beff8e030fa2db547001c
-DIST node-v8.5.0.tar.xz 18326412 SHA256 e1cde5d8e5049e7e1b61aef128f26162059d885dc8cab5014bf5cbf693f75c3c SHA512 7ef83a6da7ba9d61c19df0530dfee7b769c0bc7ab066fc29fdb54c9b09085a3536699c7c92889cea8fbf3d6241cc66c383cd351451da8019fea4e0d25d043f3d WHIRLPOOL 63576159748e9423a0b1df7d032d4f5edc23d33f22fd76d3dc0f0b4804606abf57011097dcf4fd2d3707b22babe69bcd976133b7450558925b5d679872abd382
+DIST node-v8.8.1.tar.xz 18209260 SHA256 5ce2c47ab779992db49942f757a01cc5131db5cef4e0dd270e48151b0887b57a SHA512 368eafd66d2108ebce4593bf496e129287949ea6d6b7d4b1f0f02e91ae1ef9632a63838dda752f12b4c2b133c2b2ae74b390717c02778c427e8e17964c002c0f WHIRLPOOL 26ab36f120ad068f5e36c06c6c7224fdaedcfd88d519ff573a984d83b07c5aafe0fcc773ebedab43326de32e20bfed4c681c7f14a9563733b0f091bc0ded39a5
 EBUILD nodejs-0.12.17.ebuild 3425 SHA256 4dbd8abed45e7a0266b9cd379bb95e205e8edf006e57711dde176ba954b996a8 SHA512 5507119d2bf420f8096c15258dded17cd5bc5470aa36d8ca1ef4324c183536580965b5c0b8022f22ebce509621d84ab2423d768e2c5d8e2268a40f622ead8075 WHIRLPOOL fee27aa0ccbcc6e8d827de12e49fb1e549b2784b9edf6e19304ccc24ad243a28556d01fdc046a74e9023ebf394d0e47f2e60442b2c23b0b49c7c169a66beeb11
 EBUILD nodejs-4.6.1.ebuild 4435 SHA256 0ffa9d22c3264d0bcd11ad6fddba92c55257d9da1a732ed70421a844f09857b3 SHA512 989f6f6375723a6de89aa9f593585557032f4794be80e39d68fb2fb7dab6de0fbaf6b2b56205ac21f3f9bb2b2cae92505efc9b644f99fa33f24cfbfa469fc358 WHIRLPOOL c34ce2816c957622d87abbd54f04b8763f1bdb9caada6d909e761ab024d70d2a04a41a0714339da42d445a018d9a0b9830d2e1849b00de14b8c2d5a7ffb6cab9
-EBUILD nodejs-6.11.2.ebuild 6094 SHA256 7bfa8c4347e75e4d753084aa97aa9c966184312469aaaa78fbadf3ff4702babd SHA512 4a9968d5e5e2ffea375208e3b91ee972b14ffd8dcbe24b77bc86990bc8f863831d3c96de8764368d37163462009bc0ef47ac96c528f0b04cc4554fbfc59a80b2 WHIRLPOOL 874ad9b6bdda3b115170bb811ebec675f87daeeadd0812b5f0caf042570bb26b49baa77db32742a3714e5478ffebf40fa5fba4c3ac2da82f72aeb19683ce5764
-EBUILD nodejs-6.11.3.ebuild 6094 SHA256 7bfa8c4347e75e4d753084aa97aa9c966184312469aaaa78fbadf3ff4702babd SHA512 4a9968d5e5e2ffea375208e3b91ee972b14ffd8dcbe24b77bc86990bc8f863831d3c96de8764368d37163462009bc0ef47ac96c528f0b04cc4554fbfc59a80b2 WHIRLPOOL 874ad9b6bdda3b115170bb811ebec675f87daeeadd0812b5f0caf042570bb26b49baa77db32742a3714e5478ffebf40fa5fba4c3ac2da82f72aeb19683ce5764
+EBUILD nodejs-4.8.5.ebuild 4437 SHA256 9ba83181dd49f1c758430db5c0c588d9b03eda0dcfb01bff2b22a047a72daab0 SHA512 4d005e665935845424b336e6d561a3eedf38194460cd16e4db5940d8750d97b27a51fc2a077e12832b07f75a01c8dba3ff38eea84d081ed89cd99b959702545c WHIRLPOOL 4b47a76d0bea7b57558b5dd339796e80c5e67ea38de831cbd1cc011bbdf0da4086577b2d5b5471c8db04b7a51c9f40d1a351a8641ab29e2e3d5bbbf1f2e6fd10
+EBUILD nodejs-6.11.5.ebuild 6094 SHA256 7bfa8c4347e75e4d753084aa97aa9c966184312469aaaa78fbadf3ff4702babd SHA512 4a9968d5e5e2ffea375208e3b91ee972b14ffd8dcbe24b77bc86990bc8f863831d3c96de8764368d37163462009bc0ef47ac96c528f0b04cc4554fbfc59a80b2 WHIRLPOOL 874ad9b6bdda3b115170bb811ebec675f87daeeadd0812b5f0caf042570bb26b49baa77db32742a3714e5478ffebf40fa5fba4c3ac2da82f72aeb19683ce5764
 EBUILD nodejs-6.9.4.ebuild 6073 SHA256 150fdc85c99024a7280f3b5c23f11c9a5c7f99ac5a075fccaa8c1dfd4f52865d SHA512 aefc407c057e7c660ed0be4adc5056c9130b95adb63b22bd55d06c4981d70d53d82a65350df4778684c597de5b5bf6b2f8cd28b0ce61de4914c4db02ac3461f7 WHIRLPOOL 58aabc7cc764c8a47538dff634bdb295a2c93ab646ae544cbd61fb32961a465a5da65cb9a068ff837675cd5f41ef8c769d1e06a184740e7fc86819fb4e1d1be2
-EBUILD nodejs-7.10.0.ebuild 6152 SHA256 dd32cd53dd8f66dacd397db141dea21d2030bc6dc79719714541440734e9ec2c SHA512 70b272065b7dcec036d37bea63c3047c848219eac5d3b0086689cece1c12315d6cbdfb90fded78ce117a23f82aec5f7db6098019f47b53715ee3b6f35d97777f WHIRLPOOL 646f190d8775b75419f6ced6894c442387d4209148f855109ba9b1d6dc7ac7eacbaa7ef698709b929a985d4d15c19b2f9e86e2a6cf0ff019b601d081d6cdafb3
-EBUILD nodejs-8.2.1.ebuild 6152 SHA256 dd32cd53dd8f66dacd397db141dea21d2030bc6dc79719714541440734e9ec2c SHA512 70b272065b7dcec036d37bea63c3047c848219eac5d3b0086689cece1c12315d6cbdfb90fded78ce117a23f82aec5f7db6098019f47b53715ee3b6f35d97777f WHIRLPOOL 646f190d8775b75419f6ced6894c442387d4209148f855109ba9b1d6dc7ac7eacbaa7ef698709b929a985d4d15c19b2f9e86e2a6cf0ff019b601d081d6cdafb3
-EBUILD nodejs-8.4.0.ebuild 6236 SHA256 486d66ddf4e938e3a6d34191c20ec0eef9833ac52c7a92b79fc83a7c45503908 SHA512 c6d4ed336aed843bec749b6e83af527d586fb6378904a2f3b0971d48269ec1584efc7f8fa01aa5520b6751b419e9b503d2536a0b53a1dc37a9de3ceaddb5fd6b WHIRLPOOL 75f75f2eb4b39a6690f22cc34ebf14d81f06aa4ef0c43215ae165f6c371718e2e8a3362a70921ee1fb23b58475d97e1d90ed1c89bc23de9949d79aadb426bda9
-EBUILD nodejs-8.5.0.ebuild 6245 SHA256 5933fe6f7092a60264171773f9bc442c5dad97610e82e2838f0181ebef256b7c SHA512 67d9bded8b6615fa5cbc30ff35c67facdcad32cea81fd473fbf312cd21b4c68213d329274bc5340bad1b7e3cf2e444743fda5cf22df3f11622679661e2e6cdc1 WHIRLPOOL 9aad22b07b82c2a25cbe75f3897de7fa2451f6c25f79e13e9684f6cae7cd1e3fb317c3fd8ec63492437b7af5b658b7333a4a4dcea9fada6153e5df22233316a1
+EBUILD nodejs-8.8.1.ebuild 6245 SHA256 7bb3d99a63a7847de0fe72029efc4268edffccc4e61a1399ffc0ae7a81660670 SHA512 af76765d0385310b96e5e6b9645255874d9c36be8582c83f0bf2f8be810dcf175a827ccacb1f8ad38ed4a99ed390f78c3a0996d433ccc4edc540f38de89a8984 WHIRLPOOL 416ae7ebf0fed3615d0f23e2491654962a78f9839bdcaafe2ae051fddb80ea1a4669d1ac1458bdabd23425993312bc6e8c25172a7d5b170c34732a9fe4ab8476
 MISC ChangeLog 16331 SHA256 16702a204cff5e2c71e5b982f323aa3aeaa29a6f3b2da7d23745b81a7f9e01bc SHA512 a98fae5176a945e301bb763d80c44c641295dabdd8cd6d8226106db206b5e3d90654f3b9d98f5adb2291218c97c1707daec05f68f5d1036edba0129c5d86169d WHIRLPOOL 7a409b0f4f81d549f26f777325c4149a645e275fd83b5128252dd27596654e6800454692664e3cf5d41030794215e8e39cbc05ff3cd6db7bd681a12a96eeffec
 MISC ChangeLog-2015 23934 SHA256 354bd9c41192f651dd4426b236bc63a6bb41ea76831855a0ec00550a369a1b97 SHA512 28421b67fa37d71d97f976bd938cdaded4c994c08fa68d469b1d193a4cb380da633acb352cdcbda0f4cdfaf6cf671c82132c3e64bb48721df9d78843bcf49d74 WHIRLPOOL 65cad5043c8d83e0d342c1e593a7c0eb2d2400968507ef48e2de0384baab13861c99ed7e44cdf41eb6027826b174695be598d77077587a01ce96adbb43a5b633
 MISC metadata.xml 749 SHA256 7bd1463235daf323e99518809d179f158263c5b702cb3b06433e33527a78f0ba SHA512 6b1115136449fad2edd373b2b853874b54da2dfab5a30a36f54bd8c0ac61636139f3c59bbd4618460c725bf9981c71731c33ccb07900c38c58bf4b9511254ee3 WHIRLPOOL 3bb964d5b3a51c2895fdf5c0d6cfcde5391f8cabf4f559e78c0988558f14c6c026d9523a89e14a8d8ff605d33a39982884d85397b6871aec4d5a862b2b3e2777
diff --git a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
new file mode 100644
index 000000000000..5f5a2c7b7ff0
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
@@ -0,0 +1,105 @@
+--- a/configure
++++ b/configure
+@@ -182,6 +182,27 @@
+     dest='shared_http_parser_libpath',
+     help='a directory to search for the shared http_parser DLL')
+ 
++shared_optgroup.add_option('--shared-nghttp2',
++    action='store_true',
++    dest='shared_nghttp2',
++    help='link to a shared nghttp2 DLL instead of static linking')
++
++shared_optgroup.add_option('--shared-nghttp2-includes',
++    action='store',
++    dest='shared_nghttp2_includes',
++    help='directory containing nghttp2 header files')
++
++shared_optgroup.add_option('--shared-nghttp2-libname',
++    action='store',
++    dest='shared_nghttp2_libname',
++    default='nghttp2',
++    help='alternative lib name to link to [default: %default]')
++
++shared_optgroup.add_option('--shared-nghttp2-libpath',
++    action='store',
++    dest='shared_nghttp2_libpath',
++    help='a directory to search for the shared nghttp2 DLL')
++
+ shared_optgroup.add_option('--shared-libuv',
+     action='store_true',
+     dest='shared_libuv',
+@@ -1360,6 +1381,7 @@
+ configure_node(output)
+ configure_library('zlib', output)
+ configure_library('http_parser', output)
++configure_library('nghttp2', output)
+ configure_library('libuv', output)
+ configure_library('libcares', output)
+ # stay backwards compatible with shared cares builds
+--- a/node.gyp
++++ b/node.gyp
+@@ -14,6 +14,7 @@
+     'node_module_version%': '',
+     'node_shared_zlib%': 'false',
+     'node_shared_http_parser%': 'false',
++    'node_shared_nghttp2%': 'false',
+     'node_shared_cares%': 'false',
+     'node_shared_libuv%': 'false',
+     'node_use_openssl%': 'true',
+@@ -151,8 +152,15 @@
+       'type': '<(node_target_type)',
+ 
+       'dependencies': [
+-        'node_js2c#host',
+-        'deps/nghttp2/nghttp2.gyp:nghttp2'
++        'node_js2c#host'
++      ],
++
++      'conditions': [
++        [ 'node_shared_nghttp2=="false"', {
++          'dependencies': [
++            'deps/nghttp2/nghttp2.gyp:nghttp2'
++          ]
++        }]
+       ],
+ 
+       'includes': [
+@@ -163,8 +171,7 @@
+         'src',
+         'tools/msvs/genfiles',
+         'deps/uv/src/ares',
+-        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
+-        'deps/nghttp2/lib/includes'
++        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
+       ],
+ 
+       'sources': [
+@@ -691,6 +696,15 @@
+                 'deps/http_parser/http_parser.gyp:http_parser'
+               ]
+             }],
++            [ 'node_shared_nghttp2=="false"', {
++              'dependencies': [
++                'deps/nghttp2/nghttp2.gyp:nghttp2'
++              ],
++              'defines': [
++                # We're using the nghttp2 static lib
++                'NGHTTP2_STATICLIB'
++              ]
++            }],
+             [ 'node_shared_libuv=="false"', {
+               'dependencies': [
+                 'deps/uv/uv.gyp:libuv'
+--- a/node.gypi
++++ b/node.gypi
+@@ -251,6 +251,10 @@
+       'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
+     }],
+ 
++    [ 'node_shared_nghttp2=="false"', {
++      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
++    }],
++
+     [ 'node_shared_cares=="false"', {
+       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
+     }],
diff --git a/net-libs/nodejs/nodejs-6.11.3.ebuild b/net-libs/nodejs/nodejs-4.8.5.ebuild
index 67c451917337..9de641b4dac9 100644
--- a/net-libs/nodejs/nodejs-6.11.3.ebuild
+++ b/net-libs/nodejs/nodejs-4.8.5.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-RESTRICT="test"
+EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+inherit 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/"
@@ -15,13 +14,13 @@ 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 +npm +snapshot +ssl test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
 
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
+RDEPEND="icu? ( >=dev-libs/icu-55:= )
 	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.9.0:=
+	>=net-libs/http-parser-2.5.2:=
+	>=dev-libs/libuv-1.8.0:=
 	>=dev-libs/openssl-1.0.2g:0=[-bindist]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
@@ -31,10 +30,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/node-v${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
@@ -45,7 +40,7 @@ pkg_pretend() {
 
 src_prepare() {
 	tc-export CC CXX PKG_CONFIG
-	export V=1
+	export V=1 # Verbose build
 	export BUILDTYPE=Release
 
 	# fix compilation on Darwin
@@ -65,9 +60,6 @@ src_prepare() {
 	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
 	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
 
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
 	# 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.
@@ -81,12 +73,12 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
-	default
+	epatch_user
 }
 
 src_configure() {
 	local myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
 	use npm || myconf+=( --without-npm )
 	use icu && myconf+=( --with-intl=system-icu )
 	use snapshot && myconf+=( --with-snapshot )
@@ -100,7 +92,7 @@ src_configure() {
 		ppc64) myarch="ppc64";;
 		x32) myarch="x32";;
 		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
+		*) die "Unrecognized ARCH ${ARCH}";;
 	esac
 
 	GYP_DEFINES="linux_use_gold_flags=0
@@ -121,61 +113,21 @@ src_compile() {
 
 src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	if use npm; then
+		dodoc -r "${LIBDIR}"/node_modules/npm/html
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+	fi
 
-	# set up a symlink structure that node-gyp expects..
+	# set up a symlink structure that npm 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
+	pax-mark -m "${ED}"/usr/bin/node
 }
 
 src_test() {
@@ -184,10 +136,8 @@ src_test() {
 }
 
 pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo "When using node-gyp to install native modules, you can avoid"
+	einfo "having to download the full tarball by doing the following:"
 	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>"
+	einfo "node-gyp --nodedir /usr/include/node <command>"
 }
diff --git a/net-libs/nodejs/nodejs-6.11.2.ebuild b/net-libs/nodejs/nodejs-6.11.5.ebuild
index 67c451917337..67c451917337 100644
--- a/net-libs/nodejs/nodejs-6.11.2.ebuild
+++ b/net-libs/nodejs/nodejs-6.11.5.ebuild
diff --git a/net-libs/nodejs/nodejs-7.10.0.ebuild b/net-libs/nodejs/nodejs-7.10.0.ebuild
deleted file mode 100644
index 5144cf86d427..000000000000
--- a/net-libs/nodejs/nodejs-7.10.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-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 +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.11.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-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/|| 'python'/|| '${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 || 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
-
-	# 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 myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	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/nodejs/nodejs-8.2.1.ebuild b/net-libs/nodejs/nodejs-8.2.1.ebuild
deleted file mode 100644
index 5144cf86d427..000000000000
--- a/net-libs/nodejs/nodejs-8.2.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-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 +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.11.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-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/|| 'python'/|| '${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 || 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
-
-	# 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 myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	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/nodejs/nodejs-8.4.0.ebuild b/net-libs/nodejs/nodejs-8.4.0.ebuild
deleted file mode 100644
index a86e5fe18f8c..000000000000
--- a/net-libs/nodejs/nodejs-8.4.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-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 +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.11.0:=
-	net-libs/nghttp2
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-	"${FILESDIR}"/nodejs-8.4.0-shared-nghttp2.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/|| 'python'/|| '${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 || 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
-
-	# 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 myarch=""
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	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/nodejs/nodejs-8.5.0.ebuild b/net-libs/nodejs/nodejs-8.8.1.ebuild
index 337dc33d32c6..2739d2a8cd9c 100644
--- a/net-libs/nodejs/nodejs-8.5.0.ebuild
+++ b/net-libs/nodejs/nodejs-8.8.1.ebuild
@@ -20,8 +20,8 @@ IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
 
 RDEPEND="icu? ( >=dev-libs/icu-56:= )
 	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.14.1:=
+	>=net-libs/http-parser-2.7.0:=
+	>=dev-libs/libuv-1.15.0:=
 	>=net-libs/nghttp2-1.25.0
 	>=dev-libs/openssl-1.0.2g:0=[-bindist]
 	sys-libs/zlib"
@@ -35,7 +35,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo-global-npm-config.patch
-	"${FILESDIR}"/nodejs-8.4.0-shared-nghttp2.patch
+	"${FILESDIR}"/nodejs-8.7.0-shared-nghttp2.patch
 )
 
 pkg_pretend() {
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index c0790a673da8..a03fe18f6c08 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,4 +1,6 @@
 DIST signond-8.58.tar.gz 277287 SHA256 301e2e3b6919585c8ffc56f73ec1f0f9b18a533e1db88461e9fa4e2acf75a34a SHA512 74c9f32ea99c869c0aa72b5816962336869131ea4e8484c53636b35f2ed669a49cbc0ccf10c2c446697892235b94cf2c74f8d5402f430081d7d51421646eec91 WHIRLPOOL 7cff41e9ca37627a6a80a3c23d960958543ee2344ee24771d5e02c6a519d82f68a5003bf9a2bb413c9cbf20f7b450adaf9a82160cd422146431fce237d87d084
+DIST signond-8.59.tar.gz 281298 SHA256 23f6658bf358cc09b858402ee0857db2a2809276625eb01673a0a77969740762 SHA512 b8db03127df7b62dbf046841568c12f29c48c0b3272751600637864caa1c10b05ee9abce20fa41fb8eb7133c6bb20d18ca40803077e9e7808dba5afd108a36bb WHIRLPOOL 67afcc0fcdcc6012f747bab4e2c00e4131ba1e4c92b2742d9772c6b1060d72ceeb711df6785739562f5bf0964bedee69d2ea5f7413eac829131b02fe267d4f19
 EBUILD signond-8.58.ebuild 1504 SHA256 d46d897a80c24033efa562578c02badc70d85bd222b17e3b252997a5928b8811 SHA512 79dcd94289c7580d6ea79886f1e34b675702b6b4776a38296ca48b9d1130658829f452c4a1c92a9909c195dc60cc0dd0187ae9c40ccdab0e98df1793894af6f4 WHIRLPOOL e9ac53ac3501cc3343a2c7ef98bb594898d431c8e0575d20903290963330c12846ef9d1035abfcfd90320b125d07132d76f85c16a1fbb049f48ee8807f4d167b
+EBUILD signond-8.59.ebuild 1556 SHA256 08cf423ddc87fc4a2d8242f1df2f03bf908983917136fe1bf659e5296348311a SHA512 1520361b6a80553639e51e20a26b1c7d878464406d1ac5b6cb5c4da22442a95733718532673a4e187e17eaa131059d28dfb395bbdcb0d0ef75d80953f4811fbc WHIRLPOOL 2b4db1b426a2841e409b97ae171b8d03118e7ac4079777546246fc15880b4d730541cbbff1df4cecf69bda4aa44a8485d2fabae053717f2549df1f906c6ea955
 MISC ChangeLog 2047 SHA256 36114df8ecf58dfc2ece09dcbff1a0db98541b7e99f1315c64773dae9c1180b1 SHA512 ccf1950064e45a40d5300d663915d1f65b5fbf11d7a2add973e9005a71c56a839474af67416e5c48727529d7fbae30355644901f631d4353d51bfcab8e44b47c WHIRLPOOL ad1ab2f8c3e986cc34dae63069a307df1f7aaaad5d69c06443f618c2479eded415437323bd6f41e2c69f459f5269ccb419014bde61270cf8877aa3d8220f60ff
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/net-libs/signond/signond-8.59.ebuild b/net-libs/signond/signond-8.59.ebuild
new file mode 100644
index 000000000000..b094d09479cc
--- /dev/null
+++ b/net-libs/signond/signond-8.59.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils vcs-snapshot
+
+DESCRIPTION="Signon daemon for libaccounts-glib"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.59 -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	net-libs/libproxy
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<net-libs/libproxy-0.4.12[kde]
+"
+# <libproxy-0.4.12[kde] results in segfaults due to symbol collisions with qt4
+
+src_prepare() {
+	default
+
+	# remove unused dependency
+	sed -e "/xml \\\/d" -i src/signond/signond.pro || die
+
+	# ensure qt5 version of binary is used
+	sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
+
+	# install docs to correct location
+	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
+
+	# don't install example plugin
+	sed -e "/example/d" -i src/plugins/plugins.pro || die
+
+	# make tests optional
+	use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
+
+	# make docs optional
+	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" -i \
+		signon.pro -i lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index b9e4b3ab10a7..881f51b0b952 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -1,7 +1,7 @@
 AUX confd 27 SHA256 eb0aa3b25232a64971c6b39799c384577cf85ffe16ec41119b6b4e8336649cd5 SHA512 1f7d9888a794ca4db64332430f6fd4ed3e257618fd87855922ff9186bca332827197f4f5aa199a27586fd2fcee04ed4d617bbaeb3866d9ba6f9c37ff8cb61ba1 WHIRLPOOL 6ee1adbbaf88b3334c19b60ec4b25081900afcf95f290b1376ef70c39bdeb5dfc7cb5e02f396dd2d2f010bba924595fa39d35cbfab01e03c1c274a0f8a171524
-AUX initd 524 SHA256 6d490b473102783ec9a491a9b7f4886d52393498e5495bca4d27a95fcbf35f52 SHA512 01e564d9e056b55e68586630cb5af5875c9ad02cde74610d85ea2c23673a4b9fd2b6fe206f25e9c625d63dc41fa56f6360de9191ba46851b88d090cce0ea34ad WHIRLPOOL 0dddf412173493e4e464df9bf9b71669f0a5a29398af793f59b59c47788556adc02fe31f14bd65849eccccbf6fe39cbb851330de88d95db6d2152bad72383939
+AUX initd 533 SHA256 88fac7885b62e4aef89b2be52496912752c3bc14f543b6c4330a1077a31d5867 SHA512 46fb490c26244a894e2a33b464083c0b653f9c195af08848cd85b6f74f1677ffe66664c90e9c85e8ddbefec91d773ceec95e7043ea678f7f96c50ed0f96efb56 WHIRLPOOL 2d23dcee4b584e300c7007ff81ce6a011e5f0bb814eb207b059749fe730e9a9f5411d4f54dfb846a5028e7db2f4ba7bb48771be5382e97c935a4582dc57c8f3e
 AUX tox-bootstrapd.conf 2171 SHA256 50857064339feba2e087364984d2af329fcf3c526fb559f1ee52d6f7406a1a62 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda WHIRLPOOL 11af2838d1f0e471194303021c0653ce4166493f59eb55affffd66d5e3bc83d446275d553db5c458dcd36a8ea0b29bdc17d00b5815bdd0449708a8bea75693a0
-AUX tox-bootstrapd.service 356 SHA256 cf871bebb33b4b1e3bf15bceb6809fa8ab85d16d1c1f8ef86e42a93d8d32d9e0 SHA512 7811da914bd0f496cec0540470ef2263c7899c0adbc27611c0ce5c108507b0c27978785d675c93d6fd7ef826336551fec534d39338e581e4d0e81af30581772d WHIRLPOOL 94b9fcdb039b690cd8f5cb0eac49eb9362ca1ff365ccbfb952e7a83767a6eec96c8e96ce925397aaa49bebf09d2c87b190062609414772625a5c91fd2ec6c85c
+AUX tox-bootstrapd.service 365 SHA256 f6b6ed17e7f31e1b5bcbc6067de3a919807f4e499c009d13df2f7bf3d73aca27 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8 WHIRLPOOL 7b89ec33f96728d583e29f2f94151432fe4374992cfeb04786704352e728b5074057dd789f75fb21a51eb1665180d56700bf840a8a8ec493aaa36f168ccdb358
 DIST c-toxcore-0.1.10.tar.gz 820090 SHA256 4e9a2881dd0ea8e65a35fc9621644ccf500c1797a2d37983b0057ed3be971299 SHA512 428fee2d811d0b6d5d005f082aa06f95765794b1a8bc77ec4411bb9ec9085b99675535b88db50f5ad7313850a0bb3c54c4e2e8d8864cea7c0c7d81be9879b157 WHIRLPOOL 122a6f89c1d34afc685b80e74b9c20e3175ba49865d25a580f0e850d7851304b9077842f23084d4691efa9896d33ddfe136deac034d0eb51f821622e068bc988
 DIST tox-0.1.6.tar.lz 314837 SHA256 c51dfaf30cddbfb9a6080c8202d68113452224570109cd9a6f1b7d9709eae6af SHA512 57ed7cee2c621c57e24f5ab36d68d99414d9820cdb3e8b7c4390818222f9d885f352f9cf76c8eb522c238bebc7d420bcf3cdd5f6ab65b9801aadbd225765166c WHIRLPOOL f75b27ade0f87f3793affbd291aba4b9e2387a29cd89deaf1351ed0797f634737938ff68d95a9fa1866891a68fa7a3b7f1c7ff0b68e3865eb7835fb9c4e5ff8b
 DIST tox-0_pre20160904.tar.gz 395495 SHA256 2d4a0d096bdb81b12b10551765fb9f87270e170f10f387f700b3def68cb6c35c SHA512 c0da52ac908141e97e96510a05431cbfb4b9aae81faf4c136c95e21b90a23e3bbe6db88303e48c0f4f3c74ca954229787564b7aa41bfb462afb0d8f8430cdaa1 WHIRLPOOL abd3f61784fac93d983e453515d1e8bc87f7d76651a53ce6f566a277d7ec7c1e03294d95781364ce9ab30f2698c6f5cd552bfa4888f8d5d0d315daf038980c63
diff --git a/net-libs/tox/files/initd b/net-libs/tox/files/initd
index f08c59457e5a..101d3297056f 100644
--- a/net-libs/tox/files/initd
+++ b/net-libs/tox/files/initd
@@ -15,7 +15,7 @@ start() {
 	start-stop-daemon --start \
 		--pidfile "${PIDFILE}" \
 		--user="${TOX_USER}" --group="${TOX_GROUP}" \
-		--exec /usr/bin/tox-bootstrapd -- /etc/tox-bootstrapd.conf
+		--exec /usr/bin/tox-bootstrapd -- --config /etc/tox-bootstrapd.conf
 
 	eend $?
 }
diff --git a/net-libs/tox/files/tox-bootstrapd.service b/net-libs/tox/files/tox-bootstrapd.service
index c841b3c2cd9d..ae2f238cd60c 100644
--- a/net-libs/tox/files/tox-bootstrapd.service
+++ b/net-libs/tox/files/tox-bootstrapd.service
@@ -8,7 +8,7 @@ Group=tox
 RuntimeDirectory=tox-bootstrapd
 PIDFile=/run/tox-bootstrapd/tox-bootstrapd.pid
 WorkingDirectory=/var/lib/tox-bootstrapd
-ExecStart=/usr/bin/tox-bootstrapd /etc/tox-bootstrapd.conf
+ExecStart=/usr/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf
 #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 
 [Install]
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7b168001cc30..6bcc13e0780f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -11,10 +11,14 @@ AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d
 AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
 DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
+DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056
+DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
 EBUILD webkit-gtk-2.16.6.ebuild 8423 SHA256 9043479f20882e6ba2c68cdfdeebb2bc15802cbc910764ae1a9fde04698a0496 SHA512 aecbca385defdaaf9f24aedbac7c149007fb6f2367ec2efa704083c9dbd24f7d38bee04a3c8b42b412f66c2d0228e5183b9aaa3316b528b9771cb6b00e26fb0d WHIRLPOOL 0a048e4ffffca3ba71a174da7a211d5213c0291e01a7e09a0eb9b0048613726c0514bdcac0f503571c70a92975f70cb1ac6bc64ce665fc0ee52a19b5915de66b
+EBUILD webkit-gtk-2.18.1.ebuild 8284 SHA256 5d7e8f4d89b47210692d1eb6066ad29cba1a8d7946aafc0b07cfa7d6e0d57c0f SHA512 10541ed0a4758e99c50e8c2f2470bea744476231041f2a4ba3f6669f043dfc02ed5a334c649c3a8d841ed54057ff46537fc4efd3ab50cce569339d987c09866e WHIRLPOOL 8443233bdde89e8bcf60df0b96268d258795e7640fc5908917d0759c49a542eacf3bae0f6d57da4f88a0d57740f782c10bcb88821326162682f5aaed43f5f513
+EBUILD webkit-gtk-2.18.2.ebuild 8284 SHA256 5d7e8f4d89b47210692d1eb6066ad29cba1a8d7946aafc0b07cfa7d6e0d57c0f SHA512 10541ed0a4758e99c50e8c2f2470bea744476231041f2a4ba3f6669f043dfc02ed5a334c649c3a8d841ed54057ff46537fc4efd3ab50cce569339d987c09866e WHIRLPOOL 8443233bdde89e8bcf60df0b96268d258795e7640fc5908917d0759c49a542eacf3bae0f6d57da4f88a0d57740f782c10bcb88821326162682f5aaed43f5f513
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 SHA256 7f1f65d1ae35ca378ff6f349e8a11abf470eb123e45a3bdbe9c52ecbc779a744 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9 WHIRLPOOL 9c2fc07c2b3bdb5dc87ab91054df2bbc5605208167940e9604dc5e680a57a72958fed48b09fd64c95888e5bc0aafbfaa33821322a3cc040691a29b50a7ab989a
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 SHA256 fd9192efa1b99815a456576fb1c2546747b7d4ebe07bbba2a79df26db0aee254 SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca WHIRLPOOL 49a2b920b0fdc7b0bc4846279060ab842494ca04a6748617b54d3ee7ec6622225c6405097c797402bf208b495802588fb1e08ef659ce3393c762821b1745bbaa
 MISC ChangeLog 15451 SHA256 0b65bc7fdc313946992c6be4dc78e9eab37283a4f68e5597dc30b51d667f8e73 SHA512 4baaa1690d1b2b0aff0bf6c82e3f3dcfe51c2100e64874f350c57f74da673f82248280ba6459c7a11f54c59687b1e7780e92ba0076fe365d390e8ed740aa7f32 WHIRLPOOL 7cafcdfcc3450bd74ff57f7f845ea814284fcc29aa9eb1a97254898fd1032c3a6994fb4aafc6a1d914a804a3e6d40e4e3e6e5a8049e760645e59dc0fbe930c53
 MISC ChangeLog-2015 68642 SHA256 5bff244006d996d0c8420da452b9f38139d3090da7ebade2985991ed283f470a SHA512 dac3a9c9f9ccd64fb1554a5e2c919e1306a69b1757f34e0082f76cdcd45188e8f2e299b5181fa8dcda1480263dc242b91a63449c9c7dd344386be81cc1ae66ae WHIRLPOOL b069be8455c7d13a2552ef91029cf37dd6dc47d93bd96793dead7595f19442fa4ec8ff0da0e1f194dde93b5d88683750f4969cd46848417e44f40d6d8fa991f7
-MISC metadata.xml 697 SHA256 4f096b51e01f6f74430bbca04ba292bcc015631d57417deb91a995fe943203a6 SHA512 64bebe1fd72f81707b462bdf3630404e71a87d1807519c86ed5eff393a324e30a32c489f0c7d86d3b6dc2b3855758452e95ae98fb4d0c27555947b35b28907d9 WHIRLPOOL 17cce501d17ac9a29c142462737d223b087bf80b18284fb346de62e9c9f9f23e02efa6a30ec63780ee48d0b2c21a34af9fdc6fd7f72ac152fb272085214adea1
+MISC metadata.xml 771 SHA256 b59662217120ef1a7edb3454ef844a0f53a0e585ea294a545b821dc0b20c88be SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236 WHIRLPOOL 78368036e7299c5ee0549798aa9a0130ea5f8287b151b8a1fe252c57b2d5d025cc307763a82c017d3216bfd0a204d1167e5a5c80cc5139d8f7ecf7dddc6d627c
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 2aec05767e2c..9a96619fdf3e 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="gles2">Enable GLESv2 support</flag>
+	<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
new file mode 100644
index 000000000000..2be3f452f740
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
new file mode 100644
index 000000000000..2be3f452f740
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index e3107f905c0c..0080984c0a6e 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -18,7 +18,7 @@ EBUILD zeromq-4.1.6.ebuild 1154 SHA256 ef66d74781366df3528c621badcdd276f437597a4
 EBUILD zeromq-4.2.0-r1.ebuild 1268 SHA256 75bc198b2329465b1ec660fd47824e6c163ecfb7e2787c7c1de5a9976d9416d9 SHA512 e899d165a43f8d07a1f653e046483219f1dc1827e946c48490af8ce7a156e229a7041a4051076a3584d3768fbc80f8220d8453e7f5e8c0129abf86f411c098a1 WHIRLPOOL 2331c987bda2e176c811b0d0a5576ecba9dfe5da49328eec582649b14b898bf65385b266f8750efe117107c27937f4a8a6fe34951c61e66f4d3c5e2693e52509
 EBUILD zeromq-4.2.1.ebuild 1209 SHA256 5aa692b77bdcc6976cfb9e2da25a5b402e1ebe53d1eb2cc879e07b29048fe5b1 SHA512 d748d27548088f9121f1b3143fed334f5d69527a2868f46d6a1cc74daf0e6164801573d2c4065b9383245ec686680245dc46a036e1e6432d7f138f7a39136154 WHIRLPOOL 7fe0b358f2825a828f7f07272468cbe72d32c36a70165d37de61a0d85ca498ed42d0d3066920cfb2755ce67bfe5f22cbf2478919512b3cb9300c23e1fbc7aea0
 EBUILD zeromq-4.2.2-r1.ebuild 1380 SHA256 66efe92bf053d55886ce2b04f9d50d47292329fff2e02781c9085bf824e79432 SHA512 5ce25d3196c4be51420af99b4590d54c79b687d74a3b64ee44b1322bbce829e3e04b99ea5cb840f1f991f36cc12f9080806aa91666ba183372dee6963442b7d9 WHIRLPOOL e04341b6e82e0bd3fed692a1b1ed197bdca0ff0665291ab338baa5955061ad767ee40c2c6aa4a3da81b1c0de1e7e4f12d42d2af886d69c2cd1758aac92b80257
-EBUILD zeromq-4.2.2-r2.ebuild 1520 SHA256 9a420f2f43826dcde119390ec286b20f86ad5e8ec5f1eb91199e85f50caf2e39 SHA512 b325df97ae4985875b6faffae2dec934fd871ec77e4383a1fe4e7e5a6323e28b4dcaabd89429b9654702aef5e9e1204b35ad1a17b5e77d53b895e3a63482a366 WHIRLPOOL 7b7802130bc4fea98be8f15d67479850493d88400a4b562c68d9f9a1e4c413acff8e35517ef4d0a88fe40ff37820abb38ea33574d72c3209708272e7cd97516f
+EBUILD zeromq-4.2.2-r2.ebuild 1519 SHA256 3ae27be8bb2a9eb78327c224685847f7747faee362954181ca37025e5b88cbd3 SHA512 6b2c909473551ed11fbf3ebf319651e2cec2fb3a0ed0e920d8fc12ea9aae9a1475648daedb4d61bbf3c8c3afdfa47f0baca52db1b12f792b2f7afa71c1e87077 WHIRLPOOL 3657373c4e3526e3a6376a311653b6b0cfda94b444da64baf38fe20ff7057131da273139488ca2c084e6831bf6b7fc9b602b8c2420a502a4534a39acb1f40ff3
 EBUILD zeromq-4.2.2.ebuild 1217 SHA256 e3f0fa3c5448ff5a22003c12e9bbc7a8fec740d23a56fa2c0ab9ec239131a8b1 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c WHIRLPOOL e7d225fa284a750650e338f88913d7e1c0f861be4edea16ac0d716c58f8cf75e3612134569554ce87766f912cadf5055390dab495f4bbf20c674d4f7d8a588a4
 MISC ChangeLog 6676 SHA256 311b48768020ed8e2252dcc9a034995b81f00a182e02b8ec5f8e37617b78f97b SHA512 e4494ca72365f8c03f0bedec66ac2860f5c120ad2858a9204a674b72a318bedddd7db1581d5941af7fbde3cba57010f1447d54c1fd96c5f0abfedc6e95944ce6 WHIRLPOOL 351de5f5eaefecf51db8692b7677409b96560272e80df1d535a106a8ae38d21412b2f6a167322d71f90604e23f8a88217cb0c640a8017b9ba464885a4dd64cfd
 MISC ChangeLog-2015 10008 SHA256 7d620c3e362a41c8fadacd9c1e7ab9c058189ff9b5340265782937b21f89759a SHA512 15977242729f75e7c57e0f89698576afbd09d3b7ed30f79ef9fd41dd05db1290f37c92e9a5f1eefaea619ee21ed182826535c59519755669be2cf9661f5a9b54 WHIRLPOOL 61d74b6551db99a8d15ebc2e70bd9f86a04272c895dd78676bf11ecc46d6f3101df8306e44375b0eb219b1f0ecfaaed0108a6ae02baf2a9babe31a905f0edb66
diff --git a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
index 2a885496ff3c..dc958dca3e4b 100644
--- a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
commit	bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree	3559b3e11424f5529527f2474d8a977a91ee3389 /net-libs
parent	8b2628ad8526c806375e7b157889e4274b70248b (diff)