gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /net-libs
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
81 files changed, 1040 insertions, 546 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f4f0c6a19944..2663af82808d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 50e7e477afa3..3d8f496fbfdf 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,3 @@
 DIST glib-networking-2.50.0.tar.xz 435380 BLAKE2B 02eea0692cf20c9b1df8efc7e65eb144675fa307851450d461a73df6ccd55cb2ad4e8db5790ca8b0a38a14e30391e583dada30e858154e7c5b7fa0970658410a SHA512 a1e9d28a546f83d461057f088ca2467a32be110f444c8ede1cbfeb20244637d8d5fb5b5b0ee4485feb517beebc3536671442bbfdd3ba01663b52e6da138bd7fe
-EBUILD glib-networking-2.50.0.ebuild 2308 BLAKE2B eb24417494fa386a2d25a2beb52000f90352f8d4330e667803f698b62700d2cd3121eb688e47003ec140b5e28c6842d567a896a1aefd9bc2a8581126db7e3970 SHA512 1a9517ee0e22d261aec3f6cfbcfa7abe7709968a1960dfddf5c963163873faec0a5ab091e5c940fa0550786fc0dd9be709c79fa9d969a6a1bc2be260590f2569
+EBUILD glib-networking-2.50.0.ebuild 2297 BLAKE2B 3718d5152e81516797b18be99e7e15e5f440c2ef0d7e3ddd267a86f953050d7f9a6dcd989cea8762416a65e4e6a3e7cb7e6e246fd2ad8de454f78ebe324ec0ee SHA512 627eab8efae60e19bf1b74c3fb0a0846020cd26c75d58673694b5e5f739d8743fac59290f50351cbf6917ca837fb24e0f98dbe92a891e9b320c77e3c031895d5
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.50.0.ebuild b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
index 37abdfa1ecf6..9833c8f9bcb8 100644
--- a/net-libs/glib-networking/glib-networking-2.50.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 6dba74c12ce0..6083ee8d7a44 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,9 +1,5 @@
-DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
-DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
 DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe
-EBUILD gnutls-3.5.18.ebuild 4111 BLAKE2B d6816f40d5e8fa8f27973621fa9001f0a344f60018fb3cad8619ad14182ce2f033ebe7bec47dcbaa5968870899bca9268447c45a35d4bb9b3f64239eb6b83ab4 SHA512 edc5a18ce84d09ce916f7d0a87558a5ae238f0dcb6a2f6de849e406d067af241d4ab104627e3864bf1ebd84c5ddc79f44cb60e60db4c756fa8b9d8acfb1c901c
-EBUILD gnutls-3.5.19.ebuild 4115 BLAKE2B e703c107322f50a529a4b0f3ffb286470535b40b695e224d858ce510ce51b5059c2ee3e13c61e06da298c45b7f77b778100a7878e198561e93d39c55097646e9 SHA512 73eb580f54bac0382fa5c3a0696661557dc665cab6ba9b0af3cdd10d9934133fb420224c9c37a12be846d8c3f6e54a32310144d8ac21209e1d588f110236a35f
-EBUILD gnutls-3.6.2.ebuild 3751 BLAKE2B 9777ce3562714525ea3442a8ede4a654e4fa80d67418a9eae8ddde910c934593b3f6c5ff33042cdefbb2d403ba4e403cd51998e2167a5b38c7ba4e367bdeea60 SHA512 d64c7e65868e2aac58ed783a415a8756c1b225bda0a4082798d52c8eb332ddd03ba5f07a9fa34c7831d975a17e0def85faa0b6f5ba9046b3ac49472d5756f96a
+EBUILD gnutls-3.5.19.ebuild 4102 BLAKE2B bb77e399da677e52a584cda7c5d65acdb084fa8c42d0aa4cf6381cd9e50fb208f6fc3b94cf912ea9bba7073f54913901e743f36219b499f4c71b9ba4ea723e3d SHA512 709a400b835393004cc25679b0d12b7556ff795e77475f7082976e1993a1471b728b2b8e3c33d883e53f6e2932a867171581b7820900e2e3806bcfff6368c4f6
 EBUILD gnutls-3.6.3.ebuild 3758 BLAKE2B 8a98397c7b84752d60b5d4f96cf3c7eddce0b95c6d0616ad125b004cd9037baca34b906a275f7fba034626bf36e0a91cfa32c4286632004d83f6f8713e80b483 SHA512 f9093b9acbf2b3752daeae530bddd049be189340ad3f379519026827ef8f7281b31fbb4681b1e5441b9c870c7a3debd7e2cd4a17734802b2998be3fdaa17c331
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild
deleted file mode 100644
index bdab4a914323..000000000000
--- a/net-libs/gnutls/gnutls-3.5.18.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
-
-REQUIRED_USE="
-	test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
-	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8:=[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-	test-full? (
-		guile? ( >=dev-scheme/guile-2 )
-		app-crypt/dieharder
-		app-misc/datefudge
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	ECONF_SOURCE=${S} econf \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable nls) \
-		$(use_enable openpgp openpgp-authentication) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_with idn libidn2) \
-		$(use_with idn) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		--without-included-libtasn1 \
-		"${libconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild
index 3f815626bc57..ec31235847e3 100644
--- a/net-libs/gnutls/gnutls-3.5.19.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19.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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/gnutls/gnutls-3.6.2.ebuild b/net-libs/gnutls/gnutls-3.6.2.ebuild
deleted file mode 100644
index cc2a7e26e1e8..000000000000
--- a/net-libs/gnutls/gnutls-3.6.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-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=""
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
-	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8:=[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-	test-full? (
-		guile? ( >=dev-scheme/guile-2 )
-		app-crypt/dieharder
-		app-misc/datefudge
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	ECONF_SOURCE=${S} econf \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable nls) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_with idn) \
-		$(use_with pkcs11 p11-kit) \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		--without-included-libtasn1 \
-		"${libconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
new file mode 100644
index 000000000000..5cd74808bc8e
--- /dev/null
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -0,0 +1,7 @@
+AUX 0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch 1321 BLAKE2B 93d7a80d64f16e4dec71623b71fc88e648d08423130f57d698989bfd6c9e67ceaab1f2e07f5e5619c60f701148d09d1f71c6e76ab5fb1ddc27ac8735b40b950f SHA512 a947f313aa34d9e6f4023cdaab69fd140cf1ba54947566ba964c3ff63269528035d2896c62b994374ae84a1a55437fdd707fe7e9de0206bb65728b4388b25778
+AUX 0002-cmake-fix-library-issues.patch 9143 BLAKE2B 588609dfca0da2e49823764bdf382bcd3c154d8ec66be2a0625640f0ee26d32de08f120755f416a8e9c5c945008a928549ef3725e2f1654e56a7c10e7cef6b44 SHA512 e33bca9842728799fc632cfd0acefcface9bc9a160bb20e3566c2a397fc6861702050d4bb62088be3f8751f9d1fc728395eedb012e65b5c1818218ef4dee0608
+DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e
+DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8
+DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
+EBUILD google-cloud-cpp-0.2.0.ebuild 1607 BLAKE2B 04001060e9e5c60f71c1aa27cd5d5eba0cf2523c4de3724cc16ce2af16468613bf11ca6bf2cdf5f28a862f9bfd4db2ae5754a1be1e27456475a9f9226c3af2f1 SHA512 b0e4b4a786450727fe1284a243a399566c8037b4611c963d708d5e3997ed0f9d479e98d40a6b9cf2fd45de53c3b95d0ed31377b1221d86d0dfc4114eaeb77ec0
+MISC metadata.xml 334 BLAKE2B f6f86d6b9621c1f6bb8a540835936ba0eb3ebc9ebee743cf3fdd0f236477378acff8af6528ba194cf1ba74273d3df99eeb012add242471af810afbfbe587321b SHA512 3ddab1ddecbb3f976ed02c450094873ec200d3a42faa601a10a3089d76faadaffa3fa59e48013b471e735a919502988da149f4d19e7d1d7054947462c71581a9
diff --git a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
new file mode 100644
index 000000000000..d479a82b1e30
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
@@ -0,0 +1,33 @@
+From eb0155e90498a5d7341490b9ed123f7638bffe44 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Fri, 7 Sep 2018 21:19:11 +0800
+Subject: [PATCH 1/2] cmake: Fix GOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
+
+The grpc_cpp_plugin executable needs to be marked imported otherwise
+cmake will try (and fail) to build it.
+Also the location variable was typo'd.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ cmake/IncludeGrpc.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/IncludeGrpc.cmake b/cmake/IncludeGrpc.cmake
+index 14273cbb..929f984d 100644
+--- a/cmake/IncludeGrpc.cmake
++++ b/cmake/IncludeGrpc.cmake
+@@ -231,9 +231,9 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config")
+             ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release
+             ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug)
+     mark_as_advanced(PROTOC_GRPCPP_PLUGIN_EXECUTABLE)
+-    add_executable(grpc_cpp_plugin ${PROTOC_GRPC_PLUGIN_EXECUTABLE})
++    add_executable(grpc_cpp_plugin IMPORTED)
+     set_property(TARGET grpc_cpp_plugin
+                  PROPERTY IMPORTED_LOCATION
+-                          ${PROTOC_GRPCPP_CPP_PLUGIN_EXECUTABLE})
++                          ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE})
+ 
+ endif ()
+-- 
+2.16.4
+
diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch b/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch
new file mode 100644
index 000000000000..23a6d24d54da
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch
@@ -0,0 +1,180 @@
+From 9978d05d4418bf813b8a457a2e49d0fc8fc8b26b Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Fri, 7 Sep 2018 22:35:24 +0800
+Subject: [PATCH 2/2] cmake: fix library issues
+
+Set library soversions so CMake sets the symlinks and soversions
+properly.
+Install the cmake files in the correct dir.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ google/cloud/CMakeLists.txt           | 14 +++++++-------
+ google/cloud/bigtable/CMakeLists.txt  | 11 ++++++++---
+ google/cloud/firestore/CMakeLists.txt | 14 ++++++++------
+ google/cloud/storage/CMakeLists.txt   | 12 +++++++-----
+ 4 files changed, 30 insertions(+), 21 deletions(-)
+
+diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt
+index 4d777261..4e26290c 100644
+--- a/google/cloud/CMakeLists.txt
++++ b/google/cloud/CMakeLists.txt
+@@ -99,6 +99,9 @@ target_include_directories(google_cloud_cpp_common
+                                   $<INSTALL_INTERFACE:include>)
+ target_compile_options(google_cloud_cpp_common
+                        PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(google_cloud_cpp_common PROPERTIES
++                      VERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH}
++                      SOVERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR})
+ 
+ include(CreateBazelConfig)
+ create_bazel_config(google_cloud_cpp_common)
+@@ -150,7 +153,7 @@ endforeach ()
+ 
+ # Export the CMake targets to make it easy to create configuration files.
+ install(EXPORT google_cloud_cpp_common-targets
+-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common")
++        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+ 
+ # Install the libraries and headers in the locations determined by
+ # GNUInstallDirs
+@@ -186,12 +189,9 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common.pc"
+ configure_file("config.cmake.in" "google_cloud_cpp_common-config.cmake" @ONLY)
+ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+                "google_cloud_cpp_common-config-version.cmake" @ONLY)
+-install(
+-    FILES
+-        "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake"
+-        "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake"
+-        DESTINATION
+-        "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common")
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake"
++              "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake"
++        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+ 
+ add_subdirectory(bigtable)
+ add_subdirectory(firestore)
+diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt
+index 8aaff05c..9bd3effd 100644
+--- a/google/cloud/bigtable/CMakeLists.txt
++++ b/google/cloud/bigtable/CMakeLists.txt
+@@ -102,6 +102,9 @@ target_include_directories(bigtable_protos
+                                   $<INSTALL_INTERFACE:include>)
+ target_compile_options(bigtable_protos
+                        PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(bigtable_protos PROPERTIES
++                      VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
++                      SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR})
+ add_library(bigtable::protos ALIAS bigtable_protos)
+ 
+ # Enable unit tests
+@@ -212,6 +215,9 @@ target_include_directories(bigtable_client
+                                   $<INSTALL_INTERFACE:include>)
+ target_compile_options(bigtable_client
+                        PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(bigtable_client PROPERTIES
++                      VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
++                      SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR})
+ add_library(bigtable::client ALIAS bigtable_client)
+ 
+ include(CreateBazelConfig)
+@@ -369,7 +375,7 @@ if (NOT ${GOOGLE_CLOUD_CPP_GRPC_PROVIDER} STREQUAL "module")
+ 
+     # Export the CMake targets to make it easy to create configuration files.
+     install(EXPORT bigtable-targets
+-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client")
++            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+ endif ()
+ 
+ install(TARGETS bigtable_client
+@@ -407,5 +413,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+                "bigtable_client-config-version.cmake" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config-version.cmake"
+-              DESTINATION
+-              "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client")
++        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt
+index 88c5ad6d..63d8add1 100644
+--- a/google/cloud/firestore/CMakeLists.txt
++++ b/google/cloud/firestore/CMakeLists.txt
+@@ -62,6 +62,9 @@ target_include_directories(firestore_client
+                                   $<INSTALL_INTERFACE:include>)
+ target_compile_options(firestore_client
+                        PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(firestore_client PROPERTIES
++                      VERSION ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH}
++                      SOVERSION ${FIRESTORE_CLIENT_VERSION_MAJOR})
+ add_library(firestore::client ALIAS firestore_client)
+ 
+ include(CreateBazelConfig)
+@@ -104,7 +107,8 @@ install(TARGETS
+ 
+ # The exports can only be installed if all the dependencies are installed. CMake
+ # needs to know where the submodules will be installed from,
+-install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
++install(EXPORT firestore-targets
++        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+ 
+ install(TARGETS firestore_client
+         EXPORT firestore-targets
+@@ -138,8 +142,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client.pc" DESTINATION
+ configure_file("config.cmake.in" "firestore_client-config.cmake" @ONLY)
+ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+                "firestore_client-config-version.cmake" @ONLY)
+-install(
+-    FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
+-          "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
+-          DESTINATION
+-          ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
++              "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
++        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
+index c8b641a0..c91bb17c 100644
+--- a/google/cloud/storage/CMakeLists.txt
++++ b/google/cloud/storage/CMakeLists.txt
+@@ -216,6 +216,9 @@ target_include_directories(storage_client
+                                   $<INSTALL_INTERFACE:include>)
+ target_compile_options(storage_client
+                        PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(storage_client PROPERTIES
++                      VERSION ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH}
++                      SOVERSION ${STORAGE_CLIENT_VERSION_MAJOR})
+ 
+ add_library(storage_client_testing
+             testing/canonical_errors.h
+@@ -326,20 +329,20 @@ install(TARGETS storage_common_options nlohmann_json
+ 
+ # Export the CMake targets to make it easy to create configuration files.
+ install(EXPORT storage-targets
+-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client")
++        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+ 
+ install(TARGETS storage_client
+         EXPORT storage-targets
+         RUNTIME DESTINATION bin
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-install(DIRECTORY . DESTINATION include/storage/client
++install(DIRECTORY . DESTINATION include/google/cloud/storage/client
+         FILES_MATCHING
+         PATTERN "*.h"
+         PATTERN "testing/*"
+         EXCLUDE)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION
+-              include/storage/client)
++              include/google/cloud/storage/client)
+ 
+ # Setup global variables used in the following *.in files.
+ set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR})
+@@ -362,5 +365,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+                "storage_client-config-version.cmake" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config-version.cmake"
+-              DESTINATION
+-              "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client")
++        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+-- 
+2.16.4
+
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild
new file mode 100644
index 000000000000..0cc60cd4db47
--- /dev/null
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+JSON_VER="3.1.2"
+GOOGLEAPIS_COMMIT="79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2"
+
+DESCRIPTION="Google Cloud Client Library for C++"
+HOMEPAGE="https://cloud.google.com/"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
+	https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-libs/protobuf
+	net-misc/curl
+	net-libs/grpc"
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+DOCS=( README.md )
+PATCHES=(
+	"${FILESDIR}/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch"
+	"${FILESDIR}/0002-cmake-fix-library-issues.patch"
+)
+
+src_prepare() {
+	rm -rf "${S}/third_party/googleapis/" || die
+	mv "${WORKDIR}/googleapis-${GOOGLEAPIS_COMMIT}/" "${S}/third_party/googleapis/" || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=package
+		-DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
+		-DBUILD_SHARED_LIBS=ON
+	)
+
+	cmake-utils_src_configure
+
+	mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
+	cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
+}
+
+src_test() {
+	# test fails
+	local myctestargs=(
+		-E internal_parse_rfc3339_test
+	)
+
+	cmake-utils_src_test
+}
diff --git a/net-libs/google-cloud-cpp/metadata.xml b/net-libs/google-cloud-cpp/metadata.xml
new file mode 100644
index 000000000000..19a918bcc964
--- /dev/null
+++ b/net-libs/google-cloud-cpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		Google Cloud Client Library for C++
+	</longdescription>
+</pkgmetadata>
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
new file mode 100644
index 000000000000..990704e2a3e4
--- /dev/null
+++ b/net-libs/libad9361-iio/Manifest
@@ -0,0 +1,5 @@
+AUX 7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch 1209 BLAKE2B 198818f6d54bbd9a987df795f06ec6a9a1fe0776b37fc27ad0aae4a2d31bd0e261af1d266aaf18add8585b8446806ef6d59964d90bfd08b440e49e3f5e8149b4 SHA512 4cf240a0d8cd195614ad188262a1b482c9f57647d72b3daf4a1717a03afb5ac58cd639e77ef6b861deaed81d29e60a599196456f673a7c1eb6fa8b51b2430656
+DIST libad9361-iio-0.1.tar.gz 27495 BLAKE2B d46873d69c494835e028ba1de7d17d48e5ed6bf1a73e96cf958dcfe44142cd39a9df3b00d61d3d3b8934bcb59fff3bd33c82f5c11de65f332185fe0e8c296f54 SHA512 64df3d4ce5e1c10fb44b6e39c11bac119ef77f2cc5b9785023b22670ca4905a1afd13c6923b3056f957789a911a3cae3cb7208770e1a112d849e7e3d2feb2fdc
+EBUILD libad9361-iio-0.1-r2.ebuild 743 BLAKE2B 1bb841da041dccfb400e217e515b5654b73817369ed15899f5fc08b392b291e5a9b56041c3226845bd3f19ef59ac25506ab0b2cc1dcdf1d2b26fdaa2eafbb22b SHA512 c27c986471ae812553253688dd5d06c4ab37ce4e410cc5a438edc4b664c549130cd50e17e91e80c87930af331abbf5cb3ea7cce2af1c05dae358db4d9c9ec71f
+EBUILD libad9361-iio-9999.ebuild 743 BLAKE2B 1bb841da041dccfb400e217e515b5654b73817369ed15899f5fc08b392b291e5a9b56041c3226845bd3f19ef59ac25506ab0b2cc1dcdf1d2b26fdaa2eafbb22b SHA512 c27c986471ae812553253688dd5d06c4ab37ce4e410cc5a438edc4b664c549130cd50e17e91e80c87930af331abbf5cb3ea7cce2af1c05dae358db4d9c9ec71f
+MISC metadata.xml 441 BLAKE2B 56143244ca58d80b2857f231c5313690c35cd686f152dcaaa9d9982f8692895555d19bad1cd222b91154b1a567607b80c9412d6d378a87c8580a80bab8794b7c SHA512 53ed722fc50caaa21746b65f7fd1fbff34a296cac7ecc49ad1a0dde04e17e09385985db1a1cfb2651333733516fb30bc32d9c26351f2df24f06c93d05ff758c5
diff --git a/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch b/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
new file mode 100644
index 000000000000..6b1668f0a0e5
--- /dev/null
+++ b/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
@@ -0,0 +1,36 @@
+From 7206bb2a9b655be3bdb66c6cf03aa504817ed240 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Tue, 14 Aug 2018 09:48:59 +0200
+Subject: [PATCH] Fix building outside git repository
+
+Currently when building the project on a machine that has git installed,
+but the source is not inside a git repository cmake fails with the
+following error.
+
+	CMake Error at CMakeLists.txt:35 (if):
+	  if given arguments:
+
+		"STREQUAL" "/home/lars/libad9361-iio"
+
+This is due to LIBAD9361_GIT_REPO variable being empty. In order to handle
+empty variables in CMake in a string comparison they need to be
+encapsulated in quotes.
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7af5444..8d04ba0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ if (GIT_FOUND)
+ 		OUTPUT_STRIP_TRAILING_WHITESPACE
+ 	)
+ 
+-if (${LIBAD9361_GIT_REPO} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
++if ("${LIBAD9361_GIT_REPO}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ 		execute_process(
+ 			COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+ 			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
new file mode 100644
index 000000000000..429ddc4b83f0
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+	cmake-utils_src_prepare
+	eapply_user
+}
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
new file mode 100644
index 000000000000..429ddc4b83f0
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+	cmake-utils_src_prepare
+	eapply_user
+}
diff --git a/net-libs/libad9361-iio/metadata.xml b/net-libs/libad9361-iio/metadata.xml
new file mode 100644
index 000000000000..36c978cfbdb6
--- /dev/null
+++ b/net-libs/libad9361-iio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">analogdevicesinc/libad9361-iio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/libiio/Manifest b/net-libs/libiio/Manifest
new file mode 100644
index 000000000000..cf9c19dc2e73
--- /dev/null
+++ b/net-libs/libiio/Manifest
@@ -0,0 +1,4 @@
+DIST libiio-0.15.tar.gz 192704 BLAKE2B 7eeaad1535f69ca11fe3f716ac70a161f98d24513fe910cb34ca11a0b63c07f5b5321447c96c247cc9a76ed838d806fa9f160e87fd10f1aeac5025edfa16b8f6 SHA512 7e3ca1a8b97486f20baf38afecfd26c626bed1fef535d88020d11eb4e49fc1226390c6383799222f6811c13b8b7e5cc77fb899c776c150a9d1c2024bf8ab338b
+EBUILD libiio-0.15-r1.ebuild 662 BLAKE2B e59b4222302bc9a4f52e561f3c710460198ade34f65588d33fcbd55afe9536f965d96283ae244968f3d855dd6cc8bbf24107d1b1fcbd8147018919285dc0ab0e SHA512 3f669cadb91c1697387d8484206ee6733c49fc16d937c73ca0830e0bcbb629af5f1d7c4c9635e2232876df638b09f5666898fa3a5ac7e35e5eaaa63c61935158
+EBUILD libiio-9999.ebuild 662 BLAKE2B e59b4222302bc9a4f52e561f3c710460198ade34f65588d33fcbd55afe9536f965d96283ae244968f3d855dd6cc8bbf24107d1b1fcbd8147018919285dc0ab0e SHA512 3f669cadb91c1697387d8484206ee6733c49fc16d937c73ca0830e0bcbb629af5f1d7c4c9635e2232876df638b09f5666898fa3a5ac7e35e5eaaa63c61935158
+MISC metadata.xml 506 BLAKE2B a3be5b15b8043c7e52b3a3ed6a01dab5731286ba3266285426ef8c56bd1124fbf8a2b3083cad85094ff5d0ac0f06a6127ccbfcdc89502d909797deacb14aabb9 SHA512 c408630124499db22c21e2f2911fb7dd023f1e704b895c770c2510a08f7b3516cc83aa8d50a6e6aa2c0365ca7e91064a1cb664ce80e1ba153d68a381182264ba
diff --git a/net-libs/libiio/libiio-0.15-r1.ebuild b/net-libs/libiio/libiio-0.15-r1.ebuild
new file mode 100644
index 000000000000..64bf1679f217
--- /dev/null
+++ b/net-libs/libiio/libiio-0.15-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Library for interfacing with IIO devices"
+HOMEPAGE="https://github.com/analogdevicesinc/libiio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libiio"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="+aio +avahi"
+
+RDEPEND="dev-libs/libxml2:=
+	virtual/libusb:1=
+	aio? ( dev-libs/libaio )
+	avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}"
diff --git a/net-libs/libiio/libiio-9999.ebuild b/net-libs/libiio/libiio-9999.ebuild
new file mode 100644
index 000000000000..64bf1679f217
--- /dev/null
+++ b/net-libs/libiio/libiio-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Library for interfacing with IIO devices"
+HOMEPAGE="https://github.com/analogdevicesinc/libiio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libiio"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="+aio +avahi"
+
+RDEPEND="dev-libs/libxml2:=
+	virtual/libusb:1=
+	aio? ( dev-libs/libaio )
+	avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}"
diff --git a/net-libs/libiio/metadata.xml b/net-libs/libiio/metadata.xml
new file mode 100644
index 000000000000..01dc3884d2c9
--- /dev/null
+++ b/net-libs/libiio/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="aio">Enable asynchronous IO support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">analogdevicesinc/libiio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index f8b7803872c6..ef04aa43ee11 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -5,7 +5,7 @@ AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
 DIST liblockfile_1.13.orig.tar.gz 67720 BLAKE2B c42248c652fda4604a0b4210f77046c2bbb50fc63459da03e1302d436abc21f34e77d17ca9f1e0f80abf674ac9942656014b2ea74bbf9ee92ab17d3c0b2e08cc SHA512 509b00e6841ecdbd6bef0fdf620a31f49b2e07d29c7dd2407297a3e92ded568933d75390f7cab43dd514949c6ccf8924e621324a8d4bbde4c71847b7b257318a
 DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
-EBUILD liblockfile-1.09.ebuild 1246 BLAKE2B 2f90142761b3c608945b407923b03b99d7d4124eb77ca4ec7711deb75e06a287b49c4cca5fbfe57f6d8b582ac59d474e772da1117a12eb9110cdf154d2107601 SHA512 9daddb4de76567557989902f824f1eeb77e2810055f7aaf36c2ce9e4b7086b364a4f06c620b5d6e1c02a18cef46868a62a4e2714ffc916c2417d542b1ed8073e
-EBUILD liblockfile-1.13.ebuild 1128 BLAKE2B 51ed506fd479c36cf5deb22b8b0469222120a17d874cd231baa9f66c6692d57fdb54012d9db89f215460695658278f466f8e5f54f9d7d7981c052cadcd235cde SHA512 de74d533a77f35c2755c1ab773a56559ecd8b58afdc1cd392df59597349b9b128201a1f3e918da646f2b9bd4ff152c2bdcedcbc638569a412a1bf2cc80cfb848
-EBUILD liblockfile-1.14.ebuild 1128 BLAKE2B 51ed506fd479c36cf5deb22b8b0469222120a17d874cd231baa9f66c6692d57fdb54012d9db89f215460695658278f466f8e5f54f9d7d7981c052cadcd235cde SHA512 de74d533a77f35c2755c1ab773a56559ecd8b58afdc1cd392df59597349b9b128201a1f3e918da646f2b9bd4ff152c2bdcedcbc638569a412a1bf2cc80cfb848
+EBUILD liblockfile-1.09.ebuild 1235 BLAKE2B f94958382f638b3008f82463dcdb9f06a1a334037225bf9fd31ca8eade804c5388c04cb03a1870cc2ee5e79266d859bb069cd855b60946dbdc6e3ab31569bbcf SHA512 f00ce50747bb75a5818b95c4e7e87750d4b891c2e22d89e4c71c64bbef8b804836ce766cc30cc4fe4e29100fed1f3b781b5524e09528cc71cec29c35f2b45a73
+EBUILD liblockfile-1.13.ebuild 1117 BLAKE2B e9b3beca84c51bbdaacd84d8d793fa7cfa37b1fdc3e019f5a607006e146fb3dfd33ea66c14d0bce9803fedaa93fc564093a7d71173e6ae60bda3f9b43cbad08c SHA512 eedaf954bf3c317ac9e5daf3b66ffa07e52e0bcd96377154d88e46f0ecd6d653d7cb2449571e25aed490042b3b7658b00113cdd57432cf8ebbdeb674f79c4fc0
+EBUILD liblockfile-1.14.ebuild 1117 BLAKE2B e9b3beca84c51bbdaacd84d8d793fa7cfa37b1fdc3e019f5a607006e146fb3dfd33ea66c14d0bce9803fedaa93fc564093a7d71173e6ae60bda3f9b43cbad08c SHA512 eedaf954bf3c317ac9e5daf3b66ffa07e52e0bcd96377154d88e46f0ecd6d653d7cb2449571e25aed490042b3b7658b00113cdd57432cf8ebbdeb674f79c4fc0
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
index b7bcd744ac06..2e9ea14533dc 100644
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 pkg_setup() {
diff --git a/net-libs/liblockfile/liblockfile-1.13.ebuild b/net-libs/liblockfile/liblockfile-1.13.ebuild
index f70344e97a96..5e227dcd565d 100644
--- a/net-libs/liblockfile/liblockfile-1.13.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/net-libs/liblockfile/liblockfile-1.14.ebuild b/net-libs/liblockfile/liblockfile-1.14.ebuild
index f70344e97a96..5e227dcd565d 100644
--- a/net-libs/liblockfile/liblockfile-1.14.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 0ed4512b7444..36524e8459e3 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -12,5 +12,5 @@ DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc
 DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
 EBUILD libnet-1.0.2a-r5.ebuild 1557 BLAKE2B 2c9b314d38563d4e0c1f57c22073ca820baf22fde7c4164c110f16772335ca04714934e8510ea7147e9b483766e54d5189ec54d33f5bd38f0c6cc413de3feacb SHA512 9e2f6c15c56066e87d676c38c214cb2d50ea77ddb79b5bdd0f085b79552fa14a7fd285ba72c5266495f90c829afa428786daf258c3c7bd46f676b02ce8d94c31
 EBUILD libnet-1.0.2a-r6.ebuild 1310 BLAKE2B a022c848c68aac837bb39b2cf22d9812bcfcd4337c2015c9a245bc8b9448e37260da9ba18f41c5099287900ad3107a18122b1bb5e2c59d626a088393a649b0eb SHA512 641fbbade6ccf33957314b2ac191b932584390e5878851442b06f8ee8149733fb5b3c47f90ffcb630aa46145ba763e2e50da54c66b7b603651fa605dfc543d62
-EBUILD libnet-1.2_rc3-r1.ebuild 1198 BLAKE2B c2337471363c5ef88aa0189ad125c9223a2af0c850c8f52d8a98d3971cb151b351b267abc5fdd55c4dad70ea282dff550b51bd48206c1925486fa8c3368aab25 SHA512 5b539acd9b094d1d0c61c92a98d41a603e78b62177d3ea61ecf0fc69e9723e8b1ea597ef6cc21299cdb8208efcf5c5ee674845c0aa300e7aebf4fea987e338a9
+EBUILD libnet-1.2_rc3-r1.ebuild 1187 BLAKE2B db43e462acf7218c72d9de417f585928747ff6d3386b5e9bd12e11292814a28520b5256316d3f30c06b47fcf50c59fb56d72e94014d99d33cb7b6d05c690291a SHA512 96f1228ce154b285348e9dd55edca81d7c71cae7ea26d921959bcbdfda75a7b22965d9c06e9855575b55c81f55a4f78317ffa46d6ce358af3e235190ccea78b3
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
index 6f678049447b..1f0dd9180d54 100644
--- a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
+++ b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DOCS=(
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 04e2f92f2398..dae878e1fa85 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,6 +1,6 @@
 DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055f8f590b6814b2d40f1daaf381ec9d9710e0bbb894489d251788a135550848714e8b015bf237cf41d72feabf0 SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
-EBUILD libnsl-0-r1.ebuild 578 BLAKE2B 1ad99a98bb11433c7040daffccb5697f3984af7206b7e796a43337d0e1ec2a52c7bbd9dca4f33842b72030ed9576aaba86f4192eb4bf5e506dff0e2be5402f07 SHA512 05da30d3ad8120ee9e710e16edf3d44921e7a40bb2922ef017c9832e8413dd9c59ed40d20612e3897f13619a6c2726fb7638dd4697e82e5e7073abd995571ada
+EBUILD libnsl-0-r1.ebuild 567 BLAKE2B f177900284d5ca68d483b67f1f371f4f329206a930c8cd49c531d59795fff4268af2ffa68e2627880f8f5f71fdcb9df53e3416c1d8b60f4da75257bfba802de9 SHA512 a05cf1e7c8f24c96ead7a7483500c699a77fb01edd779f6d4c897ae4196c851725a55a87d48d01badc52b35537d45888d58114b31917b672440537faa834cecb
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 899 BLAKE2B beeeadd634ac21d663cbedce4dd18c68b8f156d399d9c06cebdd2cdabe21e53c5377760063f9b215b23be9f0b90a29a811d4ffa4af533d87f606f09eaacf27ea SHA512 b8c402b184713083dd8c5af7e512aaadc079d9845bc0cccf869984838f23eab918447c37decd43534e0875c432226396bb45b3e2f0eaf231d8381b68dbb82b66
+EBUILD libnsl-1.2.0.ebuild 897 BLAKE2B 64f3b140a9e9acc57de15b3f03f4764b161ab43f87d3c44a86bad17b08c2e21b3f2d4f89f1de5f04ef74d0b56b1d84fd99578e3e0d97e744cbeb3756185eccb9 SHA512 2d04d2b14bb18403d5f4a8cb8cecaef2f76b17eb5bc7a77b95ab78fdc22cfa13e7d483b11bdbfc202470e51beae7ad5b2d6168118479897c0a2703e3571845f6
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-0-r1.ebuild b/net-libs/libnsl/libnsl-0-r1.ebuild
index cf2e1bea64a9..ae3cd9e79b33 100644
--- a/net-libs/libnsl/libnsl-0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
 
 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 760503a9d2dc..9ae659fcd87b 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 4c4f3568ae96..250d1484319e 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -8,8 +8,8 @@ AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856
 AUX libpcap-9999-prefix-darwin.patch 394 BLAKE2B b54df9fa5f1d796ad4739b2ae4ea55a8b66fc2ba434438a0e17cbd7ca5bfaf5d1611e0d8431be45d3fb80dbd61bc2bda2b6fa50378da4780154b4ce523a688d8 SHA512 bfd560b1bba72a84c5afa1cdf166944e9ede10cb817c7273941b3fc0838ca2676adfd143c0e8873f234de343aabb2177f46f2cd062738d2837d42a1da7370083
 DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
 DIST libpcap-1.9.0.tar.gz 819766 BLAKE2B bf98029eea58328c1c820966b100d8467373c9469c107bfe36bcf17e5250d64c45a331050b8a1027c4f4eb1600925b873e4fe43d866ba5a9dc5dcc7995137de1 SHA512 b94d63204f74fd155c1409c50b84c4a02d5b9db7069a24d42d496056416923183331f587903f9101d8464b74efc7db22f113c48e518bd7fb3082b333bbc337fd
-EBUILD libpcap-1.8.1-r2.ebuild 2014 BLAKE2B 946e33f229507957e49927fd17cca8bab97b40aae6f26f94a0428961aedd9c6c1f795e574fdd406d419e4b3388176226d15fce66422c055660c34a61ae2a91bd SHA512 d9a4f50d26a7bb0ea07ae0ba9e8f01174cd22abe9f3df6db1af7fbd4e9d762d6f0e48891d3a117ef72fbd8bfca63fd80bd8864c3352d5ceaa937ad59ae9f5497
-EBUILD libpcap-1.8.1.ebuild 1927 BLAKE2B 5e6b558d87a07b874c3c945848d21694930ed45899c3d9675cbc76d87a0cdd5048b00737b3abaefeafb579d4b925f588b363dfcf6c2639d249a27542bc92abe7 SHA512 29f28f19b0a258b0102a3d1ae611673d51f1649667b8816aa4dbcb36c91866cef2ea09c9bd03adcb74a524fa587b44de5056308d901d381e7bebe041dcc40c45
-EBUILD libpcap-1.9.0.ebuild 1814 BLAKE2B 57ff3e23646cb9a4dd371d75e62fb038173f898c468c8d34c7da05849f097d0ae9c67f8a48bb799528c8ff3fdd78bb0ae41965ca782ac98abb468fed2f706b5d SHA512 69fd6345d365ef3972a96afdae8a873d8d38bf14be5dd9c80eeea502a700625c16848bbd828c7f6f0249a0cadac4d3f32fc9cd88c282f19ff22ce13c6afe6fd8
+EBUILD libpcap-1.8.1-r2.ebuild 2003 BLAKE2B 7dcbc9656cbda85903363e4d3e6cb149df76c44d75243fafb8e2e414a7f39026e434f9309905b1879e4b6059ac252ddf19d350459e7206c53f89839a61f92ffa SHA512 bb143dfad1307d0a3246eea173a3fbf9ce66f35e156c61e24b873f402bc1c3d40f3d1142edcf7daccc5c09ff62e720e4eefb3944d8f38ddf3c6fb4081e395f6b
+EBUILD libpcap-1.8.1.ebuild 1916 BLAKE2B 8e51e1f17444dad1614f3f182c0eaacef1ccdaf5a6c83bae406e52484ed260ac0ddcc987b4271e5efbcd6e424ecd36a12137539f18b50365ae134eae4956bc99 SHA512 0ee228ce842d912be7b808ba7c4749d931f370914915e6dcc7702eb77c366a561af169ebe6b22657ebebdd1b7dcf3b40760f99099445cc2428589f1243583a69
+EBUILD libpcap-1.9.0.ebuild 1803 BLAKE2B 5c0d2ac2c650e1fd5851a1a2ecf5798d6776421ee8a6bd30d072c876a97e7168b466f929b60ba8593fb0e841843b12294945db5ea6c9b589866cf76e0658a3fe SHA512 4d2a8366a55720fcb9a1527015fcdc5b7278d1b7115ee4f4888d8c9288043b53a3db489dff08aee3c224706dad56093c3262d863e2d41f362d619d794b471ac4
 EBUILD libpcap-9999.ebuild 1505 BLAKE2B 0071ca57d3c8d1dd7601b5b52e3e3fbb9f45fea0afb9361557856b31bf1ccdfd6d408c1adf46e54d619f55a99eccc18faff6919f5412782960012102d0ec240d SHA512 06600088a52b75baa2c2a4aa90a5c6d8dbae5cbe54d5b74d5702d0adcf762a72c6546ff151b2750a45fb1e7fa20f621c0d9e59e83cc5f370cf91762a97a72e24
 MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
index cbce63e8d61c..b2ff810d954c 100644
--- a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
index 23229d04d07d..6f9f91240130 100644
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.0.ebuild b/net-libs/libpcap/libpcap-1.9.0.ebuild
index 93560ef4a407..e0e65562e06c 100644
--- a/net-libs/libpcap/libpcap-1.9.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 0a4daecdfbcf..1d5fe55de05b 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -5,5 +5,5 @@ AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf
 AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
-EBUILD libproxy-0.4.13-r2.ebuild 3160 BLAKE2B c4b2e9f62c4b9cdc73e6444147caa677cedfd91013d7d22b05ecf2f818bba845a5d4920708234bff98eb9a2e5e8aca413297015082ce0bddd9690561cd8b46f5 SHA512 b0cfc1519390cd1e20a9ee2fe1c1d4b0499f2107ec09226481e5e81a9a7b9ace040a40901f718738c050aeaeb7e1221f4803a81a90a5aefd86718a1d2ddaca33
+EBUILD libproxy-0.4.13-r2.ebuild 3149 BLAKE2B 1a80b00ab202e85a433b6550f8b8e091439643ba796540ad4b819f0de8a6fe8858333f1dab6017f59702fd8b7098d463af5f91760129688998194606413f2bc1 SHA512 792ab0512c0f36665c349a7ed526c04390aa17384015dbc78040a926a20bccf9e2d17c2230d914758cd392385b83224d69406bf4652ba5daa3437588bc99c4c4
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index 5fa2ed8c02f4..f98dce01e0b7 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 70c606213825..cc25373280b9 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,6 +1,6 @@
 AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b9d138b6e6ebf1ee8ae3e38fff1a8ac1f89cb088feec8297c8532fcea578260b0947946a18b6e3e8b87e6faf7643cc79a5200ba SHA512 cb8e90ef7d3b163c0e9f9991e7f219d08769f101de09f1cc17dd55fe768f9193938e45f8547e8a26f599d965eea05ff2f27c11af221384b08ab76411325dcfb5
 DIST libsoup-2.56.1.tar.xz 1806416 BLAKE2B eb10d76a92912dcf8f450d6e8449e2aec26936ca1b706d16351ead4174f0cc107e6a2b43b96bf75c16106f8f4b24620bfb07814162390eba195b8a9f56a338fb SHA512 5ac087eeba346c27e884a2053a4f8afdb2fc6e432527f4494024a7edc4eccdf145188a3faa64e3f4bdd98af2fcb98914e494b4ed24f92cffc2ff1485dce7d693
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
-EBUILD libsoup-2.56.1.ebuild 2726 BLAKE2B d8451ad0baebc1441d8f9627107abbc78bdf965089b94b9286d951357641eeafef784cfb4f8b31a69510ed6b597a308a848edde02a6307e6a77cbbad7215a122 SHA512 342ca26d36901023c260c366b4dc97a003f88b397c803680aeb57de39129b48c8e12ad338673872ff315796da703ad782d4e473e658d690133247461a589b753
-EBUILD libsoup-2.58.2.ebuild 2979 BLAKE2B 61c7bf36a48b52a75c4ba3c3b435193455ed61dc9d2d54c39f173086b94d88906c7298aa4624693b0fdd5748e861b5e45e0f7869a0d2b51474d16c7fc73d5891 SHA512 965ff094ebc6812b69b239eaf60ee9035d12ea730a0968b5a58c0b17f913d47fb0f0d30fe2ee2caeeab1047578571481dae680f1b0abd75437877895ad646603
+EBUILD libsoup-2.56.1.ebuild 2715 BLAKE2B dafb5214b815895ed1f566c2404b3d57534713a57bc5cca21152c74ef34ffc14809b9da6f4b2caccf5b363f8ae9347e5843d7f8c87b24502e9d711f97826d7c7 SHA512 4ff03d9e87cbec65d8d11a979165832700fbc89a48e8b84dc86222ad8db8b491bf997dbdb8c1e6b4054983c11e96b7d14c4d91b7d0ed84b2a66e430aa725bbf0
+EBUILD libsoup-2.58.2.ebuild 2968 BLAKE2B 25d4ac1bf549a436a2474af06227968e42ef757b880d8b3e507581a2365240415250f5935bc7ac621c058a9518ebc6b36a0eadbe26e5fe74b6faec8d36d8d7e1 SHA512 d9bf7ec92692f5e817aa87d6dac19938b3a6d927fd443763021a98945b3a7bcce5237877af6d492f09b8813495dc61f2d26c6b1448bbf9163eed09a124479322
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.56.1.ebuild b/net-libs/libsoup/libsoup-2.56.1.ebuild
index ea89078b478a..08956060c291 100644
--- a/net-libs/libsoup/libsoup-2.56.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.56.1.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index ba2e3c642e83..1e532f9606f5 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index ae63b8b88f4a..b0281846c7cf 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -7,8 +7,10 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28
 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
-EBUILD libssh-0.7.4.ebuild 2481 BLAKE2B da53e49934deb1984710a1a10f5955fa25b4b0c953566d287ff11e7a90f1991f4f5d58784cb78dc620fc522b0713be1ded8545898909a19bf18cae79e5f6e569 SHA512 e89b9b43fcef2b218cf099dbdee607fbddec3d25ffb11371029b98492ed151dc84d4f0c53050f10b48330c29066c898c83f233858edb2b19fdfa95acc1f6a369
-EBUILD libssh-0.7.5-r2.ebuild 2691 BLAKE2B bd987e06bd7418f27ddd0bec9917df13958547bde473965ac53928d68802e311c6e26a023c0de0a81c01e8861b9c8acf5553a508538e2ab09da6df826ffd644a SHA512 4c64f74e75efe58acfcb5bd75de8341428c50a837441416719fae63dee449405aeb8df2d4bbd83725aba8df35e1b63715501049f730397a55200fcbc0d83c2ee
-EBUILD libssh-0.8.1.ebuild 2877 BLAKE2B 11cd07217c02f8dbc5efa1da22d84abb4aebc3f452693f0462d8160cb804aa4af541bf7140fa2571bf1e7427d9ffab157c00ae37cc260d507b6f057caf5f1fb4 SHA512 e7f0a748700a9a0e6c4a107cf25242657285657c885078317eac21b419c03a6c174652da07882dac1bb672d042f7a68ce925c47af5e0a44084b06b03f5fe88ba
-EBUILD libssh-9999.ebuild 2877 BLAKE2B 11cd07217c02f8dbc5efa1da22d84abb4aebc3f452693f0462d8160cb804aa4af541bf7140fa2571bf1e7427d9ffab157c00ae37cc260d507b6f057caf5f1fb4 SHA512 e7f0a748700a9a0e6c4a107cf25242657285657c885078317eac21b419c03a6c174652da07882dac1bb672d042f7a68ce925c47af5e0a44084b06b03f5fe88ba
+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-9999.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1
 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
diff --git a/net-libs/libssh/libssh-0.7.4.ebuild b/net-libs/libssh/libssh-0.7.4.ebuild
index 3b45d1fa582c..f33086923326 100644
--- a/net-libs/libssh/libssh-0.7.4.ebuild
+++ b/net-libs/libssh/libssh-0.7.4.ebuild
@@ -64,6 +64,7 @@ multilib_src_configure() {
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
 		-DWITH_SSH1="$(usex ssh1)"
+		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
 		-DWITH_STATIC_LIB="$(usex test)"
 		-DWITH_TESTING="$(usex test)"
diff --git a/net-libs/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.7.5-r2.ebuild
index ea3291593f7f..95aba9f77ea6 100644
--- a/net-libs/libssh/libssh-0.7.5-r2.ebuild
+++ b/net-libs/libssh/libssh-0.7.5-r2.ebuild
@@ -67,6 +67,7 @@ multilib_src_configure() {
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
 		-DWITH_SSH1="$(usex ssh1)"
+		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
 		-DWITH_STATIC_LIB="$(usex test)"
 		-DWITH_TESTING="$(usex test)"
diff --git a/net-libs/libssh/libssh-0.8.1.ebuild b/net-libs/libssh/libssh-0.8.1.ebuild
index 8aaceace64c1..641c1853e986 100644
--- a/net-libs/libssh/libssh-0.8.1.ebuild
+++ b/net-libs/libssh/libssh-0.8.1.ebuild
@@ -76,6 +76,7 @@ multilib_src_configure() {
 		-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)"
diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild
new file mode 100644
index 000000000000..641c1853e986
--- /dev/null
+++ b/net-libs/libssh/libssh-0.8.2.ebuild
@@ -0,0 +1,115 @@
+# 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-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 8aaceace64c1..641c1853e986 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -76,6 +76,7 @@ multilib_src_configure() {
 		-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)"
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index aa30c9afc509..c7d63ec1de40 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,9 +2,7 @@ AUX libssh2-1.8.0-libgcrypt-prefix.patch 1026 BLAKE2B da1ba552aafecb1b950bc8d5d4
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 AUX libssh2-1.8.0-openssl11-memleak.patch 823 BLAKE2B 3d2abd43798a23b551ef5ba97b705f8e8e24db010a19a2387efe10299e436e0dbe655db419fa8da1467aed18ec2bb39e1d863eb981603afecb302700c565159e SHA512 d93ee0b8ea5f37b81883ff79fb7d2f19633a4415990de1743f1388f49f7897be200ae0911b6ca14d505498294727aa5542c7d76a29e7b8df0051a53e6dcd586a
 AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d51065ceb9be22e450984aef9dea0a59b5b93cac7498e3c3e9cf8057ac13dd93330bc470bd717c9a06af9d9294ef7172eed SHA512 3cfd11ef23884a3de173422e001b0ec0f9af48c832948b5d0f90f0be2008334c30ed769a642786cad9aa68ea445b66780b10d3c64434178978018e709510deab
-DIST libssh2-1.7.0.tar.gz 811714 BLAKE2B 488f6b9ea2bf072aba17e8d70136e9bf64b38a4cb6cb572fcdf0253ec5d9afa479c75858b42299e2be39589b9454ccfdd5f7c4a2e355e8e8b5037b2b637a8a4c SHA512 0f9dfd83196129568c00383e2e4fea29b3d8c4f3b1690f550a6748d1db68cc437b4ed083f5d3d4646365fdc839819619aea96eeaef5ab072c7023d13f08b5153
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
-EBUILD libssh2-1.7.0.ebuild 1208 BLAKE2B c6031ef07a5e4692fed353bc0db362a77287b6834fdd4ed52743ef41a7cf2975097f1d854e8722df19dbd27b6982e99c57f461edaed1f64d1c708a9f737348ec SHA512 717aa9d9a636a099e7a6f63a1713414ab1055f6eb3691587bb4be6f80a8eb224fc702bcbf369c8b6252d7e0990f75584c379f2a9db7640c616874f13bc94e1d3
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
 EBUILD libssh2-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5
 MISC metadata.xml 432 BLAKE2B b528bab0bd90699af37096d4b6a4e06767e39011b4ef299600c8d35987768693224869ef5e05255ff28edb0ae8e14c38a04e20df953391a3df527d8609700a8f SHA512 c0fd5dce9a697c02886aeea4e001695bf51c6cec82a1c32d58a839dbd63f0085f9005c3504d40bd858bcca80ec2018bbf44bca64dd7692029e158612da39cabd
diff --git a/net-libs/libssh2/libssh2-1.7.0.ebuild b/net-libs/libssh2/libssh2-1.7.0.ebuild
deleted file mode 100644
index ddd1da89248f..000000000000
--- a/net-libs/libssh2/libssh2-1.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-inherit autotools-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
-SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="gcrypt libressl static-libs test zlib"
-
-DEPEND="
-	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-
-src_prepare() {
-	sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	# Disable tests that require extra permissions (bug #333319)
-	use test && local -x ac_cv_path_SSHD=
-
-	local myeconfargs=(
-		$(use_with zlib libz)
-		$(usex gcrypt --with-libgcrypt --with-openssl)
-	)
-	autotools-utils_src_configure
-}
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 9da035485b46..8e6424568782 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -4,7 +4,9 @@ AUX libtirpc-1.0.2-exports.patch 424 BLAKE2B c5292cd01b7b8ffd6be3fcd5842f66ce20b
 AUX libtirpc-1.0.2-glibc-2.26.patch 276 BLAKE2B 8e557e3c40c4c12339d90c238b26ee396f0ed92622907bf829bb2758119d45a401e29610b5b30c1e9177922546bc1fab535d005df43061cbcca09b8be9a0416f SHA512 67256d618db1330eeb616ade4b79376a600ed2457c03b420fc88b9ba89ea2451c9aac3f48c4967bc5695f10e6d8c895370cc10144ecc53ed0d3810d4cf65265a
 DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec
 DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
+DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.0.2-r1.ebuild 1634 BLAKE2B 1a95787b197965383fbab8f5c7c475df2ced8d21b331c11fc351bda1e17b864ba74bff204d140776a1c1384fce42ae580fc6403ce1b88e946716b4d2274f7881 SHA512 8cb2e688bb9b1b4a8cdfd48ef19e608f68588af6f4d4bb2a1c8d770d44a9909db5634507f664ad305d4ba2e71402fd52a32a3f01096a50d84d32e34f5cf3beaa
-EBUILD libtirpc-1.0.3.ebuild 1562 BLAKE2B 544ee8a721fc1e7f04e41ac1ce778b9d5c13093782282679aa58e16c3fe10dca06fcd7c4deffb99cd7c5b7d46655a4bf036e2233e434a1374c690bca9bc69f38 SHA512 769c5e2666f6621aef826d8b4a2364d8038627004e96e1979029cff0dbae83d22398e031284ad3896490d8fececd4eba9ccc9223ce0861636c4e68a6d6d2b797
+EBUILD libtirpc-1.0.2-r1.ebuild 1623 BLAKE2B 8c5bd3d83726459b32305c1a4404618a576caa22ef78c3b131bb3df4e69de6fc17a05a3d0e8187023a7422832a5d9f0befd1b2a13d1360c6aa7e2b60c222d41f SHA512 d9dd4009fc6ddddebdc9606935eab9ae88cfef2330d63c23529e0122ee3687098c5bf0447751112af622c5653ef02c2d1188ddd497349f02fb6a3895d2787bea
+EBUILD libtirpc-1.0.3.ebuild 1538 BLAKE2B 314c521489ba189ee6158743027dfc7558171e845102d51f3fd5eb7b7fe4aac839611ccac272fa2c1f72f8c65173715e6c4a9b84c99d0d02fdfb1d5875c82a14 SHA512 ca43ba15a2c642ae9165b516ab3d0a0df974021c168482d609feea331f92eb952419c92f3a5649d51e97ca51dac538b37e06510263ec3f3146241a934018309a
+EBUILD libtirpc-1.1.4.ebuild 1538 BLAKE2B 314c521489ba189ee6158743027dfc7558171e845102d51f3fd5eb7b7fe4aac839611ccac272fa2c1f72f8c65173715e6c4a9b84c99d0d02fdfb1d5875c82a14 SHA512 ca43ba15a2c642ae9165b516ab3d0a0df974021c168482d609feea331f92eb952419c92f3a5649d51e97ca51dac538b37e06510263ec3f3146241a934018309a
 MISC metadata.xml 335 BLAKE2B 57eb0cadaa82d4fefb0adcbc01bc19d720ebd10256a7188a70e7ae69f147acba7370fcc07813352a067a181bb77321677713cd3ed4cf77f0c815a88a30abbf20 SHA512 d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
index e299ad562072..78e72ddcfc29 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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
index 355ad74c14ae..edd425c4147f 100644
--- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.3.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
@@ -27,7 +27,6 @@ PATCHES=(
 src_prepare() {
 	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
 	default
-	eapply_user
 	eautoreconf
 }
 
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
new file mode 100644
index 000000000000..edd425c4147f
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
+)
+
+src_prepare() {
+	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable kerberos gssapi)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# libtirpc replaces rpc support in glibc, so we need it in /
+	gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc
+	doins doc/netconfig
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/*
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index e8f76a0aa0f2..9849ba3ad600 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -4,4 +4,4 @@ DIST libtorrent-rasterbar-1.1.9.tar.gz 3903742 BLAKE2B a9f942e7d06e076dec98314bc
 EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2398 BLAKE2B 319dd61c379cc1e0b92f938c9364eb9af477e017fd2595ccf6bfde65a05bb8d7d27ac3ed7396233aedb24a1b02296e33fd66d42af74bc8b31f1ee97efc6c5a0d SHA512 ba767f43b744e9f1a50c7a559b91a8b45009a1b08820852c9a005d3d6a2c7f6114a6091cbfed2df34e9e7bb2c75ca10873af69bc067356913774f027b27dd2e4
 EBUILD libtorrent-rasterbar-1.1.7.ebuild 2402 BLAKE2B 56c5cd008f5228123a10ff5947d181fade302610184e6f5e17061f67644876f3b7cfe1531a0844ec16ecfd2b7c2b506e12566f06cbe4fd9e51e27a67f5426b83 SHA512 7381f9f833bc83d01504b4d47312185d6459cd0e9ec4c49999e31c877220260326db5136d7d6390d014af52a5abd20ec9523f3491b8bb91a4af5d068d1453a19
 EBUILD libtorrent-rasterbar-1.1.9.ebuild 2389 BLAKE2B 070a26370780dd74a6066a10669822918d3089c7d2d3480566b991829d30f40c8e02baa658b8657fdd4ab83400d46ca5767a780a3b980206084a9a64ada30045 SHA512 fd0c27c7c6ccad5f01fce80a3427933a950ea3bb4f7b9a1ceb803640667c9854edefdb1ae7504f023d7d25797ec0ad6ebe93b4eee2738e9b7c8ba736b8c7739e
-MISC metadata.xml 444 BLAKE2B f9abe9123b6f4b841accff6c9eec879a0aab90abeba75ec1d08b1a97d179e18645bf47d2f0ba039fafe43b3340a5c67479c67e09fe25910429fe6fa382c0eb20 SHA512 5d8a3bc354ddba410e8b394303f4faebc8072738f1ac1d44b7a3af02116c8a67b4edab39e730c35c313c8abc44703fc7b22709766e62da9aa46de15ea2c3d962
+MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/metadata.xml b/net-libs/libtorrent-rasterbar/metadata.xml
index 486018d1ae1d..c171f8ac56a5 100644
--- a/net-libs/libtorrent-rasterbar/metadata.xml
+++ b/net-libs/libtorrent-rasterbar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">libtorrent</remote-id>
 		<remote-id type="sourceforge">libtorrent</remote-id>
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 1da96191685a..98b86ea9a3fe 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -4,6 +4,6 @@ AUX libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch 3172
 AUX libtorrent-openssl-1.1-part2.patch 1902 BLAKE2B 1d0e405a0a72be250c7a79e410860d8a0afefda3f574d3854469620157d1a3184d63d902af9694d27c786728beb45d93225c09a8b427edf630675fe251d63298 SHA512 baee88e7609fe3976d59bd220c545473a336765fe9f618502cbc6450b43f8c384b56afeea379d42b2f2ee748ab088badb841140d2ea82a91b9f34cd25ff05ef3
 AUX libtorrent-openssl-1.1-part3.patch 1882 BLAKE2B ad7b62d238ad57966c91e38f32b2d45673d9caa1bb4347788cde366a5235c1a02b0b290c3b4e010c0c19baf36c0e2ad7b2651c9bed67a51714b877924f0e6c22 SHA512 aa83d4e636b3327cf78e9eb4bab14e3254d90829549020240e4498d78308cdc6e058035457341d51a1d5d6cd9b89364ebad33f6d46364f9b72171abb49c954f0
 DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb
-EBUILD libtorrent-0.13.7-r1.ebuild 2017 BLAKE2B af8844a5d8ecf26cf756ae94237d91e864bb1c1e52427aa87a4303f97ecadb03ba1409e3ca74e71cf4718a15f103092458b1293a21518cab29de8a6dc62a36ee SHA512 599928bb361035b3368fc68058348e63ad2a86d3ebc0c970d78edb1787f68831f3ab73b9c5da24d491167678c4d3dc5c8af5a6fdadbab90e6b8be7d07fba4563
-EBUILD libtorrent-0.13.7.ebuild 1881 BLAKE2B 9d3da29480ade423da553d47232dd23ae84fb31fb468492f6f80bc9869799c581194c8b5d93ed41844955adf24158cbc1e1ef52d0b00c8a8ddadfe093306938c SHA512 2c6b7628a15bc5b2ad22e9d06e502fe8916980191b985f0ae304536ce5bc1d8dd11b61d41780baf54a2b7ed7635bd9f695b68fbd2c6ec1d54f2ea6152802bef2
+EBUILD libtorrent-0.13.7-r1.ebuild 2006 BLAKE2B a2657d824aacf89f15a0848f966347cebf65f6dbdbe6b20d98f693c801da8a657c7a68029b8457bed20bcb8e827fbb5b5067d10121d90d3c09267444b28bb81b SHA512 a9e0823cb6f1ad2f8e5598d4d6ee1b60f92559d0cad701a80e3a01f64714caf0a7eb7be5ff45c83d5299d6059eafdf0ea133d87f5583e08b504ef04155ff1ca3
+EBUILD libtorrent-0.13.7.ebuild 1870 BLAKE2B 9922a71fbb2cb2073084651e8009c20133e13a5d7d5b685574d5a8c0b9e1b0838234ab43b0ef6764d49e0de7aae2ad97b94357b04a5911571e250cb1548ffc8e SHA512 c961d7d73d391cbeb381cd906f073362c95aa6384f3838efbf4c9d91b65f402070cb4de4506405b2ff40d84e5b09cfc73f0f608abdf8a5fb4e32351c35f92023
 MISC metadata.xml 443 BLAKE2B 2a25f3804cf9c29cd16835e22dd67e7a94fe2dbce0c7c4a85e0a9042a79f798349a55f1282d6c92b19afbb10120d9e9b5a30e03f082d90b622593ee7d8fa5e67 SHA512 32c9f1b9d21fb99768d60d842a49a80a844f8a6ea94c012a97fa94369916a2fd6df0965dbb394e0de2360c79c01355f8a4872b2d0032b3eef5c6a4490c53ef82
diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
index 7ffce7d3509e..4e548ed6ecdd 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="
diff --git a/net-libs/libtorrent/libtorrent-0.13.7.ebuild b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
index c445dc1ae3f5..f03f53a88985 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 5179c1e7aa9f..47de03f1fd33 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,3 +1,3 @@
 DIST LibVNCServer-0.9.11.tar.gz 1413739 BLAKE2B e295d3aef7181cd767676c4e55130fa65ecf8ea92a659b6de82d2cc465f1c9e1a587839942fd89882126dc8ec54f9de20a78e799ea194f9ae227a82ae705721b SHA512 e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
-EBUILD libvncserver-0.9.11-r1.ebuild 1932 BLAKE2B 8ce262bf57c3def75211e118be6d6e296c2c6044e3d1df5c150605f460c580bd0c85fa1eb3af68c696eb80b9eaae3f8f5a709a66d305bffc5d0f1be744ac28fb SHA512 f811f67aae5e0724f1b8f95cfdea020351524a8c03e5a5d009073571ab4b4da6280bdcd879292b5649c2e73d92f68d8ab4bcace81c455491150044eed2215b93
+EBUILD libvncserver-0.9.11-r1.ebuild 1921 BLAKE2B e324d043474b5575867592f07106ef8c6054004aed2dd46a1ac433962538b0203da3315a1025490de760960d58102935fd925ef77287af597ac18b363590c5c2 SHA512 33159e0e940be618bc4267e62f34555cc48726fab8db08097568e911f3fa5efdb1391ad0ee054e92db785811368943a601ce6434456177a0258c044431c9eaab
 MISC metadata.xml 1077 BLAKE2B 16327a9dae79b066ec42f185ecde73d18bbf19bcf14d4bf4cee2f298e252ad442f0f0ff6a144d05ab1df21807c343f69d9c67fdd789f40ea2b024270ef2ba8d3 SHA512 9a6e708b40d590b968d4cc534661f52cde4848edb93fe5775b69dd20ba8d1e794cbb284a63d9c674936a1530f520f559546c78f457853b61b4489b8f264084b9
diff --git a/net-libs/libvncserver/libvncserver-0.9.11-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.11-r1.ebuild
index 218aea83cd84..e075c4351e86 100644
--- a/net-libs/libvncserver/libvncserver-0.9.11-r1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 # No sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl +png ssl static-libs systemd test +threads +zlib"
 REQUIRED_USE="!gnutls? ( ssl? ( threads ) )"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index dd562ea4a635..e7fc5cf9138d 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,11 +1,5 @@
-DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
-DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
-DIST miniupnpc-2.0.20180203.tar.gz 86772 BLAKE2B 6959d7033f12d3cbe52bbe1ec2178c068a448441d22501f44a7228b2050b53ff5e955d390ff03071e6f34df2a652040bf5ab23c59aca16dc4379e380dd46fea8 SHA512 b8ebf02ed01c5217a789397b7c224ba21d233cb544ccdfd907fb9c6f49adae6864eb17963b9b9f654ecf3fde864c191fd7d00c5cf614771a7137a030f341f226
 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.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
-EBUILD miniupnpc-2.0.20171212.ebuild 1266 BLAKE2B 0fec3f1639a678ca9a119713e62dfde5b8d3b361a6887a85a16d4f202376423a3fbe8910400467e3da91cf368b3628d001a1c5450d4c624471202a56d57d5139 SHA512 5f46f5b41a88c39d560eb8db872b8e3266142dbce18024fd05761f4be8c144475d8b444eef0848db1ad51934f39924b71950b39f660bc47d523d7186f05b158d
-EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
 EBUILD miniupnpc-2.0.20180222.ebuild 1337 BLAKE2B 12e0b065bb728b59c80a5604b34ec47916ed4b678ec3d774809a27420ed8c10c0f533b315978de8c50b1ea6070729bea941a45580f633816c8d02583953ffadb SHA512 e5c7a6a99f8881dfa57212b0765478a93d70e35cb9a0bb0503a9dd5fc06052ad5c4c05205674b8d09c8464d61ed690dbfc77c2ce4c391b690580e318ce8828c8
-EBUILD miniupnpc-2.0.20180503.ebuild 1339 BLAKE2B 697f1d38525ead8b41b0b5ad8b88b59bcb5281ebb1e5685e1caa94b9b0d350c2b2d9c3f2e46b37a4a2b74214079fe8d9c4c52c3dc81d1072f2d603f1f4d2e9f3 SHA512 93714f9e816f487b4d130c81e5149af4126245b8901a4e669026956e00510e465a098d92bc85b574c8b576f6b81bc42616fe1e220aa58256dcd7ffb93dd092b2
+EBUILD miniupnpc-2.0.20180503.ebuild 1335 BLAKE2B c9ad470f28797e170bf2113497a85ab3da17a9cd4a91405bd8dc671dd8aee77cdf27f57b906fbebdaa5d7188fba1c445f5b60ed60231d6dac4653b974463e849 SHA512 5607d77f7fc1102977d61f4cebfe8fe2c04705df1eec9000ae32bda202bdd45d19f18eca5a91f986f2b714800a8c7aa3a28238695cf53be784911478b3fab541
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
deleted file mode 100644
index 72c1c30a7f7e..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20171212.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20171212.ebuild
deleted file mode 100644
index fbb26a0941eb..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20171212.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild
deleted file mode 100644
index 3a1c24a1b100..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
index 7692f0ffb53e..a276a2e75600 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/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index b49909cf5d3c..0b0625d4e033 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -3,6 +3,9 @@ AUX nativebiginteger-0.8.7-build-system.patch 907 BLAKE2B 1a50205946ef2327a5a00f
 AUX nativebiginteger-0.8.7-debug-all.patch 1215 BLAKE2B a3aadec849708231f5fc773134d1b85ad915bf2f0e587daeeb11ce2308660dc80f173f0de718bc2dfdd4fee0ac111028aea95fe3bc833bc6857c7a128218e92e SHA512 0e9abda1d39a9b0a7c24f13bcc909d15940dd81f2d6b87b4ae39227c0191629ed7a3cfd6be50e3692423d91e0b2931324ba384e736c1c4eaec656df8ee0da9f2
 AUX nativebiginteger-0.8.7-jcpuid-build-system.patch 761 BLAKE2B 7a7733e3179fd4b51d8fe40baf2e6112be223378eeb66b57be81a9f1f3d670bb8dcea427e78ef5578d7a3cd18967b063a9e9a6360c41b60cf0fa450ce64ad202 SHA512 9c2f0a458d4a240fc9998d28995a14742aa63873bb05479b296122a2a4f7f68caafe4df315f5ed709b4e1b92a12be22700cfe1792e7ad186feaf7cc1f97b6d86
 AUX nativebiginteger-0.8.7-non-android-warnings.patch 533 BLAKE2B 28df0a4576b0e1c0cc0f71f67cf14e22d8fef04ca5445a5e0012ec672ed656821c8e69e39326e03590377a52336b45c8fd00646dcb65751aadff2e02260b2887 SHA512 e9844d0c7fc93ed9ae9a63eba2eb737f9955c37e26e2c27e9c8ea71e098a3242d7ccc26319cfce361003b90f9831da357004567e398f4cecca2d838dc75632d8
+AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86ddfd3f99af9f5db9e39ec5eda9b51f357c0f41d6649bc92f3d1c15bbfcbb88210986ceb2a60cfe03f1c48ef4b5f3b4ae0b57a2 SHA512 70ee208ba6342633ae9cd81b38fc71024583933a4da5317d3407aacf5112672be0abbb872e1a7f617a4eee43c96fe9a64f09b9d315ad97519a6feb34755500f1
 DIST i2psource_0.8.7.tar.bz2 18473515 BLAKE2B 9f79cd2e69f26ba0fadc24b6cad0ff43301c65fd640313688687895de908c6a0c6fd9d1be6c82a6d7478cd4ecf633ce3b8fd4d200cce644512a7b4fa275a0927 SHA512 32b4eb4bf8bc7d6bb692b3ecd6b0a34c4d3d7c94b0d09a4ff330151979ccdaca9a6c88fef9b7e7965a1bba8ef54dbb710d89e0bb19265ee177ce547ff50ca969
+DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 EBUILD nativebiginteger-0.8.7.ebuild 1760 BLAKE2B 2b5d1d3bccc75e254674b87f53563279dc474165f48d567e4e467dbcdb24f02c17f073e88ce597ff4948054af5e0f7d256109b3e90cd40cc0b83745ba190e5a4 SHA512 b6ea041425c3a69962dce78836aa0b0ec08d25cbbe513ddc9a0cf44cfb62d6686baf2491e600abe213b672d2fa675b7d1939284dc00b5210c8432c63426968ae
+EBUILD nativebiginteger-0.9.36.ebuild 1312 BLAKE2B 37b70378b5bdc948b8bf7e7df56f4b30ed5ee49ec3a697ef138a953703c79d2e81f5c9ed0b3188185d3b2907bae01b993888c9c6777d0151668313459a8ba3d1 SHA512 833b437b2ec891644617c766bad4d89cbabd2cbf5b5afc55a819ed2e041a6b07f06dc5a7d149faec10d9941b0fef220c1ecab8b24d3d91fb0a1929e478fe6b71
 MISC metadata.xml 256 BLAKE2B d4cddf1e47808cc6fed0829aa4bfe16d930ee2e12bb3e7355ed4871b41e42dac196735be01fe9b38464183039f2df7f88cdd26750461dc9a3268f9844e3373fd SHA512 26e53ead25d8fef36a3759518b200c6a4ea0fc24d2c1f054ed85772cba5644118b231438d723ca25c22a55ed2fcf54e2c467279c9f3b49b6c1ced9997e3f098c
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
new file mode 100644
index 000000000000..cdb8c7f64cbb
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
@@ -0,0 +1,31 @@
+--- c/jcpuid/src/jcpuid.c	2008-10-06 09:44:53.000000000 -0400
++++ c/jcpuid/src/jcpuid.c.new2	2010-12-27 09:41:53.000000000 -0500
+@@ -19,6 +19,7 @@
+ 			mov d, edx
+ 		}
+ 	#else
++	#ifdef _LP64
+ 		//Use GCC assembler notation
+ 		asm
+ 		(
+@@ -29,6 +30,20 @@
+ 			  "=d"(d)
+ 			:"a"(iFunction)
+ 		);
++	#elif defined(__i386__)
++		asm
++		(
++			"pushl %%ebx\n\t"
++			"cpuid\n\t"
++			"movl %%ebx, %%edi\n\t"
++			"popl %%ebx"
++			: "=a" (a),
++			  "=D" (b),
++			  "=c" (c),
++			  "=d" (d)
++			:"a"(iFunction)
++		);
++	#endif
+ 	#endif
+ 	return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
+ }
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
new file mode 100644
index 000000000000..d327fc138097
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs multilib java-pkg-opt-2
+
+DESCRIPTION="jbigi JNI library for net.i2p.util.NativeBigInteger java-class from I2P"
+HOMEPAGE="http://www.i2p2.de"
+SRC_URI="http://mirror.i2p2.de/i2psource_${PV}.tar.bz2"
+
+LICENSE="|| ( public-domain BSD MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+
+RDEPEND="dev-libs/gmp"
+DEPEND="
+	${RDEPEND}
+	test? ( >=virtual/jdk-1.7 )
+"
+
+S=${WORKDIR}/i2p-${PV}/core
+
+PATCHES=(
+	"${FILESDIR}/${P}"-asmfix.patch
+)
+
+src_compile() {
+	tc-export CC
+
+	cd c/jbigi/jbigi/src &&
+		../../build_jbigi.sh dynamic ||
+		die 'unable to build jbigi'
+
+	if use test
+	then
+		cd "${S}/java/src" &&
+			ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die 'unable to build tests'
+	fi
+
+	if ( use amd64 || use x86 )
+	then
+		cd "${S}/c/jcpuid" &&
+			./build.sh ||
+			die 'unable to build jcpuid'
+	fi
+}
+
+src_test() {
+	cd java/src &&
+		java -Djava.library.path="${S}/c/jbigi/jbigi/src" net/i2p/util/NativeBigInteger ||
+		die 'unable to pass tests'
+}
+
+src_install() {
+	dolib c/jbigi/jbigi/src/libjbigi.so
+
+	if ( use amd64 || use x86 )
+	then
+		newlib.so \
+			"c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-$(tc-arch)-linux.so" \
+			libjcpuid.so
+	fi
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 553f7ad10f0b..809a4b0be5e5 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,8 @@
 DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
-DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
 DIST nghttp2-1.32.1.tar.xz 1548812 BLAKE2B a4c1f4f8d5070d1ddc5a5680d9fda28ad0b3ee6b1241b58b2be2b63026af249a1bcaf62c158c084061802ce93934dc5648e20c54887df330e07407d5879d1412 SHA512 477e6f4ccdba5c86436d554be819fd10a715896173029aa72f9c90c2ee64dbe20e2ff4cde614be3a7683dec9e0feaa21d124493ed5fc12ad4c63a37a83bad57c
+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.0.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
 EBUILD nghttp2-1.32.1.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
-EBUILD nghttp2-9999.ebuild 1937 BLAKE2B a3fbca3092493aa311acca430b3c741f3e5b7f2b573463a2f90c10c12c6e83a6a18c53ad993c5333895596862da9112ac8c8eac8ac63def6876dce426abb0de4 SHA512 5f978d788a709eff86996a1a6a080162d7c6d762c09fda34138001bdf32ae203cbe69556658271e1c7462f9c2405dc35e4619d41b5ebecedb0088f82d5611289
+EBUILD nghttp2-1.33.0.ebuild 1875 BLAKE2B d0ca0670363fb04d353d93eaed4eb7fc4eafbbc704c69cc28b53166b1ba43ca2a3b865aee2bb688cd39a66cc74209cd6a4230cc8115f4450960d6c9ad46b9ffe SHA512 4e7c5509c85ca6e862a28cbd9b564e09dcb8286a0204e5fac5b6b3ba6cbd71e0781097c38805588ce8c018e5e1f1fca58de171e1f7dccdddcc30e6eb228cd4ee
+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.32.0.ebuild b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
index f472f1d77c9e..b8cb21f53b53 100644
--- a/net-libs/nghttp2/nghttp2-1.32.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
@@ -3,7 +3,7 @@
 
 # TODO: Add python support.
 
-EAPI=6
+EAPI=7
 
 inherit multilib-minimal
 
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 31d1de9f15bf..e5d039fc7180 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -3,7 +3,7 @@
 
 # TODO: Add python support.
 
-EAPI=6
+EAPI=7
 
 inherit multilib-minimal
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools 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"
+	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 9d4fdc5dc3a0..d47c8ca49d35 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,7 @@
 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.10.0.tar.xz 19960760 BLAKE2B dc16e2afba4be727c5169ac5cd77324e0e8d7270c96da141da21a175cfbd64a38f7b51b86264396f3866174abc9095f7c840303208f7193739a1970818d4ff3a SHA512 482518a72cb0bdd5d987a7855856eadaa4fecea933ff7791918edf3097588246782d86b27568c06764ef9f2bca62b64a4d65e4cbd0e934931a72dc5719db7446
 DIST node-v10.9.0.tar.xz 19987812 BLAKE2B 4a5bd257cd527500b691b15d177bde53158b5e46e710ffeaa45224bae821cfaffdf59f24ad6bdc822cf468b90c1a4422a2f82d29e1d4b2dc0f838e3e0ab5b4ac SHA512 19c7366b4c9d1e255b5ac56e974ff86b9ca87c363534b467ecc3c59e170b891e86c479a2bcda6647c6df686b018caaedea84270e848b93a4f1c80ff04af12461
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
@@ -11,6 +12,7 @@ DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951b
 DIST node-v8.11.4.tar.xz 18323120 BLAKE2B 8deeb1d577ec5b8547fae79dd212d2aa92b567f249afd59f8668ee5cd323949546f744f9e42b37b4a1f2683d2589cde8842304ecd83c2a49204345dedcf1c93f SHA512 b1650148e9bdebeff639f0d313719589a9727fa620a9be46b4ceb9a60038b5c5f4f68e6e0f9806fa56e6bea03c3de1b0e5878a2548c3921dbccf8be3fe411f26
 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
diff --git a/net-libs/nodejs/nodejs-10.10.0.ebuild b/net-libs/nodejs/nodejs-10.10.0.ebuild
new file mode 100644
index 000000000000..6590a0a5927c
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.10.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.0:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.33.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-62.1:= )
+	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 8acd0f0e8cf7..25ee2124080d 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -4,5 +4,5 @@ AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082
 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 EBUILD pjproject-2.7.1.ebuild 2610 BLAKE2B a67e4c4c21bea82aba8fd25cdc152329734d6d9aa6550c8bcba951b997e6ee9db0e509ff344ab296dc401422ce6d2fcc4c675cd8101dae30bf254b99aee621f9 SHA512 d0d93d97ac40394416ad4e7286e226160ccb9652922a318e1293610361355130f95cabc4133e2144b62bb59d57fa8bfc2d3e5742832dbd420b87c7a7ee48ed75
-EBUILD pjproject-2.7.2.ebuild 2713 BLAKE2B b319682f4850080fe47828e291ade7eb27a182f80c26deb5be81d85c55e23335e085f0a3a5053cc435fbbf2c6491bfa05614e75592b56328c30225ef7239cbe0 SHA512 4603a1fa9a66e27d203d4d2f2c6f72224935762477f1b59e77eca24c300beb16edea39a58b78c456aaf9d3b136e1eba82b5b55bc688619172ec4000c14e20a97
+EBUILD pjproject-2.7.2.ebuild 2751 BLAKE2B 7d1d48306d0e09013a07c14a50c36bf870b887430411903d2005f0e23f4c16bb4fc011621df4c42b28e4791c8d98f4d2e1caf8b7b8d1ac59c913c9e44af11498 SHA512 4814671e3263338ba9f9c57692ded5ea1a2925d29ff9d75cb73461d7f4fa637a8d8dc04a9218fe393da289d55c6b75cbbcd7de13f1a7c84cbdca48afa751fefe
 MISC metadata.xml 1157 BLAKE2B 1b40ee1b635cb8cdafaf001ad458264c4e55344393fd76ac7263521069bd355e4febd7ef534b24bd3879a75e5229863d8b93b8d89019639c49bb7511e1044ca5 SHA512 1171e638d0320d07b0bf3d6a6d31a75722dd659b296d9f451cfe1d3cc12016ff5b1c94b690054bb3772462d7a8d70b47fcb8b5c760c8677a727743ecebb57dce
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild b/net-libs/pjproject/pjproject-2.7.2.ebuild
index ee569db2b4e1..8f9962b2e278 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2.ebuild
@@ -44,7 +44,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 
 	net-libs/libsrtp:0"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	!!media-plugins/mediastreamer-bcg729"
 
 REQUIRED_USE="?? ( ${SOUND_FLAGS} )"
 
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 7e3c9b0538ab..bf738361acea 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,7 +1,7 @@
 AUX rpcsvc-proto-1.3.1-old-preprocessor.patch 1018 BLAKE2B c65052ebb526976482c591aaba127d01e5369ffc1b89e6a7dec13d22af97718bf768a75870039f5eaabd1153f50d8b01b56489685ff9c55523746029b1b1358e SHA512 14ee7b2ff5e8e981b6a93f63bf01473b326c40977bb181b7a8ae8549ae7967b4cb7ef20beeac741370af77cbbbc8ee2960487b9f962f764e931269141760de58
 DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
-EBUILD rpcsvc-proto-0.ebuild 492 BLAKE2B 147d6d7a2bb633a6da0c7091fbcb772b65985ca55ab4a5aee026ef69468f0a6af7de19a04beafa3eecdb3e03fd1824285fa4f86ee44737c969e5e6b388cf5c00 SHA512 cdaccc05d65d1d4f7bc976b9d13fe097b49a0f7b004a626d5834b7a965305a21a22885459b6f7a7d5a68ce0d623b27da8ff796f257a4b5b25aa3c16b3e51b971
-EBUILD rpcsvc-proto-1.3.1-r1.ebuild 690 BLAKE2B 8819414150e4f4d08548c6288175d2c097bbf7b42083fbcce84eb514951ca8ffc9825bd19cfbe63d95957f9f7305204fe6fb4cfc5d5fc8aa39f988ce0947b155 SHA512 d6fe026db629e0dc3f32d9d4fb759da865f293655f409708c051f0a914564cd11c3dab0133a1f546328aad938e0748fe1ae414229bebf77f39ed92787ef2f41d
+EBUILD rpcsvc-proto-0.ebuild 481 BLAKE2B 4e507a8892c32f17d0852603b2828ca6b69621fc2686db96016b81f1112d1fd38ef6b83798800710fea95cc2bed21b95957c72c83dbbc2397a724c9907891d6d SHA512 9ca5e01d4aeb44b676f958b895a5bdb754ba88b2db19f4c8522408e073e1c901297c135391e1fd94368e9b1c87671e84523715458c98567d60ff3b037eca4cc5
+EBUILD rpcsvc-proto-1.3.1-r1.ebuild 688 BLAKE2B f86e886eb61a421f74c8373e41ee46a03cc8d92a5616d95cd463df808ea959b2af5e5c67894bce1386d129aaf0606bc1cdd4cf146762ebfb7184ed3bf0272170 SHA512 5a8fab744c86854f0924fb0532bd4c4cb023b83d128572ea440048923c213a5ca6f15df74dbb0537e81b157b6f57d60fba148cc7fd4d38c7df4f5bacbb880cd5
 EBUILD rpcsvc-proto-1.4.ebuild 643 BLAKE2B 7172abfbf67547620ae634f806b19e6dc01a154747096a562bda7ff6a0f50122dcc9c7c1c0978a287421c6d662025342202e227b0552e49d55f15513c49b98fd SHA512 5008ae592acc11837cbaa3100b4f837e4673bf8e152863d41bc4ffb3777425b972851e3195236fcf190e90d4e5b2905ce3d10af4b7a2db909d388733f3269d93
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index 64d9fa1f58a5..e78fd8941b2e 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
index 4c48b938ef68..8a8003bcc44e 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-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=""
 
 RDEPEND="!<sys-libs/glibc-2.26"
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 93c47101eec8..fdff45f6d83e 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1.ebuild 1533 BLAKE2B 15d62afdb896359ef49bbd903699227869cd91f252cd1b23cc2d6d35b993168e227374a633145d2e9f4ce0b58329e485ec2c5abda9ddbda289c54d2c1d6ba025 SHA512 efcc99188ad9686af6abea3bc1e0d845fcd60070952f0c1aa7a2461589e4eb9d4597859301f52487aff8c87a2856ff29a799551f225032d5b6c5f5c5f83cbb99
+EBUILD telepathy-glib-0.24.1.ebuild 1522 BLAKE2B 48b58e7f68b4654fa0380db8867302ab4b24b6520e39e0ffa342f4ee638e072dba68e4d72bfb9a62987af39838c5acbba9c04f29c2d39df80cab92efe9f3807a SHA512 d5a4d5edb1fbbde379d995d2f72faef06f5855be0ec7d4feb04681e242b018c3976ced3e3a2efaebed35fc2968720b66d512ca5921f466ceb7c55445bedc33d9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
index 8630652a2289..34a912ab9e11 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index e555c2d861e3..11174983fe7b 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -22,6 +22,6 @@ EBUILD zeromq-4.2.1.ebuild 1209 BLAKE2B 88a85bc62cedded0176d93e46d231cea694faf27
 EBUILD zeromq-4.2.2-r1.ebuild 1380 BLAKE2B 30394e0c22a77aeae94d990f688ab2fc13663be68bcd8ae10e48ceb7316a75a5b1fa15528f5e92f02e9315e8ca536ae591d08671754b0bc6577fdf8bddb4082e SHA512 5ce25d3196c4be51420af99b4590d54c79b687d74a3b64ee44b1322bbce829e3e04b99ea5cb840f1f991f36cc12f9080806aa91666ba183372dee6963442b7d9
 EBUILD zeromq-4.2.2-r2.ebuild 1552 BLAKE2B d1191b9f59fa5aafd1a0520d5a342db4241c937805212ff3fa8b6362192bf9359bbec45eab998138ec736614ca05a105c4170f9efcf24725771970196ffb2e9e SHA512 54b30057196c0231e7979ffbf5862be9a78d95cba0a2d860a0bd2e2120d538694d5e960a622968fb7cb994fdfe8c948222299e13c9997fe9012ecd3bb43b62ec
 EBUILD zeromq-4.2.2.ebuild 1217 BLAKE2B 9de51f8af0843322ca7aead2aca32e7b6b862b0299e62ab2678d2893740ccc964db6e1be93554469af84f9f97502b9bdfb36f61c4075d32d2fa2c5f571b5b350 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c
-EBUILD zeromq-4.2.3.ebuild 1424 BLAKE2B 54e88a28c33f082e5bf06ec2e09ee13bd4a90569b50e6e30924a923d9b0f2ca511f566431c029dd891abe3d361823454deafe8f3e387b8d2e58044c315dc4859 SHA512 1dbe5809ffd456465d44ec2d2cd24aa3ac0a1f3874ac1ba412626dcea13a041bed003bf569b85d4a1b3a802f04e40cf3b3e0984962a1e032532e0ff5f7b209bf
-EBUILD zeromq-4.2.5.ebuild 1424 BLAKE2B 54e88a28c33f082e5bf06ec2e09ee13bd4a90569b50e6e30924a923d9b0f2ca511f566431c029dd891abe3d361823454deafe8f3e387b8d2e58044c315dc4859 SHA512 1dbe5809ffd456465d44ec2d2cd24aa3ac0a1f3874ac1ba412626dcea13a041bed003bf569b85d4a1b3a802f04e40cf3b3e0984962a1e032532e0ff5f7b209bf
+EBUILD zeromq-4.2.3.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
+EBUILD zeromq-4.2.5.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.2.3.ebuild b/net-libs/zeromq/zeromq-4.2.3.ebuild
index da4a8da09188..d29132acaaec 100644
--- a/net-libs/zeromq/zeromq-4.2.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.3.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
diff --git a/net-libs/zeromq/zeromq-4.2.5.ebuild b/net-libs/zeromq/zeromq-4.2.5.ebuild
index da4a8da09188..d29132acaaec 100644
--- a/net-libs/zeromq/zeromq-4.2.5.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.5.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /net-libs
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)