gentoo resync : 30.06.2019

32 files changed, 499 insertions, 46 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5ea278f9846f..cdd83340801f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 0931bd4177cd..7dc4f5a18994 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,4 @@
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
-EBUILD farstream-0.2.8-r2.ebuild 1863 BLAKE2B a5a55b2a43826d54039054763bee6f82925f18c6efdaf05e90f1fb283a13dc5031e6d8bef4c1dd1f855e0f062a45b75c20e86a3cd052f2c8eaba62cac44999bc SHA512 c8def848ed3ebfca720ad035aa7ac9d7951415bc15932fd6bde32ce0f7e70fb68ffef840b299dc172ec4c71c8ea2c11e2c54afff17b0d477169463518017ab42
+EBUILD farstream-0.2.8-r2.ebuild 1862 BLAKE2B c84f9e1295aad464b4d88dff371a5eb51b893c704ccc6abf28c8a91fa433d0a39cb98c99d772c9b7ca4049db08b0652e6b1bffa618bfccd20eb8845d0422fc39 SHA512 283858e7dfc25dda7b37e92baf3b64eeb53f1b4c5efc3ac68bcd9becad097a8e524860dd95d51cf8204cc729d6fa5605ab110c0fde221b1f3f93b95a87a75abc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 66460a2d096f..d7667bd81524 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index a19fb5b68ff0..af93198bcab6 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,3 +1,3 @@
 DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
-EBUILD libbloom-1.5-r1.ebuild 546 BLAKE2B b456b74c3cdf402a327734716cf2547d232277b9a280b1f77f22735e9e40bedb246c439f1122ff64bcbd99d352b29ecba28ec281a2a5da895703abfe897efdbb SHA512 36f2d61b296fb01d533e7038b3efa3ac582de7d16c4501d60c6c6de1e04adea5bd5f2535b7d3ca803429c3ba6f2f47bc1832b527bbaf60a254e885e71258ce3a
+EBUILD libbloom-1.5-r1.ebuild 558 BLAKE2B 9cbdaed054ecabfe74c7bc1a055faeab93ad354e956147dbe981ef06f8bc3ad99203a5125edf6337ebd4630bb81a618f5858c764529fe12cba09367938e5d765 SHA512 4fb9a57f55112108bf17b9dd587a56631985d2d828fb3038143826217acffc9d31c7523e1813c352c0ac9879dda5a6036ae48fca4b4f87601320c61b18ffa1a0
 MISC metadata.xml 321 BLAKE2B b9276958b83d4101521b0946b8cd6db70acfc4e7257fe1773cf0e85a1f6d9434c2d27022f3628578aad4156fedafd635f89c273b09933918149491c96918d207 SHA512 c744f0f8c72f05d96c85a7dade513d5aae40413450902b66d30a0eff88c92e4f9bbf2a1f0ccfef29bef817115dd85ff7ce4386592a25ee9f5e492a398a9ff4f8
diff --git a/net-libs/libbloom/libbloom-1.5-r1.ebuild b/net-libs/libbloom/libbloom-1.5-r1.ebuild
index 7e255245ef90..54311fad4a44 100644
--- a/net-libs/libbloom/libbloom-1.5-r1.ebuild
+++ b/net-libs/libbloom/libbloom-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-libs/libcork/Manifest b/net-libs/libcork/Manifest
index b4ca6c35ddf9..8de15cc1b466 100644
--- a/net-libs/libcork/Manifest
+++ b/net-libs/libcork/Manifest
@@ -1,5 +1,5 @@
 AUX libcork-0.15.0-git.patch 539 BLAKE2B c3b50675afd74b3bd5c5049bf311ccf33dd4fc257bb4b9ccfb50007bff022ec9c260de0b507dfcf2ecd3ce3036e00fa1ef52f0d437003e6c2e5c52a8de3daab5 SHA512 2e32bd6c53c9fc3f7c27344a724138e5f3073a8d6f5b63a30cd86b48bf430a63b70cc0a2fdb93000f944cbc12655d12926c01ba374ec52e12cc126712fc41442
 AUX libcork-0.15.0-version.patch 498 BLAKE2B 15fbafc607e6a3dab0376ade883db9a783b1490b7a9063f1d3d815149198caf962e9375ed752fc077a5bf9a5cb767499071cf2aab8bf29a912024bac6eaa33da SHA512 1a0a0cf02bf51423760626a3e886c36b3e58f02cc09a5898313c185c339f08194b4bc9e118d8546aa8529d2a3047faecf85dbcf7a9097d0422b416306db05222
 DIST libcork-0.15.0.tar.gz 182736 BLAKE2B cfabcf4b040d3d2796511b5d7dce005fcff9bc6704dfaf89ea9eac36617b0c544e932ab3e12c0b06e4e3e916c50da10ba26401527a8e83bde523b91b911fd6da SHA512 8f41cce2101b96707068a21e5bd0a43c23f996c3620e7dd36621ed4bdd3f92851a92ea56ed92db40d7d8fe55ddfbdfcdaac4d2c8b2fc6cb3b1abe3b0e74c6a75
-EBUILD libcork-0.15.0.ebuild 710 BLAKE2B 3d7488a76ae382802bed5a646c1d389e3dc0f88e10f4bdd6899bcb5590c35aa83d4f6ae19ecb957cc6b54bc7658ad3b24390bf80cc931057992f263b22f2e076 SHA512 17980b953ca8fd4ddbd976ed76cde64c4c5b3c387f955a6917bfd682641ad1ae3950df7c3ae2b01007ae6c0c36283682d2fe03d16e83a26509586665268d75b4
+EBUILD libcork-0.15.0.ebuild 719 BLAKE2B 978d3df2aa767ab574ce54efdf08801a0779eee4f8ddc9521b734de8bbe41d844481308fb3bcf08a2afbc53e246341888bc417e0427ce47c50f42517148e006f SHA512 7198a9ba11c06c326321e59467ef51e8512944e3e352f7cc94ad272ce4d7039ae22891e97c482c6f7e126cb3f47ad07b1931c9723e3a6b7aafb787d685a2c05a
 MISC metadata.xml 321 BLAKE2B 413fda934011eb441b90050b4b07cb32143b70be324588f93a2d34076f67e65dac26bbfac264155c62d03a8feccfa42e14e33f80dcbc3c92d9ca8606a57ee108 SHA512 b51116388b073e857b090b791063df90c082fb7268ae80b594362e84999e4f22de11636dbb8abc9d214f651799cf1385905706de5b875c9fefdcc3c9cbc09594
diff --git a/net-libs/libcork/libcork-0.15.0.ebuild b/net-libs/libcork/libcork-0.15.0.ebuild
index f31843ee66bd..0db7956e7c1a 100644
--- a/net-libs/libcork/libcork-0.15.0.ebuild
+++ b/net-libs/libcork/libcork-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dcreager/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/check"
diff --git a/net-libs/libcorkipset/Manifest b/net-libs/libcorkipset/Manifest
index 0be312d5faed..83ace396a7da 100644
--- a/net-libs/libcorkipset/Manifest
+++ b/net-libs/libcorkipset/Manifest
@@ -1,3 +1,3 @@
 DIST libcorkipset-1.1.1.20150311_p8.tar.gz 78188 BLAKE2B cb32200a522c69b440963b11eb45e04a4ebc13a42e0067b51ffbbaa9ed15bc91e6dd4c58e6f11028f9cb309b63660e5a3bf33426157bedc6e4ddea626eb2450b SHA512 5bbce2727da1665e734981959ecb253b4052d8cc6c426fded7e1678b6e2505bc9f4c0ab3cd3b6a03f834f5e20bd1d670cc19f7491fe0ad5b7cb772e7309f5009
-EBUILD libcorkipset-1.1.1.20150311_p8.ebuild 939 BLAKE2B c71553ff16747dd727993c9f88a444a6c4397c7ba4eff2aa839b2fc53040d6aa7a367c2511661868673659025c317731480788d8e1071e1980846e7e37a659f9 SHA512 9e7ebba1a893828e01fd138c896f7dd2f03e9b9db9721eb8eead4e20659170dd846e5242ec8e082a43bc7236b7eb561fcf866fd5a7954b5ea921124e9006ecf8
+EBUILD libcorkipset-1.1.1.20150311_p8.ebuild 948 BLAKE2B cce70bba8698cfb37a289b46a5f44688ffe197894e2c4668af7c3369fb8256886de863c65ba6ab4eb7bc78d4b68553b4aa6f3f9019bf4ce22cccbeb50ffbb44a SHA512 1f3fa4e847c30d329fbf016761f1aaae41d821e848ab6a61dc18a0e67b80977a4fc01d71a88e4f542fbac7efc6414814e151f7015b6e4f9ac88cb68bcdd50553
 MISC metadata.xml 325 BLAKE2B 00a401def99d5194ebb97f6bfb763707aab6b7f53ad4f799af4f5f230de2ff17868f912ea2c728af2dc7c25060570af8824704107c6f2234524eb9b356387995 SHA512 6a8689c85274319b59094d6f31848c52de259f52905d1715024b70bbc96ce5f36ca88e5527bc9b3668bf9448e8233c2dca23233d0554c4af9315884bc14f6799
diff --git a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
index fd8b1f855364..93acbfa1f31b 100644
--- a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
+++ b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rogers0/${PN}/archive/debian/${MY_PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="net-libs/libcork"
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 3f33a1a2a87b..4d7c41f37580 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -7,5 +7,6 @@ DIST liblockfile_1.13.orig.tar.gz 67720 BLAKE2B c42248c652fda4604a0b4210f77046c2
 DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
 EBUILD liblockfile-1.09.ebuild 1235 BLAKE2B f94958382f638b3008f82463dcdb9f06a1a334037225bf9fd31ca8eade804c5388c04cb03a1870cc2ee5e79266d859bb069cd855b60946dbdc6e3ab31569bbcf SHA512 f00ce50747bb75a5818b95c4e7e87750d4b891c2e22d89e4c71c64bbef8b804836ce766cc30cc4fe4e29100fed1f3b781b5524e09528cc71cec29c35f2b45a73
 EBUILD liblockfile-1.13.ebuild 1117 BLAKE2B e9b3beca84c51bbdaacd84d8d793fa7cfa37b1fdc3e019f5a607006e146fb3dfd33ea66c14d0bce9803fedaa93fc564093a7d71173e6ae60bda3f9b43cbad08c SHA512 eedaf954bf3c317ac9e5daf3b66ffa07e52e0bcd96377154d88e46f0ecd6d653d7cb2449571e25aed490042b3b7658b00113cdd57432cf8ebbdeb674f79c4fc0
+EBUILD liblockfile-1.14-r1.ebuild 1123 BLAKE2B d6145f76e220a572bf1e0177e7fe85158f9be2c24f7f77e7c2e40fe7a2b82c17978b39bbac76e7ba1a3aacf33777bd07145dbf79b5aefca4fb07ec2f590da0a6 SHA512 20d5bbea8f730c2024452abc67cbbb31e078822444c33c39d2524a79dd421da0239262d53c648b543cd75ecf58d8b1c7a5727a1d216261851c646dce766a64e9
 EBUILD liblockfile-1.14.ebuild 1117 BLAKE2B e9b3beca84c51bbdaacd84d8d793fa7cfa37b1fdc3e019f5a607006e146fb3dfd33ea66c14d0bce9803fedaa93fc564093a7d71173e6ae60bda3f9b43cbad08c SHA512 eedaf954bf3c317ac9e5daf3b66ffa07e52e0bcd96377154d88e46f0ecd6d653d7cb2449571e25aed490042b3b7658b00113cdd57432cf8ebbdeb674f79c4fc0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/liblockfile/liblockfile-1.14-r1.ebuild b/net-libs/liblockfile/liblockfile-1.14-r1.ebuild
new file mode 100644
index 000000000000..2e058d9d5a44
--- /dev/null
+++ b/net-libs/liblockfile/liblockfile-1.14-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib user
+
+DESCRIPTION="Implements functions designed to lock the standard mailboxes"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="acct-group/mail"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( Changelog README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13-makefile.patch"
+)
+
+src_prepare() {
+	default
+
+	# I don't feel like making the Makefile portable
+	[[ ${CHOST} == *-darwin* ]] \
+		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
+
+	eautoreconf
+}
+
+src_configure() {
+	local grp=mail
+	if use prefix ; then
+		# we never want to use LDCONFIG
+		export LDCONFIG=${EPREFIX}/bin/true
+		# in unprivileged installs this is "mail"
+		grp=$(id -g)
+	fi
+	econf --with-mailgroup=${grp} --enable-shared
+}
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index ee7602420bac..0be70141c464 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,5 +1,5 @@
 DIST libndp-1.6.tar.gz 364406 BLAKE2B 616bad28a38f40b32446431ada1ad786ea09e5fe8e58fe9d4944b2fc36ab7ad44258f9fb7b8cabcea47bfb366de3a4a93ef2bd1d032896f60cc35ac92e9c8438 SHA512 ad2df92c5b908f5c40e6e1920195ef97d560b667f78dd4ba5b5418d2dc294a69357fa704b9137f76a4d1ab473f0ec5f1bc4644f25f6a3f0802b75b961638be22
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
 EBUILD libndp-1.6-r1.ebuild 565 BLAKE2B e6c1dde7773367b73701af74d37c91cf5d1c41ac509cdb06d9649be49f4addf4bd178f92ff21d689028260a917fb54388aba8b235a7b3556894cdf564e64920e SHA512 c4d41e8490f65cb6703a9831c7be6b9e097ceab8373dd3760adc855e967dca6f0523e03864f6c9048197fe458d23e206e25927dbb4080339e8a6d761b498bf7b
-EBUILD libndp-1.7.ebuild 563 BLAKE2B 8353396a850ff244de413085b66d09fd80142bfe86fd428bfbd6d424266e46ee79f800a35b75fe573a0aeb21e76582a2b70a0f0c0e391236b425ba625abc5fc3 SHA512 bb1b1f0b08e97cc14d9426658e592994e372a63c90f65cd4337fdcb3d186e0e47380bee5823a8624d1915a460177d9b060f23f5fad006fa25193a11666dee187
+EBUILD libndp-1.7.ebuild 562 BLAKE2B 9ec3b05cf434a2bc02d1017941b02c6f7e80bf83e2dda1d4ca2c5010cafab4d00da3ba5fbf336dca8a259893188b251fab11e4cc9eedd34023b3a9fedb8aa299 SHA512 880e971b2904e069a414c6e09ff214f849793802368b46ca5af579368c76bb91e47077c102b02c9210d75cd9382ca4c4b8c71f9929c4c627654a81b3e4408c9d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libndp/libndp-1.7.ebuild b/net-libs/libndp/libndp-1.7.ebuild
index 7e1914dfad6a..e994ce65b625 100644
--- a/net-libs/libndp/libndp-1.7.ebuild
+++ b/net-libs/libndp/libndp-1.7.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 8cb88670ac4b..38077799ef9f 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -3,5 +3,5 @@ AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD libnice-0.1.13.ebuild 1566 BLAKE2B 4b5dcc470188b8fba4435ed7be47dacda438d59821ecc69f5f6875572d91b3bc6a4039febb7d2c241674122b6db0aecd1dfcf2c15a226bb144850d7b403fefb4 SHA512 85220da97849a1202ff57fc6864011bc5d6c7e2ebccdc7ca98a852af08defd5616dd55bea86cd101c60dda24444258d51374124ff2ce52c50f47a6dd7c0b0137
-EBUILD libnice-0.1.15.ebuild 1761 BLAKE2B 11762da2ae453287fb825d3c4bb8c980baf95b7b403032d99bc0009072ce2aff1cb940c36d894875668eb10ad6feb1da65cc400bd1d4744b588e64d8fa74bbe7 SHA512 b442ef68e6273a47e41704196b52072c1098555dd9ed34d4fcadabdc224ed57248f4302adf0506673f64196ff899d4d2a07476a5ba349ab69fbd0e06db17a776
+EBUILD libnice-0.1.15.ebuild 1760 BLAKE2B 90d2176fd0ec940218b20455e8c7aee3ef407085e079b212d403e0ac3f90ad48521d0b1b657fe6e72697b2a5df4c48b4d3771b8859ebbb742c69edc5907c14f0 SHA512 e7808dd4da3d3825b9d01e6fb292b214b120526dc4e6f0b43db34b7755c414b82f8f1ec14641df724baa6f5f1d89e12b56d78786f5288baa6662fc2b83198071
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index b55e0f857ec8..44edc672362f 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+gnutls +introspection libressl +upnp"
 
 RDEPEND="
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 967024d766f7..e93f9047332e 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 EBUILD libpsl-0.20.2.ebuild 1473 BLAKE2B c70153f34bd9da55823c004eb61fd10cd9f91bd04b55ad33d528d37dbd4bf32bbf3eb6b117adfcc1933099ea09a3f6ce1b490342386054662f7a9f97fc125699 SHA512 32ff684e4938c070a09ecf5410b35e50131716b4e694c798c6b7a9e6cbfb86d3145ab9b78ff7c2469bac74e43c579a131d64ae5dee4002723c15d46431af307a
-EBUILD libpsl-0.21.0.ebuild 1485 BLAKE2B 2813c21e0ff4aa834c4abe697431e1126a7bf89bac2dca841dd0f24911b04c5ec5d018b585c35161be559379e4d9c36a82e0706afd858ac837488938f6a16b71 SHA512 e81c78117225407a2e2a3e362af02e9d7d905cf467278a9528ad7dce8a043a433c2b330e928b06d69a9f0c2d6f96a4e1f4376d0b293a376ac1b945b98f625b8d
+EBUILD libpsl-0.21.0.ebuild 1484 BLAKE2B dd6194fd4dc07d3dc324bb15c2a02b07fbb7c7df4692f04ff3070c5b76dc21e0b2baf9bd2d369e1f026ed883fc86ec89928cba2044c8060baacc32db7d1fd734 SHA512 d34cf5d5bada00cf56b9fbb165c38befc8033d4ef96c7fe45a2e5cd76dc2930b985cb3cee0298010c868e99afd757c8311dc872b9c32c5e7cd5f0fbcf5f08dc1
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index ff49d7e9592c..79712b3ad634 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv s390 sparc x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 791ffb1f1d93..6668762a8397 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,5 +4,5 @@ DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 EBUILD libsoup-2.58.2.ebuild 3011 BLAKE2B 6bb09cc7a247550ac1ef0fbc82b3a6e2d0fe421174243f12feabb87dda992b305ef0aaec2fdbc99a13eccd1523ed98f46bfe175598907f30d9365034ad6c3fd7 SHA512 98dfcd612e875658b20e590875f0ffc016fed4f4da998d38954a6fbd5f8817c0d95819343d567432b682dadb152299d826f8d65aa36714de091e4aad8c20e8aa
 EBUILD libsoup-2.62.3.ebuild 2922 BLAKE2B 8b7f012a12a0a6d6ec723a5d8fd74ac57bc5c734c2dd4c65fa51ac6db657f4a286a3324509c4490fe97b9e5c8f0834d8116285392bf643349bb398bffb8c406f SHA512 c70d71b679159df7cf00829cd13e68f8723e054ef3bb3ddcd131008ce699317fb5a7e9a0a69cc4381746441555b2f1dd78c78f1528e39cc38315d396054cbcb0
-EBUILD libsoup-2.64.2.ebuild 2751 BLAKE2B 4a61b9678da7a114c730bc78eee4635d388b8647c6972c0786345331f1aa54055485986e392485a6b64c25b28906a110b977af2b7d04dc777d7a6eb60b57df0e SHA512 c8e39d3c8a5798e7e59801458abbaaa2cfb572065d7382601a449d03c726225b424b61eaa5b358b84d7935ec4990cc142bce14b689f3fe8a3c540f6d5d98e356
+EBUILD libsoup-2.64.2.ebuild 2750 BLAKE2B 626b679f6369cc98800ed9e88297111930a429db7fbc939e85703c8b7fb97ec1ff9433f61fbb679b2a98b891aba7cfe0aaccf3d3716d496b9e5ba5e7f15c8787 SHA512 c8f782fe558b5dd548ff09c7203c7a7d7eed178f388878a35d7db7dada191a6c5ec8b7b33f2e40d822446ed487493674d4258dd9afe212cbb9d8633b45430b64
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index 0bd805b962a3..eef83bebe3c6 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -16,7 +16,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index c75b9d01a4cb..159f8303c513 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -2,7 +2,9 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28
 AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
 DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
 DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 8ad9455d81120726434a418abb74bfee53279040541cda50117909d43088ea992b9dbc7164b079dbe970b4348b967ed0d3f6352df98f60d1e6d9f14a086b5a40 SHA512 13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5
+DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
 EBUILD libssh-0.8.6.ebuild 2937 BLAKE2B df427590602299e1c2fb18583c83d554f083db3ad474307002474793313a0aedf5d2108ad8116934fc4ebcc748391d16d6fab87f42b42aa56ca659031111ec26 SHA512 a7fe530b3714b126fab464b0acff0cb4321ea9c2594f8862eb184b6378a5febcf93042a6a18e329e3f5d39891ef335f2f9aac783ab4485ca6d9c18359a7a5f71
 EBUILD libssh-0.8.7.ebuild 3091 BLAKE2B ebd0ec869401d1dccab35911777e785afa7700969bd2ac0ca4f9e8e53685b36f0f4af952e1544a77fadd3708f5a5e7f4811a68ca35a87168bf7b0920dfe938c9 SHA512 930688de59ddbef12c114005e2e7e5cc39b3b1066463433a68486030d64ecd43382d2483fe0eb93f7378849a111bf37d5a05d8c4e4f4b2b78e7417a206a2994a
-EBUILD libssh-9999.ebuild 3090 BLAKE2B ec389c91318025f582a7639e6abf61082d8ffeb81c91e861100ccd13dc13ff940710379079165f826524ecd761fecd29cd0e09c5a789e473a262a95eba01eace SHA512 2c8a24d0037737ee7125e505ff8e4c0a0a256e42ebd5f6ed0544ff8c171e1622bbdd2ebf07547a07e337fae3a225fbc1037979287f5edb399dba0a58fd88782f
+EBUILD libssh-0.9.0.ebuild 3130 BLAKE2B 1d2083b1ba792c5e2e4309a2d9538f2c338a2e861d6fc35c57fe17ef6e1cd05295b4a2cf14e07efdc47f6425575fe2844c150bb9dabfa6a4a17178ea8103b343 SHA512 6f41f5577cfbe3937cc8e155f2b8ab623d648a6a3b1c45839d955208c67cb74fb8102c10feb801f803c715b8f0c1fca77e4a5e63e1f9de1b12ab525724c7ec6a
+EBUILD libssh-9999.ebuild 3130 BLAKE2B 1d2083b1ba792c5e2e4309a2d9538f2c338a2e861d6fc35c57fe17ef6e1cd05295b4a2cf14e07efdc47f6425575fe2844c150bb9dabfa6a4a17178ea8103b343 SHA512 6f41f5577cfbe3937cc8e155f2b8ab623d648a6a3b1c45839d955208c67cb74fb8102c10feb801f803c715b8f0c1fca77e4a5e63e1f9de1b12ab525724c7ec6a
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
new file mode 100644
index 000000000000..19777b48ff39
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.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 cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
+RDEPEND="
+	!gcrypt? (
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		)
+	)
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
+
+	# keyfile torture test is currently broken
+	sed -e "/torture_keyfiles/d" \
+		-i tests/unittests/CMakeLists.txt || die
+
+	# disable tests that take too long (bug #677006)
+	if use sparc; then
+		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
+			-i tests/unittests/CMakeLists.txt || die
+	fi
+
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_NACL=OFF
+		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
+		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
+		-DWITH_DEBUG_CRYPTO="$(usex debug)"
+		-DWITH_GCRYPT="$(usex gcrypt)"
+		-DWITH_GSSAPI="$(usex gssapi)"
+		-DWITH_MBEDTLS="$(usex mbedtls)"
+		-DWITH_PCAP="$(usex pcap)"
+		-DWITH_SERVER="$(usex server)"
+		-DWITH_SFTP="$(usex sftp)"
+		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DUNIT_TESTING="$(usex test)"
+		-DWITH_ZLIB="$(usex zlib)"
+	)
+
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
+}
+
+multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index d88693448ce5..19777b48ff39 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-MY_P="${PN}-${PV/_rc/rc}"
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -13,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
@@ -43,8 +42,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS README ChangeLog )
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
 src_prepare() {
@@ -54,34 +51,34 @@ src_prepare() {
 	cmake_comment_add_subdirectory examples
 
 	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
+	sed -e "/torture_keyfiles/d" \
+		-i tests/unittests/CMakeLists.txt || die
 
 	# disable tests that take too long (bug #677006)
 	if use sparc; then
-		sed -i \
-			-e '/torture_threads_pki_rsa/d' \
-			-e '/torture_pki_dsa/d' \
-			tests/unittests/CMakeLists.txt || die
+		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
+			-i tests/unittests/CMakeLists.txt || die
 	fi
+
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || die
 }
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
+		-DWITH_NACL=OFF
+		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
 		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
 		-DWITH_DEBUG_CRYPTO="$(usex debug)"
 		-DWITH_GCRYPT="$(usex gcrypt)"
 		-DWITH_GSSAPI="$(usex gssapi)"
 		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DUNIT_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
 
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index b7b37f7cf305..515519aa0952 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,10 +2,13 @@ AUX libssh2-1.8.0-libgcrypt-prefix.patch 1026 BLAKE2B da1ba552aafecb1b950bc8d5d4
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 AUX libssh2-1.8.0-openssl11-memleak.patch 823 BLAKE2B 3d2abd43798a23b551ef5ba97b705f8e8e24db010a19a2387efe10299e436e0dbe655db419fa8da1467aed18ec2bb39e1d863eb981603afecb302700c565159e SHA512 d93ee0b8ea5f37b81883ff79fb7d2f19633a4415990de1743f1388f49f7897be200ae0911b6ca14d505498294727aa5542c7d76a29e7b8df0051a53e6dcd586a
 AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d51065ceb9be22e450984aef9dea0a59b5b93cac7498e3c3e9cf8057ac13dd93330bc470bd717c9a06af9d9294ef7172eed SHA512 3cfd11ef23884a3de173422e001b0ec0f9af48c832948b5d0f90f0be2008334c30ed769a642786cad9aa68ea445b66780b10d3c64434178978018e709510deab
+AUX libssh2-1.9.0-missing.patch 4796 BLAKE2B 185428de9298fc210c30a1b826b958ebde761a6b258d2b6a79c2162533c81c6f9dfa5a1c574b239067a7bf79bda36656498cea78b0da797579b5cb6711a6dfe0 SHA512 65d75ecdc041cfb627c49f992804201dc234ba63558e2cbac066efbe0c4de03900668f61f87674ea9ef5beeb217d82cb441018f11e703545ba9349a4f05c8ae6
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
+DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f SHA512 41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
 EBUILD libssh2-1.8.0-r2.ebuild 1647 BLAKE2B 47a2d718a0a2bf40f31fa3a3251ddf64e44fdb2823b61a3c10b54cf34c41af01adc3831b99f25a8b012cf7ce54a0120d4216dd3c7ec9921b48df15d29d542561 SHA512 43bbf761c4075cbe523b1b5ab247ef7e69c800f529ac41981ff61cf53a0c37b3b2b989cd9a08e7e709b9ddc0cb9d2a86f31e7930b96c95a0e5857aadf2a3eda9
 EBUILD libssh2-1.8.2.ebuild 1637 BLAKE2B c1ee43a0355c0f6fd4d761355c9a10f2ec70ff5b6dcdd175ef5162a852921e747ddae104d429536978fee57042764155bc8785ca3c15d9d3462302ff978be4dd SHA512 772baee7fe1f82db778da86c7cd7490e3d2a5843eb130aef310b5ebbffaa317d55aeea1cfc17ed71ab3e467209edbe2f5ede66482337028a1ddf2b780fe3011e
-EBUILD libssh2-9999.ebuild 1350 BLAKE2B 4c235624aeef7721a3488a1dac91d406f5f83b8e7b1482bdddf7a71f0d2ad19c0124aa64b00b228d713a5da0c394accc9d3dce19374d588256e2905139176b64 SHA512 e12db58e8a20272414575ab19378dec2ecb2c97aa79d3f8d4397ec9638a2377d9218f21302c2c56af03dbc8620e807189b50442cb8d86b3b50d9c8caf15d717a
+EBUILD libssh2-1.9.0.ebuild 1431 BLAKE2B 6caea62b094f55ac37a13f3c9b6cf03d99a327d2be46fdea8f9dbc50f4ce2cd590931188a7c1bb9e408a32c919a5efac26c5af25f5022cf3c1353da769951211 SHA512 9ebf32223963a62259bd085818fce1e4594af9b21e41773ed822cce02ad84594a18885e623a4d011d3a0da38bf391a35ed16ee1160b965387f1d028d167e5f21
+EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
new file mode 100644
index 000000000000..7cc58d239638
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
@@ -0,0 +1,181 @@
+--- /dev/null
++++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
+@@ -0,0 +1,37 @@
++#include "session_fixture.h"
++
++#include <libssh2.h>
++
++#include <stdio.h>
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *KEY_FILE_PRIVATE = "key_ed25519";
++static const char *KEY_FILE_PUBLIC = "key_ed25519.pub"; /* configured in Dockerfile */
++
++int test(LIBSSH2_SESSION *session)
++{
++    int rc;
++    const char *userauth_list = NULL;
++
++    userauth_list = libssh2_userauth_list(session, USERNAME, strlen(USERNAME));
++    if(userauth_list == NULL) {
++        print_last_session_error("libssh2_userauth_list");
++        return 1;
++    }
++
++    if(strstr(userauth_list, "publickey") == NULL) {
++        fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++                userauth_list);
++        return 1;
++    }
++
++    rc = libssh2_userauth_publickey_fromfile_ex(
++        session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, KEY_FILE_PRIVATE,
++        NULL);
++    if(rc != 0) {
++        print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++        return 1;
++    }
++
++    return 0;
++}
+--- /dev/null
++++ b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
+@@ -0,0 +1,38 @@
++#include "session_fixture.h"
++
++#include <libssh2.h>
++
++#include <stdio.h>
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *PASSWORD = "libssh2";
++static const char *KEY_FILE_PRIVATE = "key_ed25519_encrypted";
++static const char *KEY_FILE_PUBLIC = "key_ed25519_encrypted.pub"; /* configured in Dockerfile */
++
++int test(LIBSSH2_SESSION *session)
++{
++    int rc;
++    const char *userauth_list = NULL;
++
++    userauth_list = libssh2_userauth_list(session, USERNAME, strlen(USERNAME));
++    if(userauth_list == NULL) {
++        print_last_session_error("libssh2_userauth_list");
++        return 1;
++    }
++
++    if(strstr(userauth_list, "publickey") == NULL) {
++        fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++                userauth_list);
++        return 1;
++    }
++
++    rc = libssh2_userauth_publickey_fromfile_ex(
++        session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, KEY_FILE_PRIVATE,
++        PASSWORD);
++    if(rc != 0) {
++        print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++        return 1;
++    }
++
++    return 0;
++}
+--- /dev/null
++++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
+@@ -0,0 +1,97 @@
++#include "session_fixture.h"
++
++#include <libssh2.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *KEY_FILE_ED25519_PRIVATE = "key_ed25519";
++
++int read_file(const char *path, char **buf, size_t *len);
++
++int test(LIBSSH2_SESSION *session)
++{
++    int rc;
++    FILE *fp = NULL;
++    char *buffer = NULL;
++    size_t len = 0;
++    const char *userauth_list = NULL;
++
++    userauth_list = libssh2_userauth_list(session, USERNAME, strlen(USERNAME));
++    if(userauth_list == NULL) {
++        print_last_session_error("libssh2_userauth_list");
++        return 1;
++    }
++
++    if(strstr(userauth_list, "publickey") == NULL) {
++        fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++                userauth_list);
++        return 1;
++    }
++
++    if(read_file(KEY_FILE_ED25519_PRIVATE, &buffer, &len)) {
++        fprintf(stderr, "Reading key file failed.");
++        return 1;
++    }
++
++    rc = libssh2_userauth_publickey_frommemory(session, USERNAME, strlen(USERNAME),
++                                               NULL, 0, buffer, len, NULL);
++
++    free(buffer);
++
++    if(rc != 0) {
++        print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++        return 1;
++    }
++
++    return 0;
++}
++
++int read_file(const char *path, char **out_buffer, size_t *out_len)
++{
++    int rc;
++    FILE *fp = NULL;
++    char *buffer = NULL;
++    size_t len = 0;
++
++    if(out_buffer == NULL || out_len == NULL || path == NULL) {
++        fprintf(stderr, "invalid params.");
++        return 1;
++    }
++
++    *out_buffer = NULL;
++    *out_len = 0;
++
++    fp = fopen(path, "r");
++
++    if(!fp) {
++       fprintf(stderr, "File could not be read.");
++       return 1;
++    }
++
++    fseek(fp, 0L, SEEK_END);
++    len = ftell(fp);
++    rewind(fp);
++
++    buffer = calloc(1, len + 1);
++    if(!buffer) {
++       fclose(fp);
++       fprintf(stderr, "Could not alloc memory.");
++       return 1;
++    }
++
++    if(1 != fread(buffer, len, 1, fp)) {
++       fclose(fp);
++       free(buffer);
++       fprintf(stderr, "Could not read file into memory.");
++       return 1;
++    }
++
++    fclose(fp);
++
++    *out_buffer = buffer;
++    *out_len = len;
++
++    return 0;
++}
diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild b/net-libs/libssh2/libssh2-1.9.0.ebuild
new file mode 100644
index 000000000000..12ad74fa242b
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org"
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl 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-missing.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/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index d1797b7dcfa7..5bf05457d9ad 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 cmake-multilib
 
 DESCRIPTION="Library implementing the SSH2 protocol"
@@ -53,6 +53,4 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
-	mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
-	rm -r "${ED}"/usr/share/doc/${PN}/ || die
 }
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 828605cd17e3..bf797ce7f4d4 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,7 @@
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
+DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
 EBUILD miniupnpc-2.1.20190408.ebuild 1335 BLAKE2B af06f563e38a3fc50bdc673bbb39fe7d1d3892d92ba7b136db18f32d78d5d0d501a4f22c3166070ca64ccf70d068d663ae776e72a8a2b51f18d4609476db682c SHA512 5eb85d7c2c75eedf2c964dc4d552a2b53c6b91989858e3e770d0b68abc91c3fb91fc387bb7d6080a9c818e79587e23628785161980787670704ec99a78111e6d
+EBUILD miniupnpc-2.1.20190625.ebuild 1342 BLAKE2B f12bd5c9837665f4d53fcffb68dd94886e5a526d84e48414b7c06f1a227c7508a73cc582060edc2dc9be67a54d5404182c03cb89c30ca556de0e9ab9c97726ea SHA512 e28384448ff3a40f5e71625073fab0fc2b0a1c4c5a10e545377df60ca89b9d1c497677b34c1571c6f7696411498bc38a1206c66b94f3f139a37380324a72c43d
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
new file mode 100644
index 000000000000..daca72280309
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index b2228b7ad085..4f7ee9a83aa5 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,8 +6,8 @@ DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e847
 DIST node-v10.16.0.tar.xz 21480088 BLAKE2B de91e718893aa0bb87b75225a484281370ca1054fed919d6177911ca8e57228a0925c077a02397efd05594f72438d47b264d6f4b91623173e3a577a58a5d86db SHA512 df197c7b929fe1e0acf0334dbeb45be4c0cfa3266f9ddb513eafffcd6405bc02cba2fcbd34a7a5bef2e45a1d61ef3734ca0afe7295904ed563744fe06751cc62
 DIST node-v11.14.0.tar.xz 22106812 BLAKE2B 3a8dd9feb5916f235bf69d0610e32c1861e64f427b6de5ec27b3634268f273826f271cf5ea821042420d3b3f348124be2ce2fda13d0addea092db1338c9f95f7 SHA512 4e8033ea0f326fe5a8372c81771cd58242881ac7db905f697ce79ef9cb3ba2dfe2b94fb24a36775761c72ac531096c5e18a8574f933d76c1b652b18419b25446
 DIST node-v11.15.0.tar.xz 22115480 BLAKE2B ed1f621e46d24051f8d84255875e7cb2c1bc0f9432a12fcc35dc5e336a71bb3e7f511146d112d1f236f9f978a68987d80331c22699479ce63b7bf30e50643219 SHA512 48270620fab3eef86c21387b316ce9054e2b0aac60a36f7fc08d18ad4a11c8d2082886ca20a455fb4a74a561d7e97c77403227ec9a83a13c47fa230b47a5af2e
-DIST node-v12.3.1.tar.xz 22462972 BLAKE2B f28b5594aca3701735a178873ae426ebde27a6abb5b13115c6ca2a32bb2e2532f60a96722b07737246bdf8a1dce799e86f920a355278ad8619d9931319a6e81a SHA512 40e05550d48b0b8739fcd6ef66a70e53e85106af486c2f99aad58fe10c8f33e5473ab5afb59849960ce828f5c8bb21f26cecbbfb31852a2f2c6aa3916449b44d
 DIST node-v12.4.0.tar.xz 22479676 BLAKE2B 86abd574843a8aa8a17fed378e3041288eea1f41c51f0613150129be9bd38ce83e88dde884cef81fe84f746f47f027ffe37bc07773112c4a9b1a3b12ffd40ee2 SHA512 04a9eeedaef2c151e993d9ca3d43d56d85e24b5f5d04fbee1b4556d192badb3e4f3c735dee58abf0a43775d2de335f054e23aedae48140148e2466245311d306
+DIST node-v12.5.0.tar.xz 22565576 BLAKE2B dadda02d43d63f69b387c81784d76d756f0c132abef7746c9a36f5fe3fcdd3d74d9ef3fd5d8d3afd7983f28f9514cc981bfc48dff9fcd155ad002e4ef012aea3 SHA512 ae1133b6cb0856c10a081dee1f8b21f279b366f99efd6dcd24b9768b0928088ef89c3cd34ed5dd683459d30cbb54015e20616d8dfeda4a522f457d23f80a2f8f
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
@@ -18,8 +18,8 @@ EBUILD nodejs-10.15.3.ebuild 6442 BLAKE2B 8ae691a1aa9e3a2eeec5096c5890fa6ae2d877
 EBUILD nodejs-10.16.0.ebuild 6444 BLAKE2B b2b9b7389dc48866543b7bbba9745587e954309160d6158df1339116a67e0cd7a74c0ff4cdbc024d90f4b26f731b3b4ad42c294f792550c110ac32e7df832169 SHA512 ae9b06ec1e04fd41044a8f0dad681df222e7384ca9fd01b461e475d0b60b88b9b9481303a6801c085d1ee31d1a9bede849dd35927fe99b3d96a2aef321e8a997
 EBUILD nodejs-11.14.0.ebuild 6486 BLAKE2B 9098ad26511d8d268fb0e1073f126570374aa3c6b81d0a69944e21da7d2cf6340a9df14eb30296f192dbac31c3c8574128f500055e2370f3ee5f5c3e3e0022c8 SHA512 006b48fce401ec454df6a41fe050a865d5f7372448d778a775ec67c10960341812f39f8411e67f7b6797b0362f23d6fce870cda6ba682a687adf87e3d069723a
 EBUILD nodejs-11.15.0.ebuild 6458 BLAKE2B f5eb4de9847e708dcc43d8917671592459ff9357c7a26128ba9b9ed1e0fbfba19c419a234dda9c7fa528ff75590793cab2ea66abbb6929766289be87272f741d SHA512 9aaa1c5b5cd446f7f11896ab53ddf19c1552d5b635dcb5cc50745e9e3e886d6539becffb9f9568a39bca6930ee32485f82f4e426ef1da3a44ec7ac414ad5f442
-EBUILD nodejs-12.3.1.ebuild 6464 BLAKE2B 5b0b3a2d086f787e38f782ac17f608208bac066a38b293d51fe9f2cd1a93fba2749338600a14037d6c1193b336baa0703b3cc4c38c356084787edcd4ebd6ee7e SHA512 fbde4d8d4017cad90c9bee6b5c3dd92cea4d066b09230e9dba9ac2cd029e4fcf937104e7e624dada880f9a3f1a8042a9e074088412f2d46d2c3d39f1d378597e
 EBUILD nodejs-12.4.0.ebuild 6464 BLAKE2B 5b0b3a2d086f787e38f782ac17f608208bac066a38b293d51fe9f2cd1a93fba2749338600a14037d6c1193b336baa0703b3cc4c38c356084787edcd4ebd6ee7e SHA512 fbde4d8d4017cad90c9bee6b5c3dd92cea4d066b09230e9dba9ac2cd029e4fcf937104e7e624dada880f9a3f1a8042a9e074088412f2d46d2c3d39f1d378597e
+EBUILD nodejs-12.5.0.ebuild 6464 BLAKE2B 5b0b3a2d086f787e38f782ac17f608208bac066a38b293d51fe9f2cd1a93fba2749338600a14037d6c1193b336baa0703b3cc4c38c356084787edcd4ebd6ee7e SHA512 fbde4d8d4017cad90c9bee6b5c3dd92cea4d066b09230e9dba9ac2cd029e4fcf937104e7e624dada880f9a3f1a8042a9e074088412f2d46d2c3d39f1d378597e
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
 EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
 EBUILD nodejs-6.17.1.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
diff --git a/net-libs/nodejs/nodejs-12.3.1.ebuild b/net-libs/nodejs/nodejs-12.5.0.ebuild
index 1d6bf82084f3..1d6bf82084f3 100644
--- a/net-libs/nodejs/nodejs-12.3.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.5.0.ebuild
diff --git a/net-libs/quasselc/Manifest b/net-libs/quasselc/Manifest
index df276a26d263..f6cec5b9c360 100644
--- a/net-libs/quasselc/Manifest
+++ b/net-libs/quasselc/Manifest
@@ -1,3 +1,3 @@
 DIST quasselc-0_p20170111.zip 39051 BLAKE2B 7c0d6353b130e3cfcf21591044347888fd0cd6ffe5f798232286df1b6c0690eacc03b33fbc252c6d956eb08d783a330a544154f4cf34255f89fa5f3495023327 SHA512 bf2aa58953778c340408de45ddacdd47e862a431a4ee7384d595b6635954b3f705c4b51b56811f2f4c6b5b603d237512638613c912d48daed9a3cb55952d314b
 EBUILD quasselc-0_p20170111.ebuild 942 BLAKE2B e77dbc0f590548eaf8783c7cff383f0ed9420a227b76bc20c4bf1b7f490b8597e33ce2e9c37a22c482106f41d47b366d92ae531846a8960001e7cb650b05a976 SHA512 e49c00a358603f8a0e774ae414e7a1c5390bf81b401eb74aeb6f1f531304f6d95b448cc53057960a6b3517a79ab7a4b33dc8256df92f89895f2f7cb14b0771e7
-MISC metadata.xml 475 BLAKE2B 187d8abe1028f08d7bd6808ea68395fdb90bdbf88a580d8bfa3c1c8783a8fc9cf9711d9b0a12d82f78e9d22d1846e83f742aae7197941c0b6d75d09c8e1db9a2 SHA512 845ba9861385b9e2735c52f1f96507049405d733d1d5d262d5f7d9458a19fd82060a671afee60a293175e2e947d402b492720e0bb5048a8f80784e069c8ac733
+MISC metadata.xml 400 BLAKE2B 28ec14b9edcd90e1564c8561fcee37b92965140037fb08b8a0f608982275d31ade0735be7bf5291411ce6b199c527354fd63a6eb898e22e3fc394ee8f64a842b SHA512 1e9f3df62d5d4f2d5e6ac57b5b6804c194827a45ef7eb599c59295d1785c6edae3b170ef1eb4accf7e6b34edd4381652cd8a0bc4d5ce3083c28495ea37edbfd5
diff --git a/net-libs/quasselc/metadata.xml b/net-libs/quasselc/metadata.xml
index 09dbfc6cdcd8..9aa43a392f2f 100644
--- a/net-libs/quasselc/metadata.xml
+++ b/net-libs/quasselc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>wraeth@gentoo.org</email>
-		<name>Sam Jorna</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">phhusson/QuasselC</remote-id>
 		<bugs-to>https://github.com/phhusson/QuasselC/issues</bugs-to>