gentoo resync : 18.11.2019

49 files changed, 725 insertions, 386 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index bc91d41e01d1..cc5faf0cc9cf 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 72136e0d2f21..6de69623bc15 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,7 +1,7 @@
 DIST aqbanking-5.7.8.tar.gz 3818825 BLAKE2B 6536b11251fda4977fd964f513f4b2bb23cd14d62adffdd18e7508afe85d660b86aa1aadc80fe4ba47c5b393659ba7139c65eaf342795f6f05599efdd2c3904d SHA512 4078c3bc2c0b6f38f853fed064e37b6188c0b8158416ca6482756232ef8fe71e9cc1df0abe8c6bcbe8a7e818c24210f553c367f540d60cb7b7cf0161a9ca7117
 DIST aqbanking-5.8.2.tar.gz 3824997 BLAKE2B 529867a9e814d0e46ff2aac1da25a369c9a8722f41364c6ef15dce0ed861b7a5bab104fb5b30a151c6e11071c0a067aa1192a4ceda67ee50698f80053ac8e33a SHA512 2a8d87396fa8926fa338cf0a7744649512ecd773741fa24ad69a52bf65d4df881365c0fc31c3a14f718184032a7f1a596e74f63d6ffdaa05c29aac23e26bd4ae
-DIST aqbanking-5.99.40beta.tar.gz 2483513 BLAKE2B 0da77f804fdca1b00558b9e88e7c04cdb89489b43ccabc533785a30ff604d8be3ee62d82224b079040e571e7a86daa18af5ff4aefb281164ff123c640778bb10 SHA512 10cde2d4f3015b7a077b7aeb189f122715663bd9d530af0f96748ace828d9ffa51d5751ad20fb9d1e3e71607730a9b68be55c3f12740f96b31ef517e61bc1350
+DIST aqbanking-5.99.44beta.tar.gz 2515177 BLAKE2B 5d28137eb1668cb1748eab19837e654b7c28698239f483965b5e402a6aba01fa3048c93a52909a8c2252c41f922063d09e2a7759326df67ca2ea64c065cb1bc0 SHA512 d9825a8808241ace435efe5487b8a87afdf2dfb4e092adaec2d4ae91cde719f0ffda69a46540c88e9d45d7a95a5f5295bfb631584eb688ad9c8afb2e32c714c1
 EBUILD aqbanking-5.7.8.ebuild 1597 BLAKE2B 23dfae67ac7874727307ac8bae890b804ff84cea65f1ec6f239cad33891541ab81e9ab80e6956dddeaf74fc365ceeba6fef5b71bc4eb159630a88f201c52f71b SHA512 5ff2f013a85766a9c292bbcfaaa51dfdad02871d98d7639444d72f02720a6ad616482738ed07064e037c42a64020fe50c586cee724c54027cb94db752eccfabd
 EBUILD aqbanking-5.8.2.ebuild 1454 BLAKE2B 9c008c308d7ba122076de9d94492619ab13fdbd0bda80ea46d17ef60bb8c5e712be92099e6db4b3a04d39022b39a88a250346dc9277e40623dae15059beb68f2 SHA512 5505c4150f5915cd349b6d6331c5025f9c996df59b377ecf0f441502a34f1c125620bf7824660ec4674d95028de724b11301c97b580a5e2084d823cd89d7b799
-EBUILD aqbanking-5.99.40_beta.ebuild 1411 BLAKE2B 7ee82cffff9f2ec359cd92d0d6184869b234d99e1cedffd6887aace370de08f9467498d2bf3918573476f274c4839275bc4fa24718f8c449f9986127da6d375d SHA512 e8930fa92cdf140d562296740b291e426bef3e01e7f6e72d0201390f5710ae0a5cf40f90376e3affe03229f8ad68545e8ff7aa793d33f6e7da87bc41bcc5bfd6
+EBUILD aqbanking-5.99.44_beta.ebuild 1409 BLAKE2B 838942169ae4344d4e8d01aefbdb061c798054ad4edd2650d5d477d69449c76241f2ee00db3336eb992a8f8d5203f77cb5045a2dab1d2fdf97f53858e97536e4 SHA512 aafdda981df27e241f1c0bd116079de81d686418b61368c21644acc2343f43cd755f7cfb016be239dcabd43b09a8c3c8901b1b6be9cff0aeba625150a98e7e10
 MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999
diff --git a/net-libs/aqbanking/aqbanking-5.99.40_beta.ebuild b/net-libs/aqbanking/aqbanking-5.99.44_beta.ebuild
index 306c5d10f901..747a2b9a20b6 100644
--- a/net-libs/aqbanking/aqbanking-5.99.40_beta.ebuild
+++ b/net-libs/aqbanking/aqbanking-5.99.44_beta.ebuild
@@ -7,11 +7,11 @@ MY_P="${P/_beta/beta}"
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/203/${MY_P}.tar.gz"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/224/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc ebics examples ofx"
 
 BDEPEND="
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index e2ec7aec4198..c6f78b2531bb 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -6,6 +6,7 @@ AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462
 AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
 AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
 AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
+AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a
 AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
 DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
 DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
@@ -16,6 +17,7 @@ DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc6
 DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6
 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
 DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
+DIST grpc-1.25.0.tar.gz 16460163 BLAKE2B a581b1db459468e7c01af579da39cc111825931eee21d9af13833b1d65e448ee2024d86edb95e7acb705ad427f793d7911d6fb66418155e75f5e1f0e6116578a SHA512 7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92
 EBUILD grpc-1.16.1.ebuild 2405 BLAKE2B 1f3e8e9383fcb1f4eb371abde99377f653aeac44dba6e268dcf760b3e2cf20015d08965f9a8b3a2ed1fc31626326239634977d6ecfea893b9e2ca5de2e2d6034 SHA512 695ea5cbd96bb1b49cd562677911d43cfdc78f9ca95240b9103e09f8027f75eb1effbf755adb0487f8a833cbd41d4b1c0ec2de31fe9069be049198b9c526c2d0
 EBUILD grpc-1.17.1.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
 EBUILD grpc-1.18.0.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
@@ -25,4 +27,5 @@ EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056
 EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
+EBUILD grpc-1.25.0.ebuild 2546 BLAKE2B c821d0232ec9ab111eafe4f5227fe694aac651459aa3acf17770482ef89931bb4779b2e1e4ca2e28da930f41b3754a28f814e10ef400d93dc87b024bdb56d620 SHA512 b8620d5390348ccf26637edd08f7f2b3d81d66d4fb8328d9c19d5dd58a213fbbec969325df7ac0693368bf06cc8803cf261fae3da9c6b23bdc0c978906f58c50
 MISC metadata.xml 737 BLAKE2B de7262f1cccfe21d55f3ae0f744e067d54912995520b46b9fd3107abfed3c057082f91854f4bc4c399606a31200f0f2da468218b1d677de1aca1155532395d60 SHA512 dbc3dc0370c809f0ea1ad5f88dcef44b0ca5a2bbde47606acf85ec6149892f19990608da9b5fd4417e77a5b565a34fc481a9c7b27b00e11a5c0015ef04800a7c
diff --git a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..28088713e5f8
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile	2018-05-28 17:59:34.631540261 +0800
++++ b/Makefile	2018-05-28 18:01:31.266936000 +0800
+@@ -460,11 +460,11 @@
+ CACHE_MK += HAS_PKG_CONFIG = true,
+ endif
+ 
+-CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+ ifeq ($(SYSTEM),MINGW32)
+ EXECUTABLE_SUFFIX = .exe
diff --git a/net-libs/grpc/grpc-1.25.0.ebuild b/net-libs/grpc/grpc-1.25.0.ebuild
new file mode 100644
index 000000000000..0a1213a0a715
--- /dev/null
+++ b/net-libs/grpc/grpc-1.25.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.8.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 0358a61ea925..61d4c9045a08 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -3,6 +3,6 @@ DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691fae
 DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
 EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
 EBUILD http-parser-2.9.1.ebuild 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
-EBUILD http-parser-2.9.2.ebuild 987 BLAKE2B 25ab848c502bed87d886141c4cdda99d717b4efb1c9adf12b2ba0a585b5941cad568ee05cc7b0d873f9fc1cee0bcabc908eff7493c8bf0a2924bd842aa809442 SHA512 a537821d7431625cc06eea472b78aed6c2dade6b4e748a01d5d1134bdd029f2f4ddfbecb807c584dc12c09a667257e6d9bd339ee546b65d4b46349ecb203e163
+EBUILD http-parser-2.9.2.ebuild 986 BLAKE2B 5696770f2d51a251fe52896ba3cb42d713d5ca24a8bb3c631de7d8115fc67d8c3d7e3e4f4778f162b89d2398f8b8e687a6d66eadab6ed31ffecaeb256995a2f4 SHA512 abb33f763de05b5300ced90e4032293f37b56712989e33c78b8f92e0a6beff4adbc0f1a97e08fdf153be9089157258d3baf07645c7c9f510e6a3c2873c45cab3
 EBUILD http-parser-99999.ebuild 848 BLAKE2B a34ef61acb4072b1b51e13f4381fc6076b8b5e2693a281d1d41a0a15455ec29532aa7c69e474ecaad23b2230ff0d9894d02302e6940148ae19dafc080b508761 SHA512 b74380f265418b2956102b0d56c34ebbe8a439eb81dfd75f91b80eb266094d19940f29af59d50c894f832499af6aca11710ba14631b6111f5a9ea2c4ff4d1735
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.9.2.ebuild b/net-libs/http-parser/http-parser-2.9.2.ebuild
index c09ea2bb8b01..826153de359e 100644
--- a/net-libs/http-parser/http-parser-2.9.2.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2.9.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index 3efc29259a8b..b28eefba63eb 100644
--- a/net-libs/libecap/Manifest
+++ b/net-libs/libecap/Manifest
@@ -1,5 +1,3 @@
-DIST libecap-0.2.0.tar.gz 337696 BLAKE2B cd5a797570aa3bd4a0dd943b29775a2ead72509398559f8596a1338266f8f259d309f5e63d90ae05da5f45d981b42d8edd08c4335b475c5caf72869f548628a4 SHA512 5d39444ec79846b14a7f4292e51bb880befd2cbf581b257d5087517cfae1dce55e4439a90c08e0b8f5b3e8b2431dde8c6fab771c826489024f17625cfc8c777e
 DIST libecap-1.0.0.tar.gz 343468 BLAKE2B 5a5a12365289daaee8b324016f42b6b56f5bf5b1f7893ae052517c8c20a792a798ebb31f4038c121b1c6eefd9d375562014050572e0285e3a9b91bbfb9989fa8 SHA512 7d34b5a9b6843d6b09efc4fa390c7a2d3dda7a2ae5e82d5021295e436ca9afb7c1f70bc6f25a68e4c430fb6e33ee9f602655c9c830fccd46a8f554774813b452
-EBUILD libecap-0.2.0.ebuild 587 BLAKE2B ed5d6e88e87cd210d561ff22bbeffa9fd9ff38cb62ac44e2416e4ba2e722ed8bee575aa4ef337e464bddf44a6a42df89cd2974a4be3d14662a4dc984c2de76fe SHA512 bd999e6f1a3e13f2864bd28b43b8c29a3c2e6a09e5817c982b0a412ca0b69998d2d31e173ef3cd3135309f0b437633dfa243c4beeabc6c74da7f9d927caaa8f9
 EBUILD libecap-1.0.0.ebuild 614 BLAKE2B 8c32c8515c9424ad2cd3285d0a1e5678e9d79872c549bd49ef41b898f5b5a3e5e63a3849b905535f09d60f370fef7323a7a4daea875a7ce57b7c8416ccfb3834 SHA512 6ec3513bfe4628a45e58cc23ba67da3751f01d8cf566e053f1c3f7d1436ea46ee5476b442eab31ec035af81175fe7cf3984fbfb0bf7f10ff6a76692d6150417a
 MISC metadata.xml 415 BLAKE2B 20ae025b9259513bd01b05a6c2e52b905faecf97883367c4fed63970ef8a983ed93609ffce93e803c3cb9634d2a45ea0cb7daa7f9eb48ded8cb59e5d17565a0a SHA512 7f74e14bff83c5a8ccee44aac553502cb71e55e8d2da98967e8bba2fa44643be2508dbf0b8e47f6e3abb6e554cfc03f3ae53238f06987357dc7c3ea103aac394
diff --git a/net-libs/libecap/libecap-0.2.0.ebuild b/net-libs/libecap/libecap-0.2.0.ebuild
deleted file mode 100644
index b6df9511af45..000000000000
--- a/net-libs/libecap/libecap-0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools-utils eutils toolchain-funcs
-
-DESCRIPTION="API for implementing ICAP content analysis and adaptation"
-HOMEPAGE="http://www.e-cap.org/"
-SRC_URI="http://www.measurement-factory.com/tmp/ecap/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="!net-libs/libecap:0"
-
-DOCS=( CREDITS NOTICE README change.log )
-
-src_prepare() {
-	default
-
-	# Respect AR. (bug #457734)
-	tc-export AR
-}
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 3562ff67f6a9..f2f103e08148 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,6 +1,9 @@
+AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
 DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526
 DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
+DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libhubbub-0.3.3.ebuild 786 BLAKE2B b995a7361dc41af100c17b781ac3f9daf3d5fc47d22905153167165b256765747a8199bdfe6041ac3147f51beb047f6c1010177d60ac0197fa82daae28126b62 SHA512 80f415406e399aa5045f5f946590a07e2f94c173e5bf34e1326d17658e0f89a775c1a689934ad93dec404e8f00195155cd747696b611482f90475f97adfedff7
 EBUILD libhubbub-0.3.5-r1.ebuild 1113 BLAKE2B 228399e3a9c228554157475fcb6dafd0bccb40003e11cd36a992bfc17c86192de2747bc63ba944eab451aca5babf38021483179a7b9fa97874116791fc290263 SHA512 f17f7fe72802d43d894d3cf5fb29273959ccab84ba9752c280a1e0ca400bae0ffc4d73a732a450137382fb99919204a775308a3d790b349c94b0235ad4d95970
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD libhubbub-0.3.6.ebuild 1180 BLAKE2B ef06c39bd8d653c5ebdfaaf6648f66b1a290fabc8a107d4bff9744c4f3c428de3a033292dfe9e1e326c3d61875a662121182ab30408ad0407365955819e9aabd SHA512 67b3ed6cf1495b7713e9e8b08e094bef50ad0d071e3a8c04c10bc075c1e56efe1904c55053d81a24919a1e37da312d5d9f4d02e51ca149a488ecb28b308e0400
+MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
new file mode 100644
index 000000000000..763693e21b8a
--- /dev/null
+++ b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
@@ -0,0 +1,24 @@
+diff -u -rb libhubbub-0.3.6/test.o/tokeniser2.c libhubbub-0.3.6/test/tokeniser2.c
+--- libhubbub-0.3.6/test.o/tokeniser2.c	2019-06-26 22:39:57.000000000 +0200
++++ libhubbub-0.3.6/test/tokeniser2.c	2019-11-06 13:09:02.321068038 +0200
+@@ -48,7 +48,7 @@
+ 	}
+ 
+ 	json = json_object_from_file(argv[1]);
+-	assert(!is_error(json));
++	assert(json);
+ 
+ 	assert(strcmp((char *) ((json_object_get_object(json)->head)->k),
+ 			"tests") == 0);
+diff -u -rb libhubbub-0.3.6/test.o/tokeniser3.c libhubbub-0.3.6/test/tokeniser3.c
+--- libhubbub-0.3.6/test.o/tokeniser3.c	2019-06-26 22:39:57.000000000 +0200
++++ libhubbub-0.3.6/test/tokeniser3.c	2019-11-06 13:13:03.162538564 +0200
+@@ -46,7 +46,7 @@
+ 	}
+ 
+ 	json = json_object_from_file(argv[1]);
+-	assert(!is_error(json));
++	assert(json);
+ 
+ 	assert(strcmp((char *) ((json_object_get_object(json)->head)->k),
+ 			"tests") == 0);
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
new file mode 100644
index 000000000000..7a2bdd8ebcbf
--- /dev/null
+++ b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint"
+IUSE="doc test"
+
+BDEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig
+
+	test? ( dev-lang/perl )
+"
+RDEPEND="dev-libs/libparserutils:="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/json-c )"
+RESTRICT="!test? ( test )"
+
+DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
+
+src_prepare() {
+	default
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i test/tree2.c || die
+}
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	append-cflags -Wno-error
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index 7a38bb900964..64b17e08bff5 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 6c43009aa020..d90dbd760a99 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,6 +1,7 @@
 AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
+AUX libktorrent-2.1.1-fileops.patch 748 BLAKE2B 5c36ed8660b28b76ea2302801ffc2cd098f3743a80fbdc29ac15ce2afe00e0fe05717bbd8ad3375c0a95e4a1c9072b3d1257a572ef1392441393443ea35e764f SHA512 f07cfbbd135d8a726ddbc16a8263676126370438d219c49e23f2796321970dbf10c34a96df92b96da870f5a488b2832049579dab3aabf48370ebb787b30be104
 DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
 DIST libktorrent-2.1.tar.xz 355476 BLAKE2B c86205174ac0526455cc9d2049cd918fa1127e85ca18422823f89c3714950d6e4f606dabbeca4d615a17fc18d8032ef0cf86aa4d80726116ea667d9f257e0ddc SHA512 28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4
 EBUILD libktorrent-2.1-r2.ebuild 1355 BLAKE2B 6b8e1600b6c8eeb8d447166aeac2310cfc3de7b3ec50df02a087bc8306ed53ef6cb21a9dfb453a136c86ff85d87794db6ac06f17b87edceb6cb731f08f58ab64 SHA512 e11dd93dd788c50b93871d3c1bc8c34fd13bbc3db041933b31a0ab29c3b22f412e31186b977e5347e23b65f04620954e425edfda08302bc09b1122f07b3a2771
-EBUILD libktorrent-2.1.1.ebuild 1372 BLAKE2B 70433d1715e5e0d1a77033e5d3405ae50b36b79cb9c02abb75a4553608e89332152d8adbd84ec1bfc04ec5c218d7473b2faca2ca5b7c80f7302e837e0aff87c1 SHA512 142cb7a539e5248e0e679c85a2d7996819f3f8efcfa6a2a6401f718164c3cf410c56c337fe4987988cf39f280e71107500b764a6b55843d063eac8f0cf530e23
+EBUILD libktorrent-2.1.1.ebuild 1420 BLAKE2B 3b04160943d1eb14fa788320ba37b9771764d638857a64013311e103c8e3d274430732d6eccb23d2e1bc6f773c3998ec00cb6c88ae0202cd1ccd7f0427872671 SHA512 07f3566eb6cf8afdecf78985c01d5d9e0b479896087a35d736a26afb0eeacae60e12d410cc47310c449738dfae3473e01233d10687b00042e85fa9d1d54fdb26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
new file mode 100644
index 000000000000..87d25e26b7be
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
@@ -0,0 +1,25 @@
+From 1e8ce6e98d7ca0088624778964b9aed4696ce030 Mon Sep 17 00:00:00 2001
+From: Christoph Feck <cfeck@kde.org>
+Date: Thu, 14 Nov 2019 14:19:42 +0100
+Subject: Fix build with XFS
+
+BUG: 414050
+---
+ src/util/fileops.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/fileops.cpp b/src/util/fileops.cpp
+index c76b0e3..cfe4d5e 100644
+--- a/src/util/fileops.cpp
++++ b/src/util/fileops.cpp
+@@ -366,7 +366,7 @@ namespace bt
+ 
+ 	bool XfsPreallocate(const QString & path, Uint64 size)
+ 	{
+-		int fd = ::open(QFile::encodeName(path), O_RDWR | O_LARGEFILE);
++		int fd = ::open(QFile::encodeName(path).constData(), O_RDWR | O_LARGEFILE);
+ 		if (fd < 0)
+ 			throw Error(i18n("Cannot open %1: %2",path,strerror(errno)));
+ 
+-- 
+cgit v1.1
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
index 34a552aa1dc0..9399cfd161ba 100644
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
@@ -36,7 +36,10 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-libs/botan[gmp(-)]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-2.1-unused-link.patch" ) # git master
+PATCHES=(
+	"${FILESDIR}/${P}-fileops.patch" # bug 700090
+	"${FILESDIR}/${PN}-2.1-unused-link.patch" # git master
+)
 
 src_prepare() {
 	kde5_src_prepare
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 97447e407ac5..5bd658055d41 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -5,14 +5,10 @@ AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e70
 AUX libpri-1.4.13-respect-user-flags.patch 1354 BLAKE2B 68737c732ea8b31a6ee29dde627533317c0cdd4580d78f5e9bb305840ffa63f558e81f1a22a84bdeeac7c5bc3ac32328a911e6f7e3f38a4b2eecfccbbeeb6666 SHA512 6b6695a3e16de652c7dc05a1fa95948498d03901c6e106cbedddc2681b7b0a59d3567c5161539e397f3e1759be682537e57712e24b771a55c59f6bdec152440f
 AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
 DIST libpri-1.4.12.tar.gz 339669 BLAKE2B ff34c4167ec0c974c6a00b3039a97a55dcce8dfec2db1bb6db62fccd82848c47081d31a3dad855302f8c72c0b089b31f1bc41bc7d39654dcc1c24f7d3a515e93 SHA512 54933b9fc23a09c71a1c9ce40d648fc90e6900043ab04f097ee3d01918b46f65462337e98e1b2c1917e36becdccc871bd5029dedc522020ea731c29172ccb1fe
-DIST libpri-1.4.13.tar.gz 338432 BLAKE2B b2bf369427e8bfd7929f0043c29f58ca33156071a63c7de78ffb08efcb05e2b2655bbd943a0de875fcc8f1481668628c0b5821db59ef1eaa47e31daabfc801ce SHA512 5fbd408577bc92f2232c696f91691ec28e011b0918c7ff08212f352499f0af56e1b9a03ec738b13c28a4ff5e687eaf873472035ed1908cf43a844ffbf34dd636
-DIST libpri-1.4.14.tar.gz 338303 BLAKE2B b8bd4c4ab8047c996a2793c6bad50f36eb439d0858afb5c9d9ea5605acc88a9f5e2dc3540624b965ea8b96996e4610d2e29e0af7a22efa44de5ecdad1133e305 SHA512 c702249db62abb694747b56c588aa0e3883f54cba7cc125652df446604f349979e68a6d6b477bdcddd938179f1d1bab0a73044b0eb4c88a615770344ca419cdf
 DIST libpri-1.4.15.tar.gz 338633 BLAKE2B 0497797e4d799b07e073c93e224f5c8d5acc3b130ee87e0ced15d7d9d3315d77afa1562d0f477c6d224d618fa15ed68b05c26e2131b12858da19a1486802175f SHA512 2737ad404440a0c809bf0bb0e406565757fe850040911561c2e5e64f4c49b02af69db0d23dac322dda354583bca0ced88becc07017e686a848b69c8f152fb9d4
 DIST libpri-1.5.0.tar.gz 340683 BLAKE2B b7bde7a81655c30e491e6a0311979c614c183e5909d1f6a875277ffa33e758b63b69f0817c833899e231c53d3f18296981a610276beaff203691011ae17bcaeb SHA512 194e4b525e77a28665525e43a2d105d542fab242d3d21951574668bf4d14d90adeb4e0b18384eca1628d75a16d89c8b1e6577e30542d77dd5dfd3d6f4d60ed3a
 DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
 EBUILD libpri-1.4.12-r2.ebuild 689 BLAKE2B d6b484363c6a9680ded3a370be977ba3fff68d582c6dca4dc2bac86b0ee6f5c945fd055920d623a5047a77c1ec40133a5e8fe87aeca023ea971f05caad2ab232 SHA512 ec5454f729f1a47fb821827c8ad305422ec3b17825e46f7875f1df4ad3d91614da98df089c969ccc9aab3336c927e682f4fb0ecaa84836225662bc21cbf0ca4e
-EBUILD libpri-1.4.13.ebuild 676 BLAKE2B 608bb804c9c522c3425b881b074bbef0ada7cd3bfbcbf818c9a36bea7a31ccc204d04102c139d6c4bd0157a7ecb5d2439d55fbe40220234f6948e5ce82ab4438 SHA512 1557499fb225120e8efd793794ef993703d935cbea04e8dc66fe6d402473845e8efb01a85d2294be928026f314c171627cc23f2802b820c9ea1e6a6dcf2bab3b
-EBUILD libpri-1.4.14.ebuild 676 BLAKE2B ce35a3e5fadf6788b3fd45974bb19fad0e1283c9df5f41162f6b220326a70c81fa12915418675f9b435c5778a7b73c5452aa322aa348c11f8f780acee8b262fb SHA512 cd67b8b65c621c65e6e99c91fa527c0a7fb2885d8ddcd67b24438934161358fff4451d389777e116195fecbc10857fe3fedbdfb1e3c4b5486db5e387d19fa77b
 EBUILD libpri-1.4.15.ebuild 721 BLAKE2B 1a031b8ea00603207c00725cbb183eee713808125e9e44b81bb4ebea343852dfb46b193249798dec9292530554e3df28e9254ba93a990cd86a371b9c9e029a2b SHA512 15eed20f73274b14855239451a0e95771aa0ecbdd256e8175006e7968c7bd9fab7683193c361fa638a6fdfa580cb3feef9350469a9dc2c688695bd70f2abc769
 EBUILD libpri-1.5.0.ebuild 674 BLAKE2B 67ac07eac4429c8068517e7253ac974f672d2e1179a8ed2626c3a64c0c8fe1f4c5cd1821fd228c6c743adfa143cf87c0b8019ee63b0bc07c619023a02bc0206d SHA512 fc3248e584238a16baace740c749616a11bb2d1b170c7543d74d995c4d53fbb3fe0473da3d988305013ee4055a858108167a3cdeddc1d8e29ae47b600c32bcd3
 EBUILD libpri-1.6.0.ebuild 739 BLAKE2B d6a1c4e475ff3988178f2909ce9f858937eb9b92426c3b18ced1ebc442cebd20f5a47a9e9696b1b0180dab700a6272d0d9780729b7eb4df1e3bd0a721181bf5e SHA512 f3aec195d5d94f4e304264934c6375e91416143abd857aeaf0a6fdc7a3341181d24c1b59fed21e4ca9b4fc2c6d42a54ffc068d65e55ec45aa8ef76fdd0e7b38b
diff --git a/net-libs/libpri/libpri-1.4.13.ebuild b/net-libs/libpri/libpri-1.4.13.ebuild
deleted file mode 100644
index ddb515a76bca..000000000000
--- a/net-libs/libpri/libpri-1.4.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpri/libpri-1.4.14.ebuild b/net-libs/libpri/libpri-1.4.14.ebuild
deleted file mode 100644
index 345ce9994e92..000000000000
--- a/net-libs/libpri/libpri-1.4.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 4df9e89052ce..c7624baee3b5 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -1,4 +1,4 @@
 DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d
 EBUILD libsignal-protocol-c-2.3.2.ebuild 352 BLAKE2B ed42c8b4b05431d9abaa4ad0318cdfe053309aec56d888f689434a6c10ead72a5f9e7616c50019ed437d48396aeca9435a48c140f1fdafd3ecfd215458c8b35a SHA512 68e8ed4543da7968f66e9a349b4aeec05fd462f2a35d3411cc24db77eefb02d1884b44e932263cfbfc48f857c2a21d16b47c55cc215b9d2e8e521b34b373fb63
 EBUILD libsignal-protocol-c-9999.ebuild 326 BLAKE2B 804b315a202a1710247f6ca621f582098dc328381a84820fdf6e1e79a9cd66cebe697cbaf1d7a43c26c975007a9f259fa1500dd068e98282cc31f7ec63b51ce6 SHA512 ff25cb3b54300cb3dd742213401356bca0f4ce2fe5e3c9034378a4269e2f204698d41691d58af75535615f1df5727e5ad905a55beb208f293aa3ecc35a889690
-MISC metadata.xml 755 BLAKE2B 21256bc6df6fb41d342f223737511c581680b9516fcb30b2f77b5995efc6e109a610e484e5dda2cc504b0cf0d2098f58623ddff98a80a2de03d65d5b78367f97 SHA512 4974101fe9a0878f72ee64cc12612f2f9bcad5b5623e01f31c95c7cbed30419b8730d192a794c9e3da249f47564d1fe0f99267d43621532e6d7b136a9e2df820
+MISC metadata.xml 740 BLAKE2B a55ff6046cc360d761f3df397be99bb31c8b8ce41f947cd1ed18c8d96e8474fe4aed9718bb0c7b2541cec2bad46e2caf0448585afea85ca8376b4cfd9053a01c SHA512 92abe5f5a1b810e92d06099d8f59d248ec69c44ea4ec8dfbec8e637a0f58e272d32b6f1024492c010418d796991232b561131cc50a6fbf46f39b55e4c7b6f32b
diff --git a/net-libs/libsignal-protocol-c/metadata.xml b/net-libs/libsignal-protocol-c/metadata.xml
index b84663d18fe7..5a4e8024ed94 100644
--- a/net-libs/libsignal-protocol-c/metadata.xml
+++ b/net-libs/libsignal-protocol-c/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>william+gentoo-overlay@optmzr.se</email>
+		<email>william@optmzr.se</email>
 		<name>William Wennerström</name>
 	</maintainer>
 	<upstream>
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 21be5d8893e4..22146459db13 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,8 +1,8 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 AUX libssh-0.9.0-libressl.patch 923 BLAKE2B 997f909b6576e52a9104cf9dd821a42e7a00fb0c934b35d9f6775080db84e3d6a52ccb973c07d94b37f0182caeb8e0ca47330d042ec286692a59014b731fc006 SHA512 d7fdfb19bbf552de9d17bdd09ee28e8f4dcfb1bc94415249fafca52ea0dba9075fd36fef063a1e3be2ec165baae35c0c224c4a30799c7b30a9f749e0639ce91b
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-DIST libssh-0.9.1.tar.xz 1246696 BLAKE2B 3be87c3020930ddfb67b6eb2ded91e805fd17ec5493e443064ec1e7cb23797fc5128c4e39ff9c3067c3026ae370eebbdcc7706bd886a2a644b34b66cb494b6c4 SHA512 7776db347acb2d2d2ef3c19bc8ac61a4b18a4e61c1d7c2814fe44d3b7716e36d5440cdf170fb151af6c2bd9491921911b7f84732d781992c064667ea2ac3cab2
+DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79 SHA512 93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0
 EBUILD libssh-0.9.0.ebuild 3177 BLAKE2B 1d91789cacbab261b57ab0c1c07f67a4688b8711d0ce9522ec2692135daa3d5426663e9dddaef065af4ce419512e4d12461eb1861080a7049b31f182e9c2e6fd SHA512 70e1e4a45a841b2f99c4b12cf3f6ad7c5c5ef5cd2780ca8b526029b0d6ae6baa6bbc29036ec356cdb582c7cc9276948f28f42e5379f3c5da911ea6b504f5c61d
-EBUILD libssh-0.9.1.ebuild 3144 BLAKE2B c0183a15ff0cde6e171d3a94650de9153df7304706636f58b4722632007b0e8aabead5ff028cdd64dc402afca53d0b2c69c05c9bab9790b84739f5cbf813524d SHA512 53f5935246b021b559684bff22dc6aacfff9186d816f654b9f579797b90c8bb35b6f86cdb81b5cd612306c5411b9fcc1ebe0aae7aae28c5515fc76b95d722e8e
-EBUILD libssh-9999.ebuild 3144 BLAKE2B c0183a15ff0cde6e171d3a94650de9153df7304706636f58b4722632007b0e8aabead5ff028cdd64dc402afca53d0b2c69c05c9bab9790b84739f5cbf813524d SHA512 53f5935246b021b559684bff22dc6aacfff9186d816f654b9f579797b90c8bb35b6f86cdb81b5cd612306c5411b9fcc1ebe0aae7aae28c5515fc76b95d722e8e
+EBUILD libssh-0.9.2.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
+EBUILD libssh-9999.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.1.ebuild b/net-libs/libssh/libssh-0.9.2.ebuild
index 7731aab23884..dc04b6aee9da 100644
--- a/net-libs/libssh/libssh-0.9.1.ebuild
+++ b/net-libs/libssh/libssh-0.9.2.ebuild
@@ -23,6 +23,9 @@ IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static
 
 REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
 
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
 RDEPEND="
 	!gcrypt? (
 		!mbedtls? (
@@ -36,7 +39,6 @@ RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
 	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
@@ -44,6 +46,8 @@ DOCS=( AUTHORS README ChangeLog )
 
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
+RESTRICT+=" !test? ( test )"
+
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -77,7 +81,7 @@ multilib_src_configure() {
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
 		-DUNIT_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 7731aab23884..dc04b6aee9da 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -23,6 +23,9 @@ IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static
 
 REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
 
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
 RDEPEND="
 	!gcrypt? (
 		!mbedtls? (
@@ -36,7 +39,6 @@ RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
 	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
@@ -44,6 +46,8 @@ DOCS=( AUTHORS README ChangeLog )
 
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
+RESTRICT+=" !test? ( test )"
+
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -77,7 +81,7 @@ multilib_src_configure() {
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
 		-DUNIT_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index f245934bbfff..a85d62fa914e 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,7 +2,9 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8
 AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446
 AUX libssh2-1.9.0-missing.patch 4796 BLAKE2B 185428de9298fc210c30a1b826b958ebde761a6b258d2b6a79c2162533c81c6f9dfa5a1c574b239067a7bf79bda36656498cea78b0da797579b5cb6711a6dfe0 SHA512 65d75ecdc041cfb627c49f992804201dc234ba63558e2cbac066efbe0c4de03900668f61f87674ea9ef5beeb217d82cb441018f11e703545ba9349a4f05c8ae6
 DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f SHA512 41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
+DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2 SHA512 0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a
 EBUILD libssh2-1.9.0-r1.ebuild 1449 BLAKE2B 88a40f3252d4f95efa3642f3d2729f49d93b0e63ca56ed6bc5f61dc277c1460491658bbe50259e28c6fef0fc1dd3281943a6c86bdc6dc096f37fff355df8ba8b SHA512 1e2bd2ce469fa46a148af4f0db6b1924692c0c0ca47b7e125f431055d5ae968fddcd73254eda1bc04f22af43a3fce83fda8c82cd5f7b6ab6e7da6c8dbdc4c739
 EBUILD libssh2-1.9.0.ebuild 1397 BLAKE2B b3f23ca2f291f72f439d0dcbc2693719c9183775f4f80ffda6e74733ce2f552e1201586f8d50cc056eb33e194f26c148df264d409dd17edbf662984867eb5720 SHA512 c41a5133c1703771bb12c4f7f65d7ae27332b502fe436536b939a5b23c63f9564e36cf9348a2abf119d959c40ff7b184f3ab40193a9a5a4f593401cb69624a09
+EBUILD libssh2-1.9.0_p20190913.ebuild 1523 BLAKE2B 943fc640d29668e7bb7135373e7201d19ae149aede6e34eb5ee6695825676ff52b1af9d3785788a7498f0f3b1e9f34f01389b0cc7fce4d9a5b3cf38ee0873326 SHA512 dee2f7df1b7a87777e7f085de08712e5c232387e1f823ba36b512bec3191b6cce81e04f79ea7dac3d571a313bd96bc7dd384a00ba9632d8ef9255d0b9d422835
 EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
new file mode 100644
index 000000000000..83b60bec30e5
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+EGIT_COMMIT=336bd86d2ca4030b808d76e56a0387914982e289
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org"
+SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="test"
+
+RDEPEND="
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	!gcrypt? (
+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+	"${FILESDIR}"/${PN}-1.9.0-libdir.patch
+)
+
+multilib_src_configure() {
+	local crypto_backend=OpenSSL
+	if use gcrypt; then
+		crypto_backend=Libgcrypt
+	elif use mbedtls; then
+		crypto_backend=mbedTLS
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCRYPTO_BACKEND=${crypto_backend}
+		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index dc3a4b9072d8..c35c5eb7547f 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,9 +1,12 @@
 AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
+DIST libupnp-1.10.0.tar.gz 786215 BLAKE2B b652251fe4f91179b855d5231466e026ce4a232a7b6196a3a1f01fb7163b0cf953a1cffeb4330c9734f001014cda2a0a1c3ac2d3600bcd78ad8eeb42b062ea61 SHA512 d42a42ace366a781ff29db4b91d1b0dc27138c60028629dae1608335085fbab0e22bcfa5744a8e6890d948f86b642945721226204a09f8ba3c9a49e1a5b6b2b5
 DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
 DIST libupnp-1.8.5.tar.gz 785053 BLAKE2B 3ffb2568b6b56678732a9784254ba6b5f36dbed3b36a97dfecf8879bf75c1f2643e66ec590625a8060ca18af1ec84cf165ea0e87fecb99c4c1d98429709ea2f5 SHA512 0a29a3a05d7ad2a249d17a2b476addf56c64368fddd4e973851e652109ca3ccb7e30e92a97cdc03da3057eec93ea189c71803dbd6a282b70a744c7cfac3bee5b
+EBUILD libupnp-1.10.0-r100.ebuild 1047 BLAKE2B 0b8ca4e4d2d424db711f78e3c325f9d9fa4bad09c0fc99209d30ffc55c8bc68512af4f245e0913e0ff1f6d268c99eb2d2592107b641d1d18991884bbd0d25a39 SHA512 af38347e5010ebfc1a0121c0348d7f9b8b8cfeba9986c31a7e5e43907b080b538bcb741fe20186ffcb9b5cdad9765f23a8e1a0fe299ec5527e615170f0f42784
+EBUILD libupnp-1.10.0.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
 EBUILD libupnp-1.6.21.ebuild 1036 BLAKE2B d3b4077358a8d14b25df794258251bf81ac29d4283714f7d5abb2a974a2265246168986e034d07923675996063db4ff86806fb623895e5c099cfed7a83af114a SHA512 bc71c740ae8b29159960aff843fa3281e1dc4baf93761be4026edaa83ced0195a965b4c58c43f84e16618045935fd1a8ee1f780a4c672535be9b6e36ebf5d108
 EBUILD libupnp-1.6.25.ebuild 1038 BLAKE2B 5ff0fa549ca82029feeb59b0c67edb10fa46a73c62476a751d1e89a070de94fb563a6bc38ebe604be429e54d66162069695f04df20e225dc22d6b0f8801ea549 SHA512 2d335e95edd391006d6f9cd9324702dbf3380c4e22b56895d919d812b6195f094fed0bb464e8b38ad6e55701c06385f1bc8af803ceef77b2453036c047961ff5
 EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94
diff --git a/net-libs/libupnp/libupnp-1.10.0-r100.ebuild b/net-libs/libupnp/libupnp-1.10.0-r100.ebuild
new file mode 100644
index 000000000000..5d4c9a581d9b
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.10.0-r100.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools vcs-snapshot
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
+
+DOCS="ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use x86-fbsd &&	append-flags -O1
+	# w/o docdir to avoid sandbox violations
+	econf $(use_enable debug) \
+		$(use_enable blocking-tcp blocking-tcp-connections) \
+		$(use_enable ipv6) \
+		$(use_enable reuseaddr) \
+		$(use_enable static-libs static) \
+		$(use_enable samples)
+}
+
+src_install () {
+	default
+
+	use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libupnp/libupnp-1.10.0.ebuild b/net-libs/libupnp/libupnp-1.10.0.ebuild
new file mode 100644
index 000000000000..2d629febf65e
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.10.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools vcs-snapshot
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
+
+DOCS="ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use x86-fbsd &&	append-flags -O1
+	# w/o docdir to avoid sandbox violations
+	econf $(use_enable debug) \
+		$(use_enable blocking-tcp blocking-tcp-connections) \
+		$(use_enable ipv6) \
+		$(use_enable reuseaddr) \
+		$(use_enable static-libs static) \
+		$(use_enable samples)
+}
+
+src_install () {
+	default
+
+	use static-libs || prune_libtool_files
+
+	# Slot samples
+	if $(use samples); then
+		for bin in combo ctrlpt device ; do
+			newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}"
+		done
+	fi
+
+	# Slot includes
+	cd "${D}/usr/include" || die
+	mv upnp "upnp-${SLOT}" || die
+
+	# Slot pkgconfig
+	cd "${D}/usr/$(get_libdir)/pkgconfig" || die
+	mv libupnp.pc "libupnp-${SLOT}.pc" || die
+	sed -i -e "s#/upnp#/upnp-${SLOT}#" \
+		-e "s#lupnp#lupnp-${SLOT}#" \
+		-e "s#lixml#lixml-${SLOT}#" "libupnp-${SLOT}.pc" || die
+
+	# Slot symlinks
+	cd "${D}/usr/$(get_libdir)" || die
+	mv libupnp.so "libupnp-${SLOT}.so" || die
+	mv libixml.so "libixml-${SLOT}.so" || die
+}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 5c91ffd40c2e..6eb3cadbdf0a 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,10 +1,14 @@
 AUX libwebsockets-2.1.1-x86-build.patch 771 BLAKE2B d4b51038dcd6717d6608bfb98da8d0474289927950efc0e6e5d7f2d0ec84e808a4d08e15dc729f7daa4e4c90ab28070ce177b1f64280998f82fc3d0c1a9911dc SHA512 b4f34813309921728e9dcd88e29ae6b2bcb6ac3e55d86e489a85fe9950bc3758d03f7e639773447110c5bb82e4bceee3210569fc065e860f596053ed8c8a317c
+AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
+AUX libwebsockets-3.2.0-string_assignment.patch 482 BLAKE2B 1e926a64a4c1c0bf2ec99bdb2c9b917800f27e0959688ebe26a5620f7e7722e5911ab9ceeeb75cfa5e56e609d5e6aafa0587f9f326d01458111681c57318c7f0 SHA512 7bfd7c79c8355bb2e1a8824559250f7c4482d27c7b502a6b1d7bbbcc66a95d977f4b64da4c91d5483a1e583b368b6b0cd178c2bca16fca2c6291644e031172c7
 DIST libwebsockets-1.7.9.tar.gz 2915358 BLAKE2B 07aad4ab716212924177aa76233d743d6258d261f6cccb286e478f51bfeac609284cf2e43004bd99c271786a7e30357895c8687c11e1c3d7589ed13dbce4fbe8 SHA512 d5bd6171d58b5d5439af48d6cc1e92623e9bf21e059a2d25d362ef81b1bff62e759fe265261dbee0ac4ceb0d0a2490dc1e030dfee2b36eb8ac74df112da1db56
 DIST libwebsockets-2.0.2.tar.gz 2998585 BLAKE2B 0eaf2301abf9a0e47bd865b6e653f3ea23f3b00d4c6da785a8bd871f3ca729dc43152cad10aeaa9a3cd360aeecd0be87e434102e91e0eeaa6b1865031310a362 SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a
 DIST libwebsockets-2.1.1.tar.gz 3769593 BLAKE2B 8d3aaa0a844925fb927fffaf0d11ba1bdbd013db8a680ce4b85cd5d951219598288fa0f2b97ec22bc00ef879586cb5c2c076b774f3411cb6d8ca553e66fb90e2 SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683
 DIST libwebsockets-2.4.2.tar.gz 3777160 BLAKE2B 6aedc0d340e9e03745309cd1a9674b6c7e84ebdbd5232a265c7a4e0deb612665982353c3ba973b58a835b1747448d415a3625ed044973212b5a897b221d73106 SHA512 7bee49f6763ff3ab7861fcda25af8d80f6757c56e197ea42be53e0b2480969eee73de3aee5198f5ff06fd1cb8ab2be4c6495243e83cd0acc235b0da83b2353d1
+DIST libwebsockets-3.2.0.tar.gz 9848976 BLAKE2B 3ad82281c854ad6ca4183f104a0d0eaa6f6e6e6084e3a98b29d8425d335f02a2d3e4f7e7a1b350e87d4ff975c44a5ed6635e3166219d9294bbf5a56ed1357e75 SHA512 afc1c9e259d6d48000b09da111af4129680d50474cdfedbad197ee22260d57a837b67cc6a3f8e6b1aa7ce7dc5d3fd900569783631540501709868125c6d1e4da
 EBUILD libwebsockets-1.7.9.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
 EBUILD libwebsockets-2.0.2.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
 EBUILD libwebsockets-2.1.1.ebuild 1841 BLAKE2B c79cdc197d2800a7924cfa134269e1d679c0f6df185f83de157b1211a55e01d0a4cb05797e74ce8946dcda0b1b7266be030824af6fe136aedb89fd21e1535cac SHA512 5561f0c233aad102971bc9d4e626178771b349543bca91e816eace0502672e2e8edcd71e26b9791f657d2f9864b93f5aadcd63f18057ec632d939354d475f191
 EBUILD libwebsockets-2.4.2.ebuild 2120 BLAKE2B 2276db115471732eb30f81cea4fb54aa01fd0f2202c41d1b26234d9468988eca8f376ea3bac3ea105133b56a1b7ef802b9d5ab22de6e107037b1cf2d2d6aaa3a SHA512 4be547c69cfa37ad311270927512d2825facb5ed2fd3aa30498d9301b54fbe05d6138977bdcf2f8fb5672df94ccba2e835757ca6379dadde5bd199fcfe27be2c
+EBUILD libwebsockets-3.2.0.ebuild 2209 BLAKE2B 6f2ea48779952428b13a7d44909a5dc44d3102feabeda8b71c5eb905e80e78cb85d8bab0bd46764b5b801de29a7118ac5a90cc497571312506c253a64eb1ff55 SHA512 dd86106ecc75d63bf4b35d9d331ec329840e71384236207bce84032b0ba15455ed9bc0453b826f4d7018189a376b2f2a14aa06ab0f2b5d6bfb5afa2a6edd24fb
 MISC metadata.xml 1829 BLAKE2B f5f9a3e819382eeaf1a024ef53ff6d2c94f34566b4d0220f9a3a289ba5fd55c0d3d3d73d8ac46a9e10b7a5223cce44ebad2048efcf0d896762adfb04c6a2b67c SHA512 b29f893c28c5c27260838b440ae98a42d30291272c2c78aa80f61ea2ba877c29c2bed1bf10e68e59f98c732703c6a975938b7aee04f051cbb775d85cd93e00c2
diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch
new file mode 100644
index 000000000000..3dafd60e7315
--- /dev/null
+++ b/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch
@@ -0,0 +1,22 @@
+--- libwebsockets-3.2.0.o/lib/misc/lws-struct-sqlite.c	2019-08-14 10:22:50.000000000 +0200
++++ libwebsockets-3.2.0/lib/misc/lws-struct-sqlite.c	2019-11-07 20:03:43.939423877 +0200
+@@ -23,6 +23,7 @@
+ #include <core/private.h>
+ 
+ #include <sqlite3.h>
++#include <string.h>
+ 
+ /*
+  * we get one of these per matching result from the query
+@@ -253,8 +254,9 @@
+ 	}
+ 
+ 	lws_get_effective_uid_gid(context, &uid, &gid);
+-	if (uid)
+-		chown(sqlite3_path, uid, gid);
++	if (uid && chown(sqlite3_path, uid, gid) < 0)
++		lwsl_err("%s: Error setting ownership of %s: %s\n",
++				__func__, sqlite3_path, strerror(errno));
+ 	chmod(sqlite3_path, 0600);
+ 
+ 	lwsl_notice("%s: created %s owned by %u:%u mode 0600\n", __func__,
diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch
new file mode 100644
index 000000000000..86010aafd619
--- /dev/null
+++ b/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch
@@ -0,0 +1,11 @@
+--- libwebsockets-3.2.0.o/lib/roles/http/client/client.c	2019-08-14 10:22:50.000000000 +0200
++++ libwebsockets-3.2.0/lib/roles/http/client/client.c	2019-11-07 19:59:52.959534874 +0200
+@@ -214,7 +214,7 @@
+ 			lwsl_client("SOCKS password OK, sending connect\n");
+ 			if (socks_generate_msg(wsi, SOCKS_MSG_CONNECT, &len)) {
+ socks_send_msg_fail:
+-				*cce = "socks gen msg fail";
++				cce = "socks gen msg fail";
+ 				goto bail3;
+ 			}
+ 			conn_mode = LRS_WAITING_SOCKS_CONNECT_REPLY;
diff --git a/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild b/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
new file mode 100644
index 000000000000..edff1fac3cb4
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
+	lejp libev libevent libressl libuv peer-limits server-status smtp socks5
+	sqlite3 ssl static-libs threads zip"
+
+REQUIRED_USE="
+	generic-sessions? ( smtp sqlite3 )
+	http-proxy? ( client )
+	smtp? ( libuv )
+	?? ( libev libevent )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	http-proxy? ( net-libs/libhubbub )
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	sqlite3? ( dev-db/sqlite:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl?  ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
+	"${FILESDIR}/libwebsockets-3.2.0-string_assignment.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DLWS_HAVE_LIBCAP=$(usex caps)
+		-DLWS_IPV6=$(usex ipv6)
+		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_WITHOUT_CLIENT=$(usex !client)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
+		-DLWS_WITH_CGI=$(usex cgi)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
+		-DLWS_WITH_HTTP2=$(usex http2)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
+		-DLWS_WITH_HUBBUB=$(usex http-proxy)
+		-DLWS_WITH_LEJP=$(usex lejp)
+		-DLWS_WITH_LIBEV=$(usex libev)
+		-DLWS_WITH_LIBEVENT=$(usex libevent)
+		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
+		-DLWS_WITH_SMTP=$(usex smtp)
+		-DLWS_WITH_SOCKS5=$(usex socks5)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3)
+		-DLWS_WITH_SSL=$(usex ssl)
+		-DLWS_WITH_STATIC=$(usex static-libs)
+		-DLWS_WITH_THREADPOOL=$(usex threads)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip)
+		-DLWS_WITHOUT_TESTAPPS=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 0efc1efb3304..7e7137c3581f 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,12 +1,6 @@
-AUX nativebiginteger-0.8.7-asmfix.patch 590 BLAKE2B ca93b019518afe5e1af85c42d35435d34f3f7138e18cc23b8c5c49f953a9afe7dc663933699a45e5a301ab44c63b4328691723d6e85985e601fe72f27d8b4a40 SHA512 0efbf7f8e0767e2636bea21fd5020860bd6dc86bc6bb562b50bf40bd8ab0f83f9219fb031e93eedfa6d7f54027e5fdeb88aa64c283861963d1fd34e3dd4bbd05
-AUX nativebiginteger-0.8.7-build-system.patch 907 BLAKE2B 1a50205946ef2327a5a00f651a180e605d7a4b92d43bda0f9ad8b8ae81dd3910bd34cf98d792b79a47bbc0a37389d74ff1750650aa8c0b70165c704bbfff792a SHA512 13b7e8d2764ee0b86924854ee99a0c220f9b213d868460a39ad448e510cf33d4d747bfebb0b7273d70ca1cb15151324fea446431d9301973c0f2a0bd381a5dc3
-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
+DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
 EBUILD nativebiginteger-0.9.36-r1.ebuild 1450 BLAKE2B 56c42caa16590ca0bf44f401f0a3b75b6400d71f876bc0a0279ac27b2032450fbf68af66d066d9d10804b3284ff910dda9cf7984ad1612cb177262837a618dfa SHA512 31731ab0a369bb304e45bfca41ad42f0464601a97df1202ec9d7a5e8e2734ba9e06f817416631da18594fe2e5de8342e9f9ee965524a17274d81085710a787e6
-EBUILD nativebiginteger-0.9.36.ebuild 1528 BLAKE2B 6743746aca34ab8a4032a968e5bf2e1036707055ec7bbfe1f5a8cb3a1956cd1f274437db14d3e99c0f1f0732f0302e4dfdb9eb69d6c7e76bff8ddfa81ef83f6f SHA512 c9e455cd73955dbc6a65f39e4c6d83ddf5680d879871893a01656313f72fd7fcb890fa7c2cac3faf85cd1fd9606c575727ce4a6251dab1a1dfefa0ce7c71a661
+EBUILD nativebiginteger-0.9.42.ebuild 1597 BLAKE2B 92b144c717a511aa85491e72204e2522e901d37cbee29e2323fc8dd4afb3d798cdce5edda60f36d5ba9d78a0adfad7ed88c8dec603a5514620d26f54b032532d SHA512 548eea57016ca6100587a8521cc8383b999f5299a99fd577e54542e46f46254cea00ed009a568d906374a6e81a8072242855a1ee86abbaa9c937352e0c9a550a
 MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
deleted file mode 100644
index 3443a91c288b..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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/files/nativebiginteger-0.8.7-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
deleted file mode 100644
index ea298b5d0358..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- i2p-0.8.7/core/c/jbigi/build_jbigi.sh.orig	2011-07-29 11:52:43.000000000 +0200
-+++ i2p-0.8.7/core/c/jbigi/build_jbigi.sh	2011-07-29 11:53:43.000000000 +0200
-@@ -3,8 +3,8 @@
- # When executed in Linux/FreeBSD: Produces an libjbigi.so
- # Darwin produces libjbigi.jnilib, right?
- 
--CC="gcc"
-+test -z "$CC" && CC="gcc"
- 
- case `uname -sr` in
- MINGW*)
- 	JAVA_HOME="c:/software/j2sdk1.4.2_05"
-@@ -57,5 +55,7 @@
- 
- echo "Compiling C code..."
- rm -f jbigi.o $LIBFILE
--$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c
--$CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS
-+echo $CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
-+$CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
-+echo $CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
-+$CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
deleted file mode 100644
index 07dd05227582..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- core/java/src/net/i2p/util/NativeBigInteger.java.orig	2011-07-29 13:14:05.000000000 +0200
-+++ core/java/src/net/i2p/util/NativeBigInteger.java	2011-07-29 13:15:16.000000000 +0200
-@@ -481,14 +481,12 @@
-     
-     /** @since 0.8.7 */
-     private static void debug(String s) {
--        I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).debug(s);
-+		System.err.println("DEBUG: " + s);
-     }
- 
-     
-     private static void info(String s) {
--        if(_doLog)
--            System.err.println("INFO: " + s);
--        I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).info(s);
-+		System.err.println("INFO: " + s);
-         _loadStatus = s;
-     }
- 
-@@ -496,12 +496,9 @@
- 
-     /** @since 0.8.7 */
-     private static void warn(String s, Throwable t) {
--        if(_doLog) {
--            System.err.println("WARNING: " + s);
--            if (t != null)
--                t.printStackTrace();
--        }
--        I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).warn(s, t);
-+		System.err.println("WARNING: " + s);
-+		if (t != null)
-+			t.printStackTrace();
-         if (t != null)
-             _loadStatus = s + ' ' + t;
-         else
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
deleted file mode 100644
index a4020a012b98..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- i2p-0.8.7/core/c/jcpuid/build.sh.orig	2011-07-29 18:38:44.554000219 +0200
-+++ i2p-0.8.7/core/c/jcpuid/build.sh	2011-07-29 18:38:13.789000172 +0200
-@@ -24,8 +24,8 @@
- mkdir lib/freenet/support
- mkdir lib/freenet/support/CPUInformation
- 
--CC="gcc"
-+test -z "$CC" && CC="gcc"
- 
- case `uname -sr` in
- MINGW*)
- 	JAVA_HOME="/c/software/j2sdk1.4.2_05"
-@@ -50,8 +52,8 @@
- 
- echo "Compiling C code..."
- rm -f $LIBFILE
--$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
--strip $LIBFILE
-+echo $CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
-+$CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
- echo Built $LIBFILE
- 
- #g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
deleted file mode 100644
index 6240d25bcd9b..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/java/src/net/i2p/util/NativeBigInteger.java.orig	2011-07-29 13:22:39.000000000 +0200
-+++ core/java/src/net/i2p/util/NativeBigInteger.java	2011-07-29 13:22:55.000000000 +0200
-@@ -526,7 +526,7 @@
-             System.loadLibrary(name);
-             return true;
-         } catch (UnsatisfiedLinkError ule) {
--            if (_isAndroid) {
-+            if (!_isAndroid) {
-                 // Unfortunately,
-                 // this is not interesting on Android, it says "file not found"
-                 // on link errors too.
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
deleted file mode 100644
index 243ce87fb2a1..000000000000
--- a/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib java-pkg-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"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.5"
-RDEPEND="dev-libs/gmp"
-
-S=${WORKDIR}/i2p-${PV}/core/
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-build-system.patch \
-		"${FILESDIR}/${P}"-jcpuid-build-system.patch \
-		"${FILESDIR}/${P}"-debug-all.patch \
-		"${FILESDIR}/${P}"-non-android-warnings.patch \
-		"${FILESDIR}/${P}"-asmfix.patch
-}
-
-src_compile() {
-	tc-export CC
-
-	cd c/jbigi/jbigi/src || die
-	../../build_jbigi.sh dynamic || die
-
-	if use test ; then
-		einfo "Building tests ..."
-		cd "${S}"java/src || die
-		ejavac net/i2p/util/NativeBigInteger.java || die
-		eend $?
-	fi
-	if ( use amd64 || use x86 ) ; then
-		cd "${S}"c/jcpuid
-		./build.sh || die
-	fi
-}
-
-src_test() {
-		cd java/src || die
-	java -Djava.library.path="${S}"/c/jbigi/jbigi/src net/i2p/util/NativeBigInteger || die
-}
-
-src_install() {
-	local os arch
-
-	dolib c/jbigi/jbigi/src/libjbigi.so
-	( use amd64 || use x86 ) && dolib c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so
-
-	## The following is needed for compatibility with earlier versions of NativeBigInteger ##
-
-	# arch list found by "none" + grep 'JBIGI_OPTIMIZATION_.*=' core/java/src/net/i2p/util/NativeBigInteger.java
-	for arch in none arm k6 k62 k63 athlon x86_64 x86_64_32 pentium pentiummmx pentium2 pentium3 pentium4 ppc ; do
-		dosym libjbigi.so /usr/$(get_libdir)/libjbigi-linux-$arch.so
-	done
-}
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
deleted file mode 100644
index 6e2963035dd2..000000000000
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="|| ( public-domain BSD MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-
-RDEPEND="dev-libs/gmp:0="
-DEPEND="
-	${RDEPEND}
-	test? ( >=virtual/jdk-1.7 )"
-
-S="${WORKDIR}/i2p-${PV}/core"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-asmfix.patch
-)
-
-QA_PRESTRIPPED="usr/lib64/libjcpuid.so"
-
-QA_SONAME="usr/lib64/libjcpuid.so"
-
-pkg_setup() {
-	if use test; then
-		java-pkg-opt-2_pkg_setup
-		export JAVA_HOME=$(java-config -O)
-	fi
-}
-
-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-config -J) -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/nativebiginteger/nativebiginteger-0.9.42.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.42.ebuild
new file mode 100644
index 000000000000..efe1d0774d35
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.42.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 toolchain-funcs
+
+DESCRIPTION="jbigi library used by net-vpn/i2p"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	virtual/jdk:1.8
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/i2p-${PV}/core"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asmfix.patch"
+)
+
+src_compile() {
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die "unable to build jcpuid"
+	fi
+
+	if use test; then
+		cd "${S}/java/src" || die "unable to cd to java/src"
+		ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die "unable to build tests"
+	fi
+}
+
+src_test() {
+	cd "${S}/java/src" || die "unable to cd to java/src"
+	"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
+		die "unable to pass tests"
+}
+
+src_install() {
+	dolib.so c/jbigi/jbigi/libjbigi.so
+
+	if use amd64 || use x86; then
+		dolib.so c/jcpuid/libjcpuid.so
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 9f2491af7d72..a71a9a5fe261 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,11 +6,11 @@ DIST node-v13.0.1.tar.xz 31986844 BLAKE2B f30937878ef68fe94b69912b994b84c03d75fd
 DIST node-v13.1.0.tar.xz 31981260 BLAKE2B a7c9a8d851b22f3cb24132adad0c0e971401c1555951fffc2bd69b3b8bcfc295fdebde6918a467203c30bd62f883f5997f6ec57c7197854187ef78a56e52a8e8 SHA512 fa05064980c47f58b6f3e3590ca94b45850184c86d79cc2f1e489222685cb38ca7c8e0e7bc7b9dceec1148256c2ae7bcf3ddc6468c6b366a4281d77c1c20b699
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.16.2.tar.xz 18531368 BLAKE2B aec2f6257ab9237097e590b70b2e8615b664576b3af2f176260f26460f4f50bb1e00c2aff477a32cdb9ebf83f8b4eadc3ccdc2df431e359904fe4375513fb6c1 SHA512 8b0d4a089a5c80869971ceeffbef3ca03f4de4f53452a9fd16cbd189e5d76c7fdef475c144848c8d657256b41e342c020e11f6acd1880dde92ed0d0e8cf9e600
-EBUILD nodejs-10.17.0.ebuild 6278 BLAKE2B df926c7b35183086ec1a51690071f91aa2790d9c85923a7d090067b7b572ca14c6f9458b213a4da0c977cc1e57c81cc4cc5cb8460958b136d4b9ec15ccdcb0e5 SHA512 96cf76a295ad2de4ec003d103cb484889ca1ab4efe829fa069424cf2dbcd9ce2e85c5e817fb188b00d7290f2a7bad388f3d21e91134dcdb8413ccc9715fbd982
-EBUILD nodejs-12.13.0.ebuild 6402 BLAKE2B 2f90c426ffd9373534fb9ff5963b7a52735758695cb52e290affcddc95dd5963ad48c2cee68569976fe072ccfd2196fde6a7a6308c2bba231da2e46c3e6c99c8 SHA512 4192e1501436e59849ecd9ca126e351c2bcbc662f41aa8e2aa639e325f5c201ad41bc5128d7132d488c82a6506144b548ad03a0fcab9fa2375a92e50e90c8794
+EBUILD nodejs-10.17.0.ebuild 6277 BLAKE2B 054543bbe4cc7f2d4afe031b9e0672376977d4d94be9d81c1b5832d993a780dcb0f667f8586f22a3bd79645a50ccef4ad4da21233b3348cf4aff212d46ed7f2a SHA512 51015e41e62c00c6312705699cb250a1d2a72edfa5208c730ecc4243022211af455bae5593207c4fb4b644139e5bc6180f2b61962d51a1a51d421dc83ec1ec75
+EBUILD nodejs-12.13.0.ebuild 6401 BLAKE2B 9987ecf443d47ba75f954e268212840bc1580ead187c40c2adb678a6011cf7b5fb5b37d8740395fede2f54413673294794f81aea9a4d2fce02e174ea58dae643 SHA512 facf4607d0bd0bf69868f3d64fdf821fea2fd263a85189264c7df899c5afcebb6040ca86f16c044fce63cc01f4d95d71ddc695fac8efc7701739f3dfad579b5a
 EBUILD nodejs-13.0.1.ebuild 6140 BLAKE2B 53b80f89d2189a92c455cfbd7f4652378feddaf693f9c33da0388b6e548214567e6c1a6ed494cb99d44b74c58ba508da194d266191eae670e7a3d53cfef990c5 SHA512 e3193d01c1c1b8c11b9b1245dd97c925b04eea96e46d61c44c6f1f624cda2b9ab4d1d0d4dc8e509a71c968fb121b25e7b5a63ca0ba9bfd8f326f227cfc1081ab
 EBUILD nodejs-13.1.0.ebuild 6140 BLAKE2B 53b80f89d2189a92c455cfbd7f4652378feddaf693f9c33da0388b6e548214567e6c1a6ed494cb99d44b74c58ba508da194d266191eae670e7a3d53cfef990c5 SHA512 e3193d01c1c1b8c11b9b1245dd97c925b04eea96e46d61c44c6f1f624cda2b9ab4d1d0d4dc8e509a71c968fb121b25e7b5a63ca0ba9bfd8f326f227cfc1081ab
 EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513
-EBUILD nodejs-8.16.2.ebuild 6476 BLAKE2B 62c1c56423c4673f9eb40717c3636cd8262d8972a9ea8cc83d24bc3b7d6bf9a62c4273ff5e6103eae53def7079b3b46ef4c25fc0a6b920de1d8b5ec6c0732dbf SHA512 723231c6e64f60c9643358769fa0f6d55f1ec5405272f89a1ab7fbb1d9e8cafc7fc388505040395c2f040a8b344b0eff1a704454a459365d25a4e855f897983b
+EBUILD nodejs-8.16.2.ebuild 6475 BLAKE2B 05cfba2143e3e752891c263a627f09f83dcd459c598f25ece09874309209c705c42cd79bbe0faa1317e31c4217b75337f24fb9453eac5bac632c2f8ced53377b SHA512 0230f10e3291640ed412fb0495dccd162c40e4a6b76cfe75f1b1386104a8fa4281acefd375f9a4d0dfa4a809ea9e04666d69b81654df34375b242d781ef28d48
 EBUILD nodejs-99999999.ebuild 6029 BLAKE2B 0be5bdafa6ad7978d491f618d27d59e1b6b8c2a4ce02a6240d522707c0d1d744a1dc743fefa646639afb2cc31aafc7e0fa7fd5c47d54e4fb9220e42d6f032397 SHA512 ef9aa58e872621f77875a4b22bc1e33d599729c4c0fbb20d5f9d2076f32091506191d0277485f6e816ef756bb606fd9d479dbab8c253b7b0bda348ca2cbf8499
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-10.17.0.ebuild b/net-libs/nodejs/nodejs-10.17.0.ebuild
index e9ac2965862f..af990b984505 100644
--- a/net-libs/nodejs/nodejs-10.17.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.17.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-12.13.0.ebuild b/net-libs/nodejs/nodejs-12.13.0.ebuild
index e76d005fd0b9..5f78ba394c89 100644
--- a/net-libs/nodejs/nodejs-12.13.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-8.16.2.ebuild b/net-libs/nodejs/nodejs-8.16.2.ebuild
index a0f60063098e..33da81a42a36 100644
--- a/net-libs/nodejs/nodejs-8.16.2.ebuild
+++ b/net-libs/nodejs/nodejs-8.16.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 8b2dd8fc3741..684762b3c5db 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -2,5 +2,7 @@ AUX telepathy-qt-0.9.6.1-qtpath.patch 935 BLAKE2B ee54f49734a52387c68c60ebd32d2a
 AUX telepathy-qt-0.9.6.1-yes-release.patch 578 BLAKE2B fd8581e60b4f526681946c7c45638c85f3a5ad0448d71dbdfd2b4a8a5f72f423ae2d8514c2459f817c9b0aff35db8c257d827e6e25f75037fd867df18fcb3e36 SHA512 c0c3e3e6b698aa5410d33653f36a1dac044054fa03830f1c78c1a1d82aa74e24ef84d4ccfc8b3ce295e655f2618aa318c863b8b49303097d5774e789efb4cc80
 AUX telepathy-qt-0.9.7-deps.patch 2017 BLAKE2B f8f0d4eb3362b1b0d4fb628dfa773bced0eebaa359340f6b95d0d37077083f90979dd557775cc5a44b74c0b78f4741b5c03b589feedff0b0d32d51f3883b6513 SHA512 202974d14ee316e713138e5ee88a5b6ec4f613af567b83ac4dc4aec8bc39dcb6cd65d1be6724189e48cccfc526ad8bd7151a7a5420a5d5f44071ccd50a0ecae1
 DIST telepathy-qt-0.9.7.tar.gz 6213405 BLAKE2B 13e2ae73bba74b4aedd55b46d0816744a4485a2a39faed610439fff40a65065a12606080012e220fc30a9d2642aba311aca6a24b540d8d22a140197911343eb8 SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877
+DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
 EBUILD telepathy-qt-0.9.7-r1.ebuild 1143 BLAKE2B fd407ea1f38641b790e182e87c953a4ede015132f92354980f48abd96d2e4c9e2b4ccf941ee234b913b09a687515d1e80309de853913c03f6eddf023d44497ad SHA512 ad539634ee8081f27018004d7ef2a145148f9fc199c3367c4108a859fd32216f785fe2934257315f6277852abcf7e7ac2ee9bc129a736ccc5338c0b713e15ebc
+EBUILD telepathy-qt-0.9.8.ebuild 1441 BLAKE2B 5dcf76dc5c26d84d99433dc915133386e8a93bd2e5733a373bc24f614ba3eec6643013f6537a8b3d8da9ec9f582afdf576f45efe885a97bf46ec264a255cb732 SHA512 792c6f4d3beafa3f3bf66aa889d599f4fd5e67f21942aae2ed8d951f27ca6fdb53fec6c07983d015e0f8b4f95dc556f8fbe5d3ce861392761be2b90373d646f1
 MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
new file mode 100644
index 000000000000..9df248fe4b35
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit python-any-r1 cmake-utils virtualx
+
+DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug farstream test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	farstream? (
+		>=net-libs/telepathy-farstream-0.2.2
+		>=net-libs/telepathy-glib-0.18.0
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/dbus-glib
+		dev-qt/qttest:5
+	)
+"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+"
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEBUG_OUTPUT=$(usex debug)
+		-DENABLE_FARSTREAM=$(usex farstream)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_EXAMPLES=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# some tests require D-Bus
+	local myctestargs=(
+		-E "(BaseConnectionManager|BaseProtocol)"
+	)
+	pushd "${BUILD_DIR}" > /dev/null || die
+	virtx cmake-utils_src_test
+	popd > /dev/null || die
+}