gentoo resync : 21.09.2018

28 files changed, 433 insertions, 359 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 830259fdbfe1..c17ace904107 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index cac86daf8528..de8cbdc64db2 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -9,6 +9,6 @@ DIST http-parser-2.8.0.tar.gz 50575 BLAKE2B 0ea1973b452b62915ad2a92be95e09281c1a
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
 EBUILD http-parser-2.6.2.ebuild 1395 BLAKE2B 3ecf77d59826d0b5a82c3bb6dffb25b98837027e0ab915bfde595b38d2633203278422db4a60c6be2fcb142055b64ba9862e71b9bdf409fc3c074cb765a51bb3 SHA512 ff59a0b6f3b7aef3ca79483384df88eafaf7ad80f05ea809288c6798ce0234f83a9dd41b5b2c80a865c70cb449574b0f2100c87bec2a5c2fecf432874b5a07f3
 EBUILD http-parser-2.8.0.ebuild 980 BLAKE2B 95c2d5c50cb8571adc4ab93796c8622a816f6f94a20642cecc60e1ab5721c4d1016bc1b92df9e0da66067dc074350c52795de4bda35e17e96371681dbf358482 SHA512 20de8a72586400fdcd94da20ebadcc59c4c7dd22e60772d736c6b1b27bfe7fdbe16b89f0ae45f93c2524c2f3fedf3b7bc9fc6580fd15d7824feeee5442ab3f5d
-EBUILD http-parser-2.8.1.ebuild 978 BLAKE2B 0e78bb5f376827dfa39152331dab1831cd3bfeae416cb2a296fdc0347411471d216ff275678b4107c68ddf0e9b8dc724b4b073fa55d98b5823840c56a3b66a86 SHA512 12efb108573537531b099114f19dc391cc15529479fb0f67788362c37a26aa5dd2c1d6d2aaa92c3f5c9867fed9546920ac1d13dc5f2ff05043ece8ec37362b4e
+EBUILD http-parser-2.8.1.ebuild 976 BLAKE2B 831a0010160dd923ca77f39b56a5286266a0a55435fda2387251d55d6edc5d4a81ff5dc18ab5272b9689648ea60c401bdd1924cb5faaf46cc809eb0c6d504c51 SHA512 c21a74e44c107161c60e607f8acf63bdb7875350c2fd188a568d0d08aaf4ec39c6284ee66bf4df140fb1a3aa9aca4fe13fcc0e5170486cc6f18d749e54600409
 EBUILD http-parser-99999.ebuild 878 BLAKE2B f542c8332672550422d4de016d5921ca6972bcd1395bc466090a3d0f7cb8b2169a3424cfd017e9b42d676fd86bcfcce19577cb0cfa3a69a1948403608e7dda93 SHA512 49b9a884e6518be420614a59457eb6fc58f791e56c9c8ad2da866013331ae6b2413a21921c4298a0f9c9d5cdaf505d45d2368aa97a5d247531acfd1887721c62
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.8.1.ebuild
index cf78453abdfd..d7882c334833 100644
--- a/net-libs/http-parser/http-parser-2.8.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/2.8.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 1471e8a9d817..319c3becbe57 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,7 +1,10 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
+DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
+DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 EBUILD libbitcoinconsensus-0.15.1.ebuild 2388 BLAKE2B af9dec58358b370c37b770d6a0762af2940f45aa4f8ba723df2ca8f605dc87672a5134c3c773f5c83103efb4df1e0c9efeb8487a584f37b2063e35510bac0e3a SHA512 fbf7381d56add2aaf0b62016f981efbac71031ecf266a6044f0742d86e30054e01c592e276a0c1e1c66f52f99c642a29fd91757cd39ec9905d85aeb4fe726124
 EBUILD libbitcoinconsensus-0.16.0.ebuild 2344 BLAKE2B 561422a65b6f7a80500cb5422aa116e7c5bbae782ab29c0a392f57abcd14e55669195a6330145e26f2a52558065c46325d825903a93ba35cd6b5af7c4f24f12b SHA512 93d3638e10b6f3200d30b21c9416240b41752da8f50f04968d917b08e268cfce616b764747705526af0cd9a8d7b886f1a970a8b6cc47bc890a59ec18e70c9fca
+EBUILD libbitcoinconsensus-0.16.3.ebuild 2341 BLAKE2B c9ecf5c88ded7b637f573c8afd85bc4de6354497574d2dd48301c9b4010977db2bd37b39a2e42bd82ec6d6dd4f0ffbf7e005ddf0e0a95d97ab78c5ae02dbf276 SHA512 af6467257b09c88b81652f5ec16972d950ec9c1b557812bd6a428740d04a84f3b765c691faea7a0cbe8cde5e2ef297fa88e7122a6dfb5ab94eb8b5759b61de61
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
new file mode 100644
index 000000000000..1a0fa2b228fc
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2010-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
+KNOTS_PV="${PV}.knots20180918"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+IUSE="+asm knots libressl"
+
+DEPEND="
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2018/09/18/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index ce7c1e70ba4f..528572e5f790 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,4 +1,6 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
 DIST libetpan-1.8.tar.gz 6188927 BLAKE2B 730d9fc545ea2fbd4dbc0eaf3cdbd0540ec85984dee5448c5f22c83ad12e568a9e066e53734da96ef6a9c77942e5aea2eb241c2228f0ca7577755e67646aa589 SHA512 a5e97998803cc56dbd54356153c8579b52a9675fe95fbf642c3158215428d9d2cb30c4e0060c5f4dd760634fff5b1c2a32ce4bb70a5f2bc6398a071ce95e1efd
+DIST libetpan-1.9.1.tar.gz 6189971 BLAKE2B d6cffd9c333c76451d7ac26e978e09b7f1a0b225ef1f318c80f28fe00047c523f2bba32cef5892e452bc84593ce0d635a4cd075e32575c812ff853d0932b01f9 SHA512 1dd72644672e15eecc9883ffb4b29ef34d4355c55aec950cac44e7b59f252d9355f37ef0ad37007c89728c09e057144b4c3b853496a011d693598b6027356286
 EBUILD libetpan-1.8.ebuild 2093 BLAKE2B 4d24c6398d9de5b50433e3c2b4716331280fe0c88f70ac64192bedb570ce955e1002d520e0c1ff7132aa1b957020bddfbc4d4ab08823645b1e16b4b85f83bb4f SHA512 23d9195d9665ad24c58cc1c7b570e48ddc157cae14cc69dbd814124525bc70de3aaa33687a5a914aade21241c082c1b16f5014f8618795cc53ebdbf6b8b0e933
+EBUILD libetpan-1.9.1.ebuild 1865 BLAKE2B 0cc278d72d4f3e270f03b2b64c8f2a874349b6f60fcacd6985eab1b2ad58c303e2a3f8b1fea86f0cfd73239d1bb5c4e58ecfd4dd7e1a6153efcc3b66c3092eba SHA512 a008360891145c5d64e560933a0129f029675f7b1e0d95f4dcc77f6fdb58744f22289e2772d30ae94f7668246bf17e9a0c2e7e2b84acab490d7d256fca26c43a
 MISC metadata.xml 755 BLAKE2B 35e32e2b1ea6d17e7333154458354aadd3d54d5d42278e5c48cded4b8c5603f2ad19b2a7bd053627e01803e4bd0f014bc0e3fbff5b0a0e1129440dcfc92b27e4 SHA512 ed262f3a54d66d8ea1dc9e3b397cc206045a951578014fd99be5750647006da91c63a430556f1ee58b3f8bb22ccfd50699ef942dce7f3a75706f288e83d4cb19
diff --git a/net-libs/libetpan/libetpan-1.9.1.ebuild b/net-libs/libetpan/libetpan-1.9.1.ebuild
new file mode 100644
index 000000000000..31edc45696c0
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.9.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb gnutls ipv6 liblockfile libressl sasl ssl static-libs"
+
+# BerkDB is only supported up to version 6.0
+DEPEND="sys-libs/zlib
+	berkdb? ( <sys-libs/db-6.1:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+)
+
+pkg_setup() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
+		ewarn "No ssl support will be available in ${PN}."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+	# libtool recognises it as valid shell (bug #300211)
+	use prefix && export CONFIG_SHELL=${BASH}
+	local myeconfargs=(
+		# --enable-debug simply injects "-O2 -g" into CFLAGS
+		--disable-debug
+		$(use_enable berkdb db)
+		$(use_enable ipv6)
+		$(use_enable liblockfile lockfile)
+		$(use_enable static-libs static)
+		$(use_with sasl)
+		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index b78da9e3f2f3..12405449ca52 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -4,6 +4,6 @@ DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579
 DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
 EBUILD libnetfilter_conntrack-1.0.4.ebuild 968 BLAKE2B c1d3943def2e1b3d8eb61006a6426fb23ca0f9062522d8f197c8af3baa366181ba11f1e3ea797d9a461898d8fbdf40036425d36897e3b570dd3932d47f40b5fd SHA512 c1eb29f822d2ed62dea906fb0040b49a9edb966372959cd98a2297dcc88b718c2eb04d6b36d79030d2e473885c299795541a9017005f9f90d6fce176360b660f
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 974 BLAKE2B 339b6ea38023382f0efaf5edcc67fe35ecbcdb5770a75f19c7b0121c0fa12655566db2e5871d4568daba7b1b21656a8d793f9022826c03e5d24da7f116e9a292 SHA512 733b1499ace7c63dfb3840cac4ab16be42c461fc6aa3276797edf687377cbf2835a1da7936e6d8865481a5cd94d0e2c2f5b3fd138d4398941671cad82e239922
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 972 BLAKE2B 27fd7f94d9aa40bcfa0346236e44210e30dc026ff766eeb5c88318a040ccd6f9c8f330690cfb05f3728ec859ad01320f9b3f4ab9e8087962467252ee130e80ab SHA512 89a39f7afcab739362733ad5fa3f5abe0a0971bff9efff263e941398ea068e404ac2d44627cc28806d302ffb9801eb0b98d37ed46b5b4f17855fbf5c08535c3d
 EBUILD libnetfilter_conntrack-1.0.7.ebuild 979 BLAKE2B f3cc5bfc79799b9e585d68e948d614c1f8c6370a38a551104979f3c111bf56c39ff7c8ed0d476b28246662c576f583f155f3a0ecfe188779c10c3024a191456d SHA512 6105474e9db8329ed22a6bc15f5ded6d7aaf548914e2df09601968028140ee890472ec63c8187984b985b543530569f491f6ee13caa50a1c023ac2d006a80741
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
index 6339ed767ffc..7e714e7d6a91 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 05196ae6b9bb..ac579bd264bf 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,7 +1,11 @@
+AUX libnftnl-1.1.1-big-endian-1.patch 2069 BLAKE2B de0c7ac336dc01d25eb8f2a8ff837e35f9f95275ec1e0b1f32b113a1d2717e98d6281e3034a60a52b2f38e7b120f30dbba9137e330fe715793511ab3025843b0 SHA512 70cca0769923efc99f204608b59712862608e94d4030a1f16c5d8141896fb91c3e458054fd8e7b069014fe3279d209a7b5e7da996633e12781a28f224f0e9cf4
+AUX libnftnl-1.1.1-big-endian-2.patch 1383 BLAKE2B cae500d1ebdde1dd1d7dc7b572ab0a5b30f775b1c9b874ec889ef1bccb2981795e69107268b9ab67aad17864d648ce2c63e29ab54596dbf11072631fa868f44c SHA512 9cae1b05c3b3794219609c95ad547a51ec2249b2457531eb6be1450f0c17a5c4a91ce8b2d3694490e986dba1b587b2df8dcf4f014f6704bef7250f8ec2bfac69
+AUX libnftnl-1.1.1-big-endian-3.patch 1179 BLAKE2B 8ca66b878b2ddbe73aa361b3886e033662d585c5a6d35dfd693877b9f706cbfeec689272f8f43ea41bed77a908e69873f946f967d76bdae0fd45be6992f93b64 SHA512 c1249763339cb633ceb556d97c483f437d6fcc095253df076e46ff3c7c613455ea8296abca53656ad7fea14c7903373c115bb7344abb11acc17b67c67db4bf57
 DIST libnftnl-1.0.8.tar.bz2 400496 BLAKE2B d2563f707ceb40b8cd7c4b4fdede64943fabcc8a639eb61c844f7b941786a49b1c029e375977759717e5cb8f8dc2019ddcbf48223347f868713d1a077d51d8a8 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9
 DIST libnftnl-1.1.0.tar.bz2 370642 BLAKE2B 3dbc0116027e863a656c55c0d65449bf3905378e84c907f0d94582c608a793952fbb83f90565304af05978b08675a6edf13ee997fd5ce0d4374a2143746691c1 SHA512 3216afbd62f5dbd78b26c2ab3acb467bca5d6a7f5fd5bb15356b9d80ffca64f9afa1d8f374701e00f1ae9e5ec282fd55c970502121330c1446032e70bb593d23
 DIST libnftnl-1.1.1.tar.bz2 372562 BLAKE2B 9dee45bb485399c4677f636c8aa065a7e4e80102f17beb4aa066278a6ef753e7c1aaf02c6a853edc70f018ebef5e8389a05ca384116ec06761f0a29e278f4e54 SHA512 87f092e2b6576121538c8ac7ce92d8c918723e36dd02e2fcfcb7dcaf2ae705bbcd62c79c9076574ef73f461f7df5d10e72bcaeda29e4a7e60ea1401d998424a6
 EBUILD libnftnl-1.0.8-r1.ebuild 1364 BLAKE2B 0c8ed0d675c9bd38094fde0b057b667e40cad6033f70c035c8e11d1e951fe68fac729bcde0a963d16d2acb58ada4343c35185193730a5a0ed4f0ee0045107c8c SHA512 c630c448ee80de01b0e98337314f2ac695c3a653914491db4aeb4ba1d99f9a43d532d9ff19b3ec92b619ab889a97d6788828333d90dd6bf81bbb2f2bf1cc54e7
 EBUILD libnftnl-1.1.0.ebuild 1375 BLAKE2B 8176c16368b5af09f74326a79beecd990be14274cf1e643d4a71d87a260cb5513d828df70ccfb2dad2b936a0e5312be1700a4db0c6132ffdc677c80a1e391717 SHA512 bee525dc84832e27a6b80faeded252d4f5bc373bec65bb160cd1402210b1123e99d7df0e670104bc9e73f7b2e7a80a5cee5770908ca15aad3e026dc273e44549
+EBUILD libnftnl-1.1.1-r1.ebuild 1495 BLAKE2B 75d2b2cdfb8ad9e1c9b994338ef585b90fc8728bb2c5d5c1daa0111f9ccb8ea5ea8eca1d4f976bd111beb4bb5f18799f48fc41701ef56899c770a5658c84b8fe SHA512 521e8da06ad4b1e7af767e9b33985305a260776dcda48692433b491cd2c079492db2ce6d41ecd61dbe29635e572d5bf03d6581beadb42e0044575cf77cbe1ae9
 EBUILD libnftnl-1.1.1.ebuild 1375 BLAKE2B 896998647d4f4b38aaebab192925ebec10d7afceacfee79dfb5250b175142c8f332ee6c20af203a0b72af9becf2676d21d334d42710146e6131ecfa5edd51c65 SHA512 d2a1f4d3b03ce8d8c44048fa049c556acb74cbc8b53a9198ca687277257452cdb9a477b9ba4e952d466a9e72e8239ce5a49815380f36231dbb837346e4636a5e
 MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch
new file mode 100644
index 000000000000..e91333e21bb0
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch
@@ -0,0 +1,93 @@
+From 9737856067b97cbb869e04fc6b6e65c1d859f521 Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Fri, 22 Jun 2018 14:18:57 +0200
+Subject: utils: Fix nftnl_get_value() on big endian
+
+This function basically did:
+
+| memcpy(out, val, <len of requested type>);
+
+which works only for little endian integer types. Fix this by assigning
+the 64bit input value to a variable of the right size and use that as
+input for above memcpy() call.
+
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+---
+ src/utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 42 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index 3e44960..4d9ee78 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -72,6 +72,15 @@ static struct {
+ 
+ int nftnl_get_value(enum nftnl_type type, void *val, void *out)
+ {
++	union {
++		uint8_t u8;
++		uint16_t u16;
++		uint32_t u32;
++		int8_t s8;
++		int16_t s16;
++		int32_t s32;
++	} values;
++	void *valuep = NULL;
+ 	int64_t sval;
+ 	uint64_t uval;
+ 
+@@ -85,7 +94,6 @@ int nftnl_get_value(enum nftnl_type type, void *val, void *out)
+ 			errno = ERANGE;
+ 			return -1;
+ 		}
+-		memcpy(out, &uval, basetype[type].len);
+ 		break;
+ 	case NFTNL_TYPE_S8:
+ 	case NFTNL_TYPE_S16:
+@@ -97,10 +105,42 @@ int nftnl_get_value(enum nftnl_type type, void *val, void *out)
+ 			errno = ERANGE;
+ 			return -1;
+ 		}
+-		memcpy(out, &sval, basetype[type].len);
+ 		break;
+ 	}
+ 
++	switch (type) {
++	case NFTNL_TYPE_U8:
++		values.u8 = uval;
++		valuep = &values.u8;
++		break;
++	case NFTNL_TYPE_U16:
++		values.u16 = uval;
++		valuep = &values.u16;
++		break;
++	case NFTNL_TYPE_U32:
++		values.u32 = uval;
++		valuep = &values.u32;
++		break;
++	case NFTNL_TYPE_U64:
++		valuep = &uval;
++		break;
++	case NFTNL_TYPE_S8:
++		values.s8 = sval;
++		valuep = &values.s8;
++		break;
++	case NFTNL_TYPE_S16:
++		values.s16 = sval;
++		valuep = &values.s16;
++		break;
++	case NFTNL_TYPE_S32:
++		values.s32 = sval;
++		valuep = &values.s32;
++		break;
++	case NFTNL_TYPE_S64:
++		valuep = &sval;
++		break;
++	}
++	memcpy(out, valuep, basetype[type].len);
+ 	return 0;
+ }
+ 
+-- 
+cgit v1.2.1
+
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch
new file mode 100644
index 000000000000..c6fb5a25a893
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch
@@ -0,0 +1,37 @@
+From 5d592ce6c4596b25d5779a224d03c096bc25db54 Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Fri, 22 Jun 2018 14:18:58 +0200
+Subject: expr/data_reg: Fix JSON parsing on big endian
+
+Since reg->len is a 32bit variable, one needs to pass NFTNL_TYPE_U32 to
+nftnl_jansson_parse_val(). Otherwise, only the most significant byte in
+that variable is being written to.
+
+Since the value could potentially be larger than 255, increase node_name
+buffer to avoid a compiler warning.
+
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+---
+ src/expr/data_reg.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
+index 1b28b29..ad7f4cb 100644
+--- a/src/expr/data_reg.c
++++ b/src/expr/data_reg.c
+@@ -59,10 +59,10 @@ static int nftnl_data_reg_verdict_json_parse(union nftnl_data_reg *reg, json_t *
+ static int nftnl_data_reg_value_json_parse(union nftnl_data_reg *reg, json_t *data,
+ 					 struct nftnl_parse_err *err)
+ {
+-	char node_name[8] = {};	/* strlen("data256") + 1 == 8 */
++	char node_name[32] = {};
+ 	int ret, remain = sizeof(node_name), offset = 0, i;
+ 
+-	if (nftnl_jansson_parse_val(data, "len", NFTNL_TYPE_U8, &reg->len, err) < 0)
++	if (nftnl_jansson_parse_val(data, "len", NFTNL_TYPE_U32, &reg->len, err) < 0)
+ 			return DATA_NONE;
+ 
+ 	for (i = 0; i < div_round_up(reg->len, sizeof(uint32_t)); i++) {
+-- 
+cgit v1.2.1
+
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch
new file mode 100644
index 000000000000..d726ccfdc2d9
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch
@@ -0,0 +1,33 @@
+From 043060b18d27f24fe723e39bc2c9e5f50dde60dd Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Fri, 22 Jun 2018 14:18:59 +0200
+Subject: expr/exthdr: Fix JSON parsing on big endian
+
+When setting NFTNL_EXPR_EXTHDR_TYPE, one needs to call
+nftnl_expr_set_u8() and not nftnl_expr_set_u32(). Otherwise 'type'
+variable is assigned to uint32_t parameter before being passed to
+nftnl_expr_exthdr_set() as void pointer which casts it to uint8_t.
+On big endian systems, the latter would only consider the most
+significant byte instead of the least significant one.
+
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+---
+ src/expr/exthdr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
+index 75cafbc..a351835 100644
+--- a/src/expr/exthdr.c
++++ b/src/expr/exthdr.c
+@@ -270,7 +270,7 @@ nftnl_expr_exthdr_json_parse(struct nftnl_expr *e, json_t *root,
+ 		type = str2exthdr_type(exthdr_type);
+ 		if (type < 0)
+ 			return -1;
+-		nftnl_expr_set_u32(e, NFTNL_EXPR_EXTHDR_TYPE, type);
++		nftnl_expr_set_u8(e, NFTNL_EXPR_EXTHDR_TYPE, type);
+ 	}
+ 
+ 	if (nftnl_jansson_parse_val(root, "offset", NFTNL_TYPE_U32, &uval32,
+-- 
+cgit v1.2.1
+
diff --git a/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild b/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..078b64bdd182
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info toolchain-funcs
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/7" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86"
+IUSE="examples json static-libs test"
+
+RDEPEND=">=net-libs/libmnl-1.0.3
+	json? ( >=dev-libs/jansson-2.3 )"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+REQUIRED_USE="test? ( json )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-big-endian-1.patch
+	"${FILESDIR}"/${P}-big-endian-2.patch
+	"${FILESDIR}"/${P}-big-endian-3.patch
+)
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with json json-parsing)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	cd tests || die
+	./test-script.sh || die
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index b0281846c7cf..3b3e5a295aed 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -6,11 +6,9 @@ AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba65
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
-DIST libssh-0.8.1.tar.xz 409572 BLAKE2B 65bf38c5bba803a588ff4a1cc5f774cacc43c500bf0aaa77674f9120eccda26027e446aeb9e61a2418eb81077fdb0aa55d8e014f6d466877a9cd96b665c5e7ce SHA512 6630d0b101dc109116ba7a6cffb00db1bc9b5bc6004c843c5361d3d97c6cf4c323129ebf3bbf25ab2fc1961b74520490d7a16999504849c07b26a25679724b93
 DIST libssh-0.8.2.tar.xz 408412 BLAKE2B bbd531ed511baa84d40c2e156cc63fca09345196e24e485930d8f42fed451529ea6ec2ce6f50276dfa56d5523062bbc45774891ad47ce7c748e8b95bc28b9f8c SHA512 ef9877d2a35f1871139c12452c917a3888172ea29f71d880e824de182695e5a8786bb39ca2f4874a160e156648d52065a8b2e7c040220badf65eee35dcfddeb9
 EBUILD libssh-0.7.4.ebuild 2510 BLAKE2B f644104dcf0707121f141a2b75bdb57935daf4a01d897b5ffb96d6875e681aecfd9730cd02d6330acdf96256f012643659951ca4cd97e2126bf6991fa88ab14e SHA512 1a7bf07e67bb6caf4a183095347fc512dcfcb98a729db2cc1416f39a3bb201ad3046eec7c82c3aa07c7a9f3c5e6b3d3e908a4d32252b0697bdc76173f287a8df
 EBUILD libssh-0.7.5-r2.ebuild 2720 BLAKE2B 76d98f803d58cdea91439451e4842c3079bc19c052845d4f18d27fbd94faf4f3028c244b9ccacbfc27edf87490cbad7af73c3f540f012b3c597ca3596f65c20e SHA512 80148669a5bdb2b0a1cdfdd295ef833ccd51270cfdc2986109b2a6b1bad5da3908642c89e929fed5dc2fda20d8104b3dace60c0d87c7c6450bace22d091efc82
-EBUILD libssh-0.8.1.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1
-EBUILD libssh-0.8.2.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1
+EBUILD libssh-0.8.2.ebuild 2883 BLAKE2B f59deaa0db71faae34fb699be9102a6d5c7ac88722390cdf16de2cedbea66368bc102105e6d200edcbaa525f12e5a3553d9a4dc1a852dc45c2989bb3e11c99d8 SHA512 da54bac3c25d77bfbaa0d6d6a1ab84a5fa4d00581ac31cd26c95d26ad669cca65f8538a7829dda348828c9e445bad4953ac8722dc46d443cf5fb5aeb5344e206
 EBUILD libssh-9999.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1
 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
diff --git a/net-libs/libssh/libssh-0.8.1.ebuild b/net-libs/libssh/libssh-0.8.1.ebuild
deleted file mode 100644
index 641c1853e986..000000000000
--- a/net-libs/libssh/libssh-0.8.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	inherit eapi7-ver
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_STATIC_LIB="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc -r doc/html/.
-	fi
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild
index 641c1853e986..d187c20721b6 100644
--- a/net-libs/libssh/libssh-0.8.2.ebuild
+++ b/net-libs/libssh/libssh-0.8.2.ebuild
@@ -23,6 +23,8 @@ SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
 RDEPEND="
 	!gcrypt? (
 		!mbedtls? (
@@ -36,27 +38,21 @@ RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
 DOCS=( AUTHORS README ChangeLog )
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
 
 	# keyfile torture test is currently broken
 	sed -i \
@@ -78,27 +74,22 @@ multilib_src_configure() {
 		-DWITH_SFTP="$(usex sftp)"
 		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_STATIC_LIB="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
 
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
 	cmake-utils_src_configure
 }
 
 multilib_src_compile() {
 	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
 }
 
 multilib_src_install() {
 	cmake-utils_src_install
-
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc -r doc/html/.
-	fi
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
 	# compatibility symlink until all consumers have been updated
 	# to no longer use libssh_threads.so
@@ -106,6 +97,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
 	einstalldocs
 
 	if use examples; then
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 20640c412f1f..faf6dfa1facb 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d2bbaec24cf44b5910d4fc1a956723a8ed8fecaa428aea361a7ec8a3ff60b82e0d9468ac21d251c16ac8c2b52eafec6ab3 SHA512 0cceeedff6c584d2d7037ff91fbba0fe580fabfda810b9a9ed7c8d8495445339e3ff115d63d4429bcd3eff2b13b123e1bd5855ff1bc9dcd986b968a82c368591
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 EBUILD miniupnpc-2.0.20180222.ebuild 1337 BLAKE2B 12e0b065bb728b59c80a5604b34ec47916ed4b678ec3d774809a27420ed8c10c0f533b315978de8c50b1ea6070729bea941a45580f633816c8d02583953ffadb SHA512 e5c7a6a99f8881dfa57212b0765478a93d70e35cb9a0bb0503a9dd5fc06052ad5c4c05205674b8d09c8464d61ed690dbfc77c2ce4c391b690580e318ce8828c8
-EBUILD miniupnpc-2.0.20180503.ebuild 1334 BLAKE2B 71864101fbe96558e42ed65793fcd260473e1dfa0bdba74760d7060f22d7a945d91f7faa984ab3da6de3d16428cf5e2032294d58372efcc76dc633b627d31421 SHA512 389f263dc89cc4ba3f4b7a3b78c2f061c88fc800b31bddc878ef3c02829701d85302de8ed616541a9fef00090b476dad50a568fcf2db68585b037b6b348fac7b
+EBUILD miniupnpc-2.0.20180503.ebuild 1333 BLAKE2B f06fb80639cc99208bcf620091990acc024d72f250331dd6c45000917ab41a376fa7a73deb760ddf87d20840ac61760246da8af9b182d77ab756e3d208792848 SHA512 feecafac74b3f269cce4b352155244488e60655ab4ccca8ef4e64fdf065f917976082eb4972e8f1b89d04f7c40b4c32d0b292a44f02c7a825dd2b458c79ec49f
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
index f2a939d6e3ce..82b0fa4708b3 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 904420c3f5a0..eb3d4a247780 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -3,6 +3,6 @@ DIST nghttp2-1.32.1.tar.xz 1548812 BLAKE2B a4c1f4f8d5070d1ddc5a5680d9fda28ad0b3e
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
 EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B 7a7dd9bb67e6f900d02ab38353764655ac32b5f7d62f44cbb0d6daca3e476626666330a27e85abb2297cc507206767f26fd7566c7e01b079d4ae213d552e2e4f SHA512 879b31dee79958bc567f0730718dbd2da3046e5a1104f8b619d2fe19f8fd3729dd3892a3e5c1856ef9cecb71bd4a2034e32ca99ef9121499ca5606bed06cf3ed
 EBUILD nghttp2-1.32.1.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
-EBUILD nghttp2-1.33.0.ebuild 1869 BLAKE2B 6d6de13c403f06af8a5093673f281fde65ba189bf451dc595b4e9119c496e474d9ee1da0717e5d51bd6029ce315a4f08987094d011f044759d6ef796ae8edc85 SHA512 49d19a604b467942f15d7c1764749585cc5ad8965fb1a78c68780e6808fb0535935f5e23c0f075a66bb8950ef7e5c2756b500a08729d05ceef58fdf6321d70da
+EBUILD nghttp2-1.33.0.ebuild 1866 BLAKE2B 98df11188b329e536a77e47fe4313e9b04f36830461e98aefd70df142df51e586093ac269077a2b418fa7abd68275fdf5f543846e7483e9a40056012c2b9756f SHA512 772fc19a8eb1eb9d8a8ebf897dc55a90bf3dc1a7c50a52e9765c67f52843dfdcf2e4b443a0626e93f2d241654e7c927ca41e56f295d4b0cca9fda98dbfc6d0a1
 EBUILD nghttp2-9999.ebuild 1949 BLAKE2B 56a3fc7ee584692bbf9219aaba3a56c0aa57f7b4479d6da0a12c77ce8b999a1db1aec3cf76203536cdd42254dd8c42ef2df63ba08fade93a0dc674502012858c SHA512 fe76714b538e6f49c44c3beb212f98b17644575a9b049981c44a4537d7501cf9b3f6bbdd2351a3c286d8c1e1c9acce09843eb86660b5ecfb38785ce920db4aef
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.33.0.ebuild b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
index 2deabdad63c8..a0e6cd2b5638 100644
--- a/net-libs/nghttp2/nghttp2-1.33.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 45eb9107b78c..837aabcdf311 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -7,18 +7,16 @@ DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
-DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951be7a644fafbfcac9cce1bf33ed8ca47929e0a5d0df72034a6c2b967c578e3c78a2ed27ba85e41c4af1de2307293 SHA512 0ca0dead15a1623ece7f972d420dec623141a795ddd984c32ce7e92ae32ead97bb0153ebd8c1c249b91a1bd6efcef7fb313105455f66d4d181473153c4e0736f
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 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.10.0.ebuild 6353 BLAKE2B fdb46cd02319dff1cce1b3c19523998da5b7d6ea69058f9b9f3763f093614a84b4dab91151797ce32d529b41d227a051ba489b3c41cffdf3597816bd1a9b926b SHA512 58a08d3e3d69784c41dccb32a3a7cced78e112ae8f30d86ea0d865255292941f953bca23a22bfb8a8a66135a688fe4c87f6af87f0526dc716ce177ab0f41ec66
 EBUILD nodejs-10.9.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.4.ebuild 6169 BLAKE2B db659e0be25b2bde0ab6dbfd18cc738e4019885fed22d7f69c65d8c63bc7e6ddcf4fb8e6679fabb2475908d145c3616193130b918843564d5cb8f4e47be1c460 SHA512 a6cfc34b5080fdca6cb235b8665ac844c186f73046b57c930dd8107f4a772033f793739f3b3f550785f58089fc1391d8602c31613764558bf0a3cfe25d8b81f2
-EBUILD nodejs-8.11.1.ebuild 6362 BLAKE2B a1cc2e39202ee307f4792a17ffa1df456bca2c9a26427038c83080a1ecb7c4502e874a391eedb3a1b13b6e7dbd7c9b8ef715234f646b87a80eee446f15b4eca8 SHA512 07da9779295676e44c6849de2ffd8a9ac3673608c8a53ae53fd4ad04a8081887b1f66dfac8add40f57c297c212ea01d4b9f2de4add352abc98f8af73e6f24e95
-EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B 10385c4524d04cbdcbb2950e5bf32c9c444ca844575da9f488f0eb80a6042589305e03e097675422fa0d99c42507570e61d5a274dd9f3e25b4c3125309bc96f5 SHA512 846d358ab9079c58a6a7321ab78dfa042853b6a80e670ba8ba8c03d2423c10fdbe52018b1ff97bb81718088c4c230f8b8e1a1834c75decec88e50e1751e6ec8b
+EBUILD nodejs-4.8.7.ebuild 4424 BLAKE2B fa72291c5b44ce0ba1a592b329be2cd9afa3539bf8419be567c457ef223d4ef3db32ae612795da32345c69bb8b141c350b312989df2869fea37e5ecd5afe44bd SHA512 461f777fac4899b55829edc55961ac021cbe6569fcec87bdb842c8a8b3db117ef74b0ec1e1ff01264f74ee71153e6a771d94d9bbea8fee753c1ea53b8c26dc9e
+EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
+EBUILD nodejs-6.11.5.ebuild 6079 BLAKE2B cae909f4065caf36f168acee12b6fd5a9a2c6fc1c612ae78d8ae2470043a75fbe4be1c0c7975c9d5e3546d334b55ea6d3644320eee952eb17b852e8417db5cbf SHA512 2a78ae710fe19eefc05f47b98ed7a3fd0d0ab84430ffbfd30e3134f0dc9ca80d811f9caa47e61fc99a840b589d05f3b7393e7495b70f36b982637504abf984d5
+EBUILD nodejs-6.14.4.ebuild 6157 BLAKE2B 78f63916625998dce844d3bef4f45f4796e183a0ab0f728fc40076416224f4ae734042d608859dec8ef328552b74f8b1300275f8b5ac160da51aae6ff7520293 SHA512 4af3159ac838924e4ecd003bee90fc49becbf3a1b6b40c211dfe8867d8d7f54f0c03cd0ec269327aecb8b9aa490edc6631d7991b82cb511b5e394142d5060b39
+EBUILD nodejs-8.12.0.ebuild 6366 BLAKE2B 590769fb2ede5b40fb988057f55dcccf8b2cbd309948df364dfaf96ee6089544469b140265dadba511ee6779fe70a4c7c6d319680f88447f56855b92f039f239 SHA512 d5eca1c4ff0401077e80a14cc057d60e09f8ef98ef0700cf3138a8b28867ab929b5ca6bd6c6681bab69a77d4ee68c4ae4add21d52904f22d633c331283252aa2
 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-4.8.7.ebuild b/net-libs/nodejs/nodejs-4.8.7.ebuild
index 086bb0ba9987..ce23ef0038ee 100644
--- a/net-libs/nodejs/nodejs-4.8.7.ebuild
+++ b/net-libs/nodejs/nodejs-4.8.7.ebuild
@@ -14,7 +14,7 @@ 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 ~ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-55:= )
diff --git a/net-libs/nodejs/nodejs-4.9.1.ebuild b/net-libs/nodejs/nodejs-4.9.1.ebuild
index 74d336c12fc0..d3f61ffab162 100644
--- a/net-libs/nodejs/nodejs-4.9.1.ebuild
+++ b/net-libs/nodejs/nodejs-4.9.1.ebuild
@@ -14,7 +14,7 @@ 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 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-55:= )
diff --git a/net-libs/nodejs/nodejs-6.11.5.ebuild b/net-libs/nodejs/nodejs-6.11.5.ebuild
index 267d4e22eb48..8fa13fa1dd80 100644
--- a/net-libs/nodejs/nodejs-6.11.5.ebuild
+++ b/net-libs/nodejs/nodejs-6.11.5.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-56:= )
diff --git a/net-libs/nodejs/nodejs-6.14.4.ebuild b/net-libs/nodejs/nodejs-6.14.4.ebuild
index b9e3bf61e418..af4a773604ea 100644
--- a/net-libs/nodejs/nodejs-6.14.4.ebuild
+++ b/net-libs/nodejs/nodejs-6.14.4.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/net-libs/nodejs/nodejs-8.11.1.ebuild b/net-libs/nodejs/nodejs-8.11.1.ebuild
deleted file mode 100644
index 54203e6ccf9e..000000000000
--- a/net-libs/nodejs/nodejs-8.11.1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2018 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 inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.19.1:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.25.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-60.1:= )
-	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-
-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/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-8.12.0.ebuild b/net-libs/nodejs/nodejs-8.12.0.ebuild
index ec415cf67f84..9e1b9751f456 100644
--- a/net-libs/nodejs/nodejs-8.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-8.12.0.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}