gentoo resync : 08.08.2018

13 files changed, 176 insertions, 14 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index eb319d710f24..b47432194215 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 97ec2d003cb5..7e9b5d76d250 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,4 +1,6 @@
 DIST libbtbb-2017-03-R2.tar.gz 303689 BLAKE2B d36cf5329fb31cd50f64e3a9b625ebca8bf198794073480baa4f64935f4bef183e4c11f0844cd31df943da98c778bdea807fbd91676c23a3a2f830af5e7a185f SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5
+DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 EBUILD libbtbb-2017.03.2.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
+EBUILD libbtbb-2018.08.1.ebuild 3653 BLAKE2B 3051f5e34d3c75805df4d8b3d3022e096e3c48b0d9a1c170fddd2776af094931c1d4f9081a8f1c14164cda9f11aca5e991fc0f80e40bc79c2e52a9734ac67d2e SHA512 be843fadcc02138fed0f8f7d6ada75a9540e1faa27a6d2eba208d87c8a7af36ac7f099f44d9410201c8ce0967c31b63311df1a938caa5ecdaed00a5e6b29f474
 EBUILD libbtbb-9999.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
 MISC metadata.xml 568 BLAKE2B 508af89d4b95fa71c32b5a610e1630938dc8bf7b83a98b5af981de1a3a70ec0775d694ba5e5514f83e9abdbcb229500080fc31225de40bb65ad347cb273f44a5 SHA512 a4425e207724117d83fcd21f2ed5f9bd52a945597c19ee253c1c55b1e62f0f3d14d71c546cf2e2d6c7ad7b48b0e88ef3d46fc2a172f86cb00c710ed87946430e
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
new file mode 100644
index 000000000000..998113cc4029
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S=${WORKDIR}/${PN}-${MY_PV}
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="extras static-libs wireshark-plugins"
+
+RDEPEND="extras? ( ${PYTHON_DEPS} )
+	wireshark-plugins? (
+		>=net-analyzer/wireshark-1.8.3-r1:=
+	)
+"
+DEPEND="${RDEPEND}
+	wireshark-plugins? ( dev-libs/glib
+			virtual/pkgconfig )"
+
+REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+	if has_version '>=net-analyzer/wireshark-2.2.0'; then
+		plugins=""
+	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
+		plugins="btbb btbredr"
+	elif has_version '<net-analyzer/wireshark-1.12.0'; then
+		plugins="btbb btle btsm"
+	fi
+}
+
+src_prepare(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_prepare
+
+	if use wireshark-plugins; then
+		which_plugins
+		for i in ${plugins}
+		do
+			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_prepare
+		done
+	fi
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	local mycmakeargs=(
+		-DENABLE_PYTHON=$(usex extras)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		-DBUILD_ROOT="${ED}"
+	)
+	cmake-utils_src_configure
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+			)
+			cmake-utils_src_configure
+		done
+	fi
+}
+
+src_compile(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_compile
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_compile
+		done
+	fi
+}
+
+src_test(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_test
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_test
+		done
+	fi
+}
+
+src_install(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_install
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_install
+		done
+	fi
+}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index b27005513814..55c30b134114 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3116 BLAKE2B a99ffb168c85a796c9177add65efec35626b034d1337ec208aaca0d9712ae55e25e4e7bf2db01249fe683807f1b6705386d589a9aed3909f85ffcb3e3f1f6a55 SHA512 058dea79681c3c984f4b28e4c399aea67fd8b9c031dcf90169b8a825f84be7a0cdb1a79b75c0aa31edbfd8610785d7734eb0f115dd69346dd5c755ccae9a024c
+EBUILD neon-0.30.2.ebuild 3118 BLAKE2B d967bd660eb6fc01e654b03d0d235d20e8781331f5923cd6a705edca2141b7b36d6ef767077153bb12a25c8bb62aae238ef83b6b891d30726c3afa8d5d7e9626 SHA512 e4d0f327caf610ada38693eae433f814146d4f57bdcee76c4dd01c0f5d4bd21cc927c9c341c3d3e90ef90348b199c9dd14bb1b12dda091ac92c883161d2bf015
 MISC metadata.xml 1316 BLAKE2B 8d191f415e3ec7d76acac052656386617625842ffb7ca4c0ecf6e0e5c971f142d8f644bcad394671fac98fc6f046674fe5a5f94a460a5fa4328079e1ce2515a0 SHA512 6d15131eef6b6e61c0d7289d00c8dad289c5f48ffdca65b57b1ce73afe65a705f89e710874ca9f5a199dc6b1eb818f3650b8d60a65717d3ae49f9102113ca3f4
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 30abcc10f8f3..895d1fbcb069 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="http://www.webdav.org/neon/"
-SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c6e695b036f4..7aa82510ef4a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,8 +1,8 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
-DIST node-v10.6.0.tar.xz 19741864 BLAKE2B f94ba788b4510b93e4ec556d0452da713e380621d9b3cc65a47fb0ac91766b4b25ec1f6dd06f35f621dd2d18781186a2a90aae7d728803ae221c08dd015139ba SHA512 c9434d8ea362aa8ea41053013bbd69fc5b5f4e133f9662419947919d29c246950ffad4d262cf9a252bc9f8a0cc63676947c8f0b83135a120c031d71ca37f4fd8
 DIST node-v10.7.0.tar.xz 19770604 BLAKE2B b869f11c3b14dd078f5d8b228108ff60dbafa5e3ee3948b4323bf86233ecbfe8a6e06c24d8545fa364d3880997c298fab834b33660f2cffc7bb0f7e34744e9a4 SHA512 ceb70f79a3251a6243082f17a1c96617df7c40a6e1e3a24ecdd9e4d7f1203562d586e7a85a1e8e642df1de69839a9c0ea33e4a753643c5e8a1b502fd1f2debaf
+DIST node-v10.8.0.tar.xz 19910236 BLAKE2B 0f75e1ae40db52d9fdd2643406c4d1e5378ab0e2846c08c9cc3cc3c01d989b4ee96c89b028b7bdec811aea258a32510ed81436fefbf85d7ce4923eb30e09f825 SHA512 50863e4db68de2af5448d43f5d035dcda0c982a6d9daff85a67112aa3af6c7120789e41e12b2977d679e6cc010cb0c0efa8b8e97554a7e5d7eaea838a908aa0d
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
@@ -12,15 +12,15 @@ DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951b
 DIST node-v8.11.3.tar.xz 18319672 BLAKE2B a45715ffc066f378a06b84cdfc3fee96510b2fae62790965ab6f7454ccd3029b4f83cc7f8604e3bc08fb967adbbbaa419e0e2a8fda48319e7375d46a0ba469c5 SHA512 48f50f400d61c8ed35bb2b0771f31da453359f312574fdf7f2b29cba0cafa008fb0d4ad11c2cfbbcc5aa4a5c7270dc9356fe0389292136de6e2a82ed3ee4d7b4
 DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd09670dd8bd736dce2c7ab2fc87c3a717cda11c2a09c325b25a72d99431cbc79c0ee7c202ece5fc41786f1f0aa68e4 SHA512 ca49a1f3aaa8b25faa62c411a96551c8977bb43a22f8f171f27d3585306f379b6a12e55e60ddca04a6f2f8c62a1b3fed9e66c02898d80bf7ca59278536e04c13
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.6.0-r1.ebuild 6339 BLAKE2B 909a1b6e0fad010c2422482d08ccb7ee170eeba8976d1c5928824bf54d61ecce2468998bbb2a8f5024ff1d2ffbb98922ee49dbac4116ab91279e3da296cbc259 SHA512 98a3c5a57a70b8089ef98f09d06f0dd6f520c11c1cf37b41202c4e64b73eff566cb09f2dd43e9d4516fc0013c3ab61c8e260d59b4180d6ba790baf2d66691286
-EBUILD nodejs-10.7.0-r1.ebuild 6339 BLAKE2B 621f278c58c4458cbe593f28e9082df4726a6864b97e81fa157db6ddf01a6cfe6bcd0b4955091253c53dac08e3c42664c13f42dacf5ee457f57610b7fc8c6332 SHA512 da4d8791c425ae98d7ae29a696b007e5d000b670f63c4c0f55739ecc41105648b62c8093fe6760b08b53d6f1edaf433e186dcf687cc0c9691d771885aaef3efc
+EBUILD nodejs-10.7.0-r1.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
+EBUILD nodejs-10.8.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
 EBUILD nodejs-6.14.1.ebuild 6170 BLAKE2B f8f9b6ead741f993da24c760daa48a7a5ac9415a9fec05c313257cd02c9f86ba03b4c15d7e2d0ef18dd1ad1e23b5d5152edb794756dd356368ac2fb534b68148 SHA512 c49be4f51d5fcace57544a7ab35ceac10870cee4e8341b9fb7303b2b030e21b65d3d158a854fe52b5d6813a5bf15cf5cc6c5dff254c2824c6fe8c8bc826aa634
 EBUILD nodejs-6.14.3.ebuild 6171 BLAKE2B 7946e4fcd461d071fcdb81c1642d0eb6d812e5660aa308ca3bf78501aaf9cc9430f9be3a806e371c9216774a545507759faefcb30ff4861a91fc05915b4d9601 SHA512 3e77ce77a4d9453d36eb252834ed056751c8805d4e89e47448bc1bdeeb41732a8d380eb8b4c1d13254ce14ff37bd586ecf381a5878901528b5a50de777056f6a
-EBUILD nodejs-8.11.1.ebuild 6348 BLAKE2B dd10b95ed52f83175d16c6a68c9daa39f38f8e839d2f181c8a4fb0f64715561c68cff6e704aedc186af3b657dd87b4b05f29ae7c01ef1b1a31d1799a7a66dd2d SHA512 09fc1df3c4cdeafc27dd63836f30f62c81144ec70ef09acd8ebd0e093a07c413c368c47ab6657c9fc290bf59abe72062e2f92b7f6782ffdd49e80d2036936a9f
-EBUILD nodejs-8.11.3.ebuild 6349 BLAKE2B 9d18e24ea3a71ea03e5e618728c89809045f1b7532243bbc2697cc437f298aee18888d4d6401d2ad5e0ae3072a17cb2404fd17c451531184e82427a014b0c65a SHA512 d7475987851b852eb9c6995a206bb55a89021f8f42372199ff572b5cf9e5b9b3cb187e1a6473f2fea84606d0e4e6afa1d2b8b2b3c7ba04423fa3bdb08552d709
-EBUILD nodejs-9.11.2.ebuild 6334 BLAKE2B 420c0d0352b569fce62bbb4e44ec909af6edb316178049966b77011edbc0053891c663409f5fd881ed1b509e59dacb711830236d59d4af016d2f3d45cb1b1d00 SHA512 0dfcbbf4a009bc612ddc8fdcd3728d852c33d7db0cfff83e43b9d41a6c13827714ed7d0815635cd3f6ffa95017328f2bd0bf6d9b96183d86c46c94e21cc5fa53
+EBUILD nodejs-8.11.1.ebuild 6362 BLAKE2B a1cc2e39202ee307f4792a17ffa1df456bca2c9a26427038c83080a1ecb7c4502e874a391eedb3a1b13b6e7dbd7c9b8ef715234f646b87a80eee446f15b4eca8 SHA512 07da9779295676e44c6849de2ffd8a9ac3673608c8a53ae53fd4ad04a8081887b1f66dfac8add40f57c297c212ea01d4b9f2de4add352abc98f8af73e6f24e95
+EBUILD nodejs-8.11.3.ebuild 6363 BLAKE2B 3e18355fadb75884ecd68df2b2757305919c847e27429615e1fce655c9c06c9586e0d0381b7af9ff1d1068fb979918c05a5322174b84b5b4bea009f7710a8b41 SHA512 a51d9012b4f5d6ce9c2c4f4fdbaa4c8a7418b5915c865ba6bf51bdf30f9b4a2ac1d7325cd03bcc7b05f85f617a39fffda4027976bc9b94c6588af08b918039d3
+EBUILD nodejs-9.11.2.ebuild 6348 BLAKE2B 8e74887ad5e17570c3ecdb608ff21a22813b53d3049de6a608d8a71fcd562fc8f96208601c390861a4ec0c05b4d7219131da93e35e82bb96fde7fa54921c5793 SHA512 6fdd51157c30021589e7d6c2637ce02d376f3e80da578ff1bcefdb3d2473ef689d8fca02c49e1673245a158a90d19af7cf45241d8190d0b76e563c1bedee8449
 EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06
 MISC metadata.xml 581 BLAKE2B cc99932eb293981a0b4e1f48a5fc2289b0b932545efaf00fdfbec10aeb52d95d7ad02268560495386992ff543e043591102415ffac04209b4d473b61a6528f3d SHA512 eb9bf78b19041213354232372bf9f31b8c73073b369abd83d1a399466ecf6f647da60ff393093dd16ade8aa6254bc782ab55cb2a655b0d685a04d84fc13d2706
diff --git a/net-libs/nodejs/nodejs-10.7.0-r1.ebuild b/net-libs/nodejs/nodejs-10.7.0-r1.ebuild
index f5919ddd574e..34e08649c75d 100644
--- a/net-libs/nodejs/nodejs-10.7.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-10.7.0-r1.ebuild
@@ -19,6 +19,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/nodejs/nodejs-10.6.0-r1.ebuild b/net-libs/nodejs/nodejs-10.8.0.ebuild
index b02e635479a6..34e08649c75d 100644
--- a/net-libs/nodejs/nodejs-10.6.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-10.8.0.ebuild
@@ -19,14 +19,15 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.21.0:=
+	>=dev-libs/libuv-1.22.0:=
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-61.1:= )
+	icu? ( >=dev-libs/icu-62.1:= )
 	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
 "
 DEPEND="
diff --git a/net-libs/nodejs/nodejs-8.11.1.ebuild b/net-libs/nodejs/nodejs-8.11.1.ebuild
index 9ffc5ede447a..54203e6ccf9e 100644
--- a/net-libs/nodejs/nodejs-8.11.1.ebuild
+++ b/net-libs/nodejs/nodejs-8.11.1.ebuild
@@ -20,6 +20,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/nodejs/nodejs-8.11.3.ebuild b/net-libs/nodejs/nodejs-8.11.3.ebuild
index 2c5331823d68..8f2f243c0b08 100644
--- a/net-libs/nodejs/nodejs-8.11.3.ebuild
+++ b/net-libs/nodejs/nodejs-8.11.3.ebuild
@@ -20,6 +20,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/nodejs/nodejs-9.11.2.ebuild b/net-libs/nodejs/nodejs-9.11.2.ebuild
index ea25cfd9cddb..449755ba98b5 100644
--- a/net-libs/nodejs/nodejs-9.11.2.ebuild
+++ b/net-libs/nodejs/nodejs-9.11.2.ebuild
@@ -19,6 +19,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index bd16c1d5dff8..77a3f6bb91bc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,7 @@
 AUX 2.20.3-jsc-build-fixes.patch 611 BLAKE2B 63491442c9836873401fc58a2a2ed44d4f24fe52d67f21f98cc11a21e19572763cc6e0d656806cf60e4b2cdb11234ece232baa9619c54d33b69323984c573cb2 SHA512 90361785e3f562f55e37315600ab9f096804e755d0dbfa56eafd2fcb9448639467c6a707c8bf641cfa714489a8819bde706b9fffeb0229aca82c3f135e886725
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
-DIST webkitgtk-2.20.3.tar.xz 16623456 BLAKE2B 3ae9441287f4af04d2d7e2c490b262b5619f1b47962f16e34589f81f24dfd6b2e4dd3b6c98ce8fc2582c288a5afa492613a36273853cee5bf58946355febb07e SHA512 69a7b27e294de6fd43240ce1d314cd1ccdbf29674c97967674459fd02720b31fa53e5412efbd93dc1e805d38e38feb7fe9a12cdd9c472471676b8db3c11734de
+DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
 EBUILD webkit-gtk-2.18.6.ebuild 8242 BLAKE2B 1e8058fdf46994b372aabdb0e03bcd19ee95b042cfd6f12b12396273b6f887e2f802a40445426cabe724e5044bbf138209a3cf5dc13027dc21807491b45970ae SHA512 ac334598eae40b438c8504e9d5ba93dd7902b1ee55d79f07a171b7aa78088e2bd2d54cbed7e528e32cc03835e0a027f13244a14a806d350e1861a222457c4ec1
-EBUILD webkit-gtk-2.20.3.ebuild 7905 BLAKE2B 06a2b08d6cee0f259f0fcc2ea959a7e18b99c5332ef8ea9c60e271b57c91ff2bea8d4d0d63cf64345009156adb2e6e8fed57377f2b547b93bf544a80e44fc09e SHA512 e3758a9221d9f081c9946bcceca2da2720c895d151d33a5292a5c9615a4c75130b22a6a38398cf8e6c2cfe5f65583023a4b90dfa586c323dbdf8ffabddbfe7bc
+EBUILD webkit-gtk-2.20.4.ebuild 7855 BLAKE2B a0d932575d5f7ba224db1579469877ec9520d9c0c8d97e0f7f08b162d50ece4e85979ee839845eb7c07b391736e73236844c74ceca33d35e0d3444150575a0eb SHA512 0358d76289f7178aaa8da7684f2715f859390bea803305bff6d966aef86e633ce6e88380faf2054d2c027107f3d9cb35ab31deba8849442663c92671ce79af3c
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
index 264307b6bd2f..6a241552a2b4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
@@ -147,7 +147,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/${PV}-jsc-build-fixes.patch
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }