gentoo resync : 15.12.2019

255 files changed, 2656 insertions, 1446 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index cc5faf0cc9cf..9eef92448395 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/NativeThread/Manifest b/net-libs/NativeThread/Manifest
index 8df856322e3a..b153fe9f6feb 100644
--- a/net-libs/NativeThread/Manifest
+++ b/net-libs/NativeThread/Manifest
@@ -1,3 +1,3 @@
 DIST NativeThread-0_pre20190914.tar.bz2 3163 BLAKE2B b16aa3ceb3ea18ea13962e53d68fa2eac1854b9141055de251eedf0c9a2cc284e68f3f2601f49d1ac1d7fcef9fc502bf1877161fdb43b1b941a3b9983829e4a9 SHA512 ff0902b874c72f0e15f35374d0a409271ba236343cf24bc708bc7a72677a9a582013bfb7a1e8fdd2aabb741bb5dc04dc901ff4c09841a85324194644d40c58e6
-EBUILD NativeThread-0_pre20190914.ebuild 630 BLAKE2B f15e5af7589475f7f6681f83d108c58f3caba1ba9fe653aa3f55cdc5c6cd5efe1b810dce50151e0d8d173c5e332a8ccf2c74cb60346853b5ee428174cc3d9bba SHA512 7f92a4aa331cd637939ff3c87eee0cacf293c4312d72d2a04ea0645ecdb002dc662309cc3c3eca5dd76043f8309fb7b2223654b0997db2bcb1bd79a291d7a85e
+EBUILD NativeThread-0_pre20190914.ebuild 609 BLAKE2B 29e06d882651e1f0755ea359c1c4d59f33fc69577c5905aae6b5a583e8ce00ec4839199d01916ae574c60847016c7b6bf2dc5311835767de6827221e91d9a56b SHA512 5facd8cd928eac21c4de3167384e0027e62a8c34bf4d8f706e62dac0b84cfe14e11a2e128fb6ab662eea358cdd163130b3b519d5afd2fbde1548ab462f4d7d18
 MISC metadata.xml 256 BLAKE2B d4cddf1e47808cc6fed0829aa4bfe16d930ee2e12bb3e7355ed4871b41e42dac196735be01fe9b38464183039f2df7f88cdd26750461dc9a3268f9844e3373fd SHA512 26e53ead25d8fef36a3759518b200c6a4ea0fc24d2c1f054ed85772cba5644118b231438d723ca25c22a55ed2fcf54e2c467279c9f3b49b6c1ced9997e3f098c
diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild
index ccecbccb7bc7..a13407892c05 100644
--- a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild
+++ b/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild
@@ -23,10 +23,10 @@ S="${WORKDIR}"
 src_compile() {
 	append-flags -fPIC
 	tc-export CC
-	emake || die
+	emake
 }
 
 src_install() {
-	dolib.so lib${PN}.so || die
-	dosym lib${PN}.so /usr/$(get_libdir)/libnative.so || die
+	dolib.so lib${PN}.so
+	dosym lib${PN}.so /usr/$(get_libdir)/libnative.so
 }
diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
new file mode 100644
index 000000000000..1a24d71a55dd
--- /dev/null
+++ b/net-libs/accounts-qml/Manifest
@@ -0,0 +1,4 @@
+AUX accounts-qml-0.7-no-tests.patch 307 BLAKE2B 2faefed0d6de1d0f271aece811b5fa064bf67017a8964ad4cd83d2b618e30cce6fabc0272ba3fa5949da1229255602a4b86191dd9e27a91c9f95fd20cffb26e1 SHA512 d0b199098bd7993178084b795138fc87282015525d11e14913056fbaa1b0954fd37d2ad6bb56855513d900fa0ea7a4a4beb31de6bdd4338785bcba9eb1df2eba
+DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1
+EBUILD accounts-qml-0.7-r1.ebuild 941 BLAKE2B 7e5a5649b875365c11192e0167fbf69e5a52ac4c33104e0a51f4752d22abe7b3ca54dbf6e7e9c94b1c07782216a0dbb887089d27939e227d76c9a0ad6ad323ef SHA512 2572a2dcd978400307954c71608ed1e44654959128d2089492c5dbc7e939a15f279cc7ad8c31e124d709e88ad58b34b64fb2efa6ea84bea1183bd092ad47e564
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
new file mode 100644
index 000000000000..7bdabd41a8ef
--- /dev/null
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="QML bindings for accounts-qt and signond"
+HOMEPAGE="https://accounts-sso.gitlab.io/"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	net-libs/accounts-qt
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+	)
+"
+
+# dbus problems
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-no-tests.patch" )
+
+S="${WORKDIR}/${PN}-module-VERSION_${PV}"
+
+src_prepare() {
+	default
+	sed -e 's/-Werror//' -i common-project-config.pri || die
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install_subtargets
+}
diff --git a/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch b/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch
new file mode 100644
index 000000000000..cfe8dec082bb
--- /dev/null
+++ b/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch
@@ -0,0 +1,14 @@
+--- a/accounts-qml-module.pro	2016-06-08 09:26:26.000000000 +0200
++++ b/accounts-qml-module.pro	2019-12-08 14:16:24.058806381 +0100
+@@ -5,8 +5,9 @@
+ TEMPLATE = subdirs
+ CONFIG += ordered
+ SUBDIRS = \
+-    src \
+-    tests
++    src
++
++CONFIG(tests): SUBDIRS += tests
+ 
+ include(common-installs-config.pri)
+ 
diff --git a/net-libs/accounts-qml/metadata.xml b/net-libs/accounts-qml/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/net-libs/accounts-qml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index 57cae0b0b787..f40e13006b53 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,3 +1,3 @@
-DIST accounts-qt-1.15.tar.gz 64190 BLAKE2B a00f4677d9e99304729af4768c288bce1b19f357e50db0db1264760114b6a9cea821bda112605a49dafa192e10d4d6454155fa94a3dd3cea2a6525d63c129bb4 SHA512 36c80a237bc2d427ce3acb62ac3b2e7878ac7e02b00f17022af326b52edbc7ad3d0cf428fb4e1e2bcc1d0d410054102926f549dc18bea137a9d9ea19a2d268d3
-EBUILD accounts-qt-1.15.ebuild 1124 BLAKE2B d61d7f6691e875e94078268a7b3f4c86b1a809f0c652076a10dc35f5d77ac1ae0d7c7dafe259515e2f9847da8312a3f355f6ccca171c67af52d82ce579a21504 SHA512 bc1878077361b7168f637e8ee17a9814d53b3f326019fbe3045966af2aa546d5d0c55b2d2164e7a903b9c3fadf94f6e7185180ece8160962d636a535da0b43b4
+DIST accounts-qt-1.16.tar.gz 64445 BLAKE2B 380d34857e9eef5bec1f1a3d1d789c67b709e8a80b648c61cb4fe4bfe84fc08e18b88e1729dfdb35587c148781574b1a2bd9973cbbc87fe6842b6c61e3d0035f SHA512 ea495f508cd383a8f936277b5e86ceda86b2912d262145e8c097b713d53c14760c6b5b8cfb58de1d0aeee6d13be504fa94a78db07ff027ea9d28f5a43d4a29c3
+EBUILD accounts-qt-1.16.ebuild 1135 BLAKE2B 557d0ec4edf2be2e2363346b08447f571e3df9adad1b7d14350f9d35283205d8a35c2ec3e87ede3e467cfd9699382e8df2e77e54a5b5fd70a676ab0c3c31eb18 SHA512 f67647ea7d04edbefafc64cb89adef1c5ffb92183e7a6c5e37dd6e68768e165d4cea73c11c9464c38bef7e26675871e137d183fac7d887c246b37ccebea65292
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qt/accounts-qt-1.15.ebuild b/net-libs/accounts-qt/accounts-qt-1.16.ebuild
index 9b7e7c225ad9..36384c3ff990 100644
--- a/net-libs/accounts-qt/accounts-qt-1.15.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.16.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit qmake-utils
 
 DESCRIPTION="Qt5 bindings for libaccounts-glib"
-HOMEPAGE="https://01.org/gsso/"
+HOMEPAGE="https://accounts-sso.gitlab.io/"
 SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/repository/VERSION_${PV}/archive.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 # dbus problems
 RESTRICT="test"
 
-S="${WORKDIR}/lib${PN}-VERSION_${PV}-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8"
+S="${WORKDIR}/lib${PN}-VERSION_${PV}-525ec684cfa8d234f797d7e49e21c476eea04d8e"
 
 src_prepare() {
 	default
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 6de69623bc15..fb9d3f51e406 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -3,5 +3,5 @@ DIST aqbanking-5.8.2.tar.gz 3824997 BLAKE2B 529867a9e814d0e46ff2aac1da25a369c9a8
 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.44_beta.ebuild 1409 BLAKE2B 838942169ae4344d4e8d01aefbdb061c798054ad4edd2650d5d477d69449c76241f2ee00db3336eb992a8f8d5203f77cb5045a2dab1d2fdf97f53858e97536e4 SHA512 aafdda981df27e241f1c0bd116079de81d686418b61368c21644acc2343f43cd755f7cfb016be239dcabd43b09a8c3c8901b1b6be9cff0aeba625150a98e7e10
+EBUILD aqbanking-5.99.44_beta.ebuild 1407 BLAKE2B d9d6b5b1f773b13b30c86b02c04e5477137ac53b932d001dc27a9f833497e44aa8614148d54e78fb63aab54b3489e896daeb44b94161e55f16e40bd1d380c91a SHA512 49ff085ccffe5ffe1805cd7a96235c024c3493d9b496ff332090e377cf22eba8f3731ff2619e4cf7f0cff56d733eafbb684e6fa05bc32af05840dea99cb1a4ee
 MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999
diff --git a/net-libs/aqbanking/aqbanking-5.99.44_beta.ebuild b/net-libs/aqbanking/aqbanking-5.99.44_beta.ebuild
index 747a2b9a20b6..8cd7ca955448 100644
--- a/net-libs/aqbanking/aqbanking-5.99.44_beta.ebuild
+++ b/net-libs/aqbanking/aqbanking-5.99.44_beta.ebuild
@@ -11,7 +11,7 @@ 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/axtls/Manifest b/net-libs/axtls/Manifest
index 83cc6c8f1546..6963c9539c0e 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -6,8 +6,8 @@ DIST axTLS-1.5.3.tar.gz 1309853 BLAKE2B 8a7db4df4775dc73e35c3a9b2a7bbee783d96f36
 DIST axTLS-2.1.3.tar.gz 1316776 BLAKE2B f60502d34a9d23ac772e1bbe05dc9350ab2385fb3c42480117120923647f122ef7a955289b656b8a70b3ac9817b1bcf947f541739b8d01ebe1eb4340f8d9cf38 SHA512 aa116b671bf0fa059cb77f9e5c0307c48ab476b7ce7017f1d4b2e6362d9d527e534908cb30ec3667eec8c49566f950de3ae4ec0adf5b603fb4efb571eaffc596
 DIST axTLS-2.1.4.tar.gz 1316768 BLAKE2B 3ff302c59313ee80d18a0d5390c591e6259625e62707cc0c7c677add1f7fddffa5b4dc46860ee18dd96fcc227b3cac1179ab290f8af50ac91fe2841fff977cd4 SHA512 ce301719a12f5b836e3c67a169119d2836382b7b97d39f4010b8b8a644a6751b9f948a6c91f8dc6c39d19f5723311af7aca8958f9052e72cb38a9907247af3e6
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
-EBUILD axtls-1.5.3.ebuild 4658 BLAKE2B f58494ccce35e2d488d9a85b9f92c44be6845a474eb2ee6fb6c7bec5b06976510e39ff2da6f2bbbd72c46e7013325f24a1a974e9945a8d241e9e6bce4a957e7a SHA512 49d2cd35f692d828e16b56bb6eb0ed2cdc45329fdbf1641fbab53418e237141ad233121e3d1aa663df146ab13cecfefa6c2318457cbcd6f2cd8db1aa9046b2f9
-EBUILD axtls-2.1.3.ebuild 4680 BLAKE2B 97053559414aad27e913fdb547a84f2cd4bced639eff5e9a6e50d6b45617cd43fe32257ab161a7fe572cb54f926a0523bfbf6f2734fdc11487d0f3016085abfd SHA512 9762f6e4e8f517c1ee24012f93413e5fdb36016b3dd310f6ad02ddcbd4521a09209a2e2b18e6f5da26e23ce3ea8ced7514b7b59bb0cddf1f00d8ac9a9bfec096
-EBUILD axtls-2.1.4.ebuild 4687 BLAKE2B a530f9d57e16f65587028a293f0f1ddcb9efa96493ad8d6082b1217a43f1b3645629b2b2910075b6b5ffad4a380a0403b1358f171d352b2d0cf9f470e42939f7 SHA512 e266f60307098635db515eca0e6dc4aaed14d6c0ebd9b11184afe8bb34a20a1eee9367e8ee8e44ce843811d13c39ea7ba8b114657cdeeaa9c74656175ed33dda
-EBUILD axtls-2.1.5.ebuild 4684 BLAKE2B b5fb76ad45727676b7c5fdd71041257531770a95e22b2df59e9e6a068f790461c4c9e8c7a27f1c4c26c44b348738d98fe06f3ed3facee1978cf88dd8011d03c5 SHA512 6609be9ae877b62c253862f89a8c3d640e5806e68db6ad83ecace087d8edb5f213e08d50f98204a64678b656d37b0557a3db13edc8227f369344bc987c6e0d27
+EBUILD axtls-1.5.3.ebuild 4648 BLAKE2B 015fd92687701d440e34b919c3aa2fcc6c44f1ce8bdb74527a9e489a40ae307ee293f11013f05ef9a2dc99a90ebac6667c0a7e5a63a893c1d4f66f9e86420e3e SHA512 e37dd43f7f73cf284e01d89413de6989c43168abc961c6854d9994bc2e704f07c79cd2b2f151788fb48c671738e18cbc3c5931f36b59d85792909c19310691f5
+EBUILD axtls-2.1.3.ebuild 4670 BLAKE2B 04885486d07d580daed57d66feb02495ca08e9493f047fc5c162b60521cb94020642488406425fe83869a6d8bff6e68222835f44a447ebb0e367387fed4637da SHA512 691d01cfb57df53516cdc699eb3a87844064335e2c212fec1f36ebfc52779378a6a3501706a84980280216025ffa56ad362d6f393259df10fc8bfb30c18c1f44
+EBUILD axtls-2.1.4.ebuild 4677 BLAKE2B 25e88d8ee91fcebd1388ebb6e0ee36be17f973b962da0d5e0b448ccaff9bc34833561fbee78b3400ff57981f7425a46c88cb42019a038b07e065d060776194d4 SHA512 a5f5b59c5a6984c187cf3b8938bf1ad4a657dd776922c46f04c78c990dd74e3d23ee03777e74620ae06b0c29aa67c472dccf3d9fa93544723ed684dfa4332aa7
+EBUILD axtls-2.1.5.ebuild 4674 BLAKE2B 7557b02e15493c9ebe89d3cea24e6f5c75b56e45b3a10e3e723a3e835d20c04e225df68ff03f795439b78ca5e8abbd63d6963fd6e2707bf933887d0eef35d083 SHA512 0307a9e39243546b616f2709635ea11834805108edf0f8912d295bdc19d0700a3db08b6f2c4cdd86f6f4eefb6896664156667adfad3b09708bb24b4543bd7143
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-1.5.3.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild
index 47c0da37b128..1f02d467d121 100644
--- a/net-libs/axtls/axtls-1.5.3.ebuild
+++ b/net-libs/axtls/axtls-1.5.3.ebuild
@@ -117,7 +117,7 @@ use_flag_config() {
 			config/.config || die
 	fi
 
-	yes "n" | emake -j1 oldconfig > /dev/null || die
+	emake -j1 oldconfig < <(yes n) > /dev/null
 }
 
 multilib_src_configure() {
@@ -137,7 +137,7 @@ multilib_src_configure() {
 			ewarn "No saved config, seeding with the default"
 			cp "${FILESDIR}"/config config/.config || die
 		fi
-		yes "" | emake -j1 oldconfig > /dev/null || die
+		emake -j1 oldconfig < <(yes '') > /dev/null
 	else
 		use_flag_config
 	fi
diff --git a/net-libs/axtls/axtls-2.1.3.ebuild b/net-libs/axtls/axtls-2.1.3.ebuild
index 06c5a89a4df1..b856997fc616 100644
--- a/net-libs/axtls/axtls-2.1.3.ebuild
+++ b/net-libs/axtls/axtls-2.1.3.ebuild
@@ -119,7 +119,7 @@ use_flag_config() {
 			config/.config || die
 	fi
 
-	yes "n" | emake -j1 oldconfig > /dev/null || die
+	emake -j1 oldconfig < <(yes n) > /dev/null
 }
 
 multilib_src_configure() {
@@ -139,7 +139,7 @@ multilib_src_configure() {
 			ewarn "No saved config, seeding with the default"
 			cp "${FILESDIR}"/config config/.config || die
 		fi
-		yes "" | emake -j1 oldconfig > /dev/null || die
+		emake -j1 oldconfig < <(yes '') > /dev/null
 	else
 		use_flag_config
 	fi
diff --git a/net-libs/axtls/axtls-2.1.4.ebuild b/net-libs/axtls/axtls-2.1.4.ebuild
index b9c459a225e2..dcd2852e8235 100644
--- a/net-libs/axtls/axtls-2.1.4.ebuild
+++ b/net-libs/axtls/axtls-2.1.4.ebuild
@@ -119,7 +119,7 @@ use_flag_config() {
 			config/.config || die
 	fi
 
-	yes "n" | emake -j1 oldconfig > /dev/null || die
+	emake -j1 oldconfig < <(yes n) > /dev/null
 }
 
 multilib_src_configure() {
@@ -139,7 +139,7 @@ multilib_src_configure() {
 			ewarn "No saved config, seeding with the default"
 			cp "${FILESDIR}"/config config/.config || die
 		fi
-		yes "" | emake -j1 oldconfig > /dev/null || die
+		emake -j1 oldconfig < <(yes '') > /dev/null
 	else
 		use_flag_config
 	fi
diff --git a/net-libs/axtls/axtls-2.1.5.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild
index 490ad132093a..674385dd40d6 100644
--- a/net-libs/axtls/axtls-2.1.5.ebuild
+++ b/net-libs/axtls/axtls-2.1.5.ebuild
@@ -119,7 +119,7 @@ use_flag_config() {
 			config/.config || die
 	fi
 
-	yes "n" | emake -j1 oldconfig > /dev/null || die
+	emake -j1 oldconfig < <(yes n) > /dev/null
 }
 
 multilib_src_configure() {
@@ -139,7 +139,7 @@ multilib_src_configure() {
 			ewarn "No saved config, seeding with the default"
 			cp "${FILESDIR}"/config config/.config || die
 		fi
-		yes "" | emake -j1 oldconfig > /dev/null || die
+		emake -j1 oldconfig < <(yes '') > /dev/null
 	else
 		use_flag_config
 	fi
diff --git a/net-libs/balde-markdown/Manifest b/net-libs/balde-markdown/Manifest
index 02db9d979ecf..682ec0dba587 100644
--- a/net-libs/balde-markdown/Manifest
+++ b/net-libs/balde-markdown/Manifest
@@ -1,3 +1,3 @@
 DIST balde-markdown-0.1.tar.bz2 260429 BLAKE2B 4306a02e363a271c77d9ab3f08261ab9410d6ac8c258bc74dec3b1cabd8728927d12bd0d0b2941f5dbd90256e11ef8e30b5c952c2d7711bf6ae2896068822862 SHA512 ba0a952d1f8480f6173a8af6eb662741ac04db4e39d65158afac97606c2faaaff973dce384b2bc1d42aabbdd345cd451fc5624f1c6d2f941f2630b2e76a01d10
-EBUILD balde-markdown-0.1.ebuild 748 BLAKE2B ba5c2e45dba5c899d2a387f22d2257cf9670444998499108f05309e3200d1e02dc0406a80f543c5c2b8c1a1a73433670ab0be75d3059bf5f8b9c7866d340e9ad SHA512 b8504ac49904712ff9bf458e6fe6d588fafca3f7b246b1b0961e2512544cfbe2eadda037ce090f9509a9265748891c894a445dbccb6cb4859e94b9d345aef52a
+EBUILD balde-markdown-0.1.ebuild 772 BLAKE2B 13a4dc060c3498e47c50c289178a9c1b777f7c0d3a6ae8aebbd8e207590b494e2fda453ae4df513694af909a268bb827f573d282fb9c481ceaaf403646ba7150 SHA512 778bbda2229c50b9922c424e8103cb2e9f03e7e4e20bdb637ef1c9199fd9592936ba924b3b5380d0625106e308050520ce38672621ecca8eecf96c58b089a6ec
 MISC metadata.xml 618 BLAKE2B bd728fb80f8f1fff6eacec83f961bb67ed301a494e77de40b31846a69385febbe7bc4a690c517a209d02c5923605e5d814b98887aad931538b5b6106316ba04a SHA512 daeb67e040a4de1d728268acd0ce8bb013c4b055d8cf5fdb7bb2985a6de42df2564195d4a2abb8eff49a464c7f69c610612a5a4a66e576f03a1293160ecd7662
diff --git a/net-libs/balde-markdown/balde-markdown-0.1.ebuild b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
index c0dd7e59022b..50308fafc019 100644
--- a/net-libs/balde-markdown/balde-markdown-0.1.ebuild
+++ b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,6 +21,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.34
 	>=net-libs/balde-0.1
diff --git a/net-libs/balde/Manifest b/net-libs/balde/Manifest
index bcebaf4219ba..044f450f9e9c 100644
--- a/net-libs/balde/Manifest
+++ b/net-libs/balde/Manifest
@@ -1,3 +1,3 @@
 DIST balde-0.1.1.tar.bz2 360412 BLAKE2B 88f25e7c409c61f45d5fca0664d3602fd206caade28977d7d38d5626fdbc423c76cc8dda2c5829ea2b6b2f79dd9897b3a890b9a5a862d6defad4e11808edab54 SHA512 fafb9e9344ecb1caf6a4451b99adb3505fb728015e2bcce3d81162f679a70267e49a0dc194c6c977a7a155f9b5ae3318fdfcb63fb0223e43943c0fc5e8503acd
-EBUILD balde-0.1.1.ebuild 1015 BLAKE2B ad38836a04487b2288fdfd9fc6d070573f394c93575d4ab5624351ea836135cb15c9ec6193ed12794bffa41d2da7ee51fef1abaa659461ffe479692db0802fcf SHA512 02b12191c41fb211218822a80fb57b7f9ec6d11a3d820bfac7ed58a004ef28248fa41ae05ca00e519fd30b04ac755137d5fe2cd54315c0962feb4398a7a2ce7b
+EBUILD balde-0.1.1.ebuild 1039 BLAKE2B 9f6ab738553a7e8562ba8f4e0f34c057229e9b7e5b5036b48052bf1c0ef1d446be15431f216c0d1b15fba3eb77c75f6e1d1db7e902d07027ceb7f8438ad8b785 SHA512 5a8e8338b705666e0a099e69e5f31fbc32d1329c82146c89319a8340f2c9fdf60d59c2ca63e73515088045296e81c6a46a5093eff4f0cb8927d8903dd98db074
 MISC metadata.xml 620 BLAKE2B e5eaf49ef174cbe142d71db5c1355ad0437fe74a25eda55be063a9dbc9e535325519df4f64b89dce4aaaed03ee8005debc1dd4bafc080bba538ff0890749dbef SHA512 3b2647198c171ec5a7a58d03c8312eca6fe5cf5011b3472a28cdff2e934fd69df78fc80ebb6b6d78d651b6a326750dba3156456680c048ff3e4747aff7c20b23
diff --git a/net-libs/balde/balde-0.1.1.ebuild b/net-libs/balde/balde-0.1.1.ebuild
index bac205a6c7dd..db24dfa44ab9 100644
--- a/net-libs/balde/balde-0.1.1.ebuild
+++ b/net-libs/balde/balde-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,6 +21,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.34
 	dev-libs/fcgi
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 8de7d003c83b..1a08d421c81c 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,14 +1,12 @@
 AUX courier-authlib-0.65.0-sqlite.patch 798 BLAKE2B 305fb4f7349b030b98f4a13c7d104ecfdc61c098659b05a6c8258ab7311fdea586682ec5566447a3dd767540b2038fd45049db97bdd180a25a5114bdd7adc55d SHA512 f9148c23195cb9ec3265fcc86a2c8ea4c0d114046d81e527dd5759f45844b425f5270fcec52fd497e82b8272fa99984e7facb8cca6f696956896ad177c5f81fb
 AUX courier-authlib-r1 985 BLAKE2B cc970ee300a367c6c742a8fc4266bf0a1c3113e7bd16c8ab4a73d49cde013fcc8500ca1288c81f530edaca96ad0fb79a2b15d471cb3e0fea5af814064202b820 SHA512 ff5022dcc50c9bd9c112cac0ac3a47b37d496603aaef4db2cdd1b96236b5c3deff085e742301a9144dd8113cf5b51d0ee32b4a50e574274855fc1614f4769cd3
 AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
-DIST courier-authlib-0.65.0.tar.bz2 2303751 BLAKE2B 595a91a87d9f0f87ded7db73f88a9a74f8e5140452cab2bada43de9836b4f3e8b123dbb10295493e71e52e1920950f28d67a74ec026ff33c27ffa14024d079a1 SHA512 edc4a51bc0d748e7d6cdbf9e9c67c43eeedd9e3846d91a8eea24613f6fb5125d2e713ef7fd63cbbe1905205f2a406b4ff3f31d7c3fb7028939123dbc728d8e38
 DIST courier-authlib-0.66.4.tar.bz2 2192331 BLAKE2B 8fd68153b2defb63bbafb44b34c0f7ab5f7156800dc3eeb3c31fc0952c9a4637d4937babceae624c1a22512076bb11a1a356e0e0332c13d61026470a03b7e1c9 SHA512 0987bc9d33a013ae842e0ea3e4e83ef9d6196c2f923a6970e049a36b8ccddbf0c4465c43c7e27d6718480e981f573795f6417478de1ff685264f3439e8dffdc9
 DIST courier-authlib-0.67.0.tar.bz2 2194546 BLAKE2B 2ccb6ed15c2f02d206606f8bba04c9f2da415da3d739e456914e44010c955c9aaeae1f1c0746c8812f5165eb8db1997284e1c378132a6144da2b8f77d77a6eff SHA512 6e3da28d555761177727c44b1422bf5baf6ffbf28f53cea89a4a8e13daa5433803deba1614295d9679c41b5be4750f464e7869a2d3ecbfd91ae84e7281c4f3ef
 DIST courier-authlib-0.68.0.tar.bz2 2194982 BLAKE2B e463390b49bb3ca147467d3054a83d5a8ce96b604bde0b624c4d7ce81235c6f747e5d847dde794c81c4ad36aeef49bdd27cf904142b4542df833484c5eb7a57e SHA512 5c4adaf0fd69f4b9e780962aa3f9eeac6b15cea3f302288ff4549ce2b0be9ea0808b4501670ef3c4e0419c3d27505c256c082f795dea4683dd5265fd7dcab93b
 DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
-EBUILD courier-authlib-0.65.0-r3.ebuild 5160 BLAKE2B 97bd4ca75aa660b49f40e7458d621bffe7ec1cc88129316edf1c623ad68e64035197cc3958a8ee586f2a6595a842205e81f885acff7c7b326ad064b39cb0aeb3 SHA512 4f62af3dcf687066910a2ea0e044020660178e4def189f8d93e42ab279d83f8553fb64fb6f507ac97709d593e3691b47ef08ad40918f3976d698fb63e1127538
 EBUILD courier-authlib-0.66.4.ebuild 4503 BLAKE2B f7da9bbceb5cbc3eb7b2ed0075ae41ccbb7ec68c4b14d85f35a937aaf055e6af2555d8f5bbd7da6e0ac21b4d8e4156bb55c6fcec74658f1de1fceae93f0032d1 SHA512 2377192f2252912a6ff63c0390c533852f885a923141f9c76631aefd5ce1cff8e001b844d199d1ce138c6137d28a3847172b6f569b88efa298a8f09ec1c351c3
 EBUILD courier-authlib-0.67.0.ebuild 4556 BLAKE2B 8db66be2de9b5184766de9580d55dd7d8b02ad1be7a17aeea6cba66b7996e1fe7058f42a816525456d3fa22cc8b4a5791b6fc35b95d4300fea9623dc77d1d976 SHA512 6ffe4259af6f944c5d63cb56cb0f3ebb33aa77deac3c5cff03afb0ce9ec3e46967cf5dda518a0b6160ab76adc3a51fe63ddd7a627f51788cfa3a41fc8af9b7c7
 EBUILD courier-authlib-0.68.0-r1.ebuild 4557 BLAKE2B 6b93605b9a09477ec3b7b2436e2df4d821b4af3a9d4b45a6938ce31b5c0370d355dd3e904ebac32d75ef69c394f40346fed8ab5e9b534d71f6e2cbc218ac181c SHA512 66eb959da8b97598c1770ca97ef0c818afe1eae88f76a50634297ce3708774819d3aed1809556baf41f0e83fdf2e44c5e64aec65f2ec264828dbc99ec9230b20
 EBUILD courier-authlib-0.69.0-r1.ebuild 4512 BLAKE2B 02b1d273bd5f53ce0415ac047e4ebb840923b37e441f39f4696b04e784a704b0c5888db29d45cd0ee644cce310f6112dcce2ed9b12b79e9844c0bb271ba747f8 SHA512 5078372621121fd5b68803326c7f1d19c3cc221d33bc8d0447b5fa8250f45baa92ef97db2f136b9e44f61119625add93b20f8137764fa7b1859c5df653e716ed
-MISC metadata.xml 375 BLAKE2B 6f871e1db850090f00a5d249021c00707ca687cf5ac6eba2d4f84b6fea30120936cfd65d13615b38e5405329319fa425f1c01d838ae871e6f91b58a252b9e2ec SHA512 46db3b082b8928e49a73b070458f474594a55bd5252178bdbd0cccd0b0cddd7e489e8afba20c69227140fc12882b1903d5e15935f23a1adc18ba9f4dee8553cd
+MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
deleted file mode 100644
index eb34fc958461..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib user
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail"
-
-RESTRICT="userpriv
-	!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( sys-libs/pam )
-		postgres? ( >=dev-db/postgresql-8.4 )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-# vpopmail support removed upstream
-REQUIRED_USE="( !vpopmail )"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_prepare() {
-	# move local macro to m4 and run eautoreconf
-	mkdir "${S}/m4" || die
-	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
-		m4/sysconftool.m4 || die
-	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
-	epatch "${FILESDIR}/${P}-sqlite.patch"
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	if use mysql ; then
-		dodoc README.authmysql.myownquery
-		dohtml README.authmysql.html
-	fi
-	if use postgres ; then
-		dohtml README.authpostgres.html README.authmysql.html
-	fi
-	if use ldap ; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		dohtml README.authsqlite.html README.authmysql.html
-	fi
-	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-
-	# Suggest cleaning out the following old files
-	list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
-	if [[ ! -z "${list}" ]] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		elog "The following files are no longer needed and can likely be removed:"
-		elog " rm $(echo \"${list}\")"
-	fi
-}
diff --git a/net-libs/courier-authlib/metadata.xml b/net-libs/courier-authlib/metadata.xml
index d67e9c36e56b..7f3dcf9c674c 100644
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@@ -4,9 +4,6 @@
   <maintainer type="person">
     <email>hanno@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="vpopmail">Enable vpopmail support</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">courier</remote-id>
   </upstream>
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index bf8ac218ac13..61581b1c021c 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,14 +1,5 @@
-AUX daq-2.0.2-libpcap-check.patch 1000 BLAKE2B 9407ae9fee8095143ad63fef090b49bb1f6048d7fbd22eb03fd88d9a3266b5b0f0add7ad17b1e95040ca429a163c946d7bc1236c6a21bb64b93990ec07f42213 SHA512 9382026f9d93ae922299ae25a98b6e38c2bbb0619009f73feef6a7ce1ce499b5bde886323be80c7863cf8ed0c245f2b04d244166073f2435c6db915ca5afa17f
-AUX daq-2.0.2-parallel-grammar.patch 1355 BLAKE2B fe4c2938da34cfaafb4918e779c5675b8ae0befd9878763cb8f67c62b73485c0ef825b9a4eb2fe7386001579d22f1a00615349879ab702ef1db0f9dd518ba309 SHA512 18ba4e4cdaf9551504d201b76f3983e3eb33a267c2f5952006e9297e7c5de88ff1464adb103ffce9dba99339bdbbffc616ff6b659ce20179c55a1bb0173b4483
 AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3fce93f0d66328a840003b0b538792bd8439745081bbda3742d59b5f0880a4a844e919b6db6a19601bebababfe138d1ebe SHA512 d22182c91be6283a057f7f33ea093ba064f8a880fbebc3342ae0ab2d2923fee2fbb2ef1ec69b144b0dfb2fbca09c0f6a6421a961a88832d7b952907e6c2e2665
 AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
-DIST daq-0.6.2.tar.gz 451581 BLAKE2B 64eebeb669eefc6715b206de19e823708a8e4255d5898d5f6d4b80889360611950764432c941a2a930582ab9b8c2300cfdb41784f008f4ef1c248f3469819d4e SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125
-DIST daq-2.0.0.tar.gz 480030 BLAKE2B ab25ce133833babbdaecd74c79d319739e5bfa34bfa100d35c19569c935fe58b425ea817a12f6d2fc1ff47a6e8097b822e2d5ac5dc295cdde516811f139accff SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c
-DIST daq-2.0.2.tar.gz 474447 BLAKE2B fa80d435056d672eaa15f003649d90dba91986780f372cd4e953b676e414232516c5fc43065f5497d38299e0309c58b2734458f9e5aa1b93cdfa29dfe72b622d SHA512 b2a47e174155f21cb1c6f1e1c431ea7cca6aa9f7371228e77def3c526a67fd42d0e26e4c94263195e041b203cdf0c2aaef14f9035afb23dde0bd5df3bf422cbd
 DIST daq-2.0.6.tar.gz 518013 BLAKE2B 702ab20c776b9047230bb1ac36574068e461a850ed5d15959c314d62b0b828c792cf23d19cdb411ba8c067348ae74dd2f011376ccbe0376c44536ad58fa1bba9 SHA512 61dd5408c587e57999445b9549ac539ffc5bb16ddc179601de1065fc5e251c1893536d8aa2251096e34b54093529d3578e7b5d97e3514cb2bbf4de113639b08c
-EBUILD daq-0.6.2-r1.ebuild 1902 BLAKE2B b63c75041b5cf855b68b86a316cb47636e8e491ad3d5c92dd9c68e467ae711ebee4f60039bba687a3234905dc87c61c62bc45541f6d221370cacd3fdcbcf122d SHA512 aa0552a61045f7332930082e9ed36557f973a39acc449143c35fda76b5e7a7f9da3dc521ec041956b038e70aa125fb75a0c2d4a3e4cdf660c9dec479e082ddf8
-EBUILD daq-0.6.2.ebuild 1932 BLAKE2B c8a683e11312124f500f67f390231270d114ef480a3cd75653f12e4c767645f8229ab52079c904df9be11babfb2fb7487b89050870ef6edb18eb29449cddfe7a SHA512 9b25bca43e52172bc9f1a3c43dc90d6bebfa2934eeeea579f7e4e8e3d0a9ae3210ae53249f4aab723fbf2d026dc053755462426f1d14cfa0f2a420222c2a091a
-EBUILD daq-2.0.0.ebuild 1901 BLAKE2B 60904e1b66d7c02e650e54bba013b8f64087404efee0121e7e91994201396ba0a0b3d5c9116c3132dfe4a4c7a50e916f347e0861ef0c338a13d0f556487b3c1b SHA512 ce7a7fbd708e662da4b1ebd4bed6b688e8339feb9a15db188e74925f122ab421775e1a5698d2bec1d6a204a7c9667fb0a54749cd98595d45e89ba925e012d254
-EBUILD daq-2.0.2.ebuild 2001 BLAKE2B 98a7568d9bfba601bcf36e87f9a5002c489415aaf5012b891b5f129f054848549a797b921bccb051df93cb8d56d385c4025ffeb304576920b565a66d0b1d2b9b SHA512 554b8c496b10d62ca9cefd1239738c64108b6d63a61401dbfc57109f22b255f7a24a5f419f859bd8672b073850b6604f233ac0be15d4739da15c2c0bad6435a5
-EBUILD daq-2.0.6-r1.ebuild 2055 BLAKE2B d16d3b66c7a0515713a48dbd717eef07f933d00cc0e717cc0387e514ea5ca6e47b7d343084bd5e84753a6383173cd9f3ad4d042578e05eac69c4bc35662fb0a2 SHA512 93c5ffe9a0f7a6886ca32abdf7261610c8d4dc4f936d950c7d409487ebb14ea184b7276825a4f601f54c6d073384d998760c8881b67c4d3faf24c4423157a1c0
+EBUILD daq-2.0.6-r1.ebuild 2053 BLAKE2B d47824d0990ffbf3d91ab7af37b72716983bf491f465c48169b6cb87bd3ebcb4b08a25514262dc207b6bcc68586119c84ae63f9d1274d09d75197a9a521edf35 SHA512 2131265fcf2b167b6d8b2f51edcf614cae22090feda1e44bb42167ad3f5b5b6f81c8892a0d3dac7bcdb75c187caa156eab8e17232268c668c33c510f43b490ef
 MISC metadata.xml 1416 BLAKE2B 33ab28e9bac28d75031405b2ce3b47f2b797d244853bef86f586330a1bc7558a21edf325297e0aeccce08e5eefdd29fad45cb50da6f6e6d62ee82c56d7c17b81 SHA512 77a8d9f238958948d3582b3d9a9bf859c03bae5d544728270a18a5db1c221745c4fa7044fb1959e4b0811864f33de5f9bae67bcd25aa6c74d3ca74f386e6bdaa
diff --git a/net-libs/daq/daq-0.6.2-r1.ebuild b/net-libs/daq/daq-0.6.2-r1.ebuild
deleted file mode 100644
index 09c66a2d3497..000000000000
--- a/net-libs/daq/daq-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
-		dump? ( >=net-libs/libpcap-1.0.0 )
-		nfq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )
-		ipq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-
-	# Remove unneeded .la files
-	rm \
-		"${D}"usr/$(get_libdir)/daq/*.la \
-		"${D}"usr/$(get_libdir)/libdaq*.la \
-		"${D}"usr/$(get_libdir)/libsfbpf.la \
-		|| die
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/$(get_libdir)/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-0.6.2.ebuild b/net-libs/daq/daq-0.6.2.ebuild
deleted file mode 100644
index 7070a8c4883d..000000000000
--- a/net-libs/daq/daq-0.6.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
-		dump? ( >=net-libs/libpcap-1.0.0 )
-		nfq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )
-		ipq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-
-	# Remove unneeded .la files
-	for x in pcap afpacket dump nfq ipq; do
-		rm "${D}"usr/lib64/daq/daq_${x}.la
-	done
-	for y in libdaq libdaq_static libdaq_static_modules libsfbpf; do
-		rm "${D}"usr/lib64/${y}.la
-	done
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/lib64/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-2.0.0.ebuild b/net-libs/daq/daq-2.0.0.ebuild
deleted file mode 100644
index b910b5c04777..000000000000
--- a/net-libs/daq/daq-2.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/2311 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
-		dump? ( >=net-libs/libpcap-1.0.0 )
-		nfq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )
-		ipq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-
-	# Remove unneeded .la files
-	rm \
-		"${D}"usr/$(get_libdir)/daq/*.la \
-		"${D}"usr/$(get_libdir)/libdaq*.la \
-		"${D}"usr/$(get_libdir)/libsfbpf.la \
-	|| die
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/$(get_libdir)/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-2.0.2.ebuild b/net-libs/daq/daq-2.0.2.ebuild
deleted file mode 100644
index 35b35c7c306a..000000000000
--- a/net-libs/daq/daq-2.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib autotools
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/2778 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
-IPT_DEPEND="
-	>=net-firewall/iptables-1.4.10
-	dev-libs/libdnet
-	net-libs/libnetfilter_queue
-
-"
-DEPEND="
-	dump? ( ${PCAP_DEPEND} )
-	ipq? ( ${IPT_DEPEND} )
-	nfq? ( ${IPT_DEPEND} )
-	pcap? ( ${PCAP_DEPEND} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-parallel-grammar.patch #511892
-	epatch "${FILESDIR}"/${P}-libpcap-check.patch
-	eautoreconf
-}
-
-src_configure() {
-	# We forced libpcap to 1.x, so we can set this cache var so
-	# cross-compiling doesn't break on us.
-	daq_cv_libpcap_version_1x=yes \
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-DOCS=( ChangeLog README )
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/$(get_libdir)/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-2.0.6-r1.ebuild b/net-libs/daq/daq-2.0.6-r1.ebuild
index 749de964a78f..e695b8358c31 100644
--- a/net-libs/daq/daq-2.0.6-r1.ebuild
+++ b/net-libs/daq/daq-2.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.snort.org/downloads/snort/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
 
 PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
diff --git a/net-libs/daq/files/daq-2.0.2-libpcap-check.patch b/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
deleted file mode 100644
index b68a8a4865f1..000000000000
--- a/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-fix the libpcap check so that people can set the cache version when cross-compiling
-
-patch by Shawn Wallace <sjwallace@google.com>
-
---- a/m4/sf.m4
-+++ b/m4/sf.m4
-@@ -135,7 +135,7 @@
-         echo
-         exit 1
-     fi
--    AC_MSG_CHECKING([for libpcap version >= $1])
-+    AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [
-     AC_RUN_IFELSE(
-     [AC_LANG_PROGRAM(
-     [[
-@@ -147,16 +147,13 @@
-         if (strcmp(pcap_version, $1) < 0)
-             return 1;
-     ]])],
--    [libpcap_version_1x="yes"],
--    [libpcap_version_1x="no"])
--    if test "x$libpcap_version_1x" = "xno"; then
--        AC_MSG_RESULT(no)
-+    [daq_cv_libpcap_version_1x="yes"],
-+    [daq_cv_libpcap_version_1x="no"])])
-+    if test "x$daq_cv_libpcap_version_1x" = "xno"; then
-         echo
-         echo "    ERROR!  Libpcap library version >= $1  not found."
-         echo "    Get it from http://www.tcpdump.org"
-         echo
-         exit 1
--    else
--        AC_MSG_RESULT(yes)
-     fi
- ])
-
diff --git a/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch b/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
deleted file mode 100644
index 42e0f93791ac..000000000000
--- a/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/511892
-
-the scanner needs the generated header file, so make sure it's listed as a
-dependency.  else you see a failure:
-	$ cd sfbpf
-	$ make clean
-	$ make sf_scanner.lo
-	<missing tokdefs.h>
-we'd like to list it as a dep of the object, but automake can use generated
-file names, so it's not easy to list that.
-
-we can't have both of the outputs from grammar.y run the lex, otherwise we
-hit random parallel build failures:
-	$ cd sfbpf
-	$ make clean
-	$ make tokdefs.h sf_grammar.c -j
-	<run yacc twice & fail>
-
---- a/sfbpf/Makefile.am
-+++ b/sfbpf/Makefile.am
-@@ -43,14 +43,16 @@
- libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
- 
- # use of $@ and $< here is a GNU idiom that borks BSD
--${builddir}/sf_scanner.c: ${srcdir}/scanner.l
-+${builddir}/sf_scanner.c: ${srcdir}/scanner.l ${builddir}/tokdefs.h
- 	@rm -f ${builddir}/sf_scanner.c
- 	${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c ${srcdir}/scanner.l
- 
--${builddir}/tokdefs.h ${builddir}/sf_grammar.c: ${srcdir}/grammar.y
-+${builddir}/sf_grammar.c: ${srcdir}/grammar.y
- 	@rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
- 	$(V_YACC) -d ${srcdir}/grammar.y
- 	mv y.tab.c sf_grammar.c
- 	mv y.tab.h tokdefs.h
- 
-+${builddir}/tokdefs.h: ${builddir}/sf_grammar.c ; @true
-+
- CLEANFILES = ${builddir}/sf_scanner.c ${builddir}/sf_grammar.c ${builddir}/tokdefs.h ${builddir}/sf_scanner.h
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 9d567eea4c7b..26edd65b5aa9 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -4,8 +4,8 @@ DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0
 DIST davix-0.7.3.tar 4341865 BLAKE2B 8ba2855f7170ca24f4a15edc32562e47711304f48eaeb1e2870e1325396ae2b664f8af7a482986da6883ab5c92ab6e61034e8840baf3f59c3bd691e7e483fc7e SHA512 b7e7814066ca53c44c2aa0a0d1d6a2d995ea44d3d122da1d19f12849d8c2d4e91eafb40c18d4d18d1736a7c5c5099972519c08a6c7ab5b32300fc8a1fcdc5bfd
 DIST davix-0.7.4.tar 4343614 BLAKE2B 0fd618a4575cfdcbb0142b26ed8bd5ea0b8d880706ec6ebcc8e9a8755a8f392c715e2bc3cb25dd316fa90f06e7223ecd3e8272a0e5867eb2f5d74eec3053ddf2 SHA512 835d49f1729be95b88c1c422723a2ac6fa9fa0c4a85089e67d68a365c482bf648471fea000b90e7797add0809a9262b5c7275a965fde437bb8206154266fd970
 DIST davix-0.7.5.tar 4343329 BLAKE2B dfb71e0524e47a2378cd8a49fa4c7d209b8b658e8515f4f0750c9c98cb03073e2ff82a5fbdb2f7fb563f31671789cd7e9cb1656a16dfd0811934730961695db4 SHA512 4be448d6d28f315c0d098d9cf2ddf95bbd818659821935571d83dad1b2724b8f90b87be298ca8a7984cb57a88b18b0253e23f6e8cb192cd1792472993da36bcc
-EBUILD davix-0.6.7.ebuild 1479 BLAKE2B b443682bf8396040d259a69f39a5b6d3c04e8bd96f315aff99e84cad4a8afa571b2d3aaca24310b7f632739e43db129c595ed6ac1c404ccf98d05cb178887ecf SHA512 7032a772e90ed906f446f6e9ce1104545c6bf38c433914936759864402526197cb9aa6dfa0d586984fa7b19865aa96cf9c8b801a85a48171885a4bd566c135f1
-EBUILD davix-0.7.3.ebuild 1595 BLAKE2B d4522abac211e65960947ada16a381768b26e5825a2b8f41fec90a5ae67406450e0e2a50e7876b0ca0d45e3b062280e1162c25580ebe224cd94d0f29452457a4 SHA512 673ec1fdedacb7006c90e8483031e89020032a94870a0f7e3d5c9a9c6c9fc4a48ff45d2c9712f6c0f4d5a34f0d736259da218377ea782df1e9849baf0dae55d1
-EBUILD davix-0.7.4.ebuild 1597 BLAKE2B 0bac6db2f4bbe6cbf4416011de19bec02176dbe2a330bf5bcc2898c8149d5ab602ef4ee4981a82a4e24756d2e74d878518723aa5630c882e92103d20637b41be SHA512 a0902984c48641530e929abf52babb06f0f5c9591a8971bd68db9b83fe5c13fa553517cc7fe405fc641a95990eb9425c441f9414b54cdaefa30bd1b0b877e441
-EBUILD davix-0.7.5.ebuild 1597 BLAKE2B 0bac6db2f4bbe6cbf4416011de19bec02176dbe2a330bf5bcc2898c8149d5ab602ef4ee4981a82a4e24756d2e74d878518723aa5630c882e92103d20637b41be SHA512 a0902984c48641530e929abf52babb06f0f5c9591a8971bd68db9b83fe5c13fa553517cc7fe405fc641a95990eb9425c441f9414b54cdaefa30bd1b0b877e441
+EBUILD davix-0.6.7.ebuild 1506 BLAKE2B aceba7478b91996bb52fe4b7970b7aeb8419a7fc3f29481975a76eeb9d30e31df2971ed439be84dc2e803f7d152eaf0375cf2a9f0b295cd817b8e713f04e976c SHA512 a6e47ef1da6ddc3baaefa77b0be97a52f8b294929e2dc732e92d60635fab76aa2eda95ec5acded889e254d037aad5698e2c2189dfcc8fddc816d34c3c55a505a
+EBUILD davix-0.7.3.ebuild 1622 BLAKE2B 4bf101451170858ea1005626d38a907ffd8719897eda2078d6f838538bd8a21f300adb45316e81c03572ad718c71c0fb748a4d715c7127b6d2847998653efe82 SHA512 b8fb905d9c08c0dfa09d45ddeffb198b9d1c934a7d892383ceb8403809156015384d032efbf330f477655743108ae50f778aa49345985422a8606dca4176156b
+EBUILD davix-0.7.4.ebuild 1624 BLAKE2B e073022e62620ea2926cba34fd321375a0adc482d9bb27c6201b7df3a452aed6dcdc187f5132ef9835aeacbf9421cf0a4f1393d49c2a966790ecc702c53ec1ef SHA512 a738d2b68b5ea10a259c52a984e3b540bd7d79cdd7cf5976dff256acd0841755a1c87822ea1aaf2246b5fea4329b566e9200f72f9d757613846c3c9a7345109d
+EBUILD davix-0.7.5.ebuild 1624 BLAKE2B e073022e62620ea2926cba34fd321375a0adc482d9bb27c6201b7df3a452aed6dcdc187f5132ef9835aeacbf9421cf0a4f1393d49c2a966790ecc702c53ec1ef SHA512 a738d2b68b5ea10a259c52a984e3b540bd7d79cdd7cf5976dff256acd0841755a1c87822ea1aaf2246b5fea4329b566e9200f72f9d757613846c3c9a7345109d
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild
index f442b5b75b91..7bebb2047181 100644
--- a/net-libs/davix/davix-0.6.7.ebuild
+++ b/net-libs/davix/davix-0.6.7.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
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc ipv6 kernel_linux test tools"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 		dev-libs/libxml2:2=
diff --git a/net-libs/davix/davix-0.7.3.ebuild b/net-libs/davix/davix-0.7.3.ebuild
index e6daabed3b67..325471ef2fb5 100644
--- a/net-libs/davix/davix-0.7.3.ebuild
+++ b/net-libs/davix/davix-0.7.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc ipv6 kernel_linux test tools"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 		dev-libs/libxml2:2=
diff --git a/net-libs/davix/davix-0.7.4.ebuild b/net-libs/davix/davix-0.7.4.ebuild
index 448dc89c144a..610959a3bbd9 100644
--- a/net-libs/davix/davix-0.7.4.ebuild
+++ b/net-libs/davix/davix-0.7.4.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6 kernel_linux test tools"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 		dev-libs/libxml2:2=
diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild
index 448dc89c144a..610959a3bbd9 100644
--- a/net-libs/davix/davix-0.7.5.ebuild
+++ b/net-libs/davix/davix-0.7.5.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6 kernel_linux test tools"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 		dev-libs/libxml2:2=
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 1c7e3bfc4838..fb41596b01e8 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,6 +1,8 @@
 AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
-EBUILD glib-networking-2.58.0.ebuild 1930 BLAKE2B f2b4b63d10c61708bdcc8fd24983e6a915f89cb17b4de6db81cc15ea81992d38925516e8e9e38aef7e55e62bd73c482f6d75648a9645afcb4c1dd6355a1dfca1 SHA512 ae295c78535fe893bbb25d3706e082504d91808d43a1ef4345c296064fcb290ba2cfb52facfc45158a15db237124d4ed8eb73d81f2ffc3d43b0b0843ccdce8a6
-EBUILD glib-networking-2.60.3.ebuild 1744 BLAKE2B 35e8ea87055ba818503d96e6a0ff136daaebc203988aaec9f4c2225a24ff915f52078e7ac6a7c6aa04a7446bb0a13ddb6d5ad682ba2cbc0f94477ec251768359 SHA512 1abfde4bece369830c56a04fe48e4cf851ba9eaa5eecec2a5028c72b5067b7461058c6fe3ef3f2a6422b1ea76394f6063e2a20561203151b8ad4c09b64e496be
+DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
+EBUILD glib-networking-2.58.0.ebuild 1957 BLAKE2B 6ad5a0626dd10c4873d7542eb66a2b73dd85fa33a07cbad6432052a99e8ffdf569c51b71fd3a7017ffa57f19e6eed53a32ea60769200ca8516312dfe1377d432 SHA512 96d76192155ec43464d04df7ebdd19f6eeee5112bdc7812faaca211aef15b9fb88ba994d73e5f1fe5066eee1f7c20ec1bb2585c8924bd3de01d6cac44596c713
+EBUILD glib-networking-2.60.3.ebuild 1770 BLAKE2B efcc58a1e29857deeda29f1aa72bde1c2728d86907f9b6a74cb3150365a1aca1e4b0e9bc51a6188c3e0e9706d25b1c6dda4fcdfa4565261e04347060046ac331 SHA512 d63448bb31a095ddb67d3680f3948da49360d99833be7a2ee533e0ca6c8bc8d05a29ecc3b297ae84b023469288ca2c92ce2799e2ff1494c1a13f33b0fe1016ca
+EBUILD glib-networking-2.60.4.ebuild 1780 BLAKE2B a32b7d6c7ab3a32d8d182ff4c9da4d6db43de26d3c9a0c57cafd6b61c1c254f9b19880931580e78b2c323e6b271e7e937660a08f281241f4b303401f8d0dd47e SHA512 0169e55c4053938fdf226d0a8d04ffb80652b5ee729b1abf9b883dab08e45bacfae18ec486d680d6e580d7af2b8f9ba35674e2f0f87fdd02a1280c66231186e9
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
index e66b3ddb0b52..7111b4ab1667 100644
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index c8650eaef36d..56e52d93134e 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+RESTRICT="!test? ( test )"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.60.4.ebuild b/net-libs/glib-networking/glib-networking-2.60.4.ebuild
new file mode 100644
index 000000000000..43a3bcfd5c52
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.60.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index a7bd1b62cf2d..45658c903378 100644
--- a/net-libs/gnet/Manifest
+++ b/net-libs/gnet/Manifest
@@ -6,5 +6,5 @@ AUX gnet-2.0.8-test-existing-domain.patch 1000 BLAKE2B 26d58d6bf8a8fe3b46e7cc892
 AUX gnet-2.0.8-unittest-build.patch 1041 BLAKE2B 0efb7cd8f6d2b2cd8e775ad499614a4de2659153070f940a5326de36ca70b621b6ea41d27307cc62b67a20b3a490416884e3438b506c152f8370c2bb38468292 SHA512 f7cec5602a33a14083117188190881bd4e6cca188a16d854b9d48fe5fab7653386f7e8e116d2c3eedc30595068e844078b73286cc80e2d165f7acec0b8376773
 AUX gnet-2.0.8-unittest-service.patch 1093 BLAKE2B 572ac32893cf3221c9e2743a97bdf91dd60bba521ed54dac9252d260445d0da67b6b2eb68d5b21cd760f1e7e61b71c6f8ec7ffbce8b8ad4f248e27ba55bf505e SHA512 2b815264462491b072a7ffb2f8413999149aa249d33d5500fc2279b523c518a31c4dcb1baf3c5554bdfef0c6f4c112ebf1d26b19f211a0a7ace9f867e07c037b
 DIST gnet-2.0.8.tar.bz2 514019 BLAKE2B 6e09912d4d438fc55290c9df45b2fe29397efbaf2ca0ff88fa6e22a9935aa1520f4a1faac24720ab1925bd6537a8725766351e4256e036ef61cfea91470bc6d5 SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f
-EBUILD gnet-2.0.8-r2.ebuild 1961 BLAKE2B 9d8a6f4f3978ce9f5ac160bb05a31b70528e99f0b7fe2ba55259df40673e858c469e00ba736959a5dfd07f24aa4e40c0b8f39217db3a0e0b2721b22210d4d760 SHA512 e240ae27639670674fe5998514f3b635c265ca0370d65653a1652faf758d0db42c0cf198d2f17e9b6d562ba214c9838fae1294260174f10a87518932d0163a51
+EBUILD gnet-2.0.8-r2.ebuild 1985 BLAKE2B 34029ded17037e888cc0046a3c6118df0b4f90d6d2a00701836a68bddd35950f620f64e17c545a1d84c7958bb7f66b7f74d2fb5ef6b9c72354fba822572cba3c SHA512 06814837d8817ff49914227ae957943dc62634a96a9e08713ceb6e2ceff51a5298517bc699fbee1a7d7a6c899b6e1ff4f5edbc784663b3446b6957c8ab42fbdb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gnet/gnet-2.0.8-r2.ebuild b/net-libs/gnet/gnet-2.0.8-r2.ebuild
index 28be75c5683e..835538e654d7 100644
--- a/net-libs/gnet/gnet-2.0.8-r2.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # FIXME: automagic use of valgrind
 RDEPEND=">=dev-libs/glib-2.6:2"
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 87b545eb9370..354d575760a3 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-online-accounts-3.30.2.tar.xz 921284 BLAKE2B 9dc503f73ddda64411f73ac865a0355f318ad13789fac0cf7e7a91d16e53b03dee33acca6752060ce54936cfd5050adb8fadfd121158c0496a3f516e35e8fa45 SHA512 3555421adbfec0e7da1c8f3a47415f6c5bc3eaf8b246cf08eb6ee420286a4b40d11bc6e2514bca937b022b95068c9862438fa632d3385503aba2647a4a57976b
 DIST gnome-online-accounts-3.32.1.tar.xz 863252 BLAKE2B 69345a5e7a9ccfef231cb012a1e3240a31db898f32b654f6275fd18e027eebe5cda07b4a0f8fea1447ca33ac120d8476aea7d2c824238b327c0c207009fcae7c SHA512 548e6c983899bc1f4093fcf0b7b08819f2803182f52c2cdfb4cffa8bfb00e513322973fdfce2aeadeb52b0cd43c7c1e3941cff187927577cefb4fba51f4fda5b
 EBUILD gnome-online-accounts-3.30.2.ebuild 2093 BLAKE2B 1238f709ef5744af1025bab7db217bfcacb9e08ea475a54127ad738bfcaea28d188e152e9b73e1819836eccf323b21d4736272d14627945fccbae6cc673cea23 SHA512 14b614b2a71046c3229a19745e492c01b373983eb10098ee24b70e8894fe3d0162fbad2c62046c66cb7b0830d243577536d0d1ea6d431af77f7dcea4c324be0a
-EBUILD gnome-online-accounts-3.32.1.ebuild 2075 BLAKE2B 4dd36dd182b973f2ea7dfe62e261b343009fe6883cea866939d2d0acc0f3dd7a583f0bbd4679f1b2664e76e15f1c9c4ea55976b3e805320b88c2e77a0c143ba3 SHA512 dff482a6cadbf14ab95f2b616e18a859a451091b4798e646d1f06a925e4e9cd2ff686fe620f1f500a5e815c4fa2a038b0aeb0538512747da167f86e6d9ecaf21
+EBUILD gnome-online-accounts-3.32.1.ebuild 2072 BLAKE2B bac9a62f53a529c293150b5e8e39f5fcd4dd73a219794696b61f894c8ebfd8154a633491a10aa2ed6a2d7c879f5cd89b00b76057f80dbaa677749fc2343566a0 SHA512 c0c577d896ea31d6eca8a1bfb7ce3eed02310ddf6caefda8aede69852d08553076ae4c27e14c4ddb4d83064a8042f6774ea86c4728d4ceb4a2661f8d1db2092c
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
index d35a99d2acd9..3c1547f7abea 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 5d4cd57b93d7..eb1cc0f8f285 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,7 +1,9 @@
 DIST gnutls-3.6.10.tar.xz 5795984 BLAKE2B faa4069613bacffbbc3fe00a7b8963f0aa7eacc7946ea51912e2b6366964cf7001d40aa5de3f0543405c54a3200da0c0029150ec7cce84d598bce44b461f2fab SHA512 fe0481f9e4219e983b01b91e69ffd95819a4c0d0c09028509106d561967e9c5d900bc5e3a48140a34fa4467feda2a619085adf3fa8fdade96c8debf125e91ae8
+DIST gnutls-3.6.11.1.tar.xz 5902328 BLAKE2B b0cb2fd651411d1647a927bcbf8ae032e68b2d4ab3ae4a1d2b77d7dd13420e2e31cc66c3e106d830051cea5e0f9d3ca5419ec5ae57ec490638cb033fa740974e SHA512 55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489
+DIST gnutls-3.6.11.tar.xz 5818536 BLAKE2B d413b49b3f7087bb91c2b700ded0825f55e0750d1dc509bfeb4735ab7fa8992f02a71c478bbb492a68d6b673c6662842fc7992ccf408379eb142d41b00eb2daa SHA512 dbf6766131496f66d712cf3a8f042e93eea057d843972c7cc0376c25b6f3802f51af4fe9b38fbb07e8194748a185055a2bd26c1fabd234d330b892466061462a
 DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3
-DIST gnutls-3.6.9.tar.xz 5773928 BLAKE2B 9dd7678fd7ea9f170816358a6ac385193fe4db8052e7a35d553e18e8618ea88aeed2b618b288f98f2f480cafd560d46de04234808560a8ec18028574bf26b706 SHA512 a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07
-EBUILD gnutls-3.6.10.ebuild 3906 BLAKE2B 133310cd3a4804042e8e82990f5e60933c8ef8ee05e2a312bbd9e7217971efe09541a6018165f67b3903612d274ce24c86cb7358062da06bf34cc94d6eea1916 SHA512 e5dc77b13cd0d0f7759bb316f50d62fbf3872ce977d49d24c28aef402818ef4464e82662c0030a01bc435f1204b5d81f5e81e9bd6861a654c35ae3cc190f4a10
-EBUILD gnutls-3.6.7.ebuild 3886 BLAKE2B e794b5866ad786d8efb9127d8016551d21167143419c61fe7b7ede90e30bb89e6ba8b113953bda692c798271f8b81e7f86a61d9c44af21a830a9bd125ee9e8f1 SHA512 7984b2c7e407b930bdc71bb87576ec792181bf6ad35c5d4c9761900d50aa2adffa7ea64724e12581a566538c5fa513b4adb2ddb80284bd96766f21588986c4da
-EBUILD gnutls-3.6.9.ebuild 3906 BLAKE2B 133310cd3a4804042e8e82990f5e60933c8ef8ee05e2a312bbd9e7217971efe09541a6018165f67b3903612d274ce24c86cb7358062da06bf34cc94d6eea1916 SHA512 e5dc77b13cd0d0f7759bb316f50d62fbf3872ce977d49d24c28aef402818ef4464e82662c0030a01bc435f1204b5d81f5e81e9bd6861a654c35ae3cc190f4a10
+EBUILD gnutls-3.6.10-r1.ebuild 4016 BLAKE2B 161ea3056a5368688f2fad8be7cb2aa04da9a19053ae650ee9f9fef64de01b6a376dcec24e8367b84aa405a163fc445859a25082f1a1b046545447e116b5b3e4 SHA512 bf9d4b3f68def6386d78044dcf56fab28992720e933f7bf1522dbc2d70da34efddf49d96ccfb5c29e4cf0bd1a1d62c224331a0ddc3ee483de4da75875e782dee
+EBUILD gnutls-3.6.11-r1.ebuild 3998 BLAKE2B a142d3cba3f4df0daa1300be72e0ac81f1938cb2ef1ce6b7f9dbc9434fda44b3e2f98e0253e039c85f7befa77ac423df08b881f2c2a3eb861f8e269f3d29f0dd SHA512 fa259b5cabc58aceb9c12a76a69a0fa79b0ee2a3bd11970e398c68bfb4edb491d1396d7e41f841914ea6fcb7c8bb54f7478cb59adbb914d8ace98e27f3a505fb
+EBUILD gnutls-3.6.11.1-r1.ebuild 3998 BLAKE2B a142d3cba3f4df0daa1300be72e0ac81f1938cb2ef1ce6b7f9dbc9434fda44b3e2f98e0253e039c85f7befa77ac423df08b881f2c2a3eb861f8e269f3d29f0dd SHA512 fa259b5cabc58aceb9c12a76a69a0fa79b0ee2a3bd11970e398c68bfb4edb491d1396d7e41f841914ea6fcb7c8bb54f7478cb59adbb914d8ace98e27f3a505fb
+EBUILD gnutls-3.6.7-r1.ebuild 3996 BLAKE2B 8b3d8104ace6c4fb9feeee846330425e234d7aef901d938d85b8759170e4b471e15f206508627962b428d54b4b447954639bad5a926adce4649164b4f8ec01dd SHA512 3d71ee2df60845ab0bf09b1cafbaf6cede2fe67a230af6057004c668aa23b94162b81ee5d4f6406ffcd3e51c4381f2c13f9939cba15b38890989744f6c665a7d
 MISC metadata.xml 1277 BLAKE2B 08fd439ce197f1ce2b1fd5bdedf6e409410aeb45a473b2b81ab9316ef32b367d44d0c65f3e768fae9edba1a03f572417e3f7dd23ee73b700dd0798e3dca30292 SHA512 dc4e4e3a72732012cf37d21b881e44933d5e3720ee1f3dc2c5d88ae97e7e2cea79628282bebd7d58048db7edd0bb7be80ffca23d126f333600172f16473341f5
diff --git a/net-libs/gnutls/gnutls-3.6.10.ebuild b/net-libs/gnutls/gnutls-3.6.10-r1.ebuild
index 04d15d723851..4d07f7a574e5 100644
--- a/net-libs/gnutls/gnutls-3.6.10.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.10-r1.ebuild
@@ -16,6 +16,7 @@ IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3
 
 REQUIRED_USE="
 	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -110,6 +111,7 @@ multilib_src_configure() {
 		$(use_with idn) \
 		$(use_with pkcs11 p11-kit) \
 		--disable-rpath \
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
 		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
 		--without-included-libtasn1 \
 		"${libconf[@]}" \
diff --git a/net-libs/gnutls/gnutls-3.6.9.ebuild b/net-libs/gnutls/gnutls-3.6.11-r1.ebuild
index 04d15d723851..86457bd17c46 100644
--- a/net-libs/gnutls/gnutls-3.6.9.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.11-r1.ebuild
@@ -16,6 +16,7 @@ IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3
 
 REQUIRED_USE="
 	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -78,6 +79,8 @@ src_prepare() {
 multilib_src_configure() {
 	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
 
+	local libconf=()
+
 	# TPM needs to be tested before being enabled
 	libconf+=( --without-tpm )
 
@@ -89,31 +92,33 @@ multilib_src_configure() {
 	# Cygwin as does not understand these asm files at all
 	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
 
-	ECONF_SOURCE=${S} econf \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable nls) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_with idn) \
-		$(use_with pkcs11 p11-kit) \
-		--disable-rpath \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		--without-included-libtasn1 \
-		"${libconf[@]}" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild b/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild
new file mode 100644
index 000000000000..86457bd17c46
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gnutls/gnutls-3.6.7.ebuild b/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
index c9fd2245dd67..5fdd7b50a321 100644
--- a/net-libs/gnutls/gnutls-3.6.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
@@ -16,6 +16,7 @@ IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3
 
 REQUIRED_USE="
 	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -110,6 +111,7 @@ multilib_src_configure() {
 		$(use_with idn) \
 		$(use_with pkcs11 p11-kit) \
 		--disable-rpath \
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
 		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
 		--without-included-libtasn1 \
 		"${libconf[@]}" \
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index cdba504d71c2..5541dc59b5b6 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -12,7 +12,7 @@ DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c
 DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
 DIST nlohmann-json-3.4.0-json.hpp 705920 BLAKE2B 9a22a6420f818038d8c4b352fb92ff0f0041b76232ef8665686399d184cfc62caffb60b4ccf1d8d33ae428839a70fece959f94795d71803623405d041efc9a13 SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d
 EBUILD google-cloud-cpp-0.10.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f3781220994dc4b57322b71949fee3ed4b44b561c4730ca81df959ea665fa247a08915b961e62468fbaf50d60e91ae1bac9784cf6 SHA512 7309088ff54ba12a75388b50a208c6d8d37e9ef8228c8ee0dc2f3fc00d7ed8a079b6bcd64c2e2fe77c775f2f3736d5acf57849423d0f1c1a9fdd93f49c385aca
-EBUILD google-cloud-cpp-0.2.0-r1.ebuild 1665 BLAKE2B 7e581ee73e76a11a0662069c48f56420e19682d0ff50da239dabd554388192a49f905f290c89fd3e53f87d5051b2a0b501b950f71b53535d0e446ed32c88d955 SHA512 86e55d3ff6702482e7f9df3bda0989d93c5d0ebe1512af465e9bdca6b160cdf0ba15cd49db480887b78e4cc31d0d3c9d24eb0a54f0d23aa7cd83b67865d1edfe
+EBUILD google-cloud-cpp-0.2.0-r1.ebuild 1692 BLAKE2B e140396a1b9dfe47a282733c8b50961a2f820e728556a0a26c4ab66769c95bd3af5b63484af7b7034939a62731d190717d21225df6bab8c41034fce04bb847ad SHA512 d121f5d5c913f740652440e7583079aad68b1a1d03ce79145177a0ed9ff8117e7d1354c116be50623b7b7a60fd58279385b3e40181bd23eeda82b7697d140b5b
 EBUILD google-cloud-cpp-0.5.0.ebuild 1668 BLAKE2B 07e76db614ffc35f1accc059f6cfefdc7f75009618ccfe04a69fb017babc52f9177d7c6bf8c44b64f9787b16d82c3776e56f0df7978c7eec42284bda1318fc97 SHA512 da75dae85dcfbc839b95dd00bcf42f65d31bfd4d315605cbe09db9971488a5347327e3f8b71563800ea16e3ac94309b7131c3ce4ca147b026e1ad611982e78bd
 EBUILD google-cloud-cpp-0.9.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f3781220994dc4b57322b71949fee3ed4b44b561c4730ca81df959ea665fa247a08915b961e62468fbaf50d60e91ae1bac9784cf6 SHA512 7309088ff54ba12a75388b50a208c6d8d37e9ef8228c8ee0dc2f3fc00d7ed8a079b6bcd64c2e2fe77c775f2f3736d5acf57849423d0f1c1a9fdd93f49c385aca
 MISC metadata.xml 334 BLAKE2B f6f86d6b9621c1f6bb8a540835936ba0eb3ebc9ebee743cf3fdd0f236477378acff8af6528ba194cf1ba74273d3df99eeb012add242471af810afbfbe587321b SHA512 3ddab1ddecbb3f976ed02c450094873ec200d3a42faa601a10a3089d76faadaffa3fa59e48013b471e735a919502988da149f4d19e7d1d7054947462c71581a9
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
index 5ed6e5bbbe45..fe66dc867def 100644
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/protobuf:=
 	net-misc/curl
diff --git a/net-libs/gupnp-ui/Manifest b/net-libs/gupnp-ui/Manifest
index 47c9d0002837..3f103da701d3 100644
--- a/net-libs/gupnp-ui/Manifest
+++ b/net-libs/gupnp-ui/Manifest
@@ -1,4 +1,4 @@
 AUX gupnp-ui-0.1.1-underlinking.patch 755 BLAKE2B 02bd4724610799c4339e9a7f347b580437b8a1f9fcc368832f942c989d0d5fa00f118517a50ac932e421b186075cf3f55ab9dca4f6bfbef2668448c260c0e018 SHA512 1dba9b59bbbfff77886573fa53dc03207a72a7f483e5c67274dd8a7ec8846a2dd2d01bb95044ed96f96c568d87b2105016d6d429180116b4a3a290a1f9bf0d39
 DIST gupnp-ui-0.1.1.tar.gz 362414 BLAKE2B 2453520ea36f4d69df3af26241f9f2a0584e55225394a8e76d7a13cfd0d0b42cfb3203f1afba157cc2dd651cd63744fb5f4393e3790becbd3293764c3d37d14b SHA512 eae64352e96e6cc54411b5f9276a4386b60bc4af21246d3387024b8d5b7243ef988a98739adecc068f7d26fd85887b7500c4e9d89993aa68e5fe746ddc93dcab
-EBUILD gupnp-ui-0.1.1.ebuild 739 BLAKE2B 515a3c0e379866efa1ac3d8dd084fe8f159cb4ef654fe925d13822f38cb73a3d8260a8ff13a4165745a78ded63a4c54adf7706b88bbd0e6dbff90dbbdffd9bf0 SHA512 c5e464e329a4e961ba12f90fda6c63a7ef605d40dacc87e6e3f6c6cc5f8d9e8b3711d5ca735d361279b319a3b2b87be1cd9182bf78564519c2a1d5ad30589b38
+EBUILD gupnp-ui-0.1.1.ebuild 709 BLAKE2B 371be5d3335f8939fc4b5508b0cb321b5147a8285c25730cda2649abe6480a6798293e384d1151360264dc3f27d0307ece19cbda5cbde62931456c9585f8248d SHA512 40ae1b264a0ec31e10d00340fc9db38fccdc6c080d56007781736571952c388dd068d83eec78df132cd1d2533f4b8e12ade2565739f3739105f5fc9cf8692170
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
index b76fb5174a79..1469081e3807 100644
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
+++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -34,6 +34,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS README
 }
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index cc682f4a8cb3..5f9e80a2136c 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,5 +1,5 @@
 DIST gupnp-1.0.3.tar.xz 422912 BLAKE2B 900a2a81982a50239b26ddd5df3f57caac1ee66103e857b9014db7dc694e303c1eaa0633cb467887f3370e97058abc221bd0175c9df11ca4af31e3f802145a66 SHA512 f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
 EBUILD gupnp-1.0.3.ebuild 1948 BLAKE2B c7515e47821d5e385d21f507a241f15b320645d88d94e3bb8cfd91574c40dcff36d52b412663723cfce4d59324034fd60de31175b0dbd878a41d0d184fc25c1a SHA512 495086fb7212e0f4bb864eefe84e6d895d9dba1939bf43f9a001deacb5389eb4dea136ccc39a469683d6a36e8e0b98d05ecece38e825ff1a395ac829ba84635d
-EBUILD gupnp-1.0.4.ebuild 1953 BLAKE2B 1fc828d6d3ec967d2a6564d56547514dbb4f2de42caad06cd75ce63e0f083a24cb53d0c2c319b52f5548b56063109d46c78b1d2c4e07d9bc1dec9f047e54327e SHA512 32be26a800256a06e27b3dc2e9aca20bd9836fc1ee5b58587aeb2f393fa2cd6e0850cc852fd4aee1a9fba068bbb0753eef7c489e2fe797e3c469ba054d9d568c
+EBUILD gupnp-1.0.4.ebuild 1949 BLAKE2B 00b66628c3d84b53aea5fa55ff6f82d5b8dbe7dfe8da9221c3535cec7d3984de72ce3a29d43a621d73d419d0222620a0e99d616c1bdc88c066befe927c3de14a SHA512 2c693f2150a66047cc0b32526e6c6355863d671cd3b834544c3f2dbecbe91e009d1dc3fdc0f924b269de46e6ffc3ce842c1d606283c6212c73c2dcd93e3980a3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
index 6e5cf8b99539..432a781ef7b2 100644
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="connman +introspection kernel_linux networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 61d4c9045a08..549e8ef2276b 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 986 BLAKE2B 5696770f2d51a251fe52896ba3cb42d713d5ca24a8bb3c631de7d8115fc67d8c3d7e3e4f4778f162b89d2398f8b8e687a6d66eadab6ed31ffecaeb256995a2f4 SHA512 abb33f763de05b5300ced90e4032293f37b56712989e33c78b8f92e0a6beff4adbc0f1a97e08fdf153be9089157258d3baf07645c7c9f510e6a3c2873c45cab3
+EBUILD http-parser-2.9.2.ebuild 985 BLAKE2B 027de308c6275c5ecb747f12b2d266bdfa33b21fe9ef5872ab3635f4e27360cc74bae06b8d2e835e4fbcc569ae5e65f75c8aeea201538838f41fae9be280b084 SHA512 a60847368bffec4c352257265015249a5b0807557e24247aacdfb6c99b9c3594f7c89b79c0fc49b9ba7cb3fedb96e3227ff77a9e986b398d9dde1bea46b99df9
 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 826153de359e..e2628e93d41e 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/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
index 350e154a01b1..22423c93b5fe 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,3 +1,3 @@
 DIST libdmapsharing-2.9.39.tar.gz 757492 BLAKE2B e9f47d793be05845d1afb6eb4a785cbd131ceac1e3146bdfb5c6914f584df2fb8db10b829447a6ac084e7a9e0576202485019b1e724cc033f11163fb1bb21b95 SHA512 7003b947e1982735b647c1fa8e7e80e05322acf4ed4b5c1c28708da00a0bfe3eecac01bc2ddf59966e7db045f14fc78e749a2859d7e909bcea41164939f15b4a
-EBUILD libdmapsharing-2.9.39.ebuild 1224 BLAKE2B d0c705451ef5f0eb914e425e5d728d966f498a225834eec5cfb7b543cfe6cd50a0e75ec205dd3290c7b25986a317bc172716c730c46de448057fd36098e52728 SHA512 1c7718a05b5527d4a6e7c55dee581d19ef209e9a8fef01c053373b6b22c0151866e095df7191e11adac8ad73f2cff43238b62d0d6a7078f78c709c59bfcb92bb
+EBUILD libdmapsharing-2.9.39.ebuild 1251 BLAKE2B 2e682bec5a05d1f19217e03e8de6026a94002bb1d04a566cea51a234567d508f1488ec9381bfbf4d22ed7e482c923b8b06fc832b316c99b05da37f4ed0b8acfb SHA512 eabd1dafa92c72a68048253a6de138de0ad7ff7a26358d5895bcaa8261da0632309078bc685f14b4a345fe0f0f693d62cff864244711f76a23a97062666fe854
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild
index f39dca47af47..01133fa7ece9 100644
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.39.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
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="3.0/2"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection test"
+RESTRICT="!test? ( test )"
 
 # Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
 # Doesn't seem to be used for anything...
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index 5d1eac15221c..bfbd2e245881 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,3 +1,5 @@
 DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
-EBUILD libdom-0.3.3-r1.ebuild 1192 BLAKE2B 771f632cd7d6608c85f6bf217f6f4435fcc1675626c8e939b0d457aee1e34a3f942a3d47f94bb5bfea5b02ccbffad6ae7fcaa13e3ead44bb7d0c382defcf96e1 SHA512 c99c11f8cf4cb91e06f3f3834a0c141ddf9fdeae150750e90c947fdb18bcdf26045dbdb6c8fe58d43c8bf6a9cc2679d86747d9ef796c465e67735cdef7a0cb2f
+DIST libdom-0.4.0-src.tar.gz 871499 BLAKE2B e0ab1a1cf14b532eec1bd68c3ee2557a720a984232ede2f9b0e1d4c68299cc8b39b3d83fa1ff77233d07b8148188ec3012dca64787cfe476b4eb6990f1c71629 SHA512 4d3acb6520619c6c28f20c9fef72b19a879070d0e65d896212c557ada44d35c1fcae4712b901db720ddeb3b1b90832005d63075dcafaddb5f4ba2088fa7a9eef
+EBUILD libdom-0.3.3-r1.ebuild 1219 BLAKE2B ee68ac1d36b1ab0949c4cde6b48f2401295a0511ee1a5cb3290a3e4dc6e9fdff9b0b046fbff6baac0716b62331fe43dd36864d555aa72a7083c0cca6deff45a8 SHA512 5866280d5f86a4ccfa9484093c32850476ebabc9c945902c398813e23869ee1f9291f07df48d5aa9ca57df1ff43053cfc0685ea9f9183b58cb60615a929d665b
+EBUILD libdom-0.4.0.ebuild 1201 BLAKE2B 1f326a228e12011d1a0bbb73b1f98dbe5a5728fe2cb7b5284151d07318c4da23e5964442f58d734f83d57bf223e8b18c3d6ee4efac1da275e43a8415529fb759 SHA512 477fdd247ba7a130992a0735c4a40a5c3a6baeb6d6880a3a82886ff9937b2fa561ae7dde3d95b7a54f245c917289d35c8ae6924565684f51b2bf82ca1a895abc
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libdom/libdom-0.3.3-r1.ebuild b/net-libs/libdom/libdom-0.3.3-r1.ebuild
index 5d361bf7b98a..1a6947896f96 100644
--- a/net-libs/libdom/libdom-0.3.3-r1.ebuild
+++ b/net-libs/libdom/libdom-0.3.3-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
 IUSE="expat test xml"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libparserutils-0.2.1-r1
diff --git a/net-libs/libdom/libdom-0.4.0.ebuild b/net-libs/libdom/libdom-0.4.0.ebuild
new file mode 100644
index 000000000000..e9cb215757f4
--- /dev/null
+++ b/net-libs/libdom/libdom-0.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="implementation of the W3C DOM, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE="expat test xml"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libparserutils
+	dev-libs/libwapcaplet
+	net-libs/libhubbub
+	xml? (
+		expat? ( >=dev-libs/expat-2.1.0-r3 )
+		!expat? ( >=dev-libs/libxml2-2.9.1-r4 )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/XML-XPath
+		dev-perl/libxml-perl
+		dev-perl/Switch
+	)"
+BDEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig"
+
+REQUIRED_USE="test? ( xml )"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
+		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
+		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \
+		$@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 0fd7bff006cb..dbc6cfc369ea 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,5 @@
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
 EBUILD libgadu-1.11.4.ebuild 1291 BLAKE2B 10c941dd42ab5ab2478bd915f4c70faf442abc7f1dcd65444171134ba6618c76673bd56768a775d84631f24354ca6ccf55dc769d2e101cf346326eb8831d1232 SHA512 f9245ec916ad4cc0381fee2ed3f8ff136bb6143095ba6720d888d1d15ccf813e99cdb79e3b41469683a8f3e4b53836556c78921fb61a643c135a8ad92b8a705d
-EBUILD libgadu-1.12.2.ebuild 1385 BLAKE2B 87302a7b10b889436036145a8e910687309fff42d01f4cf3c5eedcf15ab320e1f9cb846022b683a5aec028033c5b99169c90fa3841be4ed9fa3bf88bfd82c78e SHA512 399127f1ca998400d4a65fcad028d4b7165625e086950cbcd6400f84599372c7e6a1ca465909c9e14db56dcf3b9f1760b2dbf87ea22044239faa32a9a126cdb5
+EBUILD libgadu-1.12.2.ebuild 1412 BLAKE2B 8618b371c30b6eef11c7f313629c48e7bd32792d188c2532642d8c01697392e47c7959f055aa0441c89484e42570acece2e97b58294af97557ecf7bd9dd053b2 SHA512 c4ed214ce611c521ac6e98a4f35707c3f0eacc6e1d3e9f51974ff6bef5ee5dfca943ab76c38ef219f041f5a8b661a600a30ffd0fbfed8eabc67ebd2aa17c62fb
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
index f4c3aec40dea..8a6c3f71c24b 100644
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	gnutls? ( ssl )
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index beb8d4e46a61..0dfc3bce897c 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,5 @@
 DIST libhtp-0.5.22.tar.gz 5773159 BLAKE2B ae3b759624ce7c6063013810142fbc12544d60cfaa482ad82114b65374923871bb732c86051822fe78a539efbe5e139f480117a28fd4ba2fac9201a46b8eb99f SHA512 3daf7241e8abca34bf348e0fc805c755472ebba01a869d5523637a81dfd6b9b3019941dff2e75d6e0978ebfbd60d917191e355aa43a2391500ecaaddab487ebc
+DIST libhtp-0.5.31.tar.gz 495621 BLAKE2B 7c6c552dbecfc8e4314207c1b944dabee1172ebad608848a80549b1726b9b0d576c01b7ba1f79beb3912e5e79384d5c261cf7a548d8c8f49b20f77b2c9d71823 SHA512 8069afe87548a9cb29a883ebeb9fad05a79297fc567de22e9c1c030f5239d4373478bc3ed5ecb284e84401f1086f6a18a58e288f28381b96dbb5b71d60afa03a
 EBUILD libhtp-0.5.22.ebuild 802 BLAKE2B 952ed01b70409f28eabb0297cdfc9b0c3ee18616172a71a9d3a94d70da005b98fdc06cf3a944646ab90d8b7f95f78f426e5eb24facc27108f33d0716ef972e8d SHA512 16e21e57bf13a605e40900f81406b378f5c05332bdd537c5279968975b80ba78d76f0129b8c083d7c234c5520589f2eecad0e1328fee3a11af4ce90c4b072f67
-MISC metadata.xml 239 BLAKE2B 5663c5db91a61423afef9ca57ba09e86a7510a559e5cc1c1eb31040d52992f0ff9ddda7d8da8ff0d1659f840a9945cf445d240467f3e4f3dcbeafdd88110ec08 SHA512 28e6cc728967776bcab01a267db4306577f203c0dd2daff89fb99af56f3414ba8675fe7015da268c246916d4d454382aae093f5ccbd233aa12ad605e85a5333d
+EBUILD libhtp-0.5.31.ebuild 856 BLAKE2B 662ab3523934bb8e16e01312f5c919d654cab285c063b59bc958a30c6c7ec140d6ad51fb89b4490a1167aeca1ea8675e46bea8ea56bed9c527db696abbe9312e SHA512 af7d56ce1d18b5248583d57698914b34c013c0a0a30ebd583272475337fa9206b59e501fcdc9d361e8fce7468e3b36829e05fbd0ca0fbc1c9f46ff3cdd56d1d7
+MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.31.ebuild b/net-libs/libhtp/libhtp-0.5.31.ebuild
new file mode 100644
index 000000000000..d737b3ef282d
--- /dev/null
+++ b/net-libs/libhtp/libhtp-0.5.31.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
+HOMEPAGE="https://github.com/OISF/libhtp"
+SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="sys-libs/zlib[static-libs?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# The debug configure logic is broken.
+	ECONF_SOURCE=${S} \
+	econf \
+		$(usex debug '--enable-debug' '') \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
+	fi
+}
diff --git a/net-libs/libhtp/metadata.xml b/net-libs/libhtp/metadata.xml
index 3b1b37df5a69..b2acb4cf4cfc 100644
--- a/net-libs/libhtp/metadata.xml
+++ b/net-libs/libhtp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+	<email>marecki@gentoo.org</email>
+	<name>Marek Szuba</name>
+</maintainer>
 <upstream>
 	<remote-id type="github">OISF/libhtp</remote-id>
 </upstream>
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index f2f103e08148..d2d845045a76 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -3,7 +3,7 @@ DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420
 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
+EBUILD libhubbub-0.3.3.ebuild 813 BLAKE2B 50d1b0f9d5a81647359ad8c0c43cfd1752fe70ebd4663f6d33122b23061ed72a6cb563eaedb42a01b0ff2a925da2f305b29892917ea78c09a4465712ff99cb76 SHA512 e73c622d5df44f6447bf9bb499a0bb513c9156b40f67ba04fa2a08f0aa1c36c333cec9d2454de35d3d0d3620bfb5aa27c51e9974e1f7f00b440a1674aed42f64
+EBUILD libhubbub-0.3.5-r1.ebuild 1140 BLAKE2B 4c92376ec7450896597e8b582ede11da5ca8ab72590741404b3c79f5fbcbc55b72a8371c0a4e18400185cf79c0799a9fb1cc9dd986366f01b5085de15c20e010 SHA512 fdada0957a19b27dd8b76c807f7308db5976f09f81e026d5bc1df83749abf969121c6c1dfa690b9fe5ffc524e47e13d97b05aecb933710855221474056cafb63
 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/libhubbub-0.3.3.ebuild b/net-libs/libhubbub/libhubbub-0.3.3.ebuild
index 833850b112d2..7c1047c179c8 100644
--- a/net-libs/libhubbub/libhubbub-0.3.3.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.3.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=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm ~ppc x86 ~m68k-mint"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
 	!net-libs/hubbub"
diff --git a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
index 04cde6298f8e..1ac38dd958a4 100644
--- a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libparserutils-0.2.1-r1
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index b49240d32b98..9e0d79b48351 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,8 +1,8 @@
 DIST libisds-0.10.6.tar.xz 724120 BLAKE2B b6d3f42d4ff84c377c9425dfd84a14ae97ccc39ea4bb96169e3a8de21b99dd6e5ceda39a6d4a574ccb418561dbec2507f72afc8b6f185c34ff92202abcc49441 SHA512 602c4e7f047dedff131cda941d02ea41fca7b8ea80eb668ab8f7ab2626a013ddc1a86f1e2c7b5759adf266c7c22c515284e6d4fdd9fd594ad310bed1be6016f4
 DIST libisds-0.10.7.tar.xz 724840 BLAKE2B 73d93b518271cbd08787a38da454ceb8fa6c2d421b0291c61cded8f1438d44c5607d1e90d75714c3d76e0886ac723e38dc2a41d60284a58d567abdcba76becd4 SHA512 ba2ef11c2983cb3bc8f779e7af3fb8319d38a786911e68c6b53c25aff339b4630bdf78886825ea3da671e87f689cab376cd9e41398f3f74608af932abe7a0023
 DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
-EBUILD libisds-0.10.6.ebuild 1160 BLAKE2B 5f4d4d1805b282a16e7967af3c0a60c16ea7a3460b065222c4852c0c86883e9773128435f22ca9386a1c21ba5f75c5657f5ea592eee710c3bed4e27c1f21c09a SHA512 dcf884de16b11260aa3db9436a3298c2dd4e36a3f7b25646e336654da908faebf1cca5b2fc61784c87f2defe56f13473ea578269fae972904652c15b85af15ef
-EBUILD libisds-0.10.7.ebuild 1160 BLAKE2B 5f4d4d1805b282a16e7967af3c0a60c16ea7a3460b065222c4852c0c86883e9773128435f22ca9386a1c21ba5f75c5657f5ea592eee710c3bed4e27c1f21c09a SHA512 dcf884de16b11260aa3db9436a3298c2dd4e36a3f7b25646e336654da908faebf1cca5b2fc61784c87f2defe56f13473ea578269fae972904652c15b85af15ef
-EBUILD libisds-0.10.8.ebuild 1159 BLAKE2B 8ebad4fca72eaf8b994d60c20b9032db4d4ed479fa1e6257462a75af1ee41f0e09f915d562773680c3562ab20de8cded563668848016bc68e5a2d507725868e6 SHA512 c969cf6c89f1a7f3976b65f547f0f7554db1949ddae1a9808552867b7c707eac47d1a5a82c6717f6f462ccd5d16120789194fb4d52bd4d157cb338e67bbec901
-EBUILD libisds-9999.ebuild 1208 BLAKE2B 996a41fa67545b9ea3b26f69d101de67ec7d38bb2a5bf001f037c6f706296a3ec09816a05f1d19b2abd3586cb606b5bdcace401e4f4e684e5a72ceb94455ecd1 SHA512 440120e6d3d583780020b4c2e22a8f0598c2c28ec81da44c4df4c4018142e0051fbcf9aa7fd0e69ecddadbd3b09f8f4b38441284c7b8ca784f7efc162ab5847a
+EBUILD libisds-0.10.6.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
+EBUILD libisds-0.10.7.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
+EBUILD libisds-0.10.8.ebuild 1183 BLAKE2B 609e17accfe1f3b0c149890cc81a38f5d03f9d63e826e64b8e0dd48842d17c1292acc27ba58f9f7a1158db292b2a27ee9f0e6165d2a5e0d254d9f9470d4903bb SHA512 4111123c6388132aa065df5c9c1dd4d73f44223086577ef0a3c9afaedf22052ef54f78b762b45e0b950aa41b96e9ee80cb2fc073698661b14e881fad035ee9fd
+EBUILD libisds-9999.ebuild 1232 BLAKE2B b36387416664cf5273f17d6afcaa86157af7a381b9aad4ddff889fe79fc372d63f6db66e4b34d15070b274ac5b091529c57a15e21c60654b373c28cc32918285 SHA512 017031a837d18d026e48a2a87908a39992e3d134ab65eca2570afbc269f1287064ad672e5d0f77f651a190c56a6daad3dc94f2fb323978d963b7a751b709cb4b
 MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
diff --git a/net-libs/libisds/libisds-0.10.6.ebuild b/net-libs/libisds/libisds-0.10.6.ebuild
index f0c245e83cd7..9b1974819ffb 100644
--- a/net-libs/libisds/libisds-0.10.6.ebuild
+++ b/net-libs/libisds/libisds-0.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ KEYWORDS="~amd64 ~mips ~x86"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="+curl debug nls openssl static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/expat
diff --git a/net-libs/libisds/libisds-0.10.7.ebuild b/net-libs/libisds/libisds-0.10.7.ebuild
index f0c245e83cd7..9b1974819ffb 100644
--- a/net-libs/libisds/libisds-0.10.7.ebuild
+++ b/net-libs/libisds/libisds-0.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ KEYWORDS="~amd64 ~mips ~x86"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="+curl debug nls openssl static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/expat
diff --git a/net-libs/libisds/libisds-0.10.8.ebuild b/net-libs/libisds/libisds-0.10.8.ebuild
index 65d76154cb1f..f2a22ddd2c9c 100644
--- a/net-libs/libisds/libisds-0.10.8.ebuild
+++ b/net-libs/libisds/libisds-0.10.8.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=7
@@ -11,6 +11,7 @@ KEYWORDS="amd64 ~mips x86"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="+curl debug nls openssl static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/expat
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
index 316c2d9f97c7..29b8477bdd67 100644
--- a/net-libs/libisds/libisds-9999.ebuild
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ fi
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="+curl debug nls static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	app-crypt/gpgme
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index f4795d0e4a9e..3f9be456dcc1 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -5,5 +5,5 @@ AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
 EBUILD liblockfile-1.09.ebuild 1213 BLAKE2B 6baf53369f3dcfbc3c3d12ad6b4b3f146b4d649aa587a4b29db73959fd9a0623a7b0671089f06210d613a18f854ab127799d3621e1af7f7c3a319fddbd6beb4e SHA512 dc6a60b2695e8f22c496ecdbf4d4520245ebdf4d9306ff4d03e71ece099f590940f16b080684983228f80569596a8c401f6f604077d9a613467fd0d7a48fd4e8
-EBUILD liblockfile-1.16.ebuild 1343 BLAKE2B 4f2857b7952472896346ceb2db57c62cf0e7e983425339544103c0fb639b4209157f178215e0b5833cf1b6a86fc99fa3152425843fda2cebbc2928e708574714 SHA512 9c1fa442fdbc9f478a7b9e0a7992d298b00058a13ac9917eaab31f97d93b362f541727d641fa6d7fc6e226e5de95411910e492c06a6fd73748dd32a62343b81e
+EBUILD liblockfile-1.16.ebuild 1335 BLAKE2B 17730034da8d80cbcfb5e4777f544f7d06f6e2b6ab71f76f860cd3ea75f68e281e6b822a0ff73486b77b0eb4862380697da0efc6c463071977da8c62230fea2b SHA512 0fb7e56ec4df03eba7d3c8d25913991339cc3b10d9d7d0f7932b7cd9041e93187672fcf886ae6b3947bc1ac63f3c08f31bf139306053fe751bdce88bcde5567e
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index 7dd77e302bb9..d350ec4bea37 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 5568103363a4..c47cbbc2c179 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -14,6 +14,6 @@ EBUILD libmbim-1.14.0.ebuild 811 BLAKE2B 489a2c2d5a8fbde0a084631025ac8780c962407
 EBUILD libmbim-1.14.4.ebuild 816 BLAKE2B 398027b913bebfddd07a91335c9df5e58a584cf46b8fc364a7f7b23872a4349660b680956fae8b1301643e5072c01711ee1be561729145aa65c830676c758228 SHA512 057b2fdab9ef6784236e173b0b9dc21f6fa68d642c4acb7fcb32e4f55ba6f0fac365486489f4e5ba33fbb2aa38dd6780dd89924dd3910cc05b482c7e7692fa2d
 EBUILD libmbim-1.16.0.ebuild 816 BLAKE2B 398027b913bebfddd07a91335c9df5e58a584cf46b8fc364a7f7b23872a4349660b680956fae8b1301643e5072c01711ee1be561729145aa65c830676c758228 SHA512 057b2fdab9ef6784236e173b0b9dc21f6fa68d642c4acb7fcb32e4f55ba6f0fac365486489f4e5ba33fbb2aa38dd6780dd89924dd3910cc05b482c7e7692fa2d
 EBUILD libmbim-1.16.2.ebuild 810 BLAKE2B 81d677b03e4fa582cf7807102db9b7a44449c62fc024357e0c52d97730308411d474e35da970ab0f9de86e1492ec7636dce0c35e5d3fbc133ba7b73c66e61638 SHA512 a19fa48df208b1c7ac5136c7b0dcb9de41d74e898db8f0279fd1c07a3ca3cd69669c202eb9f742cebea4e1b950466e90a0a37a8f159661de3d263c01a7c16172
-EBUILD libmbim-1.18.0.ebuild 825 BLAKE2B 55f5f72e4f5ee961508c9afbc33548b7c5513469d67768fbc9854f4c6e7e08bc7d63c129c33adfd41a8f55cbd2a097d91a4340f604d8d60c2fc2eb9a5d0f4b96 SHA512 ddd17fa4bcbdb0f65d785e3b08d84dce712e2a34e38c0ea62e851d45a9977fc8e5d7e22a4a5f5979e70c77e5e79305d5ef98dd48c73be16f5923d80c008f90eb
-EBUILD libmbim-1.6.0.ebuild 1024 BLAKE2B b938785aca0831730d7fb88f5639c6f998a613cd6844a6bb1042626f0665ce3ea8ef7e715c52e7272388b0e8a75d3fe730d29b313280b983029cf6e78a507709 SHA512 94d9cda9535f60d53d494c4c4cf64e0dca5229f2e31aa7fc396608e2eb694d4f932f5ea28888304fca60a503de3a65f7bd48124caac48c32909eb7b500df6b04
+EBUILD libmbim-1.18.0.ebuild 819 BLAKE2B d3b37644e4b06d321f51a145f0d23d6cb36232744bb766fb6beb0c738a7dcada12d733eb27b50622f6c4a5eae0392ce606b67a6f7f6668fc0b6a6f46d0252f24 SHA512 45ab3fbb709839c8834d5ce305ca358ad9ee6bce593b086a60b40d31998b1083e27336ba310e8d2d7b3cb2a99006059f77b601d140ed9c9eaeec54ba32149708
+EBUILD libmbim-1.6.0.ebuild 1051 BLAKE2B 00969447576acbbc3e932f130929107b825b277bf5b0696052e8b0b676871f8c85d975334c4edf48ff3c653cd777844754f0035f5c1aa76ddf10c35c814c7f7d SHA512 75f5fe88368645c5676feba980af14655cbad78fd36092fa3b5c1a80dba797997e7ac36ca24549f1d7077dc87122987bbfe4b4375efb9ff99334c63f8ca54b3e
 MISC metadata.xml 241 BLAKE2B 5323e3cc2a6d62c9fe301f465f7e03b145f6877adc893cf9e3f0fe4863fce3423f3471f62fce04fafc65428fb4781d2d74d796281d9332d0707e45bedec9a1a0 SHA512 d85c72d707e2c7290ff4bf18bbbd34b938cddb7e09528c5d10fa7f141122e3836687c2fff91c1000791457b7f808d3222fe671755a0fc25c157d80c908bc3cae
diff --git a/net-libs/libmbim/libmbim-1.18.0.ebuild b/net-libs/libmbim/libmbim-1.18.0.ebuild
index b1da88a0beab..75d6ea792a6f 100644
--- a/net-libs/libmbim/libmbim-1.18.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.36:2
diff --git a/net-libs/libmbim/libmbim-1.6.0.ebuild b/net-libs/libmbim/libmbim-1.6.0.ebuild
index c0c238ded468..150265cda987 100644
--- a/net-libs/libmbim/libmbim-1.6.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.6.0.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.32
 	dev-libs/libgudev:="
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 60c700a7d2d0..bdb536834097 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -4,10 +4,10 @@ DIST libmicrohttpd-0.9.65.tar.gz 1633346 BLAKE2B ce6ba2b6c52e30194872c66ab5b9e35
 DIST libmicrohttpd-0.9.66.tar.gz 1877096 BLAKE2B 4788fa63b0438e250264852f291a7661ee64f4116cbe95eec0902a47115721040a9259acb9c3385d833364f9b27695a90a2cedc516a35ee89125e0852d545579 SHA512 59cc56a9511d9d1c05647a57d920a16d0aaa0d0523d0241ceb88641d18bd95fdb3bb5a60fd648ac54a6f4323a673a3145e520a2fe9e124e78973ff6dac3ad89a
 DIST libmicrohttpd-0.9.67.tar.gz 1881973 BLAKE2B 640bc99642160adb6728dfa6ea71720e376bd0bca3b86a56424906a563b9ea1ef92d51c509d0e642c8e32f46a9044826ab41f0e5eef88ee971bde9094a961db7 SHA512 2a2a11e9a525024dada639b1622cc875bb9b59af266a53e2742d5bf92f544192713c4e1369a573b2e3796d27cf490a9a02ba360ccc91136b4780306769edb7ec
 DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13
-EBUILD libmicrohttpd-0.9.63.ebuild 1264 BLAKE2B 6cd0a690a3f344e6e6fd60cb7c7601f1c5abf9f8fcbcc4fc81e2b4b730ae037afda530e984318c7cdba26d6126f22f11d2747a56194047eacd69e86cf181abf4 SHA512 eac1917a4193109502a487008b23405a4f11acb437e87f3b444d328b41f228c5e3a08f78aa11b71d6471b64df294e594b5f56e1e64ef6b2abae49c0acd235cfb
-EBUILD libmicrohttpd-0.9.64.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
-EBUILD libmicrohttpd-0.9.65.ebuild 1263 BLAKE2B 0bcd99e0f8042197263d6b8ae874121597f379e7d3f5e543b16f0d967a1501ef5de207184012bcd3cd0f26b5e484267de92927e6313686ab44dc53d48e6454c9 SHA512 dfbd43c649735e7a9e67b1493a4f1cf562a9a9ffe8841aa680483675c2e748a60b2fa5f9d0e4d22eee479096922731f3b477f76812488c49ee38a753f5eba30f
-EBUILD libmicrohttpd-0.9.66.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
-EBUILD libmicrohttpd-0.9.67.ebuild 1258 BLAKE2B c4c3cd46275d511540b912a9394d16cab151c412810b6349979c504e59713549d110658364924ec966e83d163ce8ea0bd45e3b52932970022c86f4bfc884afb3 SHA512 f2434105bb05696f3c104b523fcc7872aab568bdb2bc263391ae8902bf1ea02f5033ca1abba2984b94191614d9bf9e2bef34a980cb2ff9ecb9a49ff61e9ced39
-EBUILD libmicrohttpd-0.9.68.ebuild 1258 BLAKE2B c4c3cd46275d511540b912a9394d16cab151c412810b6349979c504e59713549d110658364924ec966e83d163ce8ea0bd45e3b52932970022c86f4bfc884afb3 SHA512 f2434105bb05696f3c104b523fcc7872aab568bdb2bc263391ae8902bf1ea02f5033ca1abba2984b94191614d9bf9e2bef34a980cb2ff9ecb9a49ff61e9ced39
+EBUILD libmicrohttpd-0.9.63.ebuild 1291 BLAKE2B 77aa399b7154b32e59ca5711ec42632f2dda757fba2fe760293dac3871f62587eca67f3a24f281eb146ca60557c167197aff35c83b3422218128fe6f0815bf97 SHA512 55a1604c9d9a3624354eb7f300261d96ff9e3f129b71c15d7014bf106cf6fa6e977cad2387cd1e1f26b232d61711c33f6a0e048b300021971830d5fdf23a7ba4
+EBUILD libmicrohttpd-0.9.64.ebuild 1299 BLAKE2B 8ca8580dc23d0098bc5d0f98d9b2ad2fd3572858867f1b897d0a33558b369a3a6c67144e8685a585443076dc41fe61a2c1b6519fd7b6aa34d8ee7bdeb257126d SHA512 72ea030e1cd5f356235243e988f2401e8f812f53c340e207dc7c936d1ed4d1eb6af840e372bab2d60165d787f02b327c218b36137dd3c8069797969f0be106a4
+EBUILD libmicrohttpd-0.9.65.ebuild 1290 BLAKE2B 986e70136a781a204d31a1deb3ab4a248ba4549f1539574c8c838224b8ee1d40ec6af7930a7cb30d04cab71dcc9005bd6a9a4fa2c4f5df2b5ef27565f013f444 SHA512 f0ec497fa405ee34e2dace388dbab2525f163a6e4a38f3082c23327c4adcce4402ce1ba7ca76ebd6f99520a3cdb15d4360ba9f44136e71965052565b7d92e0ce
+EBUILD libmicrohttpd-0.9.66.ebuild 1299 BLAKE2B 8ca8580dc23d0098bc5d0f98d9b2ad2fd3572858867f1b897d0a33558b369a3a6c67144e8685a585443076dc41fe61a2c1b6519fd7b6aa34d8ee7bdeb257126d SHA512 72ea030e1cd5f356235243e988f2401e8f812f53c340e207dc7c936d1ed4d1eb6af840e372bab2d60165d787f02b327c218b36137dd3c8069797969f0be106a4
+EBUILD libmicrohttpd-0.9.67.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
+EBUILD libmicrohttpd-0.9.68.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
index 328d70812508..6e1388c35b3f 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll messages ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
index 300e0e2e916c..49a324a74749 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+epoll messages ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
index f252703d57e2..5aa1b47456fa 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+epoll messages ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.66.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.66.ebuild
index 300e0e2e916c..49a324a74749 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.66.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.66.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+epoll messages ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild
index 6d9443a12376..c17a93c12ff6 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.67.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+epoll ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
index 6d9443a12376..c17a93c12ff6 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+epoll ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 38f7bfb37c0c..560ea180c300 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,5 +1,5 @@
 DIST libmnl-1.0.3.tar.bz2 337375 BLAKE2B 7054b5f2eaff639bcf0bb836ce16d7787ea88422326d2faa5959b47e4652cd9d2d8d6ea94e2f9addeb87f8c018392de0eca08343ed201895dc8c2d6974435779 SHA512 c47b76a6125271ef9dce13bc8bebd415d2bbd79b6d50491d8ba23344e7e6fe0c1413fe055913ab9444203f0d73166b79f0d4b532b13b62feecde3e5a8cd442a7
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
-EBUILD libmnl-1.0.3-r1.ebuild 749 BLAKE2B f98f63db109dfd68c334dea46a6678dc631708d7c747be37d0424987adcde4ceaf1c2864e518468d45c6ae85935b786aef047f7b05da232a48c3dc0abb81c9d5 SHA512 ecb435192e6fa3681da974dc4f3013b30ae3bf4e6abe0eda5e260d90b87cf861380a7a09f5202069343938a10803fc892acf81318c022f9ad75cb411688b48d4
-EBUILD libmnl-1.0.4.ebuild 760 BLAKE2B cab49e4d3e5b3193531e2b8a133c1c2011f330d0153692d27b75f4bcf31cff9148a22fa376e7774a0cbba53f739024cde67083ba162ff8309ecac2139350924a SHA512 973e4f711700e5f76b291659bf9d23052f95dd2fcb60d806892c91282ea0d13a99dcc387d34a073efb694eefc98da7de6576ab6f307b3ee47dcde1e6b23f7c4d
+EBUILD libmnl-1.0.3-r1.ebuild 768 BLAKE2B ab9d2f485c645394d059516fbc40107dd3131eb8be68e28f8c19b7f369e5dad4a3dbf177c990f47534b27b1b491961eab23bf2b66e2706d30ca55340b94963f4 SHA512 c4133521cc284acbc9c9cbdba8aa230dd4fd798b7d88cb4374c55947c4f42d323c68543bf6e32c9d69d7ecb10e0ed8f6139debbb6e4330fe038ac1ad2c4d5b53
+EBUILD libmnl-1.0.4.ebuild 781 BLAKE2B a187372c080edb884d622f8a4fe19386f942da401417266e88df304f6ded8c0022952690d7e2d2c3d016a63c187506419161b056b9d03d187084218042145dd5 SHA512 4be264f989629a47deefcdf90ffceaee59717a0b65bab12198e164b733a0658947014b09aa686885f3cb9993c442655a28aca6bfe2b88a8c10d8e28d0d5d3747
 MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index 316073b5786e..67fbdb2cc36f 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs usr-ldscript
+inherit toolchain-funcs usr-ldscript
 
 DESCRIPTION="Minimalistic netlink library"
 HOMEPAGE="https://netfilter.org/projects/libmnl/"
@@ -20,11 +20,13 @@ src_configure() {
 
 src_install() {
 	default
+
 	gen_usr_ldscript -a mnl
-	prune_libtool_files
+
+	find "${D}" -name '*.la' -delete || die
 
 	if use examples; then
-		find examples/ -name 'Makefile*' -delete
+		find examples/ -name 'Makefile*' -delete || die
 		dodoc -r examples/
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index fd97a5559d26..794d9e309842 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs usr-ldscript
+inherit toolchain-funcs usr-ldscript
 
 DESCRIPTION="Minimalistic netlink library"
 HOMEPAGE="https://netfilter.org/projects/libmnl/"
@@ -22,10 +22,11 @@ src_install() {
 	default
 
 	gen_usr_ldscript -a mnl
-	prune_libtool_files
+
+	find "${D}" -name '*.la' -delete || die
 
 	if use examples; then
-		find examples/ -name 'Makefile*' -delete
+		find examples/ -name 'Makefile*' -delete || die
 		dodoc -r examples/
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 2ca22993d67b..2025c89974a1 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -4,5 +4,5 @@ AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039f
 DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
 EBUILD libnfsidmap-0.25-r1.ebuild 1222 BLAKE2B 330ac209ea2c836320d71cb91738cf140a2207664c469c0470fb8e7d37b8690b2075cb67c727019a738a3d33cdf1ed79f956e7d1abd781787a79602472549e90 SHA512 aad280f52fa485aedbc4fd0856f57367bf25aa8888aeea550d2683230154671d963b6645f972d48c0e9d20c1560a07d51a4eecb2d6ae442f55ea4de71fbf1f8b
-EBUILD libnfsidmap-0.27.ebuild 1357 BLAKE2B 5e976922f305b8549331aff8d74a48dc5546d20deba68c7196e3773c8272b3964e72f31fcfd358def163ddaca53eac6cbb9d28ad137dadf4c33f2e5bc4b423aa SHA512 192121cc99c8240f1a9e66d5d4ed6bb2bac743a324c58c115d5b7ee2aeb610f488d105c27055d072b4268bdea43be00c94d8dadf71a7af7ba9cb8776772fb239
+EBUILD libnfsidmap-0.27.ebuild 1343 BLAKE2B 236b89cc71a53cc3d2690ea33eea195069d18615fb39136ca0ebb8d011711700a38cc1f9a1a57d67968c275574806092842c742844a742c6c3b78c2e4827ed6c SHA512 502ab6399b26f97661ce82497963cf318712dfaf3d9d60cd389374e74b09c44324db3cdabb5a2ac520d0bd7124c4d7fb9fd8f654b4bb0807418c3e3de1feff3f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
index 1cfe1e970017..77bda5dce31f 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.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
@@ -12,7 +12,7 @@ SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index ead5db3afcfd..78bd9af08a91 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,5 +1,7 @@
 DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
 DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e3597474b1cedf931728f3105b04a851eeeeff98fd2a49772f29849a9094c2e0cfef7d500050e8f205565e8dfd1ec7a49d SHA512 6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6
-EBUILD libnftnl-1.1.3.ebuild 1163 BLAKE2B aa2bff82edec4ab5e098022db9d9b609cc699674746a88ef6a0f43f60c3b89d957656fd8eca09e12a67885f65fe92d994b708adb747e880de4d9bd735133f849 SHA512 54d1af11abc80e4f39ffb8535957e3a1f9c6b8a90b811979e0c16dbbe4456d3ecf173fb513b7df4d90d38721aa0032379a888e190c5ab53133867ff8adfcf493
-EBUILD libnftnl-1.1.4.ebuild 1172 BLAKE2B 5478337523c2fd1823de78bb5468c4d8d3d3e08836b8233a029eecb793bf0d9ab9b6cac4cf92da9cb6368573ef27aafad436dbd3da8558419291a2291345c820 SHA512 9001a1cb38f4b670afda7432c0315ee5539d9131b4f15c98b23694700c5e950174e7fac29fcc6c298b9fa4c284d58db0736ddb26121e7b5860fd94c6e6351406
+DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170e5209564579ff26bdf49e2b70b5b3944275861e32fcc7f6f2bb1d9f43bf51157665d0d5faea259e14cf930030c0 SHA512 a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7
+EBUILD libnftnl-1.1.3.ebuild 1191 BLAKE2B a95ebfa37d23c20e23d978f2cbb90629c4f0b525134e47106a3cf9c5a80de7b6bc924cdbc76f1b7ba532cc0fde5c56820a25ef36be5c63f235ac301bb6dcfed5 SHA512 d076046e9809dd532d7903b6b55f9958ed98cfe0139f1d11f29d4b4187161923d148b9280ebf3bc03a6505bca46b6d2e3d34c499315f44345e2bad4d4055a364
+EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
+EBUILD libnftnl-1.1.5.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
index 713abb6f662c..985d410c3a6c 100644
--- a/net-libs/libnftnl/libnftnl-1.1.3.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
@@ -14,6 +14,8 @@ SLOT="0/11" # libnftnl.so version
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=">=net-libs/libmnl-1.0.3"
 BDEPEND="virtual/pkgconfig"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libnftnl/libnftnl-1.1.4.ebuild b/net-libs/libnftnl/libnftnl-1.1.4.ebuild
index c7dd0aecc739..ce7a01b0ab8a 100644
--- a/net-libs/libnftnl/libnftnl-1.1.4.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.4.ebuild
@@ -14,6 +14,8 @@ SLOT="0/11" # libnftnl.so version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=">=net-libs/libmnl-1.0.3"
 BDEPEND="virtual/pkgconfig"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libnftnl/libnftnl-1.1.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
new file mode 100644
index 000000000000..ce7a01b0ab8a
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.3"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 5bd658055d41..970cb8328c6c 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -11,5 +11,5 @@ DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00
 EBUILD libpri-1.4.12-r2.ebuild 689 BLAKE2B d6b484363c6a9680ded3a370be977ba3fff68d582c6dca4dc2bac86b0ee6f5c945fd055920d623a5047a77c1ec40133a5e8fe87aeca023ea971f05caad2ab232 SHA512 ec5454f729f1a47fb821827c8ad305422ec3b17825e46f7875f1df4ad3d91614da98df089c969ccc9aab3336c927e682f4fb0ecaa84836225662bc21cbf0ca4e
 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
+EBUILD libpri-1.6.0.ebuild 734 BLAKE2B 71e6d9b61b87df3ec13166d8a217a4f7ae9a5fd8b3d5144b2e6a2e45f47ecd51e20025a91d79390f55893fb96aa73ed62519f617d9f4e959db5a0525e0989715 SHA512 7cffae1730136be08fb3757a6d60ce5e8f3898c84aaa0f8b85f8b4b708af03e4b257c0a59cea0f409ce8b928e108dd7509b537fdec18eb0af39c352d435f2006
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/net-libs/libpri/libpri-1.6.0.ebuild b/net-libs/libpri/libpri-1.6.0.ebuild
index 0754bc49ec70..6a62a8d9467e 100644
--- a/net-libs/libpri/libpri-1.6.0.ebuild
+++ b/net-libs/libpri/libpri-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 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="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
index c423e70b9f6a..7535dd6b501d 100644
--- a/net-libs/libprotoident/Manifest
+++ b/net-libs/libprotoident/Manifest
@@ -1,6 +1,8 @@
+DIST 2.0.14-1.tar.gz 548297 BLAKE2B 1ebee48a18b798895171152f0e56e93520d39ffd7a18f025638bb2a115fded07c76db5b1110b93c4c7e2191f5c1a6043d42ce4862d6ee30914d3a47ab225b1f1 SHA512 2026f55ccc2cbf80f11c81c8d05e23f035ed8eb0b61443d9723b0d6d37a6befe989941043b7352761ff9cc744076b3d1ee36ffe971e4bca59b8f7d4a8a1c6d94
 DIST libprotoident-2.0.12.tar.gz 571466 BLAKE2B 604dee2d33f7944615211ee3ab0a3ba610354bd604bcbf5296d58698ab963b5e667ea3e08fc2df62dfdb1e7dc7a336a57be6e61b6f410fdd7a96f3b46c35d70c SHA512 b8ba13ce9286a026062f47ffe3bf9407b408f64fbf0521aeebaf0e39e6ddf70cfbc6574f8e9c0f35fc2c2e5f9c4e71e200536665988f88c65bbdbeb9b7baed16
 DIST libprotoident-2.0.13.tar.gz 592008 BLAKE2B b8e4ecf5fdc1b40881709e9a572148e666f6d1a56c00cca39efd81caba3c3344a57bbc57e0794a92d1ec23bac3c928ac2b06323c1785cb8fc08cb33f55f2195c SHA512 905c97ba3f994d7b63c95ee80bc7b2c2be13b86745d072f5aecb4df88f791c02dcda3f851f01b5cca3cd36ad87379759789238a8c05f3209a5aad3d854e6ff20
 EBUILD libprotoident-2.0.12.ebuild 750 BLAKE2B 2983aae00b276a2a02b1e6c4ce7fc31759f35596ea38035f78ec6be5c3cc430cafad517f39c6909c03f37784fb17060269ab567378699216b3ed737e8c14b2ce SHA512 2e31e2aefa07348e63fd459c44ab68555e63a2194b0b33fbadb9895d4a51a447337bcc0d862d716765b716964271837b67d6566d1f5e45ee805cc031d9c0fda6
 EBUILD libprotoident-2.0.13.ebuild 755 BLAKE2B bb6a60f761e7e0aaf4990ac71b1a7fed86f10028df8829db8ddb43d196d617732648e7c93c8ce7a6cc98253f74a0c67f0cd7cf1868d0c789e891a37361769e5c SHA512 e52dd8c021325e157c632cbbf4c157322d8e777a2b2b0759811097b11a924ab4bb76f1be3f6899b5a042c6fd0710130407b32bbff52a542ace03ed8431a9771c
+EBUILD libprotoident-2.0.14_p1.ebuild 807 BLAKE2B 6bf2c3b242e412d0f551c238e0dd10e0973bfc7f779bdef50acb8d2edbb93c325723ba1d45cc61b17a3c795b253c00b57c1b5075b1279c3e2cedd1eb143b67c8 SHA512 7fd175f9607035017838e3536cc71310078503293dbb96766cb78317b532116599a0f6804bd94d90cad5f40a73d36b63c5c145f084cf9713b2cf10e9d3e5168a
 EBUILD libprotoident-9999.ebuild 783 BLAKE2B 6cc2e12379d71d21a3031969cca20dfadc9d256eaeddf65b67fcf88e33b3a4f3ebbd8def18755e46d337f69ad9927e8e2fbd4b0229d18e2af79c8dc3e5a3a4fd SHA512 4adfded1639d62cd0b5d8ab7685dd1e74a0cd3c65d56d86282fad7a3421be57fabd8361da7c6359763b8fc63069eced42864a9a4253bf10417b4521d131cf938
 MISC metadata.xml 360 BLAKE2B 17e614f06987241150e84b3738ef722bf680c8a9601307140767b78500a709849e71242774ecaa9c423771331365b4ba9e4293a859365527bfe11031339d91a7 SHA512 3de118bb358e064950487fffd58a49bb2fd5fc6597e6f3d0bf96a93d955e4879727fae386bdaf1a4a89388e471217903ce92b520edf257e1d1e66a6099e04b37
diff --git a/net-libs/libprotoident/libprotoident-2.0.14_p1.ebuild b/net-libs/libprotoident/libprotoident-2.0.14_p1.ebuild
new file mode 100644
index 000000000000..5ab401137bbc
--- /dev/null
+++ b/net-libs/libprotoident/libprotoident-2.0.14_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A library that performs application layer protocol identification for flows"
+HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
+SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs tools"
+
+DEPEND="
+	>=net-libs/libtrace-4.0.1
+	>=net-libs/libflowmanager-3.0.0
+"
+RDEPEND="
+	${DEPEND}
+"
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/-Werror/d' \
+		lib/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 001bd2875669..0d7f9d817bd7 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -5,5 +5,5 @@ AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf
 AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
-EBUILD libproxy-0.4.13-r2.ebuild 3135 BLAKE2B aba07c029ff36588c638ea841a1388ec02313df8309b692eaaea9ec47535799abf5d2a6021d155705dec56c5a7334f49147d8768faa77b5148c51f244e6c6268 SHA512 790bac581241ffbf05845ba4b36187a34926844643d832fb3ab69e052e5240eb45909c8fcf37b96039e5033887cd898fef1b4e7dfa058662cac76ea2be621756
+EBUILD libproxy-0.4.13-r2.ebuild 3162 BLAKE2B a47bc29f68d55349482c655bceadb23863dbd759eaf932d2750ecc9d710d2e5fde03ddd919427fe194d8c343a300214bde41301d8b467f3ca57114455b84d588 SHA512 b78198fe3dda3743208f7a1e0f4a04fff1d27e34993585591c32ef968759dc9f8372107d7dacf5cab6794404f865ae4e26bf74fd5c76319d4f944b94b245db1d
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index d18c96c3686c..df49a04dc033 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 877b8c514c78..9cc3d08ed53c 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -17,6 +17,6 @@ EBUILD libqmi-1.18.0.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb32
 EBUILD libqmi-1.18.2.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
 EBUILD libqmi-1.20.0.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
 EBUILD libqmi-1.20.2.ebuild 1132 BLAKE2B b00ab99ac45a3385b902977856cd5f6969913078d382ea22b4bd0e523b99fa178885bd1a638ea7ba4c33967fa46758f5ab0f341c012735d1ea349d7dc641c8cd SHA512 d1e91dea19bf8522ef6a297d55862d1daf0bed28c44eaef2bd4af58c0ec63deb388b899c85091d285c9a317ab7d9ce3a3c67a928c0949977aa063842791a06fd
-EBUILD libqmi-1.22.2.ebuild 1131 BLAKE2B 5759e56e1f92fab80eecb805b306c8327be818c0fd48fe95b3d83d0bd5d49d4ff1f38956cd9f1cda945a32cf6728b6c615f8571fb8b08aeb50fdac9e2b2593ca SHA512 55b6cf58dfbed8984e925f904b8cc25409d309833fc7ebd973d3a18a26d3ac0b26967e7d2a8337ba3e95c071f06526ae540598a26bb27e350b4f08a13fb7ab6d
+EBUILD libqmi-1.22.2.ebuild 1127 BLAKE2B 5034a4d167c756bff0dd49973582bceec429c6a2b03f7a034638a9a32d5bd3f516721ddca13262c11693904b4f749153e8a972e1618fe7006b5c6a46de2a5634 SHA512 eb793fc944c163890b3480a393237e102fe35c42c2f90738ee724702a9a1c46c89e5ec387576beed83729a7add4594791a24abe659271a042e8441ea1c363f94
 EBUILD libqmi-9999.ebuild 1126 BLAKE2B f57c7326cefc6864daf35627b7ab3733b12ba81398865927f830d8b5e3c0764d78d821b0923ce257513a49a905ee4674acdaaba9fed3f7289ad67cbd8e4602c9 SHA512 5184d185b9f6dd0343e892de0f178eaa1b4231597748287c94f706ea3bf8e7969bc1ecd09291b35c502a57f18dd287b7c0c3706d78523b148ed1fd355d18f171
 MISC metadata.xml 416 BLAKE2B f391913e78bcdb06b9c686a460059b4ee38861fa09fa0d50c19418ac3e1d966efd2646694d89d240d13f0a9bf2eb910d952288de153699b9564040efed8b04ab SHA512 4ebf9f46a3c7c6e18e0eb83341bac1b087bb6471a0f3f11663975b8a6e0e1a78f8db680a628dc693c4c3eb825d50717f0b7ed086d90c9d33818f094de2611fe2
diff --git a/net-libs/libqmi/libqmi-1.22.2.ebuild b/net-libs/libqmi/libqmi-1.22.2.ebuild
index 80fd734cd9b1..baa6bed183ff 100644
--- a/net-libs/libqmi/libqmi-1.22.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.22.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 5c33eb3c8ec1..aa39b4c107b2 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,6 +1,6 @@
 AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c886328c5f0e167a68f38d68a170809a63b63439ca99b0e23e6f3b548cb99a518651e93236072de300001c453a5de6f23059709 SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.4.8-r1.ebuild 977 BLAKE2B a6acd15aea3179b15f5d907e401c91d334e509e1ba17335c56f0aac4f8241d924addc7df0f693c6e5f3d3e0581568a805f32893a3235c1975fed54fde3e4ba19 SHA512 2bfba7c7e98bb34912860320b253bddc7c3b769ed613b7cfcf15db607a5d60be5ff1dd248d55767589610fedbf6955247e6622867fb20bb54dbfa60507090d93
-EBUILD libsmi-0.5.0.ebuild 865 BLAKE2B ab58c135612d67f80f86d0713625a1c7da09d31a0056c9ad9839140b9a5de40f9c79fb108025a1feaa0e574b6d62f6b3665c2cf84abebb67c46b4245fa828de0 SHA512 4fea5779eadbef4c6797846b8cee5346748dc1370b32d3607769725bfcebf04567696495d2c0e81e066c73205a4a675b726efca34c65abc357f9d3eb7c797b4b
+EBUILD libsmi-0.4.8-r1.ebuild 970 BLAKE2B 49174aa06ca0c7b3b40bb06e8a3cfe09c1a3efed67e5dca8a31beae6f7f2b4e43f03a9ff715d714d35757b7ce22eda0058bc05f55c9177c2cbd243dc9d876699 SHA512 5f311cc7ff7778538dc21f091e76f5d8c5e4be70dceb3d4662297a3c41f61b3a60d269929e1299c33c20c75fef40a0bc3af905e65b73bf866d85b906e7ed89b6
+EBUILD libsmi-0.5.0.ebuild 858 BLAKE2B bb580ab6245dbdd84e5e0ce8ef110cb43c1798c65f22592deffd8dfefda5320193ef8afefa5d737b16cc735de60da03ab5291e58e3f0337ad2c8071fefb91a6d SHA512 d1da6b65a5df9e4005cbc4be3a97c9e886ec8845de228928131cb7669a0441c7b92825987896006b65f35aa2a23bbde9bb23bf1dc7bd6b0773718b770bb021b5
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index d16177829871..ea0bf896ff10 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -26,7 +26,7 @@ src_test() {
 	# sming test is known to fail and some other fail if LC_ALL!=C:
 	# https://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
 	sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
-	LC_ALL=C emake -j1 check || die
+	LC_ALL=C emake -j1 check
 }
 
 src_install () {
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
index 086a1135f946..464dd62053c4 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -21,7 +21,7 @@ src_test() {
 	# sming test is known to fail and some other fail if LC_ALL!=C:
 	# https://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
 	sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
-	LC_ALL=C emake -j1 check || die
+	LC_ALL=C emake -j1 check
 }
 
 src_install () {
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index fcf9de5e7e31..7ff9360f6c80 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -8,10 +8,10 @@ DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c04
 DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724 SHA512 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092
 DIST libsoup-2.66.3.tar.xz 1448924 BLAKE2B 82edc5afe06d41dcd18989fb5cb439047f52c52bd13406fddaa3cafc5540d4c54924c244bb9d58839eb0cf7187da8da82158ddb01f16a7913f543f95df4f285d SHA512 166559480ab84c9bd5407abbed51f4ed76b5c061e647441bf2657ed2c918402985a0a3b9caaf14639f11a40e0b9130bf270a94b32fb72ade3782fac8692bc2ef
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
-EBUILD libsoup-2.58.2.ebuild 2989 BLAKE2B 57ce5571b78237b0cf301cadae2fd341b60b761f9fd4d7355af3a0b06c1f5012d61477be371a217c3612f8c59ed0cee40efde362e9ed9b05c26fde1c8381efc1 SHA512 6a03441253bbf0d2b1769d108fcf5a2ba7d79214222e79f95b74417ab378c661f74976e5394f6a2a5b6068e9c263cad81eb04c081b9446828824faf5f3ef7c50
-EBUILD libsoup-2.62.3.ebuild 2900 BLAKE2B 0c898abfca51dce0a78b6fdd882bf4cd7a60aae0518613c3c30f81ecdd1a4b40a43cd2625fa3171ca2447180786d8685b6032271ac45bace2e373663fb906d89 SHA512 cd447855a0cc044853c07f9ef45f4886113349b5192b50cc0efdba7428c1dfcbfbbe6f5f2a31bc7b0ec83beac5f87003176adebf8068df0d13456afe88d20c73
-EBUILD libsoup-2.64.2.ebuild 2748 BLAKE2B ed2f5330b2cb693564086bc2f2a4a4aa9eded3f21f0598a49962317cbba6aceb2c8d2b6963ce1c78c101904f1628714535023f27d0aa4c9acc86be45c30e9f41 SHA512 73fd3defdcdaf27179efd312e6928c416675778f56836b7160f3e3c9498fff3ce2dcc722fa490f28705b00b47dd8b7122e2b0cc239a3c32a3b18af8075cada06
-EBUILD libsoup-2.66.2.ebuild 2751 BLAKE2B 19a21abb9fd70ca5c5f21d9756fc711114aba0f8028364603574e8550a2a2a100890d9df5d459e57cb769bca805b92ac8f77b606e2444f17e9f5e4870b7fb283 SHA512 f49379ff1e40ec9b62861141c6157576d8d0dc4f9e40c16199bcedb8267d6e3012e6b73e3a4b2850e79116642b81251199f5253440f33ae27cb8c1215b088032
-EBUILD libsoup-2.66.3.ebuild 2757 BLAKE2B 5d90e8787beaba8af83baad61d0cad6234e2a3400554bf30f91c110fe1a84b1dc8cbf4cffa5f261e2e5de2d370ba968d44b1fa40bfe2858139e50119719d35b7 SHA512 084658201916ff1a7b7c74ba9b820e33c58b5e4455935e8918ed2d02c76d7847c7c1508f8bb504e51bf212d9cb72d1528dafab34af8a59481913ecc09838cd43
-EBUILD libsoup-2.66.4.ebuild 2757 BLAKE2B 5d90e8787beaba8af83baad61d0cad6234e2a3400554bf30f91c110fe1a84b1dc8cbf4cffa5f261e2e5de2d370ba968d44b1fa40bfe2858139e50119719d35b7 SHA512 084658201916ff1a7b7c74ba9b820e33c58b5e4455935e8918ed2d02c76d7847c7c1508f8bb504e51bf212d9cb72d1528dafab34af8a59481913ecc09838cd43
+EBUILD libsoup-2.58.2.ebuild 3016 BLAKE2B 3d9407661bcda300b4bc0e9af65c7bb186115dc88c5cf34e49bf4052d4828b7c72e99be2da16f9ef74e6a19ccc9089d20e869ec851a44a8c119778ba7e9c5697 SHA512 c53073bbc0a23f000fead1b40bda2a3eb2d77f773e5955dd65b36834818a14ae7b853c97bc748553cb55455c8fb2ce6298469e1b8230a448ca410cda02ee9cc1
+EBUILD libsoup-2.62.3.ebuild 2927 BLAKE2B a03df09520d43957856928229b1d7cac7cfc64fd59c2d6e98e50b146c5ed33d03efdbf14954b4c48e3ffe1fa0838969d573d1e0fa65f389b5999ebad7728865f SHA512 8399e58d4f887af84125be023b47760affc266693b7c19b0108d0d10f1036e0b063b8d72a1dfccf3892a8a8ee84ce1fe3f60339478bccabb92d80ce62c03bd29
+EBUILD libsoup-2.64.2.ebuild 2775 BLAKE2B ba014f64d6d7dcae695c1e90d81bc7472b307decaf8c9097b672dcba13b3ff4b285fe8a71ac9fab872a720fcfeea0bdace833b940b28006e16278a688171918c SHA512 1f22036de81982d73430fca4932850d736eaf81456455f59efd3cf0d2778adb043ff67e4eb597fe5c4276f3e53067a49e194244df5cd89aa23f47d4fecc194d6
+EBUILD libsoup-2.66.2.ebuild 2778 BLAKE2B 33c83648ec93e1796e735a40ea348c0f43f0802783dd5f3f4c904ac3ae0623a72ad8a31567bed6d3bf5cf1282538d18cc22937f01a57e7c41f601c75fc8250f0 SHA512 3d6618caba64675f28805c547afce49656ec6c6be86c0d1da19945298899a8c7c2522d6118c159b286700d054e355647bd34e35d4eedbc21d555a58600fcbb73
+EBUILD libsoup-2.66.3.ebuild 2784 BLAKE2B 30840ddc73e6e5f08943fd6784dcbeaf25f7ea9b19b75de22df7334ff119b53cbbc42de281cf16caac23bf05ae4d0e4bdae4ac1600c80c798a56e9a9bfbf196e SHA512 90fa261304d8f030f4fd23654f956f906a572cb0da5496f997dcde98729971c0c1ca7e84c50df6a97e6d1480c70285ec5ccc3f3bda7f864564facbb843481cab
+EBUILD libsoup-2.66.4.ebuild 2776 BLAKE2B dacd28928c274cccd756ad8343d8db361a035cfb470196c01a649e1424f32bc73c249afa82ae02267c9dab9abd56112adbe91a27bc204a561ca61feda1ad0b8c SHA512 a2eff60de24569eb2cdc69bc2002215fccce7b3f0787a1fba8c188b165818302526420cbba5258fbca3419ba230fdb243026d75c4744b1935e76569d3a874966
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 9ba2ab06bf47..16b9a977e1b3 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.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
@@ -15,6 +15,7 @@ LICENSE="LGPL-2+"
 SLOT="2.4"
 
 IUSE="debug gssapi +introspection samba ssl test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index c9496ad3a969..2f0abf9d1c45 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2+"
 SLOT="2.4"
 
 IUSE="debug gssapi +introspection samba ssl test +vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index 1c3c04ae2467..d254311ee97f 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2+"
 SLOT="2.4"
 
 IUSE="debug gssapi +introspection samba ssl test +vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
diff --git a/net-libs/libsoup/libsoup-2.66.2.ebuild b/net-libs/libsoup/libsoup-2.66.2.ebuild
index 238bf9bb9666..80d4ab70d70f 100644
--- a/net-libs/libsoup/libsoup-2.66.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2.4"
 
 IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/net-libs/libsoup/libsoup-2.66.3.ebuild b/net-libs/libsoup/libsoup-2.66.3.ebuild
index af731bff6fc5..b834dcca60ab 100644
--- a/net-libs/libsoup/libsoup-2.66.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2.4"
 
 IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
index af731bff6fc5..6407562e85c1 100644
--- a/net-libs/libsoup/libsoup-2.66.4.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.4.ebuild
@@ -13,9 +13,10 @@ LICENSE="LGPL-2.1+"
 SLOT="2.4"
 
 IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
+RESTRICT="!test? ( test )"
 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"
 
 DEPEND="
 	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 0969c07c6a12..5e849ca23040 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -6,7 +6,7 @@ AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cd
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
-EBUILD libsrtp-1.6.0-r1.ebuild 2371 BLAKE2B e812c2761b686000bc19564cc1df93c09fb6daed8d4058978fc38c3d231dd709abb8dc8adb3ef220c5575970d04ba5c6297420117e2667407c2b26c2babd47c9 SHA512 9b56e2216b15d9213e32244dc3ee7eb030861f375a6cffccdc21cd290c05ee9f1db02b87f812d44dde95e63f6ea709f84fe821e7db98f19460bf90cee96ba34a
-EBUILD libsrtp-1.6.0.ebuild 2205 BLAKE2B 6fd3f621f883525a802e6c93d62b6a7628a5a4eb634e4b877f92f3f0104cc39926ba76e74bd614759cf049f62ae3fa61712b9cc5a1c51e4534a58e68de8dae04 SHA512 d955fcf71ba64b30ffe21a01c1f704de10b792aa9d78d452607e185d00b5c0c399a6aa4b603ab12ecebecfe5995587fdd021d0e9b5b1081772764ade51e43fac
-EBUILD libsrtp-2.2.0.ebuild 1836 BLAKE2B 08bb247ecb2d8a7f3cdfb2b627da5f17402b7f7708ad2ed01b647decc4951f26f195de595ba496999ab5d57f41a876b957b0a7e3696bc3ad5674a5236c2e3a4a SHA512 a40d510f96915c632438aa271b0139a446384ec91c2a684de2638af6837b4651134c21e5bf15af691e547b97ae70cd435dc24a174a9a499855ebc82eea24cd15
+EBUILD libsrtp-1.6.0-r1.ebuild 2398 BLAKE2B 2173fb4622651c28f714c19e7eaf6848f9f6ca95264c3d4327d81e4a0d938c5683a8e5b2be09a67a96b665da326c2bd22a0f3c76a65162118c3281037c5f02c7 SHA512 4d863311f0b0fe068b261f58b1c72d8bfcc789d52a5e6c1f55b9be07a7cc9d13db4090e5a11b9fe1cc896d4e56e5f82463cc09be706bb02c8464157f23536584
+EBUILD libsrtp-1.6.0.ebuild 2229 BLAKE2B 356249ebdb469dafc66dc8f954f653dd8abbf17cb6f0260fa15a532b03fda3d940780b021108e0e7475f5100d4fc9eec3cf4ff09c5a8ddf07e4dbd64c5904732 SHA512 ba6d025535d3e3f4ad36ee2e534869c72ca2dda895588db57143c761727d5721b3eb86ea3ba350ea2330385e7d8f35eee39c8848ba310e52eab4dafc442580ae
+EBUILD libsrtp-2.2.0.ebuild 1863 BLAKE2B bd1dcd6369ba64b441a168a0364a6c1dd117fe8eb651515c87ec9f42c20eb189bb5ae4d11e288ab6e2be32c9da8ec1c832481fbfdce69c4d3d6b659ef3cfca16 SHA512 1fe796d21c84cedb16cf09397b57215164615386599f43f00d2aed08f1977c394e4799d7fc5ecfe48739cdd0bbac9ef2ce9939269ce95a298dec45e61e7dbafe
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index 2e2ba01a7d5b..efedd66ddf54 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	openssl? (
diff --git a/net-libs/libsrtp/libsrtp-1.6.0.ebuild b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
index edb479668741..6dedd6b55c7a 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	openssl? (
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 51e278112f11..a66f1cdb1db5 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="2/1"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	openssl? (
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 22146459db13..f6922e46fc47 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.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.2.tar.xz 495876 BLAKE2B 82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79 SHA512 93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0
-EBUILD libssh-0.9.0.ebuild 3177 BLAKE2B 1d91789cacbab261b57ab0c1c07f67a4688b8711d0ce9522ec2692135daa3d5426663e9dddaef065af4ce419512e4d12461eb1861080a7049b31f182e9c2e6fd SHA512 70e1e4a45a841b2f99c4b12cf3f6ad7c5c5ef5cd2780ca8b526029b0d6ae6baa6bbc29036ec356cdb582c7cc9276948f28f42e5379f3c5da911ea6b504f5c61d
+DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2 SHA512 6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3bbbbc69b679b6775edc21dec158d241b076c6f
+EBUILD libssh-0.9.0.ebuild 3204 BLAKE2B 763653c92388856812aaca0156eaad868834bd82be1415374fbfd02a83044e870f4ef9a8f9a15301433216af2ee9e1ee583e0342047b0257a89e213933017851 SHA512 f66ab27de1c903236736119d536280d41e0ba39dbcac3a2e81a53f791cd9ecd38fb62e1a98a2408f85ded21222b2416ce07931046cfacb8866173a1542705f28
 EBUILD libssh-0.9.2.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
+EBUILD libssh-0.9.3.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.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index 133fe08bc323..b13f672c4840 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -19,6 +19,7 @@ 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"
+RESTRICT="!test? ( test )"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
diff --git a/net-libs/libssh/libssh-0.9.3.ebuild b/net-libs/libssh/libssh-0.9.3.ebuild
new file mode 100644
index 000000000000..dc04b6aee9da
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -0,0 +1,116 @@
+# 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-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 )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+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}
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+RESTRICT+=" !test? ( test )"
+
+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)"
+		-DBUILD_SHARED_LIBS="$(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
+	multilib_is_native_abi && 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/libssh2/Manifest b/net-libs/libssh2/Manifest
index a85d62fa914e..64d85d5b4cfe 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,10 +1,6 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 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-1.9.0_p20190913.ebuild 1520 BLAKE2B f37b7a9c8e0712f0b8a4573265814b29a4ba23771f02aa915ad93cb9a35046107cd4fb1903145a6f06e076a93c77e0ef1c26564be7befb30e1f71678a0f20719 SHA512 1ee3c6eb7293b1aaf130631e89fe46971f812296254e8a7f75ebe5ebc853724d17e6407fd89ef4de47b1fd5276439adebec155da30c5e7830e910c42d9a7773e
 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
deleted file mode 100644
index 7cc58d239638..000000000000
--- a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
+++ /dev/null
@@ -1,181 +0,0 @@
---- /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-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
deleted file mode 100644
index a5602949511d..000000000000
--- a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-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
-	"${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-1.9.0.ebuild b/net-libs/libssh2/libssh2-1.9.0.ebuild
deleted file mode 100644
index 73a2130ed835..000000000000
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-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-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 83b60bec30e5..5ba34d956653 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 0da94cfce6fd..df6aaa3ed04d 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -5,10 +5,10 @@ DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19
 DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
 DIST libtorrent-rasterbar-1.2.1.tar.gz 3562762 BLAKE2B 1978356ba00c07c4b89657ebe190b2aa4a938d22e5ab63844fb664312d60f761a07c42b9353f2f500fdf9a08afcb294a39bfb447d255d93b1a45ecc2be629ffe SHA512 a60e38c4c951756786ede69af1a5d56bf6293bcb7d235f0b7feda72f731bc163ea6a7401c4b5f5400b8ce236decff0ae3a1d5fe39c7f8f775e65031677f02074
 DIST libtorrent-rasterbar-1.2.2.tar.gz 3584187 BLAKE2B 93c77544d4641122f0bd2b5c5f0577629fb7bdfc9e81bd54f7a849f5a477255adc699676516865c93610d24a830a26a0de45f10e50ce64ad6f0214c116f7754c SHA512 34dcf5421dfccbba78bdd30890b9c18b92fdee1a2e1693ada9b55b79a167730093862017581b9251a654b5517011dbe4c46b520b03b78aa86a909457f7edcf2c
-EBUILD libtorrent-rasterbar-1.1.10-r1.ebuild 2375 BLAKE2B 4d24f43c40311260dff5fdcbb8cb056a0c69c4128b4929204fd2fc276a79c860c726a9fb939b9ae4c97cbce03dd1c3fc9cf876d5f01675a1e984ba62cd6e65b8 SHA512 bb373329e48181df13b282fb5a2b4b64819e1334b06c2fad6b4f8dceed0bbade70a6f4c4a74947d5972890528a2d22472a3124122e7d487e6e76b9a7a572aae1
-EBUILD libtorrent-rasterbar-1.1.12-r1.ebuild 2375 BLAKE2B 98d0e4f944523ef291f1e7a0218bac5ff5a8ca98793da62eafc45c0dff67e69ddae2c3f2797187ef8bdb5d0047bf20a4db7a39d7cd43fae2655589dda2a76ade SHA512 43505a296ec86d384ca86518ac23c08b0bd58ceac2f9aadcea9333feb902f833b79162ba592c047cfa5ef2d38a3d7fb4941804e4ac93a4a10929b3206b980f4a
-EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2328 BLAKE2B 950160199313d985b48c1bd4ea764018545dbcf28ee9e000ea557deb1b48f3b01f6f95680f11e27e486ea1dd07f44a8e2b6535793e92e861e5a03f88412603cf SHA512 e63c332a1fdb3d289077a8921068f572b395f7776fcbffcecac009f3e3ff5104db539700b70dca2fa10ca1848f48c40c7a3d851c57332c8d818986fea4bbbe3d
-EBUILD libtorrent-rasterbar-1.2.0-r1.ebuild 2555 BLAKE2B 16b160c0455d7b5058e5e66e2bdd16530f60f349eedcee15a18b65a7ba024cf57fa28b8c934182ea44b395326c0e2ca87fe40c92969236df6cc7df9f538c8750 SHA512 f967c0f6ae21e0637d136e2bdc8105b2ddbe06a9f4f051a4dd43853cac6aadfb4a5e99caf7ddeac3d84f718858192655b831130e776447c0e038633a6ce402c0
-EBUILD libtorrent-rasterbar-1.2.1-r1.ebuild 2527 BLAKE2B bd28fd8e842def8add44bff06debd412f4dc55854f99ab2708353d779d95e3621be95f6042bbf956e615c0aecb74abc21ed71fdee6d63fd1321bc46ab3d45f6e SHA512 7032d9a3e3f084139e0ebd76254176d36ce20b39013ccc329072811947eebb11181f78285d97104c8d2e7899b2472aedcbe24770a3f2ac63cdce3e4f2e7f2c6c
-EBUILD libtorrent-rasterbar-1.2.2-r1.ebuild 2532 BLAKE2B f74ad83e31aeee0460b6fc1480bd5fefae1bbf04d5458379c8b55a37e538b429090543a64ac7048756c037c073046b34aaf4396e4bc2d2bd351f041c0b8c5c57 SHA512 cdf6080d94ecf42859da9dd46bdc21d7309ad234bcfffb54c5839b9d6b08f4fbaa3dd440372e717afb7ea33af67a1cac39c70772885d1218353e3e2512989c83
+EBUILD libtorrent-rasterbar-1.1.10-r1.ebuild 2403 BLAKE2B 850d99b91c3ca211b03c9184963aeaf3cb3e534e2356f44fb4ef0dfc41b38c365300c85c6860eb67759f8db6fe487a354cf78e38e1f4e6385304727474c9e134 SHA512 5b100b6565d2a393456caef36e132477cdfad171d2e60f068c4eb7be6b7a131f110308d8f048e29c7a1b2a3e390db66f17ecb7beea19b81a70685f197c3b2b5e
+EBUILD libtorrent-rasterbar-1.1.12-r1.ebuild 2403 BLAKE2B 24f122a80d00df7f90e1778edd95fd8a92e904144bc7b0156174423be8e1a0b9b1c430e08a31b25fd7b460c85a92df49e596cc616254e83b4da748ffa382338c SHA512 07eb786b5cbc0e5c343f01873f203f9bdf5b520f54227d65af1f926a7c149b24041a1e41d88fec307291b5eb8a18c3f3e8473e04002e9b64757b310c7cba747e
+EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2356 BLAKE2B 43c5f5f839ba1aca885a972fea0de2592cc59b43b287b7ca0830a67a959c8df7040f1f08cb71e65a283509e10aea0d8019f1300b148d85714fbb5805a4aa210e SHA512 04e27495af50412e96f955e2adfc90a48b71bfe21d1aeb7e071152026f2dc751fcd6851498db9027dbf32154a1f74572abfe7086df7708e910a3c8f49a2e9be1
+EBUILD libtorrent-rasterbar-1.2.0-r1.ebuild 2529 BLAKE2B a64b7857bcdbf1522e33ad7822dccf493e38991307efd25cdf5154e51337af7fa609221618e6c75ef4aa48930d43fd1b37575801b1507ef703128e350d72b28f SHA512 f4a8dad117b52d0c519f61d7a92b44e28e7ef86aa7e3db37eaf870c8c61949c96dd83862898479f535fc6c0812ed034ae9957f472012d78451ef0355269bb64e
+EBUILD libtorrent-rasterbar-1.2.1-r1.ebuild 2501 BLAKE2B 47bb661cc8cf40abea1c698e7cd983b7d3fba9f2e3e89e218aae627abf0f6c7e488ed851de66704b9a0eaea3fc46917f428311c38ccebad3cae5c078e29d3037 SHA512 199f444da0ae8aa8562fcd44d27febc6067aca01c67e897cb25c31a7e4f9b8e361709c383a4f86cc8112f8e7836fed3d8b0a449fdaea1a68469837f6fadd3fa0
+EBUILD libtorrent-rasterbar-1.2.2-r1.ebuild 2506 BLAKE2B d2aedbbb47b6bb91035ed79d903f11415e42760d5a591ad0f589cb788c71b9bd404d35cc72b19bcf6ded5d2982f41642376245090e0a2499041f0cdfe85a61e0 SHA512 c52014364a6bffa448d59daed20f3cd07467ed10b65a0b53fd078ad7bb5cef091b1a5345325d213c99ea16e73a7bed019f3a0ffda16770c9d8ad3af38c739c25
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
index 64ee98e5ca60..8ceb42bfbe83 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
@@ -23,6 +23,8 @@ IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/boost:=[threads]
 	virtual/libiconv
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
index 732866f91701..6d2ff7ccceaf 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
@@ -23,6 +23,8 @@ IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/boost:=[threads]
 	virtual/libiconv
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
index cc10a56b4223..300aab6dbcf6 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
@@ -23,6 +23,8 @@ IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/boost:=[threads]
 	virtual/libiconv
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
index 3b05cd5c1a8d..118eb5fdcc87 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
 
-inherit autotools distutils-r1 flag-o-matic
+inherit autotools distutils-r1
 
 MY_PV=$(ver_rs 1-2 '_')
 MY_P=${PN/-rasterbar}_${MY_PV}
@@ -24,6 +24,8 @@ IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/boost:=[threads]
 	virtual/libiconv
@@ -63,7 +65,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cxxflags -std=c++11 # bug 634506
 
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
index fb3f58e2f217..d77cbc4c8b34 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
 
-inherit autotools distutils-r1 flag-o-matic
+inherit autotools distutils-r1
 
 MY_PV=$(ver_rs 1-2 '_')
 MY_P=${PN/-rasterbar}-${MY_PV}
@@ -24,6 +24,8 @@ IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/boost:=[threads]
 	virtual/libiconv
@@ -61,7 +63,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cxxflags -std=c++11 # bug 634506
 
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
index 3bb5a10e01ab..d3c1a6f318d0 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
 
-inherit autotools distutils-r1 flag-o-matic
+inherit autotools distutils-r1
 
 MY_PV=$(ver_rs 1-2 '_')
 MY_P=${PN/-rasterbar}-${MY_PV}
@@ -24,6 +24,8 @@ IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/boost:=[threads]
 	virtual/libiconv
@@ -61,7 +63,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cxxflags -std=c++11 # bug 634506
 
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 0acaa854e6cb..217664ca086c 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -5,7 +5,7 @@ AUX libtorrent-openssl-1.1-part2.patch 1902 BLAKE2B 1d0e405a0a72be250c7a79e41086
 AUX libtorrent-openssl-1.1-part3.patch 1882 BLAKE2B ad7b62d238ad57966c91e38f32b2d45673d9caa1bb4347788cde366a5235c1a02b0b290c3b4e010c0c19baf36c0e2ad7b2651c9bed67a51714b877924f0e6c22 SHA512 aa83d4e636b3327cf78e9eb4bab14e3254d90829549020240e4498d78308cdc6e058035457341d51a1d5d6cd9b89364ebad33f6d46364f9b72171abb49c954f0
 DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
-EBUILD libtorrent-0.13.7-r1.ebuild 1996 BLAKE2B 8d78e884f5eee668e3ea3e09e1c5f0d148590efdcadf08e1a97087372e2ad3fbbde1974799cb346728b66553fe707f5c88e339234084b966c4f975c909674fc7 SHA512 3b22c30fd6ba7468fcad4722a3076c9aeef35281e411bc5c030ff1425ecb57b30908825ca7dadcead77cb28bcfcac151fe440477cd76971affce50157743602a
-EBUILD libtorrent-0.13.7.ebuild 1860 BLAKE2B e2e7fa8ba213581e43d3fb629ab164d143dc8cf9c3fff787a9e24aeb3abed7525ff79143e535645dfba3a3a74fbdc17684a8b3a5e91d34e416d628d2ef3b9d2f SHA512 26ac0f7143d91127101993130daa6bd33de37f2efbead8c13cdd1d383c18574611c5ffcd56dbeda5d3c12d1dbfcefd5ebcf6abd4d3367a2fc0512ee74f765192
-EBUILD libtorrent-0.13.8.ebuild 1702 BLAKE2B fe8980c9178244b89ccad211c7f4ba5c6564c623aae608fcfd338546538a84963c11a03e26f9c43e8edd9be4039eec1e84a3fca19805bc0c8b3da8d646413c1a SHA512 c77bf1214ee20d7558c630c689ac96fea24a8759a4bc3ca86e638767490a257920e2a630dbaabb0838b1e16ec42f8c3978b92d071cb065efb187b51848b417b3
+EBUILD libtorrent-0.13.7-r1.ebuild 2020 BLAKE2B f056eafd05cb65f4877743b426aa001960c483eec3357b9ac7c02f7c09a4ae959f8e46ea0e273cde7a2f15fed9ea09b19bde73b3d87b31cf917438f7a33c961a SHA512 f9578efa3392717a62f39ee1abcea311e246d6fec17f2ebb05c0c22a9c5681b7aab2c44b002b7660516ae6a8898ac5d826354566e64338498948932191d80b68
+EBUILD libtorrent-0.13.7.ebuild 1884 BLAKE2B 8357e08ff7e17dcd6bf461f18597cf460d8a8fdc4dff32466400d327ad9e7a4bcc8084643ff7ffa7853a2d0e87fbf4ba3dce34f6ba0c183cfbe155f04de074fe SHA512 2f017af1252a06111834a459c984a5ec34452e3fed0711c3ed83a2dac56fc1062be03de4a97a9d9ae80e3e8b6ca27d87dffb4048812bbd76cf9972708ca1d7c6
+EBUILD libtorrent-0.13.8.ebuild 1727 BLAKE2B a7c442eb8a51ccf31678bb38a7eb685a5a072326f87e0958812df531acd3588169b4699ea3b02b6c37e8bcbba3b50db6f298d1a1b18b0a3099134ede96ff96fb SHA512 1a95159100675c6a199a61da25aecf134b5054ac4aa3a96a38840220e70d933eaaf5cfc59ca1a462ff3524a5d445c6c2264d973474f663911d585f2ae5245484
 MISC metadata.xml 443 BLAKE2B 2a25f3804cf9c29cd16835e22dd67e7a94fe2dbce0c7c4a85e0a9042a79f798349a55f1282d6c92b19afbb10120d9e9b5a30e03f082d90b622593ee7d8fa5e67 SHA512 32c9f1b9d21fb99768d60d842a49a80a844f8a6ea94c012a97fa94369916a2fd6df0965dbb394e0de2360c79c01355f8a4872b2d0032b3eef5c6a4490c53ef82
diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
index e3689c3874ff..9cd3a0d347e1 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7-r1.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
@@ -19,6 +19,7 @@ SLOT="0"
 
 KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib
diff --git a/net-libs/libtorrent/libtorrent-0.13.7.ebuild b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
index 15f6eec5b6e6..b40c230693c5 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7.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
@@ -19,6 +19,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib
diff --git a/net-libs/libtorrent/libtorrent-0.13.8.ebuild b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
index b1bfdde599aa..158a5198f27a 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
@@ -17,8 +17,9 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index c35c5eb7547f..f0b019d6fd34 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,14 +1,13 @@
 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.10.1.tar.gz 786273 BLAKE2B d01515783f2fac185998419d9f249d087ca4433c9547537fe77d3a57e41926d0a4e7e97a88e25c9d2614fcb43498ae94992868bddcb5507c518d3f89059255f0 SHA512 f85053670e696e2216ca8e5a90e862f6868a0043aa855278ef2788417cdf2195067c79c4fe593b49a5444cc33fe31ad2073106c6d8cb67c8352e3321dce0a08c
 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
+DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
+EBUILD libupnp-1.10.1.ebuild 1060 BLAKE2B cd4c5cb72e16af878bde6092fb5b0d228596f7dc8035c7bf00c6a3123811200aebe881ae117feee1b4f71de406e5720ea4f7a981c9b033614376b269414febe3 SHA512 cbf1c4aae916c0358dc26af22276af0651a2178d5cb8e092fb0421688f33293fc23b878ec30a478436a487c856f3a30b52ff21acb7aa7c6f820202be99d7a516
 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
-EBUILD libupnp-1.8.5.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
+EBUILD libupnp-1.8.6.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/libupnp-1.10.0-r100.ebuild b/net-libs/libupnp/libupnp-1.10.1.ebuild
index 5d4c9a581d9b..e06f186c5a5e 100644
--- a/net-libs/libupnp/libupnp-1.10.0-r100.ebuild
+++ b/net-libs/libupnp/libupnp-1.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
 DOCS="ChangeLog"
diff --git a/net-libs/libupnp/libupnp-1.8.5.ebuild b/net-libs/libupnp/libupnp-1.8.5.ebuild
deleted file mode 100644
index 2d629febf65e..000000000000
--- a/net-libs/libupnp/libupnp-1.8.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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/libupnp/libupnp-1.10.0.ebuild b/net-libs/libupnp/libupnp-1.8.6.ebuild
index 2d629febf65e..2d629febf65e 100644
--- a/net-libs/libupnp/libupnp-1.10.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.6.ebuild
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 5401c12d7417..4f906d13dd87 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -7,5 +7,5 @@ AUX libvncserver-0.9.12-pkgconfig-libdir.patch 1241 BLAKE2B 7ac16afc86204a320253
 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
 EBUILD libvncserver-0.9.12-r2.ebuild 2097 BLAKE2B 1223ec5554bef0062c5fb20297bf8d07f0c43241cb35e6f51e1b71eb841c3bf392403f1acacd10330b37be829373c6587ad95dccbf6d2ffa192451f3dcf61085 SHA512 bec5d64d0f6400d2f9c434e832f4360e56fdfacfbb6efa2fba58eadbd0df71f5731083415cb6689fa1bab994698ad84a6483a6491b7c6171ef88b463f884235e
-EBUILD libvncserver-0.9.12-r3.ebuild 2281 BLAKE2B 91fafd161a72b9d0124c5bc8b92a52312db21a7fa2104b5206eb3ac908ce3fb0f448efe615a9cb0dedd8b7b4cf8c928256fcefa696979836ae2c64b0aaf5727c SHA512 20b8fa68a6def2a2242dc52472716dab3b3002ef72d8e2218ad6d9cc5392b6ba6e56ea20783b091919074294f60f4e2c1834a45e76672f9e0c96cb4c5fb1b1b8
+EBUILD libvncserver-0.9.12-r3.ebuild 2272 BLAKE2B 03e90712ea3208d342d672c654b8e8bb03b7d346c4b9318719c3e5ed316d1f36bc50f18dea654e091aa820005beb3009fc267d1c9168e99f7cc86f20a2a1f85e SHA512 875b640acd630ae3f22d06f60633072a93881615fb36853a8629fee38a4f75c64cc3190e704018f614bce6377f9bcfc2be2a88b797f6601f4ddfb4ccbdb2250d
 MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
index e21ed47bcc3d..cedaa4a52fe6 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 6eb3cadbdf0a..2577a21ada83 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -11,4 +11,4 @@ EBUILD libwebsockets-2.0.2.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9f
 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
+MISC metadata.xml 1723 BLAKE2B 561ac0a5b23081a9b351b2d516d63784c40688a399e0ff49522b4a572b32e7d4462a0062680aa6a1e39c6cc364c1b8fddafb1eb7edcdd99e19eafe557710e23e SHA512 7d259d9f7744deede3f3bde1e79f8e17351443cb8dff672f7c550206bf41064a01a43b2bb955a97144bf9319ee190c9f9ffc49a9513c22db6288b49b51c9ace4
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 482bbee780d0..5d94cebb10db 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -5,10 +5,6 @@
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>yuchen.xie@live.com</email>
-		<name>Yuchen Xie</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index b0b811689490..6c01ae6b4b87 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -2,7 +2,7 @@ AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a58
 AUX loudmouth-1.5.3-skip-gtk-doc.patch 394 BLAKE2B ebcfed350077bcb67b0f7da9d0c9a31fa7483d4d927323490920f7d56b7cf78bcb6dfe04b4f59a36fac07c24267653ce8bcb2e17f2e19f4d2ad7037dca0844b5 SHA512 02ec191f33dd5601f9d875d3a5d0e1bc5baf904c18ca47c90280f860ee1449e51dbc7f2be841de85c8baf23d615574592ca8f9a913ae6b5dacd2583497bf8889
 DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
-EBUILD loudmouth-1.5.3-r1.ebuild 1144 BLAKE2B c0f5f6d6d538cc0661c678a00fe31ad6370b444ee01aa999ef19b1bd2861a8e7647df192471eba6756d121a0ec3ccf5a7360eaa47e2db0682a95c4ee5ddeb34d SHA512 1dbd2faec2ffbbad86a1e651a679c6994b7d1edb3e84460f174f78fc8d333bdf238e7c3d6a6b251fb61144cfe6b34bc33f00f8d6102c4d1f5b7bf58d1ba4648b
-EBUILD loudmouth-1.5.3-r2.ebuild 1174 BLAKE2B 29524a97e8a1c4bcd2d57850615725f8ec2b927d84d261cd7acd410b0f57fd0cf21dc5593d6d80e40eca6ddc5a0acb224324adb27fb65ddf2833cb586c2dee0c SHA512 524c7f0e58c2561b1049c2cc8abf460fa086d152ec5654f1b87f189086bd73c9237bb8476a76f1781b4bbd12b6a2663ff27fa64f95558560d3cd2a50f92a4af3
-EBUILD loudmouth-1.5.3-r3.ebuild 1045 BLAKE2B 1263dc28ef74315f559999624a0747f7197098da092126293fbcf995dc61069416f370527d0bd3e05bf70935259914259926e093c05170d1f3367b20b05519fd SHA512 907b5b6dc225ec96df164db4d0b9ad3ea6cdf6d7c98a6fcda00dddafdb05978603fb7fe5ce7a5ef07f804eedd40d31da5500dabbe3ed4b2d25978a7f00c347c4
+EBUILD loudmouth-1.5.3-r1.ebuild 1168 BLAKE2B aa65c54703ccc3d6d2d7d06f42e4de6749cdb60a3f5413c77a34b6367388fd4540f94d804a33b174eb65869d3f7c093540eebb2fca005fb322b1abbf797629f3 SHA512 032b522ef8d30d1b5b4d88d823fc1ee1427c8296670e8d645cb3d461a837c4cda0829848010f66daf0d940d0f1b2f1a6c4651450e213190c1b766a953c827b86
+EBUILD loudmouth-1.5.3-r2.ebuild 1198 BLAKE2B c9937e44c3d032a6a68e4fce361a308609a6d287f498d45b69a870ae44ea7e84703ca761af65e610e065dc7ec41571b1b649fecb87a4bb45f1f6e13a9cc7bcbe SHA512 7598c1fe67f16f5bf37c30f00da4a2ba2eb42efb4826295a3980f72a0036783c3ac4ff4ce0963e06a28e0be28c9d25e36228edf2328515da96b890df7ea8e6cb
+EBUILD loudmouth-1.5.3-r3.ebuild 1072 BLAKE2B 0f21fa7378c614907a5186319fc10d24ba7d7fa8aceaff74854166469eaf0abc653a66decedbfd6d66e938a71de05e82731ca8830621a5223d06e2f66d5ac3f1 SHA512 b6e3242aa217dff252d9871940b8e08ea77418b34361901304b84e8bd2756101f53c3166501c2d3a1924d2a9089fa816e230c5a29a6e3a864c22ecdc361f2a44
 MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
index 6f91b5632614..e6aba4fe23e1 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r1.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
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
+RESTRICT="!test? ( test )"
 
 # Automagic libidn dependency
 RDEPEND="
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild
index ad185ab77e8a..6b2b320208a2 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r2.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
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
+RESTRICT="!test? ( test )"
 
 # Automagic libidn dependency
 RDEPEND="
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
index a0bcde42ddf0..f538e07a39cf 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -12,6 +12,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
+RESTRICT="!test? ( test )"
 
 # Automagic libidn dependency
 RDEPEND="
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 8fe0127f5d56..cb48e548aa4a 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -2,8 +2,8 @@ DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
 DIST mbedtls-2.16.3.tar.gz 2459563 BLAKE2B 5de21b27274dae61e282114da196078be7931e823750f712145c372160204e02f36f995d2cca8589f7b8ffcb646b0b258b0d49db6a0ffa01117b8c0af9f3fa0e SHA512 3d798f7de9c33325585d5d7c8608cc16acdcf42c246d283b2fb8a29f5e419f2899342965ff297432ef2ab20c91eaee28d6ca53349f5a68b0a4fd29d6905fc64c
 DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
-EBUILD mbedtls-2.10.0.ebuild 2392 BLAKE2B 8127b8612a16cb8421d865c8812f3cda2d78f8f55dde6879b4b9be09504dea0fee0a8f2c7b1a8973b42c6f54c0f55f172a05320d022915782e9f2131d1b5ad55 SHA512 7eec69c20f376d19c8e2186384ddb04fa2fd214febb15efbba2340b4a2aa6449d14e865a86139e87bc25f00c54c83ba9f9f01ba7cc018ef0ebb5c267995ed83d
-EBUILD mbedtls-2.12.0.ebuild 2420 BLAKE2B 127126877ea026036c4993ea157fc517e1f6abd33c15fd8a215e188980ba8a99c4fc71d9ba1d6abcbaf181b8912817a3efb9f8ad79a809eb02e9c68fb94f840a SHA512 8050aca33b36dbf8e1ef446787a71861d4e762c9f4dc58f5bb46c991e0c292c72154066afdf4bd78ff25ed4a2b537a8d37d1c5c86a201e90d892540653aef28b
-EBUILD mbedtls-2.16.3.ebuild 2430 BLAKE2B 74f231ba31eb1f9d932b8f07aa8fa6d930e7d1027f6a69410ff067e4e6455d4b5e5e4997137aa590abc4fd08747c2b1b4274b213d06c38e00590510c37a26961 SHA512 39001011710809bbe0a851c4307318d69442787b838bda820d03aeaee2597af61d16924b7eab71f535ec9976072b9f1563c56eb991a0e109d4e4bacd7a644360
-EBUILD mbedtls-2.17.0.ebuild 2430 BLAKE2B 74f231ba31eb1f9d932b8f07aa8fa6d930e7d1027f6a69410ff067e4e6455d4b5e5e4997137aa590abc4fd08747c2b1b4274b213d06c38e00590510c37a26961 SHA512 39001011710809bbe0a851c4307318d69442787b838bda820d03aeaee2597af61d16924b7eab71f535ec9976072b9f1563c56eb991a0e109d4e4bacd7a644360
+EBUILD mbedtls-2.10.0.ebuild 2419 BLAKE2B 33cc9bbcc3fbb07de8389fde94cb606ac50c50776f14ab0d192c2bd475a7ca33204e244aa13b8bc9e64514006484106c9dd4fb80b834f3d132ffb7903e761a92 SHA512 d26ecb8788be571165c8a7e98757904b1c751e4c34e19ad541cfde97945f5ba52e564e1ed25aae50989cc9fcdd9e498b1bcaf29683ef06878869f5cf3ffb87d4
+EBUILD mbedtls-2.12.0.ebuild 2447 BLAKE2B f1f75b43f084adcaf6f9268bb39f6c40fee931ab2d7e600e2b44f9df3306f41b558fb52403b8af9525dbb61f77965253999df8cf430f099cf03c11a020f00ab5 SHA512 fe30a115df87767c1515721d84c6bf988226734c1efae802a18773b240c72d66bb9359717b953d17060d71c0847c8c835de705b75d05e39c65776ebb560b724c
+EBUILD mbedtls-2.16.3.ebuild 2457 BLAKE2B 52032b6e91158a0110746a6c928a121d2b4a764589708ff0b2cd3b2c56e94d1186f26cf87b79f25643a881ac34ee9b8ee649737036a0a9572e55e2ac6b2b6f16 SHA512 ff12f6f5403f06003293be95ee44e10ff26855926c0d81aa7b2d24b280441f28e947f0f0aa95c27c562f369555dfa797b5724dfa344a534f72bea77504b22d3a
+EBUILD mbedtls-2.17.0.ebuild 2457 BLAKE2B 52032b6e91158a0110746a6c928a121d2b4a764589708ff0b2cd3b2c56e94d1186f26cf87b79f25643a881ac34ee9b8ee649737036a0a9572e55e2ac6b2b6f16 SHA512 ff12f6f5403f06003293be95ee44e10ff26855926c0d81aa7b2d24b280441f28e947f0f0aa95c27c562f369555dfa797b5724dfa344a534f72bea77504b22d3a
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index 9b8c96be8480..ffd06f8ff627 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.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
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0/10" # slot for libmbedtls.so
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	programs? (
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index c660faa6c354..fafff54c9a87 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.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
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0/11" # slot for libmbedtls.so
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	programs? (
diff --git a/net-libs/mbedtls/mbedtls-2.16.3.ebuild b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
index 347aeef76fc8..a0303acdb713 100644
--- a/net-libs/mbedtls/mbedtls-2.16.3.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	programs? (
diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
index 347aeef76fc8..a0303acdb713 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	programs? (
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 898428822070..b5211ef6bcab 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
 EBUILD miniupnpc-2.1.20190625.ebuild 1323 BLAKE2B f8bc0853f7a47ae30c45cfa3377bfc38792a4fb171fd5aa1f8be2ef83eda84f8f244cf50a5f525ffac8daedfd036339f6daf1a5c44bd6941f0523dd09f6baaea SHA512 cf130e53ad502521880104721b5b092cab3a5841ad838a3eb1efab62bc1a1daf0c3e3e3099cea31f918ee57921b6cd21774f4867824fdf54d18d550f141964da
-EBUILD miniupnpc-2.1.20190824.ebuild 1332 BLAKE2B 1672ad870e46535d43a6cfe2161d0db686cf48af5c27e22ec154c92378ea7daea3d083e131c328297aed339c107cf807fb4b227062e4cfbed1c30e0480f8c974 SHA512 e96a5f62149af3bbc38c696bb8acf48d301bcd6ec4337ac129bfd901064a84f4a26a1ace4e027f7f5c81f7fa0494de9ca118ffc8e56f74c61ed49eb4548a99e9
+EBUILD miniupnpc-2.1.20190824.ebuild 1326 BLAKE2B 340b2a3052d2fab38e382683aa71523bb69c2b9c531fd329fb9de67110a299b5a0560dbf3f0073d1fe55b12ab2ebda9d46793fc8f3654f5d1307e4691a1b256c SHA512 a014c8b229a5a93f9353b23bd5f1d3f791649ef0cfd86c73c01fd6a4784f83e3d0b86e03c009c345ed6e74fd6ebb0ca2bcc5bea1884878f280a3acdcecd95a3b
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
index cc591323e332..7ae2f0642764 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 7e7137c3581f..9611bb62d11e 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,6 +1,6 @@
 AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86ddfd3f99af9f5db9e39ec5eda9b51f357c0f41d6649bc92f3d1c15bbfcbb88210986ceb2a60cfe03f1c48ef4b5f3b4ae0b57a2 SHA512 70ee208ba6342633ae9cd81b38fc71024583933a4da5317d3407aacf5112672be0abbb872e1a7f617a4eee43c96fe9a64f09b9d315ad97519a6feb34755500f1
 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 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-r1.ebuild 1477 BLAKE2B dbe24a64621ffb46f7561df9db14333dc5cabede535fdf7d577d33faefa73e034fc98bf80cd53080aa814736256f0272d27256bc03b8edf6295f0dfc30fcc189 SHA512 9a9adec2cb88eadad13980ff7b4ae648d61ae33ab74b74aaf79cb5bad8881bae31d189847e48d6029ae99acb7413a5d8cef7bfdf62fd5824bb02d6b11dc2f909
 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/nativebiginteger-0.9.36-r1.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
index a4f330caaee7..fafd98f37e95 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE='public-domain'
 SLOT='0'
 KEYWORDS='~amd64 ~x86'
 IUSE='test'
+RESTRICT="!test? ( test )"
 
 DEPEND='
 	dev-libs/gmp:0=
diff --git a/net-libs/nfqueue-bindings/Manifest b/net-libs/nfqueue-bindings/Manifest
index 5c6cee6d68af..40e027c17b9b 100644
--- a/net-libs/nfqueue-bindings/Manifest
+++ b/net-libs/nfqueue-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST nfqueue-bindings-0.5.tar.gz 22385 BLAKE2B dd14df558dcc3f811f7f649f0e4ef305025f863d850deceae0dba308974865150265899d3cee43d2a279d6c6d6237dd4df6b01b72c39b6a96819d25fa4413dbe SHA512 c88ef6997b8e4b3ae2c2eb6c1002b74f39979c73b4dc3a4da428aa4eeb6eedeeaff1cbc27c0740e8b29fb8b6a6f98af326be0b4fbc6ed3e432a9884febb3f7a6
 DIST nfqueue-bindings-0.6.tar.gz 22425 BLAKE2B e338268a41e29cbab9a5dc2e891caa78a75d7849439fd9afc8eb105c965e8d201d854f95460d337dc60249ee2c90d88582075a14bc321bf5b952e5a8b648ed0e SHA512 6ee31b01377c0e4b6aa2d2f2e14b34d4d432f04d0e813f90a9d7e52ea9c8483044f7a36b48220887d658c80ca07bfefc88f8aa92309cff30619ec8fb9f52ab43
-EBUILD nfqueue-bindings-0.5.ebuild 1990 BLAKE2B 23db678937b8fb4f7825272bcb8abe1c5ec752970d7901bb32933f303ba3b46fd782abcf47e4b2b0ba38d74aea5e5a9fc2a03d29144853c8173550d38336888b SHA512 23226b2f2e72fd49c0432d2a71e06a0818e43a2a85fe85c6250399e9005e00858ec2b33b6b6baea5372f02cf4ab9809349a92eaff4fd347b94c98f61463cb4f7
-EBUILD nfqueue-bindings-0.6.ebuild 1966 BLAKE2B 53d0b57bdeb78525ec4009d77b0a18292454faa709b70f31cb4cc752a7fecbc6d3fc433dd066cbe593b0347ea1f37b7ed92b239a16e5a759df4a635e020fe8a1 SHA512 6c0adede95388dc5d0a7a4a1c0bb3f63bd43fc37526593e7fc4de4275e603c442a6700c5cb1db2e9a8b441436bf6c6ca8be54365f7279c7539c3073a832bac62
+EBUILD nfqueue-bindings-0.5.ebuild 1983 BLAKE2B ba1f4bc6a61f198560d0a415202972d32e896a62aae7a88ca11938ddad49f58011801a1260977b77092c05a48f59fa02e3bb9c801c7e384b26fed57561196c33 SHA512 6fcecd6297f2f4d2e6778c7263e87e910a8ba51a526ddc35ea328379018ce069df6d9b9c5a8ba6a7936ac7781bda8da06ae8089214e8339ddde834a38955651d
+EBUILD nfqueue-bindings-0.6.ebuild 1959 BLAKE2B c6ab4990c06d9904704d102490fdf1b1b01e3e4a916b6c93144c4730cafbe1d5c1f3cc0570eda16df729b0c0dd2267f41e82b16b9aa0bca1a0ccc4be5fe92991 SHA512 13b245b2fbcf98569a37d50e24cd481d24c8ad92f3deaa1999bb5b058b766816dcc53ffcdc238f4580a93bde932305690c07d3f2777bfa28b8ab60deecc46fa5
 MISC metadata.xml 389 BLAKE2B 7d33c22b26e297b9cf696712e893a908f0dc1e6db264d9dfe39eaed7e5fea809c1e0d5bf5661a50783192c75cd414f92e3450da533aa9087f8e94fa016bd891a SHA512 93f27dce7f495f0e0bb277938e5133cc8a2ca33fe8d6b822da48dede56b94dfb35c471a77679cee6e8cd08dbca41f7459440b21ca1c6a1f02368ad5bd8c91d96
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
index a236c6709f93..208daba1fd23 100644
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install PREFIX=/usr || die
+	emake DESTDIR="${D}" install PREFIX=/usr
 	docinto examples
 	use examples && dodoc examples/*
 }
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild
index f3bce16be25a..fb8f566b9270 100644
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild
@@ -61,7 +61,7 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install PREFIX=/usr || die
+	emake DESTDIR="${D}" install PREFIX=/usr
 	docinto examples
 	use examples && dodoc examples/*
 }
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index c6d14924e7ec..798ed4ed9e3e 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,4 +1,6 @@
 DIST nghttp2-1.39.2.tar.xz 1635428 BLAKE2B 4569774c33f17d51ac889c385697fcead82106db421399ceb22ad2aafabe64a576445d9272adcf37e2fec47cdd6ac1dc6423efd49012ca7be0aa2087609a0397 SHA512 d8c971543e3e87736dfafebca55e9ecd0644e304c9731edaccba34170205824476595861a439077289b438ad489dd6008dedf2c6b2c111920300329be1b1bf34
-EBUILD nghttp2-1.39.2.ebuild 1943 BLAKE2B e964dceba78c453903c6a7889de2f5ce8bfb77d91c8a89ce77fb671eaf9a07fc4e722cf01a1a5407a9739246ddf8994a5bedd816e54ee26e0998c422c121c8c9 SHA512 62d312fe5c28eb7b6d22dadd0edc738144a75d8bbf469fdc755788a7d3aec5c9686245ae8e75a5edab8f19e2183d8ecd18fe8efccfe6505f1b2d20d83f1a2b52
-EBUILD nghttp2-9999.ebuild 1954 BLAKE2B ff2ab3bf0c6c585ff522b73d11a2a3e780f2dcba47c84290b336b6a43d861b0f48919bbb5233d80550012182f5b805fc5f044460ff8fd58774e392358919f8a7 SHA512 a6e5b180d4029944eb8942e5f57ddd4f71359428159b220367db7b629c551457f2e9a84e993fa41b261f7217a03750c5e2e7e4ace7cbcfc6ba499e9dfff8f9c7
+DIST nghttp2-1.40.0.tar.xz 1637004 BLAKE2B 7735ba06cd0655450a6379ea33cc79e557f73b5b4b2ba746564a53e6c305aa656b62da7c3b00dbb70472dffc471271f73af0bcbfadab99406d217d1989ad052a SHA512 3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce
+EBUILD nghttp2-1.39.2.ebuild 1971 BLAKE2B db617ce5770b9ff8d4b1d210f394f5e71f0188d9805e2f73c514bfdf29e1d9a56294a0c37c40f43cbab19887b6bff3fde68aed0b2dddc0d81f9ce6fe14f401ab SHA512 06d1567c2cafb4a6c17dc78887bb74c948cf0ebcc4261d023df63b464a18d3f882f1e89aa2d0aeddead99e9d9cb765c0e202412a6924153333a3de0571a2accb
+EBUILD nghttp2-1.40.0.ebuild 1982 BLAKE2B a026ef4243c2ca3d79e2d3e43a6e45e3b45ea8ea21d599ddf5d832f03a31cd6a8446493089fabfc3be4576d8dcb53074f76deddceb25b4edc22bc5ebc358c014 SHA512 f13ffcceb60aaf9a1ec0b529a85659d4ed21d5b04eda9be9277ef6f3c4020dca6919c64a162a1750fa5a658086dcbd2b07052dadfa60c8b61f8b83cfb9f9b389
+EBUILD nghttp2-9999.ebuild 1982 BLAKE2B a026ef4243c2ca3d79e2d3e43a6e45e3b45ea8ea21d599ddf5d832f03a31cd6a8446493089fabfc3be4576d8dcb53074f76deddceb25b4edc22bc5ebc358c014 SHA512 f13ffcceb60aaf9a1ec0b529a85659d4ed21d5b04eda9be9277ef6f3c4020dca6919c64a162a1750fa5a658086dcbd2b07052dadfa60c8b61f8b83cfb9f9b389
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.39.2.ebuild b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
index 83f298094049..bc28fd779dde 100644
--- a/net-libs/nghttp2/nghttp2-1.39.2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
@@ -22,6 +22,8 @@ LICENSE="MIT"
 SLOT="0/1.14" # <C++>.<C> SONAMEs
 IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
 
+RESTRICT="!test? ( test )"
+
 SSL_DEPEND="
 	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/nghttp2/nghttp2-1.40.0.ebuild b/net-libs/nghttp2/nghttp2-1.40.0.ebuild
new file mode 100644
index 000000000000..4600d9387e98
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.40.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 6750a2a20d71..4600d9387e98 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -22,6 +22,8 @@ LICENSE="MIT"
 SLOT="0/1.14" # <C++>.<C> SONAMEs
 IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
 
+RESTRICT="!test? ( test )"
+
 SSL_DEPEND="
 	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a71a9a5fe261..566e1202ee1e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,16 +1,23 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
+AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v10.17.0.tar.xz 21514260 BLAKE2B a37793d78e14d1d2ca861c39f27c5e1dbb47ad26f14aa97139fd9f9be039bd47e528f10c9977725f1ca4b5f4e31a1066715091ffaa488f764c67290bc1c84541 SHA512 4eec936fa8d848b7e261f83b6e25c1bfb06355a7146dcca91b0f64fc401ca32dd1b0758c127b81be7f0d1cc59c3b24b4ec2c17282b4bdb91c5bf71f42f2f7cbc
 DIST node-v12.13.0.tar.xz 22862096 BLAKE2B b0121f45b535bac7baa0103db538070b4beb4b40a6c871c217eebfb1abb5a7821d83d46946047b3385af182f901c0390eb85134c9201be2d03b5745b297271f8 SHA512 a7aa8b1f010ea1df122d9d7b88ee0a9d10e0d79ae2f3d18c706ac6ce36e2e2039c21ea6f3dba3a22a79ed3f6069850a8a3c463dbd64e1e8f4a9dbe8901a89cc8
+DIST node-v12.13.1.tar.xz 22854348 BLAKE2B d1cce8d367db93d47fee45209547bd29d9574240d9bc00b8dd0e66572f79478d96a03e6e25495f710410670c4fc3942bae61dbe918811c84e3543d219cf2dcf7 SHA512 439116a8610686d59fa7b5ee214fb3c3995d5555de3e03dd057610d0bffae9e4ae4d8c738878b6827a46654acaffe59490c4cdd8a21f913ac5fd9d720cb1ed29
 DIST node-v13.0.1.tar.xz 31986844 BLAKE2B f30937878ef68fe94b69912b994b84c03d75fd92e243d77453cfa7d335e9e1a37ce4f18eb1cbba141ff9a017a777e31ae64261f46dbf17d1f6ff0d6d5c263a2a SHA512 a39a64761ef3867379f3a2ef230f65ddeb91fb93d8833c1ada7312588fd75d060f4d73df1a106f7d7cc08886ac7c5335d453e4d882c8cdde28a25a0a8cbcbfa6
 DIST node-v13.1.0.tar.xz 31981260 BLAKE2B a7c9a8d851b22f3cb24132adad0c0e971401c1555951fffc2bd69b3b8bcfc295fdebde6918a467203c30bd62f883f5997f6ec57c7197854187ef78a56e52a8e8 SHA512 fa05064980c47f58b6f3e3590ca94b45850184c86d79cc2f1e489222685cb38ca7c8e0e7bc7b9dceec1148256c2ae7bcf3ddc6468c6b366a4281d77c1c20b699
+DIST node-v13.2.0.tar.xz 32219304 BLAKE2B 89cc3a80c2c75441038d7993c1a435842b4565728771e1a3d28d0939e50abd3032564d3ea694272cd79cee2c0f7fae4037c162d3b8b29122d2072fb75134af87 SHA512 7d1653f67d1c833bf459b2689a2780d3b6ebdeddf66f6c8c9aa3b3e9f0e438d29939875dee90766e41b70c9b82377774fa177c736095e0783a111d2f43db1920
+DIST node-v13.3.0.tar.xz 32312032 BLAKE2B 833e3f06aaf59aa0b7a2ed87a268877ad047f7d9b8dedfc8f9441e3318e6746709915f10446d781cd4054a2cbb32f3372caec96871244589f0dd067aaa7ab5de SHA512 82e30fc342101230b69227ecd6fbf0078194ad6f48b3ba51689bf958dba554183beca3a3ea4f658faedee4ed645b6e129c24bc267a25727372bae7650755c571
 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 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-10.17.0.ebuild 6276 BLAKE2B 4e823d8a4f8a994a1ef908d1203d22106be9432f0177cdb88ec1983b6d505a824db35c0c55f59b9af0a9b706bcfb6eb91f337eec5ef28eb109122906bebdfb13 SHA512 9a454f61424ff36a9d84d45c61a366589bbc28e8e4d5bef5341942e9f19a551656e08c7298fa86191c46943230874535155616b553f14094b246ee80a74387b6
+EBUILD nodejs-12.13.0.ebuild 6400 BLAKE2B 75df2ea0fa35af0d75c67f5ea2fb3c7b6cffb64756d25638f714156d30aeb9b43caecf74f24c344b287926cf9af8a1b48e8b089055f310de4d076631e2c34e90 SHA512 fedcbedb6ca35bbd3ab50f811bfa8747305241cfeea554d5a5f4e8a4ffbf726d6f0630633dcb21523211094bdc5da52484cd5162c343aa419bdc50d6ac448258
+EBUILD nodejs-12.13.1.ebuild 6121 BLAKE2B 9d98d4799fe0a2f1f805164a990d7581145800c4446c08bf35d188ded8a546245f5ffa1a6874a865b71d6bb4de9aa36c1ee3d37eaec9df5e9b340bd3fe72bb98 SHA512 8668e731ad11521c9184fe5af34cc8feffaa2e19315e37f8378873721eab7e11979889f55d65248bb3f2fb7bf9a1e06c7075aa8ac307d12176da9c05e780fa21
+EBUILD nodejs-13.0.1.ebuild 6018 BLAKE2B b716eb86763201578359efb5d3894716d5cc3e7abddecd407942b21fedc6b32b05281a279ec6c7455b2b362958f01af19b87b8e50c2b112b08d74bb6c15732ac SHA512 5364a2c63a0a9f16e036c4258e60a26e6a6c222ce6273adf724124c020ff11dfb5b3c89bba08db0c026aaef68b024a992886a89ab1659ddc473e6790de4afedf
+EBUILD nodejs-13.1.0.ebuild 6018 BLAKE2B b716eb86763201578359efb5d3894716d5cc3e7abddecd407942b21fedc6b32b05281a279ec6c7455b2b362958f01af19b87b8e50c2b112b08d74bb6c15732ac SHA512 5364a2c63a0a9f16e036c4258e60a26e6a6c222ce6273adf724124c020ff11dfb5b3c89bba08db0c026aaef68b024a992886a89ab1659ddc473e6790de4afedf
+EBUILD nodejs-13.2.0.ebuild 6142 BLAKE2B 8e498e3b2acec711bf7578d5488f0788ec46d7425cba5a8684244f0c4eec852b84b2d0a8efc8d52cb0415cf4bfb68a9a5ad590a58a1faa1879c337df66932908 SHA512 399d34f0bb5504901c228e523955946658b54f00e3fb111d1b419af979b05308194659d460ce9397ce64cbb3393d13a6d8d64f30df1d97a40e5b722604af7834
+EBUILD nodejs-13.3.0.ebuild 6142 BLAKE2B 8e498e3b2acec711bf7578d5488f0788ec46d7425cba5a8684244f0c4eec852b84b2d0a8efc8d52cb0415cf4bfb68a9a5ad590a58a1faa1879c337df66932908 SHA512 399d34f0bb5504901c228e523955946658b54f00e3fb111d1b419af979b05308194659d460ce9397ce64cbb3393d13a6d8d64f30df1d97a40e5b722604af7834
 EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513
-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
+EBUILD nodejs-8.16.2.ebuild 6474 BLAKE2B 1b3ea27bebebac7a516162ea1dfd59c68498e9e49d6c4cb2e54967f0307c01015c6ab4aa4bfb3fff0eed6a22961cee4e74972e85c34af7a2ba4b2625448935e9 SHA512 14f1524bee2fa4bfd31330d2b22ca65c978b74c6702c6991c687412c95b6102c292a9e29adb7ffecd57aa55216ec47ed3881a9ff646605dc9f74d6d8add9b934
+EBUILD nodejs-99999999.ebuild 6058 BLAKE2B e16f4325cbc184a1eac2723e0f1226b6fe06567c4df9596cc029c4b25045c8831457e0266d01f2b76e8f76f04e2254a53a6771a158cf9c8d3bc6a054b6e9ba35 SHA512 50a998e065cac9b2c54066e01bc7646a9506154045ade60ff83711136765cd7441781223af3804154a1ab9a476d110c58c98e5bf157b1a8559e0d1ebfb1c34be
+MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4
diff --git a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
new file mode 100644
index 000000000000..143e41662724
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
@@ -0,0 +1,71 @@
+    Bug: 694100
+    Add actions for pax marking mkcodecache and node_mksnapshot
+    to disable mprotect for pax enable kernel.
+    Reported-by: Attila Tóth <atoth@atoth.sote.hu>
+    Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
+    Signed-off-by: Magnus Granberg <zorry@gentoo.org>
+    
+--- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
++++ a/node.gyp	2019-11-12 20:58:43.957881862 +0100
+@@ -233,7 +233,9 @@
+       'deps/acorn-plugins/acorn-static-class-features/index.js',
+     ],
+     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
++    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
+     'conditions': [
+       [ 'node_shared=="true"', {
+         'node_target_type%': 'shared_library',
+@@ -436,10 +438,24 @@
+           ],
+           'actions': [
+             {
++              'action_name': 'run_pax_mkcodecache',
++              'inputs': [
++                '<(mkcodecache_exec)',
++              ],
++              'outputs': [
++                '<(mkcodecache_u_exec)',
++              ],
++              'action': [
++                'bash',
++                '-c',
++                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
++              ],
++            },
++            {
+               'action_name': 'run_mkcodecache',
+               'process_outputs_as_sources': 1,
+               'inputs': [
+-                '<(mkcodecache_exec)',
++                '<(mkcodecache_u_exec)',
+               ],
+               'outputs': [
+                 '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
+@@ -461,10 +477,24 @@
+           ],
+           'actions': [
+             {
++              'action_name': 'run_pax_mksnapshot',
++              'inputs': [
++                '<(node_mksnapshot_exec)',
++              ],
++              'outputs': [
++                '<(node_mksnapshot_u_exec)',
++              ],
++              'action': [
++                'bash',
++                '-c',
++                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
++              ],
++            },
++            {
+               'action_name': 'node_mksnapshot',
+               'process_outputs_as_sources': 1,
+               'inputs': [
+-                '<(node_mksnapshot_exec)',
++                '<(node_mksnapshot_u_exec)',
+               ],
+               'outputs': [
+                 '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index aaaba184187b..3f344f0d8eda 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -7,6 +7,7 @@
 	<use>
 		<flag name="inspector">Enable V8 inspector</flag>
 		<flag name="npm">Enable NPM package manager</flag>
+		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
diff --git a/net-libs/nodejs/nodejs-10.17.0.ebuild b/net-libs/nodejs/nodejs-10.17.0.ebuild
index af990b984505..0d092cf3066b 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 5f78ba394c89..e6741c72ebb5 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-12.13.1.ebuild b/net-libs/nodejs/nodejs-12.13.1.ebuild
new file mode 100644
index 000000000000..93881fe7882e
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.13.1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.33.1:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-13.0.1.ebuild b/net-libs/nodejs/nodejs-13.0.1.ebuild
index 64dd1ca4d151..56bbeb5526f4 100644
--- a/net-libs/nodejs/nodejs-13.0.1.ebuild
+++ b/net-libs/nodejs/nodejs-13.0.1.ebuild
@@ -60,9 +60,6 @@ src_prepare() {
 	# https://code.google.com/p/gyp/issues/detail?id=260
 	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
 
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
 	# less verbose install output (stating the same as portage, basically)
 	sed -i -e "/print/d" tools/install.py || die
 
@@ -119,7 +116,7 @@ src_configure() {
 	GYP_DEFINES="linux_use_gold_flags=0
 		linux_use_bundled_binutils=0
 		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
+	"${EPYTHON}" configure.py \
 		--prefix="${EPREFIX}"/usr \
 		--dest-cpu=${myarch} \
 		$(use_with systemtap dtrace) \
@@ -192,7 +189,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-13.1.0.ebuild b/net-libs/nodejs/nodejs-13.1.0.ebuild
index 64dd1ca4d151..56bbeb5526f4 100644
--- a/net-libs/nodejs/nodejs-13.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.1.0.ebuild
@@ -60,9 +60,6 @@ src_prepare() {
 	# https://code.google.com/p/gyp/issues/detail?id=260
 	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
 
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
 	# less verbose install output (stating the same as portage, basically)
 	sed -i -e "/print/d" tools/install.py || die
 
@@ -119,7 +116,7 @@ src_configure() {
 	GYP_DEFINES="linux_use_gold_flags=0
 		linux_use_bundled_binutils=0
 		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
+	"${EPYTHON}" configure.py \
 		--prefix="${EPREFIX}"/usr \
 		--dest-cpu=${myarch} \
 		$(use_with systemtap dtrace) \
@@ -192,7 +189,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-13.2.0.ebuild b/net-libs/nodejs/nodejs-13.2.0.ebuild
new file mode 100644
index 000000000000..8013ab7c39ae
--- /dev/null
+++ b/net-libs/nodejs/nodejs-13.2.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.33.1:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-13.3.0.ebuild b/net-libs/nodejs/nodejs-13.3.0.ebuild
new file mode 100644
index 000000000000..8013ab7c39ae
--- /dev/null
+++ b/net-libs/nodejs/nodejs-13.3.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.33.1:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-8.16.2.ebuild b/net-libs/nodejs/nodejs-8.16.2.ebuild
index 33da81a42a36..9796fe0f07f3 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/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index e5e6f8a9d81c..ff8d2952c984 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -13,7 +13,8 @@ EGIT_REPO_URI="https://github.com/nodejs/node"
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
@@ -31,6 +32,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
 "
 DEPEND="
 	${RDEPEND}
@@ -56,9 +58,6 @@ src_prepare() {
 	# https://code.google.com/p/gyp/issues/detail?id=260
 	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
 
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
 	# less verbose install output (stating the same as portage, basically)
 	sed -i -e "/print/d" tools/install.py || die
 
@@ -85,6 +84,9 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
+
 	default
 }
 
@@ -115,7 +117,7 @@ src_configure() {
 	GYP_DEFINES="linux_use_gold_flags=0
 		linux_use_bundled_binutils=0
 		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
+	"${EPYTHON}" configure.py \
 		--prefix="${EPREFIX}"/usr \
 		--dest-cpu=${myarch} \
 		$(use_with systemtap dtrace) \
@@ -123,8 +125,6 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
 	emake -C out
 }
 
@@ -188,7 +188,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 1334aba98c65..108f6d57f7e8 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,5 +1,7 @@
 DIST ntirpc-1.7.1.tar.gz 373327 BLAKE2B 55d71932e35b844e382409593b5dead30246d0cbaa27d3d49ad94d09435acb8abb34b945ba90ab7ba9733a955b4184ad839ba202aa82f97eeecbcc502cb88bf0 SHA512 9a98d83db94b4775940584cd08a1105b79263412d44309f91d1e86c609e6d56a482ac239efaaa73ccc1c2f4cabb8b597ccb8931514f33b8b2fd5c2a11b731106
 DIST ntirpc-1.7.4.tar.gz 373897 BLAKE2B 7354c5d6114947c8d66dcbc4fb933ab38237dd70eeb318278a658946fa4ec354bcaf7e90ac210f39f76b6d8e60f865c0c63ecbf7cbd8ee1e8defa0d7622cfb51 SHA512 076d789edc3fdf0ddb75437196b72b1aef78780d579ae4db0bcc116a1a92ac861fc77e1611070f2d3df003bfec7883ab20653a3c2f2255c685aaed8e7c22ce0f
+DIST ntirpc-3.0.tar.gz 386738 BLAKE2B 123c8f31ea532f6a01b4544d4f19d503c6e44ec8f3923f3f053f1ccc2ff5c5dc62da6464373b25a1881f69749a4c62395838be4451f3281ed9e7446eb8380255 SHA512 a7e9fdfcdaa2e85d4631094874bd72dce6c2e93924f6099f6bc20c98a1792839559ffb028b100aa3c5ec0140c10e090b32155439846276f918e9ba017271e14b
 EBUILD ntirpc-1.7.1.ebuild 742 BLAKE2B 6c65b2bb30cde7ee1d36fffaaa93fa4ab7afed246d90de97e3410847e0680bddc27a61e30af8cbfd3000d1ce320dc4a179a2d235fda183c36e20d61589341e67 SHA512 8d3a8a5131dea9db88ab3d7a34957478f44e8e628cf176419840fda945c4de02ddfad777c4f3095839b83a8021bd73c05722ab255f78b64525b79ab2dda611dd
 EBUILD ntirpc-1.7.4.ebuild 740 BLAKE2B 8e1539462ffe6a0b6700fb29dc7a3dbfa389e757e8d862c3581a199b317b10460f7fc293a6ad503cb677a13b03d9a7fc520ae4fda0b06657d60b91c5dd6eee3b SHA512 603d21ff32cff6fd08fed345797d7f0b6f7481ceb7249e06a6cc0db66af03b72af91283484175eedf00b6835669f056ff6e2b2ea5fc88e6e1cd54510b40bc635
+EBUILD ntirpc-3.0.ebuild 770 BLAKE2B c425aa769bdebe375fceb3e53e87defb13ed93e58570affaf0a88519ebf7e708f432347fa8bb97fe74269cac0f74fe37152031f424720fa81170728a108a4498 SHA512 6478f2766d035205bdd5a38bb8b1214dfb49828f4a9215a83ddddbc18a591232b6969a8a850535ffd24204ec43b66186fbc2965e2e4949e4c8da41236133afa1
 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c
diff --git a/net-libs/ntirpc/ntirpc-3.0.ebuild b/net-libs/ntirpc/ntirpc-3.0.ebuild
new file mode 100644
index 000000000000..f492c2991f56
--- /dev/null
+++ b/net-libs/ntirpc/ntirpc-3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
+HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gssapi rdma"
+
+# Since the GSS option only controls some extra files to be enabled,
+# there's nothing to list in the depend string for it.
+RDEPEND="
+	app-crypt/mit-krb5
+	dev-libs/userspace-rcu
+	net-libs/libnsl
+	rdma? ( sys-fabric/librdmacm )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUSE_GSS="$(usex gssapi)"
+		-DUSE_RPC_RDMA="$(usex rdma)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest
index e521fafce6f7..26178f14202d 100644
--- a/net-libs/onion/Manifest
+++ b/net-libs/onion/Manifest
@@ -1,5 +1,5 @@
 AUX protos.patch 1239 BLAKE2B e20e0efee1cbbb04caee2d1754164e54545d17ff79a36100b5abc5de2f6174dc49daf776fff137dadb9a298977083a2dccb09286c7f1acaf5c8e8a784fba8712 SHA512 0dd7f95dab267b1df6279fc60869696d506b62756a863c86ade9725dc17e48bc4b71b984d53bce94e88448ab295673fbe27e7687e2807d32841d0ad5ddf6b018
 DIST onion-0.8.tar.gz 344347 BLAKE2B c43bbbf31d29ccc99d2969c7c8dc9aec8d5e514cc785091e3e0e6d1fc1d5db5f8561d5c2c745b4150a493b607c6c271d669e7ca541f72bf4d8872beeba00b220 SHA512 c40a36346de7dee6e98d0b5c38b5e133606046e29bacb06a0055a361013077ec0f6adb04dfcbf2f4ce0b72317c9ed918573299aed8760f069dcfd7c211a302d7
-EBUILD onion-0.8.ebuild 1883 BLAKE2B edb95c79af8ea6cb1d34cccc7fd1f1e485168de5c685cd6e2e83b194e498b6acc434a78ace373f21e0619f9550bd5fb8722ac0ef95a18900419970ad4023a524 SHA512 f7671bc755a007dcacb479accdf4ebbcd6a5988e0daf0a3e397123acb8ff0524fd811f33ed885950b526d6d7a3a36aa7317705e626b2a174f259b1b208c31251
-EBUILD onion-9999.ebuild 1843 BLAKE2B 8473ef5538e391f19d72d60e7d99c3efdb99a751a7f4f64fec2532649867c02dd847350608cc89806c43d5d74dc3e8e88ae916b4bb0246c8765a4e95418c7f28 SHA512 ac1f63e9e7b186ae1c4c49887bf76b3e250f7c3b6ab39ccadaa70789257b7b195d788d154fd7e0a1dff1f4d6da3e685f45a99d073c6498dec5d0d0780bc0d210
+EBUILD onion-0.8.ebuild 1910 BLAKE2B 2d289f327f7de8b66f384c36822525e1116b5476dd6ac1aeff41b68346a387db0b6257faf7ef46cfae3b8e2d232cf5ac1c7cc99a7e357f2b524c1294e7f11bf2 SHA512 79a92b12bea34fde6df357374e136da2fa42ac51ed0a5167aeba6cfea756b75ac71955422352ed7075968c8786f6153ef09234dbc13dfed818555c3557e1e08f
+EBUILD onion-9999.ebuild 1870 BLAKE2B eb59107fb8dc80f1b93438768586b2722549b5d9111354838e2c22c2222e433bb04a949604c85f6351d5048dc878114d23cf09176d593a9ad0e5db40b9c781fb SHA512 6695440cf94a0a7a803fef66a2dac4546451f3ab3cda9d9372a6096a4b1101631d8abd888935a2f033812d7360d9aa6f831d619ba353789a0fe2327b16b60863
 MISC metadata.xml 719 BLAKE2B 91253f71648b48cd344267e189fed4f77c1fbe2e8f218ea7751502ed419f1ee7d97fd881234a99368aaf888b6b550325c054f5d65e9cb007735e25ffebb24366 SHA512 1afb4311878a3eef4d13d7fa6c670f2b1b23e0e89d9c50694668cb36c0d05f529da37af25469b3e4ffc34d25780be7f710e82e87c1962056aef9e4e924d1e868
diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild
index 5491a6115339..cf77737da1a3 100644
--- a/net-libs/onion/onion-0.8.ebuild
+++ b/net-libs/onion/onion-0.8.ebuild
@@ -29,6 +29,7 @@ IUSE="
 	test examples cxx -libev -libevent
 	redis
 "
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
index de8dbb95ca03..88e7246cecfe 100644
--- a/net-libs/onion/onion-9999.ebuild
+++ b/net-libs/onion/onion-9999.ebuild
@@ -29,6 +29,7 @@ IUSE="
 	test examples cxx -libev -libevent
 	redis
 "
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index ccaeffcd33a7..db465397bb51 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,8 +1,12 @@
 AUX pjproject-2.7.1-ssl-flipflop.patch 4345 BLAKE2B b52f5a2cb86abdae86e9cfe58fe63b187f615b39ea4991768d0937e8b6e353a8496f1ad24f3cbaff92a09847c1ec444b81f9e470f1e78325ea26ca04456579e7 SHA512 00e7b8b347f73929f52015e102286f0631699de4c0e3631c53df6b00130d5b6760492748454ae7315eb9df0b182019901c59b9ed15c8fdd578548f9039080050
 AUX pjproject-2.7.2-libressl.patch 3446 BLAKE2B 47b21f621ffd1990e276459d9692ed7e8a083b93fc8dd0f44225af7cbf8f8390f9790efd61c8c790a0f20da64cb7f47db4fd83a8f0604de9a1bce30d54b3079f SHA512 173fc80e85673c4036b433cbf8152c58862d4716d4d98688cfaebf4c5ed3df76b8d4893709577c1dfff82a02baeeb0220dcae1dafc2e69ea9472056727b0d0fc
 AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082ff1c40d5ba383103371550d2c682578a9c57d58b4029e512ac5a064fae3a526bd6e62fb645ba45b4067c47fd148bcce668aa SHA512 438a61353c0200d3f230b81cc13f565a178d078b4580aa468a9241b5b95f5a2336d039f4aaf99cd57e7b1042f4c0a1cafd00c29191e36c08f2194d984811b8d6
+AUX pjproject-2.9-config_site.h 2168 BLAKE2B 39d526e7a2ca79ea2c1e453d95d420a6245e7a93641227a908660fea553a8b66d5dfb6b7108b49dc0686de6522c2485b72a6e7511096cbfe50bdb2800d559e6f SHA512 d6456b7fa36b3256613eea515b78f0884fa6b56705817cd421a962f3c3302bf0efa69006432dffca49400ef75dc99ebc7639d270aebe5bc2d4a9a9515cc56408
+AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00651c87d0b39b9bc800fe0d38294f2afad43fd7f4ee5c260bd62044d17b010112c59363277739f4ae7d20940943437539 SHA512 5fd3e681801e6e2cd56ec177d71a65422ec22b788adfad3920562616c737188f71097a545d9c59bd6a3d876ba143f90f731d165d8c68da25aa93b03c009753e8
 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
+DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
 EBUILD pjproject-2.7.1.ebuild 2614 BLAKE2B 10ee58a83d0ebce1fe52bfe395bd319e08a4128364f7fbf889d0d089daef222859992b12786bf0796d6bf77f599a9dcc9dc9800253d4e781069a9587efe07259 SHA512 2bd916ffdc6449e3fc62fd4aa1d3dee7634a97351b369e896384b46316e089185121c39efb8fa30143745c6c91ccd001c797cd0f13020481769dc3bf0e196e8f
 EBUILD pjproject-2.7.2.ebuild 2755 BLAKE2B efbca2a7da848ea23594811a1ae9636ac15010f1ee7228b821237076d3d497d0aa240c15cdce4f14619138acef073aa86670b5bfba051c027532c04e3a524bb8 SHA512 f1ccce719dc7b0e7c667cccd0c9137115089d0ef882949994918215068913369843391490ee407bd2c164204a0241b55b87c6b63b75c5160c3402d46fa42a964
-MISC metadata.xml 1096 BLAKE2B 03a918c911b8a3c8bdd0aafaabc820b2750dbf5a3b7573ffe987e71ee8edad4a369e7c15845d4ad748150c8972d646d44f6489a9a54e16895dee7a6048b5eac5 SHA512 d2547bfdc7aced6f242f7493a39425f4c2ba5881ab2cc6b8da386e84c092780ab0f876dcf947436150a5060faedc3a0a55377ad389f3a53f6142ef188b321a92
+EBUILD pjproject-2.9.ebuild 3030 BLAKE2B 1418bc3c0973a06f109f3b5afa61418074676354755b6878ac6908cae06b452852703d9de60acd45de5282883f40a3b0d202c3c2fd1aae18a31bb8b97345bdd3 SHA512 9f8481927212966ae472220fce138e211779bb7ce453795f5c0376434713180ebee985ec029e39c2cbd0ee87e165bceabd1494a7198ff20f146febace1715b5d
+MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
diff --git a/net-libs/pjproject/files/pjproject-2.9-config_site.h b/net-libs/pjproject/files/pjproject-2.9-config_site.h
new file mode 100644
index 000000000000..d41ac1d1947b
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.9-config_site.h
@@ -0,0 +1,74 @@
+/*
+ * Based off of the Asterisk config_site.h file.
+ *
+ * In general it's the same with some removals due to being ebuild-managed.
+ */
+
+#include <sys/select.h>
+
+/* handled by ebuild, default to disabled here */
+#ifndef PJMEDIA_HAS_SRTP
+#define PJMEDIA_HAS_SRTP 0
+#endif
+
+#define PJ_MAX_HOSTNAME (256)
+#define PJSIP_MAX_URL_SIZE (512)
+#ifdef PJ_HAS_LINUX_EPOLL
+#define PJ_IOQUEUE_MAX_HANDLES	(5000)
+#else
+#define PJ_IOQUEUE_MAX_HANDLES	(FD_SETSIZE)
+#endif
+#define PJ_IOQUEUE_HAS_SAFE_UNREG 1
+#define PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL (16)
+
+#define PJ_SCANNER_USE_BITWISE	0
+#define PJ_OS_HAS_CHECK_STACK	0
+
+#ifndef PJ_LOG_MAX_LEVEL
+#define PJ_LOG_MAX_LEVEL		6
+#endif
+
+#define PJ_ENABLE_EXTRA_CHECK	1
+#define PJSIP_MAX_TSX_COUNT		((64*1024)-1)
+#define PJSIP_MAX_DIALOG_COUNT	((64*1024)-1)
+#define PJSIP_UDP_SO_SNDBUF_SIZE	(512*1024)
+#define PJSIP_UDP_SO_RCVBUF_SIZE	(512*1024)
+#define PJSIP_SAFE_MODULE		0
+#define PJ_HAS_STRICMP_ALNUM		0
+
+/*
+ * Do not ever enable PJ_HASH_USE_OWN_TOLOWER because the algorithm is
+ * inconsistently used when calculating the hash value and doesn't
+ * convert the same characters as pj_tolower()/tolower().  Thus you
+ * can get different hash values if the string hashed has certain
+ * characters in it.  (ASCII '@', '[', '\\', ']', '^', and '_')
+ */
+#undef PJ_HASH_USE_OWN_TOLOWER
+
+/*
+  It is imperative that PJSIP_UNESCAPE_IN_PLACE remain 0 or undefined.
+  Enabling it will result in SEGFAULTS when URIs containing escape sequences are encountered.
+*/
+#undef PJSIP_UNESCAPE_IN_PLACE
+#define PJSIP_MAX_PKT_LEN			32000
+
+#undef PJ_TODO
+#define PJ_TODO(x)
+
+/* Defaults too low for WebRTC */
+#define PJ_ICE_MAX_CAND 32
+#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND)
+
+/* Increase limits to allow more formats */
+#define	PJMEDIA_MAX_SDP_FMT   64
+#define	PJMEDIA_MAX_SDP_BANDW   4
+#define	PJMEDIA_MAX_SDP_ATTR   (PJMEDIA_MAX_SDP_FMT*2 + 4)
+#define	PJMEDIA_MAX_SDP_MEDIA   16
+
+/*
+ * Turn off the periodic sending of CRLNCRLN.  Default is on (90 seconds),
+ * which conflicts with the global section's keep_alive_interval option in
+ * pjsip.conf.
+ */
+#define PJSIP_TCP_KEEP_ALIVE_INTERVAL	0
+#define PJSIP_TLS_KEEP_ALIVE_INTERVAL	0
diff --git a/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch b/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch
new file mode 100644
index 000000000000..bb8a11d7f457
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch
@@ -0,0 +1,100 @@
+From 2942c73cd3b3389ec1a35258f22ac9d0f0742de1 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@iewc.co.za>
+Date: Thu, 24 May 2018 15:40:33 +0200
+Subject: [PATCH] Fix support for --enable-ssl.
+
+This change enables the explicit use of --enable-ssl in such a way that
+package managers such as portage (Gentoo) that explicitly does
+--enable-ssl or --disable-ssl will get the results that it's looking
+for.
+
+Without this specifying --enable-ssl would end up actually disabling it.
+
+Additionally, if --enable-ssl is specified but the script ends up being
+unable to enable ssl it will fail.
+---
+ aconfigure    | 16 ++++++++++++----
+ aconfigure.ac | 15 ++++++++++++---
+ 2 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/aconfigure b/aconfigure
+index 0cf17faae..57bdfba87 100755
+--- a/aconfigure
++++ b/aconfigure
+@@ -8001,8 +8001,9 @@ if test "${enable_ssl+set}" = set; then :
+ $as_echo "Checking if SSL support is disabled... yes" >&6; }
+ 	        fi
+ 
+-else
++fi
+ 
++if test "x$ac_no_ssl" != "x1"; then
+ 	        if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
+                     CFLAGS="$CFLAGS -I$with_ssl/include"
+                     CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
+@@ -8317,16 +8318,23 @@ $as_echo "GnuTLS library found, SSL support enabled" >&6; }
+ 
+             		ac_ssl_backend="gnutls"
+         	    else
+-            		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5
+-$as_echo "** No GnuTLS libraries found, disabling SSL support **" >&6; }
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found **" >&5
++$as_echo "** No GnuTLS libraries found **" >&6; }
+         	    fi
+ 
+         	fi
+ 
++		if test "x$ac_ssl_backend" = "x"; then
++		    if test "x$enable_ssl" = "xyes"; then
++			as_fn_error $? "SSL Support requested but neither OpenSSL nor GnuTLS operational" "$LINENO" 5
++		    else
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No SSL detected, disabling SSL support" >&5
++$as_echo "No SSL detected, disabling SSL support" >&6; }
++		    fi
++		fi
+ fi
+ 
+ 
+-
+ # Check whether --with-opencore-amrnb was given.
+ if test "${with_opencore_amrnb+set}" = set; then :
+   withval=$with_opencore_amrnb; as_fn_error $? "This option is obsolete and replaced by --with-opencore-amr=DIR" "$LINENO" 5
+diff --git a/aconfigure.ac b/aconfigure.ac
+index 8d7d944a1..45c42756b 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -1607,7 +1607,8 @@ AC_ARG_ENABLE(ssl,
+ 		 AC_MSG_RESULT([Checking if SSL support is disabled... yes])
+ 	        fi
+ 	      ],
+-	      [
++	      [])
++if test "x$ac_no_ssl" != "x1"; then
+ 	        if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
+                     CFLAGS="$CFLAGS -I$with_ssl/include"
+                     CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
+@@ -1692,11 +1693,19 @@ AC_ARG_ENABLE(ssl,
+ 			AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_GNUTLS)
+             		ac_ssl_backend="gnutls"
+         	    else
+-            		AC_MSG_RESULT([** No GnuTLS libraries found, disabling SSL support **])
++			AC_MSG_RESULT([** No GnuTLS libraries found **])
+         	    fi
+         	
+         	fi
+-	      ])
++
++		if test "x$ac_ssl_backend" = "x"; then
++		    if test "x$enable_ssl" = "xyes"; then
++			AC_MSG_ERROR([SSL Support requested but neither OpenSSL nor GnuTLS operational])
++		    else
++			AC_MSG_RESULT([No SSL detected, disabling SSL support])
++		    fi
++		fi
++fi
+ 
+ dnl # Obsolete option --with-opencore-amrnb
+ AC_ARG_WITH(opencore-amrnb,
+-- 
+2.23.0
+
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index 3d82a0d2376c..6d51c770dce3 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -2,22 +2,27 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+		<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>
 	<use>
 		<flag name="amr">Inlcude AMR codec in the build</flag>
-		<flag name="v4l2">Include Video4Linux v2 support in the build</flag>
 		<flag name="epoll">Use /dev/epoll ioqueue on Linux (experimental)</flag>
 		<flag name="g711">Include G.711 codecs in the build</flag>
 		<flag name="g722">Include G.722 codec in the build</flag>
 		<flag name="g7221">Include G.722.1 codec in the build</flag>
+		<flag name="g729">Include G.729 codec via net-libs/bcg729</flag>
 		<flag name="ilbc">Include iLBC codec in the build</flag>
 		<flag name="l16">Include Linear/L16 codec family in the build</flag>
 		<flag name="libyuv">Include libyuv in the build</flag>
 		<flag name="openh264">Include Open H.264 support in the build</flag>
 		<flag name="resample">Include resampling implementations in the build</flag>
 		<flag name="silk">Include SILK support in the build</flag>
+		<flag name="v4l2">Include Video4Linux v2 support in the build</flag>
 		<flag name="webrtc">Enable WebRTC support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/pjproject/pjproject-2.9.ebuild b/net-libs/pjproject/pjproject-2.9.ebuild
new file mode 100644
index 000000000000..5a4d582b1e2e
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.9.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# g729 not included due to special bcg729 handling.
+CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv"
+SOUND_FLAGS="alsa portaudio"
+IUSE="amr debug epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc
+	${CODEC_FLAGS} g729
+	${VIDEO_FLAGS}
+	${SOUND_FLAGS}"
+
+PATCHES=(
+	"${FILESDIR}/pjproject-2.9-ssl-enable.patch"
+)
+
+RDEPEND="net-libs/libsrtp:=
+
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ffmpeg? ( virtual/ffmpeg:= )
+	g729? ( media-libs/bcg729 )
+	gsm? ( media-sound/gsm )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	openh264? ( media-libs/openh264 )
+	opus? ( media-libs/opus )
+	portaudio? ( media-libs/portaudio )
+	resample? ( media-libs/libsamplerate )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speexdsp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	rm configure || die "Unable to remove unwanted wrapper"
+	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
+	eautoreconf
+
+	cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
+}
+
+src_configure() {
+	local myconf=()
+	local videnable="--disable-video"
+	local t
+
+	use debug || append-cflags -DNDEBUG=1
+	use ipv6 && append-cflags -DPJ_HAS_IPV6=1
+	append-cflags -DPJMEDIA_HAS_SRTP=1
+
+	for t in ${CODEC_FLAGS}; do
+		myconf+=( $(use_enable ${t} ${t}-codec) )
+	done
+	myconf+=( $(use_enable g729 bcg729) )
+
+	for t in ${VIDEO_FLAGS}; do
+		myconf+=( $(use_enable ${t}) )
+		use "${t}" && videnable="--enable-video"
+	done
+
+	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
+
+	econf \
+		--enable-shared \
+		--with-external-srtp \
+		${videnable} \
+		$(use_enable alsa sound) \
+		$(use_enable amr opencore-amr) \
+		$(use_enable epoll) \
+		$(use_enable opus) \
+		$(use_enable portaudio ext-sound) \
+		$(use_enable resample libsamplerate) \
+		$(use_enable resample resample-dll) \
+		$(use_enable resample) \
+		$(use_enable silk) \
+		$(use_enable speex speex-aec) \
+		$(use_enable ssl) \
+		$(use_with gsm external-gsm) \
+		$(use_with portaudio external-pa) \
+		$(use_with speex external-speex) \
+		$(usex webrtc '' --disable-libwebrtc) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake dep
+	emake
+}
+
+src_install() {
+	default
+
+	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
+	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r pjsip-apps/src/samples
+	fi
+
+	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
+}
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 105215d86b50..941dc0d41a47 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -132,7 +132,7 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-EBUILD quiche-0.1.0.ebuild 3416 BLAKE2B 3f8e6d6255a0f918e75c68aa7d236552d7265f292a3dfcb447c6f53662f2a9899cd016cf3841183196a45176e6cd8366c4c7468d4b758b22fb778967b43a3a05 SHA512 371ca431bdaac4aed1ff9916233132b50047bb69550bbf69d80512d70794d59912abb1e8e08395f1f9eb7390d8e6cf426d1e7635739347cec4fff4e29ad27b61
+EBUILD quiche-0.1.0-r1.ebuild 3988 BLAKE2B 39f2e25701cf7bd72fac25257f43088dc51f19fcfd24bb0e031615c307fadb670b0a7940c7dc6deff0d8e35f4e0abd2f5b8d460626ce25aac051f5649850b505 SHA512 9c00fad5edadc7d28662872ecc947889921a221e3ba91ceaf0d672549d105c571013cdc37eaf08e0c7cf6af9397d3488431a146e56f5c39c5b8d5de329707bd6
 EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3776 BLAKE2B 78ea083d45b9426a5920160e1faafa0cc0057c7dd1e6f6af5a166be875419eb11b7f2fd5a7884823a42a6c0c7e62863301d71bc40074782ac31de8e9678f5e11 SHA512 b918a7ad17decc581f18944007827b88fb524ddb5848f0cd6dbfc9c74334cc276578ddf29cd504c6108429d27e49c12f45558bf5d169ec66528a92df7ed31bca
-EBUILD quiche-9999.ebuild 3415 BLAKE2B 7e3e0cb674eb426272e8dfc52ebed7f10bba3ebe5d58e697f214a152abeba6dc2db6956fb9ce22f378caa65fce97c2bd8f0717784dc8986434054873e64fb7be SHA512 8f573254a6230e6fb22b32094efa2f59da06befb4f0a59e4d88ff94f6a4b1fd14b5f56e752e2bd77746826f957015004e5fc337fedbd74ef4b224ecf82e7cdd0
+EBUILD quiche-9999.ebuild 3987 BLAKE2B f9fa4525be4439f8ac2b8526a9223352289896b939bc96bb313f011996429d8f917c050fe654aa811848210bbbb1c66f6a35566ae767c73e31f076e7102a1991 SHA512 c89f95f983dc18c08add4031158b8b5d40a233e5dde382717d2325489d8a534531c2eaedf61d28937922c34a61ba2c4bed461c1b30b4e0c4b4d135ec0b2d6779
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.1.0.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
index 8736c5d257b0..68ddc23bf7a3 100644
--- a/net-libs/quiche/quiche-0.1.0.ebuild
+++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
@@ -122,7 +122,7 @@ wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
-inherit cargo multilib-minimal
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
@@ -133,7 +133,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
@@ -151,13 +151,16 @@ IUSE=""
 DOCS=( CODEOWNERS  COPYING README.md )
 
 BDEPEND="
-	>=virtual/rust-1.35.0
+	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
 	dev-lang/go
+	dev-lang/perl
 "
 DEPEND=""
 RDEPEND=""
 
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
@@ -170,15 +173,26 @@ src_unpack() {
 
 src_prepare(){
 	default
+	cmake-utils_src_prepare
 	multilib_copy_sources
 }
 
+multilib_src_configure(){
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
 multilib_src_compile(){
-	cargo_src_compile --features pkg-config-meta
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
 }
 
 multilib_src_test(){
-	cargo_src_test
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
 }
 
 multilib_src_install() {
@@ -186,5 +200,5 @@ multilib_src_install() {
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins target/release/quiche.pc
 	doheader -r include/*
-	dolib.so target/release/libquiche.so
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
 }
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 0c71fee6d049..f641b6907a83 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -122,7 +122,7 @@ wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
-inherit cargo multilib-minimal
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
@@ -133,7 +133,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
@@ -151,13 +151,16 @@ IUSE=""
 DOCS=( CODEOWNERS  COPYING README.md )
 
 BDEPEND="
-	>=virtual/rust-1.35.0
+	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
 	dev-lang/go
+	dev-lang/perl
 "
 DEPEND=""
 RDEPEND=""
 
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
@@ -170,15 +173,26 @@ src_unpack() {
 
 src_prepare(){
 	default
+	cmake-utils_src_prepare
 	multilib_copy_sources
 }
 
+multilib_src_configure(){
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
 multilib_src_compile(){
-	cargo_src_compile --features pkg-config-meta
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
 }
 
 multilib_src_test(){
-	cargo_src_test
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
 }
 
 multilib_src_install() {
@@ -186,5 +200,5 @@ multilib_src_install() {
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins target/release/quiche.pc
 	doheader -r include/*
-	dolib.so target/release/libquiche.so
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
 }
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index bcb320ab11cc..120071de42af 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,6 @@
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 DIST qxmpp-1.0.1.tar.gz 259791 BLAKE2B 3687dd8f74db8a995bc37850f6988b1750219b2f683281d26990a430046cd1d7f1957c19604540a56c3110aa5b9a40d037388f9726f684a56a0d15c7de6a4849 SHA512 b6fb5fc0e3edfd978ac47b3ce32d8d0892678247479ba3e30beba3a7e67da1eb053bb95de07306920cf6ca5e744c12fd31f1a72612c5ee5b724a3eac7b8d6c6e
-EBUILD qxmpp-0.9.3-r2.ebuild 1815 BLAKE2B 7e800dcaad27d3d876a07b41dbba5dfd2f27c506c8a95f0c75b42778054a25b584828756437309787fe0b585868e433e4cce764b8ce8325c044ba6218d4f0fdc SHA512 69a64ff108de9d7d0b70bc5f21d18c1bcc0c2949a701ba5b89eef13412fa4f85c7084ae3c6f3f70e814cb9aaeb027bfbf5afdd83c2ed7f43e40652f3766092b3
-EBUILD qxmpp-1.0.1.ebuild 1371 BLAKE2B 656f09c6f6191ed9ecefec938218dce6256ab1ab071fe86bff62e932213b10f5027a4433b5aa93887fdbab4730f7889dce87daf847bcf7a85110b6ab31c8425c SHA512 5ac23406455b745ac331003ce2777f1463a1668ed6458c2d7220d3cc4c8a0c5ea5220c8778039d3da9573a5b06085ecf24874d6708e614dbd9b0c870cc17b027
-EBUILD qxmpp-9999.ebuild 1346 BLAKE2B 706db83d1c49524069d421e26fae37d49ce6221ed88a225e5a8b9ceec792c51523326d21661b4d7a1fd022d85e0483ef71175fdfcf5191928c90efe25524c7f0 SHA512 7df917d3cb6138af27d7717a2ec98f701f1a00e067b33dcda0eaaf808851800cb6800390f60edfe64af0fcd66a06195426a892a4173d7060c4a4a91cae38d63e
+EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede
+EBUILD qxmpp-1.0.1.ebuild 1398 BLAKE2B 8436df254b5fb10cb60a7044fcba975fa283d765cadb1e52abcc73ea86b14bc1cee4bd4ed2c6965d477eaadced2d295e44ef15bde6e24e82b3ea921ca5e67251 SHA512 5017f3b418e388ece03015adf98205984fa7cd578bef9a4b33acf06a2c0177f1988cee1543cdd0143378f6809eadb02373c72cfdb20389fe359b80f308d58a84
+EBUILD qxmpp-9999.ebuild 1370 BLAKE2B 4b29c5e54630679f9dbbfc04f773f3ce4a2c70b87f0774d8b144bfb6d8008b013a227714d37e30f444c518da37d70ee0fb125eedd84494211bc53034d3181eda SHA512 b196a0a6a2cafc320bff35528a92f05dd2821602b5cbaaea0b9cbe9773352b27816aa7da0049fe490fa75da2bcd99ce3f444dd2750218e6284500d000c905169
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
index 686efcd72f8c..9a67cc314b2c 100644
--- a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r2.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
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="debug doc opus +speex test theora vpx"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/net-libs/qxmpp/qxmpp-1.0.1.ebuild b/net-libs/qxmpp/qxmpp-1.0.1.ebuild
index de71964e178c..3085ee7a3745 100644
--- a/net-libs/qxmpp/qxmpp-1.0.1.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.0.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc opus +speex test theora vpx"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index a6fb6f67b142..b1973ffc3cce 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.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,6 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug doc opus +speex test theora vpx"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index d2d669dfad8f..8ce9e5e6ac0d 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,3 +1,5 @@
+DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c
 DIST rabbitmq-c-v0.9.0.zip 227245 BLAKE2B ea37e0a9734bc7a8923cab880a9e150f055bab83bb79eb793882a1d435e6e435fbf4610034235f858d0e4d20978287b9432b312c8c3eea5e588655dc2f831554 SHA512 0cac0e26b4caca3de22b468200a20c38c8ace1a824442faa0855d93922b0c3a649fc2067366f6694eca0be635187ca9a9cfe47643472f4abb3d67028768f49fb
-EBUILD rabbitmq-c-0.9.0.ebuild 1328 BLAKE2B a2dfe91537aec396a39e6a1d52c6014458842e9159903c72c5ae9647b27d9c5f8072521f60b0040e42233c316b899b880cc08711210bb3f0a29c96844153e720 SHA512 9693798a5a4c9f1be4bd5030074044c18d68ecc6d37dd1cf1ca9045b68569c2b86bd47fa3228666148d4df9bdeca6c85c759f81da78711a86988eeb7d0ecbd00
+EBUILD rabbitmq-c-0.10.0.ebuild 1355 BLAKE2B e47b8654955d3d3ece16d1cd591fa677a2a7dbaa80b8f25ab6398889a38b32ddc38220aea7339c51a2e6eefc218c22b658d8954070bf1d869f03591d802753cb SHA512 598eae2c2cd2b3f436383c46fe4d4a9e992ad7f7f0708e4cff85de7e456769de7295b4c3734f3948eb95bf63bc3667e4eea94ce3aa2cb2cfae69546973e67211
+EBUILD rabbitmq-c-0.9.0.ebuild 1355 BLAKE2B 370570b5ac07ff56dd09cdfe3480beabf32de947b99c612ba70056a07a5f550f24078a1b7c88733ffb705f0fd2bbd80615745e4f1f59544547f91b9d52ebe780 SHA512 5ea896020c5b33bd845876c34488cd30f678e2f6a16179c4f2095e3b2120c28d09d1c34a2a08fe2c9808ad01bd07d51ad6ac95641710b670392cd7546c8df20a
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
new file mode 100644
index 000000000000..91110cbd2aee
--- /dev/null
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+DESCRIPTION="RabbitMQ C client"
+HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
+else
+	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/4"
+IUSE="doc libressl test +ssl static-libs tools"
+
+REQUIRED_USE="test? ( static-libs )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? (
+		libressl? ( dev-libs/libressl:= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	tools? ( dev-libs/popt )"
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen )
+	tools? ( app-text/xmlto )"
+DOCS=( AUTHORS README.md THANKS TODO )
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_API_DOCS=$(usex doc)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_TOOLS=$(usex tools)
+		-DBUILD_TOOLS_DOCS=$(usex tools)
+		-DENABLE_SSL_SUPPORT=$(usex ssl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Skip "basic" test which requires running local rabbitmq-server instance,
+	# see https://github.com/alanxz/rabbitmq-c/issues/530
+	ctest -v -E basic || die
+}
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
index 38124aea5dce..6969404a06ed 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0/4"
 IUSE="doc libressl test +ssl static-libs tools"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index c5f408be4016..81a4dc39bd69 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1504 BLAKE2B aa6aa1bcf6bf55d3097b7baa5359dfb5b256a2303d2cd7652a711cfe5d5dac0d01bf03639e023ef30e8eef01f942f9e79700a6d61a54b16cded0ea6ea31d9126 SHA512 c09c3703a185d00cce7bab3ddd06519bc90571a2159c172258e59ed574693372e7f04653d811b72f4deb89c108b6c51500fd3b86faf5ceaf721657ed2eee9d96
+EBUILD rest-0.8.1.ebuild 1531 BLAKE2B a5a70bd5987cd003f15614982db5e6d1af9327cf553d708ad6ce5d594317285dcaea3adb82268440f673e0b00e1cbbf2d7e9e7d77727ca897833c15cc85a4aff SHA512 3a493667f175bcf10b8c2fb292cae7d7e8e8c9aa6893bf1566adf695b4654958e85625c4c4dab7eca375a52bc774951ff1f9cc1946303451203bfbcc4fbbacae
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index b8d9e4d1f22e..68bfdf67b8b9 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
 LICENSE="LGPL-2.1"
 SLOT="0.7"
 IUSE="+introspection test"
+RESTRICT="!test? ( test )"
 KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 
 # Coverage testing should not be enabled
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
index 50abc19ebae6..e68f9cb2d808 100644
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ b/net-libs/ripe-atlas-sagan/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
-EBUILD ripe-atlas-sagan-1.1.11.ebuild 856 BLAKE2B 45359fc23e6bd24a561ba5608209df99834a8c0fbd4e24215eded258744ebecb8d905472c3cbaeb310b25df903b4400aa8b6976d1b61532d8f005afa0f92d861 SHA512 799dde2d232cd25e6d695557b1e8c3202a98ffd123ae2673d6fdbc8b430768a0a3f84143c6b1995c754384eea50acc874c45c4dfa830dff372bb5aa3eee49092
+EBUILD ripe-atlas-sagan-1.1.11.ebuild 883 BLAKE2B 9160396045660b8afe6f80947594977e312125da6c25c67cc2808d82e8946554e2aba1c0a6a821637ac9c986d15ce903ff75a9dc107884a2587d8474f331b2e6 SHA512 3b57106362a0d763b70e8af09d60ab95afeaa08b71da001f69168c44f94909afefda85963459423c8d55062b61b90307cc767c2e2fff443b3433910aef038d86
 MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
index 8d0000b89214..f31e0b416f1d 100644
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
+++ b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DOCS=( CHANGES.rst README.rst )
 
 S="${WORKDIR}/${MY_PN}-${PVR}"
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index 0f387a2bbfbd..bbcc621d1d7f 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,5 +1,5 @@
 AUX signon-oauth2-0.24-disable-examples.patch 331 BLAKE2B 259170e4ef75d002dbdcb8494cd0a3e6ea7fb77e5222db600c8d7a5d731af147cd5c7149b7e15e724607018331a29a53d589c2e6f60f614248e7badff5e63056 SHA512 a12e14d59987925dc0c14d407455c95d49751fc3bda66211898c1308a76d4f910b7ba4fdbfe98902a457980f7037f9853c5a007ee82df690375e5e430afa587d
 AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
-EBUILD signon-oauth2-0.24.ebuild 1092 BLAKE2B 36d030a82b6130ecca2d8e9de6a359c799213de67957834f79e70bb9be48415f16519fcd3a4bc96ac3be57fc79f5be27ca371865b93cfba4471a1e667b6487f3 SHA512 d73d42487f74334caa8fdf5f026f48f70e4b9b9ccba36be57c7f7ebdb832e938f9717919762bbe825064a353cba284754f7a927992eb255a7972b8075b0264cb
+EBUILD signon-oauth2-0.24.ebuild 1119 BLAKE2B 90c0f1275b8562bb4847e73f1ab6261d5d4e180f507ca80e58b151561e63e98e68c7d2ef9c00672537070d50faebdd9854ae2d899636913523c42076a3078663 SHA512 b51f3c2d641239ccef7d51524b60ef6944c0942ddc617a0b147bb5a6acdc3c8600bdae2abc653be40511a29c11d92155eae15f06e97206ce7dfdbb0a79b9c15c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
index ff53dc277ac8..6afc4fe8d209 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 011bcb5db90f..c1ff5db255cd 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,5 +1,5 @@
-DIST signond-8.59.tar.gz 281298 BLAKE2B 29b97705b6e774f65b42a7ef9a253b08b1f4caf46141e3d761aabd9ef641dbe1301ef2fac0f46d8073e815bb97bc64bfbbf4b19d9c6644e2369f3abe538a50af SHA512 b8db03127df7b62dbf046841568c12f29c48c0b3272751600637864caa1c10b05ee9abce20fa41fb8eb7133c6bb20d18ca40803077e9e7808dba5afd108a36bb
+AUX signond-8.60-buildsystem.patch 1306 BLAKE2B 5cf758cd974d54fa39e42291f6d4969f341d37970948d0e1bb6f74367a5a77e5b0be8c7a435af2f7474d9ff8ab6f8352a7ddd83e772b792bb8db97032db2b8ba SHA512 ec69a845da1019c7517ca1163bd09fab2cf1f4e1e8faf27c2baa1ae0da5c5b4689b7fadc4207f744224deff7b99eaada6d41af4c451962bc07c9920d1559ba1f
+AUX signond-8.60-consistent-paths.patch 10565 BLAKE2B 09024a3a877d965ad037f3e77add52589e230b2fdeb133960192b6f26d4272395230621625a78633d084f863fd3aa0c931011f47134587a44e1a27a20ca04e91 SHA512 e3731e360c208c75de3634e507c81be94da29df7592ae90c192a30ef727cdf1c86e939a6d27ddd5b227a7655630dc7320c7181f644721e8b59b37501dc34e2fb
 DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
-EBUILD signond-8.59-r1.ebuild 1583 BLAKE2B c37317a68f2d839b5d9be9e8cef75fa1d6d04563fd7496580b40fd58ce3b7bdfdfaa934f4ca9570b62b82e06c6e0ef391e7415d3090b176e7968fb2f2021b109 SHA512 2300c0b0cfd3b1384ef4a74a81d77885c8042b5f3f5c03a77c9da814178012b918c77b288fd4ef0dc9169aac6cfd5bbc9adb09a009c377ccbdc92aa3d43f5bcb
-EBUILD signond-8.60.ebuild 1706 BLAKE2B 5d8544fc401a804c732a4f13e132b8d8a4febe151d64cd4b04d0cf017040a81c8969d400e97998428a8a66e5fc4cfbd977d5ea959fbf7c1378464158717f7eae SHA512 d11ec9dd593565923ab374d3bb62483cff097df9fe11fa7726d07fe1d3feefbf027a820ecd2a458059bf1ff1ab698e3a247aa9313b19c08da84360662f2100bd
+EBUILD signond-8.60-r1.ebuild 1615 BLAKE2B ff1092a2b26d4fcccf7ff008944c517eabef14452a3e054318cde00e1f2e6cbf18de1f7d57fe848d88a472de5f9a590e3e303822b471cef1f2ef7cf36856608f SHA512 ec0802242b49a5c6c688008a768f13303731dabf75a864b33fcc1384797d5dbf6c8a40355cf43d5147d78db2bb8bc0e225c3a228a9cb8f4363339df7debbe02b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/files/signond-8.60-buildsystem.patch b/net-libs/signond/files/signond-8.60-buildsystem.patch
new file mode 100644
index 000000000000..95c4791ac4e2
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-buildsystem.patch
@@ -0,0 +1,51 @@
+From 43e953418a5a08c3492d1160e4268dbcf82e7be9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 8 Dec 2019 20:35:11 +0100
+Subject: [PATCH] Fix build system for Gentoo
+
+1) remove unused dependency Qt5Xml
+2) don't install example plugin
+3) don't install static libs
+---
+ lib/SignOn/SignOn.pro   | 4 +---
+ src/plugins/plugins.pro | 1 -
+ src/signond/signond.pro | 1 -
+ 3 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/lib/SignOn/SignOn.pro b/lib/SignOn/SignOn.pro
+index f6a1d61..28af041 100644
+--- a/lib/SignOn/SignOn.pro
++++ b/lib/SignOn/SignOn.pro
+@@ -1,7 +1,5 @@
+ TEMPLATE = subdirs
+ CONFIG   += ordered
+-SUBDIRS = \
+-    libsignon-qt-shared.pro \
+-    libsignon-qt-static.pro
++SUBDIRS = libsignon-qt-shared.pro
+ 
+ include(doc/doc.pri)
+diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
+index dfccc4a..ca1c1ae 100644
+--- a/src/plugins/plugins.pro
++++ b/src/plugins/plugins.pro
+@@ -1,4 +1,3 @@
+ TEMPLATE = subdirs
+ SUBDIRS = password \
+-          example \
+           test
+diff --git a/src/signond/signond.pro b/src/signond/signond.pro
+index 60ee5e7..211dab6 100644
+--- a/src/signond/signond.pro
++++ b/src/signond/signond.pro
+@@ -4,7 +4,6 @@ TEMPLATE = app
+ TARGET = signond
+ QT += core \
+     sql \
+-    xml \
+     network \
+     dbus
+ 
+-- 
+2.24.0
+
diff --git a/net-libs/signond/files/signond-8.60-consistent-paths.patch b/net-libs/signond/files/signond-8.60-consistent-paths.patch
new file mode 100644
index 000000000000..f32ac319e570
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-consistent-paths.patch
@@ -0,0 +1,263 @@
+From c68f31b964f9decf323cd212282cf13d4a42ad21 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 8 Dec 2019 22:52:46 +0100
+Subject: [PATCH] Consistent overrideable install paths
+
+At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong.
+
+This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath INSTALL_PREFIX.
+---
+ common-installs-config.pri                    |  2 +-
+ common-pkgconfig.pri                          |  2 +-
+ common-project-config.pri                     | 30 +++++++++----------
+ lib/SignOn/SignOnQt5Config.cmake.in           |  6 ++--
+ lib/SignOn/libsignon-qt.pc.in                 |  2 +-
+ lib/SignOn/libsignon-qt.pri                   |  2 +-
+ lib/SignOn/libsignon-qt5.pc.in                |  2 +-
+ .../signon-plugins-common.pc.in               |  4 +--
+ lib/plugins/signon-plugins.pc.in              |  4 +--
+ lib/signond/SignOn/SignOnExtension.pc.in      |  2 +-
+ lib/signond/signond.pc.in                     |  2 +-
+ src/extensions/cryptsetup/cryptsetup.pro      |  2 +-
+ src/plugins/plugins.pri                       |  4 +--
+ 13 files changed, 32 insertions(+), 32 deletions(-)
+
+diff --git a/common-installs-config.pri b/common-installs-config.pri
+index 69c5ae8..b72477a 100644
+--- a/common-installs-config.pri
++++ b/common-installs-config.pri
+@@ -18,7 +18,7 @@ contains( TEMPLATE, app ) {
+ # default installation target for libraries
+ #-----------------------------------------------------------------------------
+ contains( TEMPLATE, lib ) {
+-    target.path  = $${INSTALL_LIBDIR}
++    target.path  = $${INSTALL_PREFIX}/$${LIBDIR}
+     INSTALLS    += target
+     message("====")
+     message("==== INSTALLS += target")
+diff --git a/common-pkgconfig.pri b/common-pkgconfig.pri
+index 975068a..9f010d3 100644
+--- a/common-pkgconfig.pri
++++ b/common-pkgconfig.pri
+@@ -3,7 +3,7 @@
+ !isEmpty(pkgconfig.files) {
+     QMAKE_SUBSTITUTES += $${pkgconfig.files}.in
+     pkgconfig.CONFIG = no_check_exist
+-    pkgconfig.path  = $${INSTALL_LIBDIR}/pkgconfig
++    pkgconfig.path  = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig
+     QMAKE_EXTRA_TARGETS += pkgconfig
+ 
+     QMAKE_CLEAN += $${pkgconfig.files}
+diff --git a/common-project-config.pri b/common-project-config.pri
+index 606f70b..1185559 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -57,36 +57,36 @@ exists( meego-release ) {
+     ARCH = $$system(uname -m)
+ }
+ 
+-linux-g++-64|linux-icc-64: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
+-else: linux-g++-32|linux-icc-32: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib32
+-else: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
++linux-g++-64|linux-icc-64: DEFAULT_LIBDIR = lib64
++else: linux-g++-32|linux-icc-32: DEFAULT_LIBDIR = lib32
++else: DEFAULT_LIBDIR = lib
+ 
+ # default library directory can be overriden by defining LIBDIR when
+ # running qmake
+ isEmpty( LIBDIR ) {
++    LIBDIR = $${DEFAULT_LIBDIR}
+     message("====")
+-    message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'")
+-    message("==== (current installation path is `$${INSTALL_LIBDIR}')")
++    message("==== NOTE: To override the library dir beneath INSTALL_PREFIX run: `qmake LIBDIR=customdir'")
++    message("==== (current library dir is `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}')")
+ } else {
+-    INSTALL_LIBDIR = $${LIBDIR}
+     message("====")
+-    message("==== library install path set to `$${INSTALL_LIBDIR}'")
++    message("==== library dir set to `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}'")
+ }
+ 
+-isEmpty ( CMAKE_CONFIG_PATH ) {
+-    CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake/$${CMAKE_BASENAME}
++isEmpty ( CMAKE_MODULE_DIR ) {
++    CMAKE_MODULE_DIR = $${LIBDIR}/cmake/$${CMAKE_BASENAME}
+     message("====")
+-    message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'")
+-    message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')")
++    message("==== NOTE: To override the cmake module dir beneath INSTALL_PREFIX run: `qmake CMAKE_MODULE_DIR=customdir'")
++    message("==== (current cmake module dir is `$${CMAKE_MODULE_DIR}`, install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')")
+ } else {
+     message("====")
+-    message("==== cmake module install path set to `$${CMAKE_CONFIG_PATH}'")
++    message("==== cmake module dir set to `$${CMAKE_MODULE_DIR}', install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')")
+ }
+ 
+ # Default directory for signond extensions
+ _EXTENSIONS = $$(SIGNOND_EXTENSIONS_DIR)
+ isEmpty(_EXTENSIONS) {
+-    SIGNOND_EXTENSIONS_DIR = $${INSTALL_LIBDIR}/signon/extensions
++    SIGNOND_EXTENSIONS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions
+ } else {
+     SIGNOND_EXTENSIONS_DIR = $$_EXTENSIONS
+ }
+@@ -94,7 +94,7 @@ SIGNOND_EXTENSIONS_DIR_QUOTED = \\\"$$SIGNOND_EXTENSIONS_DIR\\\"
+ 
+ _PLUGINS = $$(SIGNOND_PLUGINS_DIR)
+ isEmpty(_PLUGINS) {
+-    SIGNOND_PLUGINS_DIR = $${INSTALL_LIBDIR}/signon
++    SIGNOND_PLUGINS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon
+ } else {
+     SIGNOND_PLUGINS_DIR = $$_PLUGINS
+ }
+@@ -102,7 +102,7 @@ SIGNOND_PLUGINS_DIR_QUOTED = \\\"$$SIGNOND_PLUGINS_DIR\\\"
+ 
+ # Note that you have to CONFIG+=install_tests in order to install tests
+ isEmpty(TESTDIR) {
+-    INSTALL_TESTDIR = $${INSTALL_LIBDIR}/signon
++    INSTALL_TESTDIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon
+ } else {
+     INSTALL_TESTDIR = $${TESTDIR}
+ }
+diff --git a/lib/SignOn/SignOnQt5Config.cmake.in b/lib/SignOn/SignOnQt5Config.cmake.in
+index 523fffb..7105315 100644
+--- a/lib/SignOn/SignOnQt5Config.cmake.in
++++ b/lib/SignOn/SignOnQt5Config.cmake.in
+@@ -2,6 +2,6 @@
+ #  SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
+ #  SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt
+ 
+-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a)
+-set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})
+\ No newline at end of file
++set(SIGNONQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so)
++set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.a)
++set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})
+diff --git a/lib/SignOn/libsignon-qt.pc.in b/lib/SignOn/libsignon-qt.pc.in
+index 26f0f5b..c614541 100644
+--- a/lib/SignOn/libsignon-qt.pc.in
++++ b/lib/SignOn/libsignon-qt.pc.in
+@@ -1,6 +1,6 @@
+ prefix=$$INSTALL_PREFIX
+ exec_prefix=${prefix}
+-libdir=$$INSTALL_LIBDIR
++libdir=${prefix}/$$LIBDIR
+ includedir=${prefix}/include
+ 
+ Name: libsignon-qt
+diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri
+index 1458c50..d80f8bb 100644
+--- a/lib/SignOn/libsignon-qt.pri
++++ b/lib/SignOn/libsignon-qt.pri
+@@ -79,6 +79,6 @@ QMAKE_SUBSTITUTES += $${CMAKE_BASENAME}Config.cmake.in \
+     $${CMAKE_BASENAME}ConfigVersion.cmake.in
+ cmake_modules.files = $${CMAKE_BASENAME}Config.cmake \
+     $${CMAKE_BASENAME}ConfigVersion.cmake
+-cmake_modules.path = $${CMAKE_CONFIG_PATH}
++cmake_modules.path = $${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}
+ 
+ INSTALLS += cmake_modules
+diff --git a/lib/SignOn/libsignon-qt5.pc.in b/lib/SignOn/libsignon-qt5.pc.in
+index 2181359..5d98b6d 100644
+--- a/lib/SignOn/libsignon-qt5.pc.in
++++ b/lib/SignOn/libsignon-qt5.pc.in
+@@ -1,6 +1,6 @@
+ prefix=$$INSTALL_PREFIX
+ exec_prefix=${prefix}
+-libdir=$$INSTALL_LIBDIR
++libdir=${prefix}/$$LIBDIR
+ includedir=${prefix}/include
+ 
+ Name: libsignon-qt5
+diff --git a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in
+index 3d7f3db..2240789 100644
+--- a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in
++++ b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in
+@@ -1,10 +1,10 @@
+ prefix=$$INSTALL_PREFIX
+ exec_prefix=${prefix}
+-libdir=$$INSTALL_LIBDIR
++libdir=${prefix}/$$LIBDIR
+ includedir=${prefix}/include
+ plugin_includedir=${includedir}/signon-plugins/SignOn
+ Name: signon-plugins-common
+ Description: SignonPluginsCommon
+ Version: $$PROJECT_VERSION
+-Libs.private: -L/usr/lib -lQt5Core
++Libs.private: -L${libdir} -lQt5Core
+ Cflags:  -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn
+diff --git a/lib/plugins/signon-plugins.pc.in b/lib/plugins/signon-plugins.pc.in
+index 5be38df..2e3c087 100644
+--- a/lib/plugins/signon-plugins.pc.in
++++ b/lib/plugins/signon-plugins.pc.in
+@@ -1,6 +1,6 @@
+ prefix=$$INSTALL_PREFIX
+ exec_prefix=${prefix}
+-libdir=$$INSTALL_LIBDIR
++libdir=${prefix}/$$LIBDIR
+ includedir=${prefix}/include
+ plugin_includedir=${includedir}/signon-plugins/SignOn
+ plugindir=$$SIGNOND_PLUGINS_DIR
+@@ -8,6 +8,6 @@ Name: signon-plugins
+ Description: SignonPlugins
+ Version: $$PROJECT_VERSION
+ Requires: $${LIBSIGNON}
+-Libs.private: -L/usr/lib -lQt5Core
++Libs.private: -L${libdir} -lQt5Core
+ Cflags:  -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn
+ Libs: -lsignon-plugins
+diff --git a/lib/signond/SignOn/SignOnExtension.pc.in b/lib/signond/SignOn/SignOnExtension.pc.in
+index e439284..8fc669c 100644
+--- a/lib/signond/SignOn/SignOnExtension.pc.in
++++ b/lib/signond/SignOn/SignOnExtension.pc.in
+@@ -1,6 +1,6 @@
+ prefix=$$INSTALL_PREFIX
+ exec_prefix=${prefix}
+-libdir=$$INSTALL_LIBDIR
++libdir=${prefix}/$$LIBDIR
+ includedir=${prefix}/include
+ plugindir=$$SIGNOND_EXTENSIONS_DIR
+ 
+diff --git a/lib/signond/signond.pc.in b/lib/signond/signond.pc.in
+index a7b5036..9ec0b1a 100644
+--- a/lib/signond/signond.pc.in
++++ b/lib/signond/signond.pc.in
+@@ -1,6 +1,6 @@
+ prefix=$$INSTALL_PREFIX
+ exec_prefix=${prefix}
+-libdir=$$INSTALL_LIBDIR
++libdir=${prefix}/$$LIBDIR
+ includedir=${prefix}/include
+ 
+ Name: signond-dev
+diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
+index f4b6e53..2657b47 100644
+--- a/src/extensions/cryptsetup/cryptsetup.pro
++++ b/src/extensions/cryptsetup/cryptsetup.pro
+@@ -41,6 +41,6 @@ LIBS += \
+ 
+ include( $${TOP_SRC_DIR}/common-installs-config.pri )
+ 
+-target.path  = $${INSTALL_LIBDIR}/signon/extensions
++target.path  = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions
+ INSTALLS    += target
+ 
+diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
+index 2c03e74..ea2fcb2 100644
+--- a/src/plugins/plugins.pri
++++ b/src/plugins/plugins.pri
+@@ -27,7 +27,7 @@ QMAKE_CXXFLAGS += -fno-exceptions \
+ 
+ headers.path = $${INSTALL_PREFIX}/include/signon-plugins
+ 
+-pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig
++pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig
+ 
+-target.path = $${INSTALL_LIBDIR}/signon
++target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon
+ INSTALLS = target
+-- 
+2.24.0
+
diff --git a/net-libs/signond/signond-8.59-r1.ebuild b/net-libs/signond/signond-8.59-r1.ebuild
deleted file mode 100644
index 8c546f616ebf..000000000000
--- a/net-libs/signond/signond-8.59-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils vcs-snapshot
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.59 -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="doc test"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	net-libs/libproxy
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<net-libs/libproxy-0.4.12[kde]
-"
-# <libproxy-0.4.12[kde] results in segfaults due to symbol collisions with qt4
-
-src_prepare() {
-	default
-
-	# remove unused dependency
-	sed -e "/xml \\\/d" -i src/signond/signond.pro || die
-
-	# ensure qt5 version of binary is used
-	sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
-
-	# install docs to correct location
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
-
-	# don't install example plugin
-	sed -e "/example/d" -i src/plugins/plugins.pro || die
-
-	# make tests optional
-	use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
-
-	# make docs optional
-	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" -i \
-		signon.pro -i lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
-}
-
-src_configure() {
-	eqmake5 LIBDIR=/usr/$(get_libdir)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-libs/signond/signond-8.60.ebuild b/net-libs/signond/signond-8.60-r1.ebuild
index 48c9bc22dc56..b703194fbfd3 100644
--- a/net-libs/signond/signond-8.60.ebuild
+++ b/net-libs/signond/signond-8.60-r1.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=7
 
-inherit qmake-utils vcs-snapshot
+inherit qmake-utils
 
 DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://01.org/gsso/"
+HOMEPAGE="https://gitlab.com/accounts-sso"
 SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 
+BDEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -25,14 +26,19 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-buildsystem.patch"
+	"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
+)
+
+S="${WORKDIR}/${PN}-VERSION_${PV}"
 
 src_prepare() {
 	default
 
-	# remove unused dependency
-	sed -e "/xml \\\/d" -i src/signond/signond.pro || die
-
 	# install docs to correct location
 	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
 	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \
@@ -40,12 +46,6 @@ src_prepare() {
 	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \
 		-i lib/SignOn/doc/doc.pri || die
 
-	# don't install example plugin
-	sed -e "/example/d" -i src/plugins/plugins.pro || die
-
-	# don't install static libs
-	sed -e "/libsignon-qt-static.pro/s/^/#/" -i lib/SignOn/SignOn.pro || die
-
 	# make tests optional
 	use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
 
@@ -55,7 +55,7 @@ src_prepare() {
 }
 
 src_configure() {
-	eqmake5 LIBDIR=/usr/$(get_libdir)
+	eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
 }
 
 src_install() {
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index bee0e41cc76d..8e908f5f4b15 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -3,9 +3,9 @@ DIST socket_wrapper-1.1.7.tar.gz 54774 BLAKE2B 132b3875cc3434b2ae9c9e37c664737c7
 DIST socket_wrapper-1.1.9.tar.gz 772252 BLAKE2B ab8031ddd5b22fc9534daf996dd137466d2592bb83dfac4f15fb1adc3f0369544ad74b5b8fdb8dd61a09b6264f445604571d1b6b886401b96720ccd0499219bc SHA512 62458c7881c0d4e0e7f1ef3ec8dc4277a0f886cd1e9c73f6a20f23ed4546bcc959169fbac909e193e60567985f196358f6567de68b89ac4d4d5ec8473c8afb64
 DIST socket_wrapper-1.2.1.tar.gz 67955 BLAKE2B 77091f0650ef4be31e581e32651920acd532c8a0018ff2775c0b273ddabdd4251a63b9cb2536f2dbda37b324e13ecf49422241fe7cdb92c8439e4b675f88af96 SHA512 2e905591bf7ff9cf06a1b5ce2c683996a32c6d08a416aeb07e4b6049849c915040b528171275a8b101a3ea549f05c9c7b2fc9ad6096089dc471e0278a4fc610d
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
-EBUILD socket_wrapper-1.1.6.ebuild 701 BLAKE2B 60d422829b34f9b374d386b56f868bf19fe5a88ca963f0f6858726f04a4389f7281d1f1ca47d74fafa4200aba4f5d6a2c1ed1b04e0a8434b465202c488f4510d SHA512 f3929eaf574cb4eee26e44015436160149d000f49c385b8d543c685e6ccb650d8c3b0b18ea2a13d9ca41e45be44874c0ef80106c4eb8a4f0187daa1c7d2661f0
-EBUILD socket_wrapper-1.1.7.ebuild 704 BLAKE2B 001927e73c918c295cb3ba794815575a25dc84bc08e97e27bd3c774b5fe1828e78d567396dfd2b8fa534c6e9279de9e5238298c08d7760954df92020abc6fce7 SHA512 755f5228ae682cee2fc2809705a0cfa9246ccf30c81aa72bb88af4f707421dfc5e47acc8177fd7069b2572ff75c0d525bba38448b2c99caf53dca3d2e46786a6
-EBUILD socket_wrapper-1.1.9.ebuild 716 BLAKE2B 8463e9537cbdbad9e34433d7f0518c70c0cf58200ee26d6972d83a07c663a65dcb8f44c514be6769925fccc8101ce5b1615e1510f6ff91a28cbfd31b5b7985e4 SHA512 5cbc2731f5ed327e10149267c2fd6e2b4517dca4196d30fc99cacf85127835677e013dc88393b9811ffbcec585564fb04c84cd6622e8f0699429b65742855991
-EBUILD socket_wrapper-1.2.1.ebuild 458 BLAKE2B 56847b4af19a587e61f6e26d7cad2f343ac80c7bc703b00b69dc9cfe74897c6311f9974d9f305364ae0b335175a351b710c128f40e14bf562da61301463d1b63 SHA512 573e8c69a0be3b37cf33c0c960d276a3cc6b48d636b4fcf0a6d819be367c7f09eebf38686f48ace6364717cf63c78625f9d4b89b110da3123ab59271f2fcd06d
-EBUILD socket_wrapper-1.2.3.ebuild 458 BLAKE2B 65590c9344139edbfc150065733f6f1262d08b338491210993dc7de49dff7621c4ca1901c3e9961fa4339c1abee6b21841062de40bc92b051fa63d45a012dde2 SHA512 d44bef22bbc80a4216f2e454eb044110abdd2d8bb21d52d770fe6781266c8b0fd8637f7caecff47d553d322a52caad2c31b2533bc11f86facc72ed8693d2169f
+EBUILD socket_wrapper-1.1.6.ebuild 725 BLAKE2B 5cf1168b44fe35d96af100ce245a6c01ff33951f09aab0f06979aa9d488ff32e7c594d07d411e765f3a790afa602b7a090f2f2e29e82ac626eccd9bc885a8751 SHA512 dbc0a17667ae0ba75d22bfc4573218e59bc4439e55417b64710ae4d0a7ac55b0ca79a0d979ab5d09361a8cdb9f3753b2911b1600029dcc19b89075477c8dcf34
+EBUILD socket_wrapper-1.1.7.ebuild 731 BLAKE2B 7811c4271517ae5fb3faf99adc08576dd76d8f99981577458c0bb3ce97689ddbe4ba27e5efc86a256b1cff2d8e1f859979455792b13c63073f06817963c131f8 SHA512 223b55e8ddfc367fa948b2619c652c16fad67202e07406c9ceb373e93b34f814ed16e1ba64291af14cbb6c221065f98c963c905d188ac71ee858553346fb958d
+EBUILD socket_wrapper-1.1.9.ebuild 740 BLAKE2B 68d345bca842e396e131c095f8e805a308ebeb4328a109c90bf7c1a2980d3bbe4e18b86efe1a77c8809e4531146f5a1739cacec590a2c3d8f4c2001ec587fe45 SHA512 114e8d0b3b14634a894ce7228dccf0a7b1ad60bc597d2d5fd02cd6a020b6df19de1d5ce2235251cacf4785784c509541bcb4081a2e160bbc45605546912faba9
+EBUILD socket_wrapper-1.2.1.ebuild 485 BLAKE2B 85dd52805f1b4930db0d62097696ae09a3b0ea5f149bcd4c625a32dec57a0a4f33a0006516e1e78f3602953def3f9cda321900d9d042425a9632221a1093e82b SHA512 1bb53ecea125936652cbb67b4d11b6bf9d0c4dddcd35b79d8c3feed30ec734549d7253232737f67a01484b2a0666abfe748b452f4710ae6ac7425368561e7ed3
+EBUILD socket_wrapper-1.2.3.ebuild 485 BLAKE2B 443a1a73c1f7b23b77067000db83cd30f5273ee8e2be54c1f136f0671ff5463a8d7adcbaa8602292a0f83da4b73bc8c593dc3ce4ce6d1ad85a63dabba9d6d03c SHA512 8388c75eae272098319f1fd79f3a953da0ec91af89693b2f8da2c820db51ba95261560dd2ad28812817601db07a1e0b94e82d4d1edeef85737b06f42fdb49010
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
index cc6cbb4002e7..b76345869562 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
index 2cb206465805..25f6bd01fee8 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild
index 4cbcd2bedf10..117f187291e4 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild
index 10f5dbfec6e2..f7e809e6faf6 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.1.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
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
index f1b0c465c9eb..b2882fb86753 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index b71e7ed2cead..d80ad8f45123 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,5 +1,7 @@
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
+DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
 EBUILD srt-1.3.2.ebuild 1247 BLAKE2B 675103c16054fbabfb3481a5dc9b205f9db7ac28080a52fdcfeda7d2a21ec6a5752ad0d6131b4b2736d29f8d9f2c989f506814a206f99fc7896641b1fb31a915 SHA512 35279b41b08407c2c55f15e5ac4d44d6a4b0065a63d8cb93ae1123f9f7ded7c4ef9f09a88495d996fb3fe0c721c672ca00023a7f5bba6ad996be5e6a144de78e
-EBUILD srt-9999.ebuild 1349 BLAKE2B 73c3530ff5de95c6eae098377bd1ae88b791f157c441363966e5a98b45b14aee2db1334feb94e7fc3029a1a935e564b8ad33fefe80b0c0aac537b61a78119f06 SHA512 81859b511dadbd45ed92c8fad001e70b39f80533eadbed1024627154da885d4abd1ee9ee031ed85f30786d8e322dbb864ddf90eaed642b74a9ed82407cc5f695
+EBUILD srt-1.4.0.ebuild 1254 BLAKE2B 377d38e6480cd261ea5106b8a735f343850ca52b525ce685bff11a0a1d15462b534f0c12c7aeff804cad91ac3d8ddb4c26c8a08847c9d443638cf06cc145f3b9 SHA512 8cf2d9f7162b27435b6474b57196624c4dc948abfbc4fb06bdc9ad644f8c87b1180783bf464db93018134ab08f86402caaa6ef407c0961ca64c22ec015eb1801
+EBUILD srt-9999.ebuild 1348 BLAKE2B 211466b0989c4a1ba51cd329746bb80410bcc922a30c800333e7dcb34762bf0752ae16847949d6d6b7acc49364b333070becb4e8bdcf205d7d5761f1d2d80f5c SHA512 99b05466a3a7e6809c1a79c07486ba2dafad524cec4e01617f026f2c9f463f079ed2557822477dbb33cb9541e075e892045a1aff7b0ec24148b8f0eef41c8448
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/srt-1.4.0.ebuild b/net-libs/srt/srt-1.4.0.ebuild
new file mode 100644
index 000000000000..7188ae1c913e
--- /dev/null
+++ b/net-libs/srt/srt-1.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/Haivision/srt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="gnutls libressl"
+
+DEPEND="
+	gnutls? (
+		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+	)
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
+	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GNUTLS=$(usex gnutls)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index f5e557bab10e..05f29c86c32e 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
-LICENSE="LGPL-2.1"
+LICENSE="MPL-2.0"
 SLOT="0"
 IUSE="gnutls libressl test"
 
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index a07c621245f6..8eecfb445f40 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -2,8 +2,8 @@ DIST stem-1.5.4.tar.gz 1915722 BLAKE2B 37c278eab0d7c7c305d7fcb498ff39460921ff59e
 DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca46db140463882cbc1f5701893e6a4a28820100e05e3ed4fa5ff76135a3b20ec1af917a63f63b3abdf5361df6 SHA512 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c
 DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
 DIST stem-1.7.1.tar.gz 2196854 BLAKE2B 318b762390ad5f1b8a7ad49bd442841d4552cf3d6782c7c912ca8251a076baa6d01bd6f60ea2d79f96994f7c29775c09b815ee41177c638c7e4089e5f4b1b1e4 SHA512 a275f59bba650cb5bb151cf53fb1dd820334f9abbeae1a25e64502adc854c7f54c51bc3d6c1656b595d142fc0695ffad53aab3c57bc285421c1f4f10c9c3db4c
-EBUILD stem-1.5.4.ebuild 1256 BLAKE2B 6de39bb871cfb8eafe22f76c316866c4f94a73c10c04f78b943ac6215d4b9c2306f5c1a3fdbaebab6fe7dfc7c204a191b0bf0a4435f9d4395cbf36177fe93768 SHA512 d458942576eeb66bdc8a30d7d86ed94923be0856aa567c9828d46cf1a0e939d24430ee1f7f35c08511423888ded97b499a002fa638e454e02a07e6a0f98068e9
-EBUILD stem-1.6.0.ebuild 1256 BLAKE2B 6de39bb871cfb8eafe22f76c316866c4f94a73c10c04f78b943ac6215d4b9c2306f5c1a3fdbaebab6fe7dfc7c204a191b0bf0a4435f9d4395cbf36177fe93768 SHA512 d458942576eeb66bdc8a30d7d86ed94923be0856aa567c9828d46cf1a0e939d24430ee1f7f35c08511423888ded97b499a002fa638e454e02a07e6a0f98068e9
-EBUILD stem-1.7.0.ebuild 1355 BLAKE2B 1e4f64b6dd3303a691a5056cdef819fd0fa826dde78e725d59433fcd70061d11b85fff60517b22ec476eaac488308b47a52f7db5d3c48deb0a5bfa35ad35f1a4 SHA512 de9416b177b784fd47659760362a75a0e8bdb2d80c1a71b4e0678b4d7cc681cf6372cc5325acb1b691b79c317cd737218d79d95fd9da1ed5b45236a605e4e21a
-EBUILD stem-1.7.1.ebuild 1355 BLAKE2B 1e4f64b6dd3303a691a5056cdef819fd0fa826dde78e725d59433fcd70061d11b85fff60517b22ec476eaac488308b47a52f7db5d3c48deb0a5bfa35ad35f1a4 SHA512 de9416b177b784fd47659760362a75a0e8bdb2d80c1a71b4e0678b4d7cc681cf6372cc5325acb1b691b79c317cd737218d79d95fd9da1ed5b45236a605e4e21a
+EBUILD stem-1.5.4.ebuild 1283 BLAKE2B 625d9b3c2b5ddd35b7d3793f80eaf50ff426bde33d5a67f568e68aa98f01a5798c4e8acae82d1e8921ef45ce3920d6a701d40d35140dfad300e994722849423a SHA512 65161ce2d94693b05b10594880fa0055b3538784687e207370d3e535bc392192145674c323356229a77c400f925215c3c1845c3d3b8936738a38356ec262d585
+EBUILD stem-1.6.0.ebuild 1283 BLAKE2B 625d9b3c2b5ddd35b7d3793f80eaf50ff426bde33d5a67f568e68aa98f01a5798c4e8acae82d1e8921ef45ce3920d6a701d40d35140dfad300e994722849423a SHA512 65161ce2d94693b05b10594880fa0055b3538784687e207370d3e535bc392192145674c323356229a77c400f925215c3c1845c3d3b8936738a38356ec262d585
+EBUILD stem-1.7.0.ebuild 1382 BLAKE2B 8849f490d17f0cfb919fa9a50341e5071db5f8d8d3313207aa3936155abc2093ce2e40d60ac83ea2e4f87f2b8efb3cf8187e5d7f913b65d8b3450d44285994d2 SHA512 6a7388a6113d9f04fdd7d0bc953d6b4b6c4eeddad8f25b87a43debb65dfc0bfd89d12b64cc8c7ac77a93c45849b5c3759d654bfd32709f63806a42bbc8768fc5
+EBUILD stem-1.7.1.ebuild 1382 BLAKE2B 8849f490d17f0cfb919fa9a50341e5071db5f8d8d3313207aa3936155abc2093ce2e40d60ac83ea2e4f87f2b8efb3cf8187e5d7f913b65d8b3450d44285994d2 SHA512 6a7388a6113d9f04fdd7d0bc953d6b4b6c4eeddad8f25b87a43debb65dfc0bfd89d12b64cc8c7ac77a93c45849b5c3759d654bfd32709f63806a42bbc8768fc5
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.5.4.ebuild b/net-libs/stem/stem-1.5.4.ebuild
index 712f914398cd..552c994602ee 100644
--- a/net-libs/stem/stem-1.5.4.ebuild
+++ b/net-libs/stem/stem-1.5.4.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
 	net-vpn/tor )
diff --git a/net-libs/stem/stem-1.6.0.ebuild b/net-libs/stem/stem-1.6.0.ebuild
index 712f914398cd..552c994602ee 100644
--- a/net-libs/stem/stem-1.6.0.ebuild
+++ b/net-libs/stem/stem-1.6.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
 	net-vpn/tor )
diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
index 8c048a3057d0..277cf472802c 100644
--- a/net-libs/stem/stem-1.7.0.ebuild
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
 	net-vpn/tor )
diff --git a/net-libs/stem/stem-1.7.1.ebuild b/net-libs/stem/stem-1.7.1.ebuild
index 8c048a3057d0..277cf472802c 100644
--- a/net-libs/stem/stem-1.7.1.ebuild
+++ b/net-libs/stem/stem-1.7.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
 	net-vpn/tor )
diff --git a/net-libs/telepathy-accounts-signon/Manifest b/net-libs/telepathy-accounts-signon/Manifest
index 75190dfcab7d..e83d05871508 100644
--- a/net-libs/telepathy-accounts-signon/Manifest
+++ b/net-libs/telepathy-accounts-signon/Manifest
@@ -1,3 +1,5 @@
 DIST telepathy-accounts-signon-2.0.tar.bz2 15335 BLAKE2B 5c33403b2c271cc93526058d8415e8f47249018b6fdef4cc9d41ac8f530de61dfa94fd33f1cac433f2ac90077db0a322b8f3907953172ba20bcdee812c852298 SHA512 2fc4e04b47740a0500f6c7a6f08b5d421c1415970c97331b460bdb124b029e35b5288211dfe3da20eab18924a0c05f769094faa258cf05b76665b4428855f1ce
+DIST telepathy-accounts-signon-2.1.tar.bz2 15362 BLAKE2B 62919b9dda9514ad554026c733e03fbb272334f72f4c8d5220ba10b7680220f67e696f2a4e0824da8f450ea901dc9a7e8b4628f05b733bd492af69c4d713b43b SHA512 537d5e1da577101514662771de6394c66ae2e3e95189a755432f1c88b61aa493843b2c8eac778b45e281e5a612fbadf2cda8d4ae09c6e2ccebdc3700009096bd
 EBUILD telepathy-accounts-signon-2.0.ebuild 631 BLAKE2B c5e545d32466d23995946382d10fe81bc7dc876bcfc30219d54641f85434bee092cf7179d2be24575a52f8224a44fd673371f6dca11b428d4b64cd37f2b955b1 SHA512 3424889053d5b1e86b57c705a0aa648a7dfc4793b487a40f91dc606bc614b02daa9e99f3d3a83d25e57550760c45821d9a2f5cfe06bb497d4c3eca5fa073d1d1
+EBUILD telepathy-accounts-signon-2.1.ebuild 602 BLAKE2B 5eabdfb6500cf41487784eca4363a5d830affe4c718eca1aab3281aae909d99a122abc7d6d2f54d1819857d2c85fa97a55948df83c212c2da28a41329d7b6fdf SHA512 802230abcb5116469a19cfc4a8d410f9c808a45da4e0f610313ae5f4dda674dc27263146b3c95942002cf59d4bb17d797a8ef5886a436a81f6e22472a02d8f8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild
new file mode 100644
index 000000000000..e2e5c5ce6fa6
--- /dev/null
+++ b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Mission control plugin for Telepathy to provide IM accounts and authentication"
+HOMEPAGE="https://gitlab.com/accounts-sso/telepathy-accounts-signon"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	net-im/telepathy-mission-control
+	net-libs/libaccounts-glib:=
+	>=net-libs/libsignon-glib-2.0
+	net-libs/telepathy-glib
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 406b3fd1fb2e..fb1e9f2c380c 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1-r1.ebuild 1502 BLAKE2B 34436cbe92504b4988f1ea7295a1e3970f932f295912e744889611a14e967dd2c4557e1ec46739e58c5ed7e9eabb65551f5d7fcf81412c43f144c59c5b49a68a SHA512 2dfb9d920b92acfc1100177a43114158a39ccb54e391db71ab6fee8bc975b3533745c2778b9517007c941ecc3efd6f115b7eebca8d3bc34926813dfa6c40907d
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1495 BLAKE2B b7850c8d3ab91d8505d89ad0a3e8b9dc9f0e63e40911f75805a74ab3c3868d4083c7312616ae5b37fa673a23b32006836a930878ca35122b3c62c5e90291d54a SHA512 ad8f538be1e54f6e3102c9a436f8b8fc08606f0c951c50214bdfba42d09c860c86500090759da431334eb37b1fb445e37e32cb34e5d3123a5fceae8ebbd6ca7a
 EBUILD telepathy-glib-0.24.1.ebuild 1529 BLAKE2B d600e8e085f9708c3837776a09c43ace1558b90eacc07a5594cd2ebc16d7b499dad761e2efd382bceeb6e491fa2c21f7790701ac470476084121b4b036b54be2 SHA512 92f11d3981cc2d8a9744865c5ae4e69ba9f8100d1ee9bb3364a4a498cd44dcc3de6e1c401898861e3fc8e3833ddbf88821ad84ce4055d5e97275cece5b80642e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
index 758e5eceb488..8e2f66639cc8 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index 68381363f0ed..594f973c3896 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,5 @@
+DIST telepathy-logger-qt-17.08.0-python3.patch.xz 16228 BLAKE2B 8226a6cd0537e46edadccc50027da6386bafcf3e5cd2d9af2f7ce996da30f42762f43a00c1274771a15d3fd2e5de912ad0833cda6ad7630f1d25492cc27a9bff SHA512 c762213f09933ee08b755d830fd32309fb248ff91f2d4c0ac04f7096e874f2a63d7231aaf5abfc4245cf6f66056d2e9cabb6a83b0c561422efd0e8944bc05893
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
+EBUILD telepathy-logger-qt-17.08.0-r1.ebuild 838 BLAKE2B 92380a675c1aedcf9a9ba71fd3b9c9ce0019a38c4101062307b6fa168efd6fdae3bc13121e3d8275f0698f417950ecfd8bdf83f79ffedd1e86d788bb67e78eac SHA512 fe058a105615d916ead4a5800dcc5fea8a2a210d8e78446e029c55fda18a285980af7e7214e32aecf442fd52252227316ae289df26586b69c0ecf64be3970b5b
 EBUILD telepathy-logger-qt-17.08.0.ebuild 685 BLAKE2B 0bc1287ad89bc2f6aa78362470f8bd8bdae42753960105d627f7550848b9714a32bd4a8ee12d808c7a329f60801103deefe9cfac30b9db3b5c6475a5e7bf9079 SHA512 9b05246bdc3ec66418261bfe8b1d2c04671c3a0521015df09e892f0cce8991c49719475610024751f7069bd6b71da054b7d5b1a96985f1bb45b15dde6d4cde15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0-r1.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0-r1.ebuild
new file mode 100644
index 000000000000..412c055fd2f8
--- /dev/null
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+QTMIN=5.12.3
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Qt bindings for the Telepathy logger"
+HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-python3.patch.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+IUSE=""
+
+PATCHES=( "${WORKDIR}/${P}-python3.patch" )
+
+BDEPEND="${PYTHON_DEPS}"
+DEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libxml2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	net-im/telepathy-logger
+	net-libs/telepathy-glib
+	net-libs/telepathy-qt[qt5(+)]
+	sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 684762b3c5db..8fc974f9c57f 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,8 +1,3 @@
-AUX telepathy-qt-0.9.6.1-qtpath.patch 935 BLAKE2B ee54f49734a52387c68c60ebd32d2adf189340d845eb9a4989bea45f79901bda3fbec6ffb32364527675882aca1ee4f972d6cca1c2131e8cac550b5d8e2f8de9 SHA512 8b1351e005db5b85e39bc56e666dff000f7acc1bf1cf1d1df9577b8da1f7fbde6ee4a0abd0c81ba757aa49c8a30efb9fa3e46561efd9e2c64d69ee818b80a42f
-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
+EBUILD telepathy-qt-0.9.8.ebuild 1484 BLAKE2B 0e09cc5d671686c52243669f02fb644fda4b76e6f384b7b2db514e5c0196deb4fdda06c919c095f024b3c2b9150d806573a28af07c5692487b0f414cf7d38dba SHA512 25a87c7168cbde43a73efd18c1a2fdd2efd8e7602fe1ca6a8db759e18a733e2d78328125427ca2c77f5d43999dd9b38646c38f5a40654f965d21711548c9b4ce
 MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
deleted file mode 100644
index a14e1da1a658..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
---- a/cmake/modules/FindQt.cmake
-+++ b/cmake/modules/FindQt.cmake
-@@ -19,7 +19,7 @@
- IF(NOT QT5_INSTALLED)
-     IF(NOT QT_QMAKE_EXECUTABLE)
-         FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5
--            PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
-+            PATHS /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin /usr/bin NO_DEFAULT_PATH)
-         SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.")
-     ENDIF(NOT QT_QMAKE_EXECUTABLE)
- 
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
deleted file mode 100644
index 97a880c72ca7..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
-index d34b24d..eb51454 100644
---- a/cmake/modules/TelepathyDefaults.cmake
-+++ b/cmake/modules/TelepathyDefaults.cmake
-@@ -59,11 +59,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-         set(DEPRECATED_DECLARATIONS_FLAGS)
-     endif (CXX_DEPRECATED_DECLARATIONS)
- 
--    if(${TP_QT_NANO_VERSION} EQUAL 0)
--        set(NOT_RELEASE 0)
--    else(${TP_QT_NANO_VERSION} EQUAL 0)
--        set(NOT_RELEASE 1)
--    endif(${TP_QT_NANO_VERSION} EQUAL 0)
-+    set(NOT_RELEASE 0)
- 
-     set(desired
-         all
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch
deleted file mode 100644
index 033ece79bb5e..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindQt5.cmake	2016-06-12 13:04:05.000000000 +0200
-+++ b/cmake/modules/FindQt5.cmake	2018-04-25 18:04:28.351188748 +0200
-@@ -22,8 +22,6 @@
- #  QT_QTDBUS_LIBRARY            The QtDBus library
- #  QT_QTGUI_LIBRARY             The QtGui library
- #  QT_QTNETWORK_LIBRARY         The QtNetwork library
--#  QT_QTTEST_LIBRARY            The QtTest library
--#  QT_QTWIDGETS_LIBRARY         The QtWidgets library
- #  QT_QTXML_LIBRARY             The QtXml library
- #
- # also defined, but NOT for general use are
-@@ -65,23 +63,19 @@
- find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
--find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED)
--find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED)
- 
- # Copy includes and library names into the same style as pkgconfig used for Qt4
--set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
-+set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
- 
- set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
- set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES})
- set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES})
- set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
--set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES})
--set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES})
- set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES})
- 
--set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY})
-+set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY})
- 
- SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR})
- SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
deleted file mode 100644
index 493cfb62bd24..000000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 cmake-utils
-
-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"
-
-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}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.6.1-yes-release.patch"
-	"${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
-	"${FILESDIR}/${P}-deps.patch"
-)
-
-# bug 549448 - last checked with 0.9.7
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDESIRED_QT_VERSION=5
-		-DENABLE_DEBUG_OUTPUT=$(usex debug)
-		-DENABLE_FARSTREAM=$(usex farstream)
-		-DENABLE_TESTS=OFF
-		-DENABLE_EXAMPLES=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
index 9df248fe4b35..1f505982cf39 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -12,9 +12,11 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug farstream test"
 
+REQUIRED_USE="test? ( farstream )"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -44,11 +46,12 @@ BDEPEND="${PYTHON_DEPS}
 RESTRICT="!test? ( test )"
 
 python_check_deps() {
+	use test || return 0
 	has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index e1e273b081ab..bc8cbda17e57 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -6,8 +6,8 @@ DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d
 DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735
 DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966
 EBUILD tox-0.2.10.ebuild 3145 BLAKE2B 5c4e33623b746c48d7527ed054919218a18bfa8b44c10cc7acf529d86e179d141428de3753b9c8a5bca7810cf548ed5dca2968140f0d92f37fe62a4c2de6bcf2 SHA512 f22a73a65c2720e0c5a0742f796d8a02cb9a0c07843837e3b8c4c20e2444b7f7dfb313f884c79cb8029b1e51d21eb1ee5eaca18a9e75a961ec0c17feef6a3d71
-EBUILD tox-0.2.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0
-EBUILD tox-0.2.9-r1.ebuild 3128 BLAKE2B a5a0e3a4ec5171fb513a6567916e84a20ec2400ae4a83e97ada018e048b92e03d1874b5accf278dcecf303eae80a917e0d21514a49c6b262e3662f17f0094a9c SHA512 be7033b60e01d5ff19e9465ad2662822a94b97caecf24bd3babd0aa769eec4c7eff67fb62a11d0887b82b5d84d3ccf8e3e8357ff83005ff79637d2c349cbef27
-EBUILD tox-0.2.9.ebuild 2695 BLAKE2B d377d87f4e678929521072e5aba6652b11bfe8722dea5a9d6d2c57a81a8519f76f6d7e1f138049de3adab94db04cfee82ba5d493c509f456eb3f6957201a6dd3 SHA512 7f114ea6bcab068aa456212765ee3a3b573a1607482aa60fa149a1c0af3c250ec4a8351a622e05f151fad5d78b4ada1e8cc300a5135e63b112603afc4d187718
-EBUILD tox-9999.ebuild 3057 BLAKE2B 0bbfe93cdeae91f28f13d633b81a84776e84de6f1bc91e07e95d7a1079adb7c591b23308b41b1979e761938c48e09b77636ae738ad3b533963f8b6a8bfd0d13d SHA512 f40093e691b821e687e441807246210b062eac1fbc8fb8b25c2cb38d5935966385513d558148f38c9ef0cadd2298cc26f78fb2150c7d98b2e828c954b9712bd4
+EBUILD tox-0.2.8.ebuild 2784 BLAKE2B 3941172b9bc29f67f4c289756e1e040ea8d8b5205885bcf8ba0370ed1c18b8d0355c8fce8a669d4b366a4c7447899f49f198c8b5936e477ff65aec48cfa660a7 SHA512 33a3deccf95578f8594cd7d0faee8953fa80839f48a62aafe7831170e0e25eeb1e97a3e93b5b5a4a6702622f3a8ad6f8fb363a2c833f3de5d856cbd5d5755ca4
+EBUILD tox-0.2.9-r1.ebuild 3155 BLAKE2B 4d494a5b28e07969e3bbad6211af176da73a05e61197cf87f6c57d95725b72ea43cda690b046a32eea40178137513f5927dfed5efe1d3196ecb570bb13db7d2e SHA512 db0d847bdf211f04c9bd392085cb061f5b72c2de85aa979e7bd38cd01fa44b3fe39bb43d5ba6231d126b061e9c4602f2db582b96c3bd938614ccd2b07138a4d8
+EBUILD tox-0.2.9.ebuild 2722 BLAKE2B ef78575e1f4cc95612425dbda0393c843713d0e6aa926ba797e4b353d3f8509b98353372448c6f43b9a65874f0a1a9056b8cbd1dc662567d4f434d887c36f2e5 SHA512 2ab0f1b5a6161bf6e42b54f1453bda7a4c4660dfa6b314407271f827d1e5460e12f5cb3651701f513e28eb9101565bed30f5d6767a13e7735d1d923b9e4908d0
+EBUILD tox-9999.ebuild 3084 BLAKE2B 2265c2ddb19ba08857148cc05623b4bb6a42d9979661f201be265cb25602992aa344c37e1c7863031075478663f70878df877e23c4c7125f9e92a865b0b79ee8 SHA512 c78c1c80f5da28a58f710446b74f03c3b849fece2bfec36f71cefe49a6d045d37076c127c754b7d8e370b01f7ea47075f54e29e77c6962a6abe3345334c268ed
 MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279
diff --git a/net-libs/tox/tox-0.2.8.ebuild b/net-libs/tox/tox-0.2.8.ebuild
index d10d777179d7..7e056d8ed926 100644
--- a/net-libs/tox/tox-0.2.8.ebuild
+++ b/net-libs/tox/tox-0.2.8.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
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+av daemon ipv6 no-log log-trace log-debug log-info log-warn +log-error static-libs test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )"
 
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild
index 96361d5998c8..54d31725efe7 100644
--- a/net-libs/tox/tox-0.2.9-r1.ebuild
+++ b/net-libs/tox/tox-0.2.9-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
diff --git a/net-libs/tox/tox-0.2.9.ebuild b/net-libs/tox/tox-0.2.9.ebuild
index c026338dbbfc..f227ce28006d 100644
--- a/net-libs/tox/tox-0.2.9.ebuild
+++ b/net-libs/tox/tox-0.2.9.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+av daemon ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )"
 
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index 501b16dc7266..02c534562822 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS=""
 IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index 773010299724..a8d09b43ed41 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -7,5 +7,5 @@ EBUILD wandio-1.0.5.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f7035
 EBUILD wandio-4.0.0.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.1.2.ebuild 760 BLAKE2B 0882091040df94b87a0fd6fcd299ba996706dd57e69c6ba1f1661a77bd9f919e0d5cac8aded697073d79a3516f5937973467ae389b6c06c9939627728c81e8f8 SHA512 32a42584bf5d8a5366d51b24e8bc0a204ff94b9918dc13daaeb4fd33c729eae676b283eccca967cfe05bf16d5a34aed8b9af8728ca024c0d3525f992d8abbe22
 EBUILD wandio-4.2.0.ebuild 760 BLAKE2B ce10f3f5b9892f8d4559340d7bd658f6c81eb8386ac44cec033c92690b23e5aa7ba148cc3a17057ab0e80e1218639e2887886046a8aba22791e02cabccfac902 SHA512 2d65bb7cbf03be4bf7555d2f4af1f01d6c51e69b3fced3574604f90d695fe91b1d8f5ae05a990b8189d8b4d1b60bd4d6ade4e61c29de07a4aeb794c4f2e07d95
-EBUILD wandio-4.2.1.ebuild 912 BLAKE2B 8170f1be28ebfadb66a596ac78d49b12b41faa51c02a13567f83b2db35d6c291eb2b557efde0d94e18d9f4a928316743953029cbb7f7070478e8c9a87d45120e SHA512 414f23e9d3eb2a8b96810cafafe6001e6ae1461cb9b2100b9ac2c1615de6d25d8039cf00eaf21415691b82aa1fb2981764124ca990d75cc5d82f98909e0791cb
+EBUILD wandio-4.2.1.ebuild 939 BLAKE2B 5b655173042829fb5466eef3fb5517758e84674243b6f0c0bc3a4df8d183b251df5a8ec10f61f8f3050d6bd81dabab36f8733fda4ad3e8452c7e5fbfe48c8cb5 SHA512 428e577429bb6a3fdbcd569d003ad27828b384163097e2d1cd0a7f0e3e3dd5826529915b78c322be4d7e14b6b5aa2e8ed5b8bae709100c3478e2d46cb9b78870
 MISC metadata.xml 325 BLAKE2B 83c3a11757f54887d9fa3ed48c2a9c5a5ababc6070875778a26157b04624c6411d406f810a1c9c02bdc6355675e41a130cb21cfd987aea39e1d2aac8d23c2895 SHA512 f6baf388df040729e65cf7b578f13650917d22989b89ba4adeaeba332fdc78fc8f3661fc37c238a495c75f4cc601c2642f13e2660e73b6e36da8db39dacb052a
diff --git a/net-libs/wandio/wandio-4.2.1.ebuild b/net-libs/wandio/wandio-4.2.1.ebuild
index b2404e7e7a1c..97dc53cce125 100644
--- a/net-libs/wandio/wandio-4.2.1.ebuild
+++ b/net-libs/wandio/wandio-4.2.1.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-3"
 SLOT="0/6"
 KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 http lzma lzo static-libs test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!<net-libs/libtrace-4
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e3b707c8eb54..3c3b33fcc6f5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,5 @@
+AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
-EBUILD webkit-gtk-2.24.4.ebuild 8374 BLAKE2B 1379429bc52472ddc23ee11a6e698dec2eb06bdc4f678eb491c533ef83e5f436fc472df0840c30ca3d390af988223b0b1403fe31a2490614c1d3bdf10f6030f8 SHA512 1d7ae08c0b9e78d4915475001b8e4a2e13a3891292f428fcf52776a76cae9c1e6f6835d1a825bece2a465f368ea460c7f0e7fdecbc5e1a559979da58c5013922
+EBUILD webkit-gtk-2.24.4.ebuild 8439 BLAKE2B 7ec88a755d2797216fdde296c2ef58a7e447f83962868189799dcd1ba14016cb430b0e670b2819dfe916ff8c376f31ddb2005ce918a91f16736fbf953aef8e62 SHA512 4766bdf88de134dd6e239e0ef8642ffd9f581a2cccaedcd68e7e7d62f5dd6f21973652786ff744aae6f5bd1148c0728782e85a4f89cc95d29e693e78b918f9e2
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
new file mode 100644
index 000000000000..9c277e719d89
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
@@ -0,0 +1,10 @@
+--- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-08-26 17:55:46.000000000 +0300
++++ webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-11-04 23:33:44.146933810 +0300
+@@ -31,6 +31,7 @@ 
+ #include "WebKitWaylandServerProtocol.h"
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <WebCore/GLContext.h>
+ #include <WebCore/PlatformDisplayWayland.h>
+ #include <WebCore/Region.h>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index d90cc8c26a48..93381a7d5a11 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -160,6 +160,7 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
+	eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index ef60a16445da..91e3648ce5a6 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -15,6 +15,6 @@ DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e
 EBUILD wvstreams-4.6.1-r3.ebuild 2402 BLAKE2B 11f5dc37d031861bda2deb3dc218b8d67a6bedb6bf8b16d35f1d55629e41ff9442bc84194f26702bc9e04f9a3bab49aaf1dea0c2ebf46609dbf4f85e19b9ab5f SHA512 3d2ef93469dcefac2389f9f0cf6db5fa8a5971449ff33e146c290de7d45984078a8652a8613f0ee7aecd3adff65896d131b8363613dd73e36f1a6f8569a517d7
 EBUILD wvstreams-4.6.1-r4.ebuild 2039 BLAKE2B 8d2e705b314f886c8522e63fac56614962ac58326e208f870f72725827a9664d1b758800fc3df1d1c51c4bbe2e350614ed820a06eab3d9af5b6613179bf069f4 SHA512 4ba831bf157f148dcf3e2e9b8f5c23cf84ce81868031ac8e88390a867af988eb2b332a55e19867a99838ddd088ecc12bcc038c305303e3b1741dbce826989ffa
 EBUILD wvstreams-4.6.1-r5.ebuild 2113 BLAKE2B 312af3556c5452ce0b995389d5aa90259fd86d3fcc3267e621caa8688aefa90f0f48886e500eaf7e56bb0118edb4304da26114e747c3f590825388f9ef715b9d SHA512 54240ebac515d1e1c042d9ae4f558d95c3051ddacb2ec2f3aa1f686c4bccfb2d10f1d0aab44c33f95cdabc8df91a7563824bc0a2cbdd30542444f4b763fe32c0
-EBUILD wvstreams-4.6.1_p14-r1.ebuild 2193 BLAKE2B 8e964f898aada01fad32b1fa1c226af81399cd1b936f910445c59d4cab2d77f16de1f2701ee16eec28ede2a18a3223fa94994e60ac5b150644617e6470f89b5b SHA512 67d1faeac0d55c48b5a2f2606c96c95b8ebb58e032bcfb5faad504116a1545e7f7138ace858456b667702dcbd8e4c081d833e89f7dc0daf57c7862171ccc5e8e
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2189 BLAKE2B 9b096fd73ab24b14a6a54b7d61f6ceccc1ab22f0fbfc6471eab68326870d628de6bccff7f34a82523cd1c6360bb4055b8108e90a6004a9ebc47bc8735d613fca SHA512 8fe32b296980ff64b846344b91cf0e3e45c5531d3719a6e57e7e881d2344625b0cbaf54737ecd96dc3d4cc41c6489af2ce7037eb1d8bcf95a6e7e84a5af38ce5
 EBUILD wvstreams-99999.ebuild 1968 BLAKE2B 201f9877c6b7a826896dfd477dca8e70bb851be3189107b5aac33b2cfac891fa0d82e04687ace39213c36e753d07bc760368be67af73f4f4a8f2128de703379b SHA512 4cec4908411d8e650ba2fd047bc37e2bf60b78b3abb2ec7befb4cc0be1ce6f1a1f70139523e15162492e9f73ccfa6e9e0763917bb9cfab9a13c4b814c1c2242c
 MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
index a38bedb32199..d0d55418697e 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 IUSE="boost +dbus debug doc libressl pam"
 
 #Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index dbb895512fd0..dd55d8660486 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -7,7 +7,7 @@ AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae27327
 DIST xrootd-4.10.1.tar.gz 2532982 BLAKE2B 79cc334c631060e9be48c4f443837065e786f49513e535150f7490a9a5a17ec91f4f5dd054b0f15cb6b60ecfc18a1447e28825dc7d6665ef59004ab11665f9e2 SHA512 49234db532292c6ef04d455a1a6a5d1ff4d6705c088d5c2571602f444cb9bf03699e63a12ba962a6d3a8b9cc9f43635889ec33976840326a8301c81da7099397
 DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
 DIST xrootd-4.9.0.tar.gz 2517614 BLAKE2B 5f1ce6f599fdf5b1f9b4fa078d9b306be241757f95e9b5e9bc0a6f06450a21315778428d8c1d1ffd28ef0841bc50fca387036740bb707d9a96b7f07e94e15540 SHA512 a956262a8adae4c9cb9a91275d4207943cf43251fc61ade111c91152c62baf06c1cbdf1d659c6d792703045a4c2a82bac732220ecfd2fa707e445d6fc66ee047
-EBUILD xrootd-4.10.1.ebuild 2586 BLAKE2B db28f1d8ca2288bec601fe22328b563a4116b93daa49f3d5e36f91340ba540e181f58fc16714896bd94a964ad1eb5e1b1d4ff37057bc9a19e43f0b22564547a7 SHA512 b5235f0f3e90dc78d665b68c23132f93c8ef6f29d464dd8a3b4e7d89c865772d44667dd559fc23afc2e948164240c2d6342f7a9876ca80b658d8da72b726cc86
-EBUILD xrootd-4.8.3.ebuild 2593 BLAKE2B e0aef6a1c55d34fc4175e4f57acf99083f208ea0283b49c988de16d58176c8e63b5bbdf8378361be34313b5a3734d6d362c64d02b723cd56b903bf655f72b0de SHA512 75526b8954ceba00889d4649b01f0995c758998bdc4b11af5d11f826bbd7319e112b368997ee144aee8299a74d5ee38ac3732621faed9b75ecb4cd6afe518a9b
-EBUILD xrootd-4.9.0.ebuild 2603 BLAKE2B e73ab288f2dbf0482364e083c8d93cd21523d13242a8a3fdf5053d6fd0147de2b21f469bc1bdc45667cdcf52ec24ef17e2634d837e19263aca9e40cbf0bed7bb SHA512 4366482e0c0c7d6ef657e51dbe14978b301f389ffb3b9a67d39ff3c8e0e8980cb6ad8176ca1691c4e04bce4838731a4625e3980b1593a23469626ea08d69a163
+EBUILD xrootd-4.10.1.ebuild 2613 BLAKE2B dd3799d4fbed93f55ef047269b342838df7d08a9e6391cf952ddd05faa0bc949826bd1aec522fa2cdd3ad7fa305d1b8b37f01147a9bd946670e24c08c24702fd SHA512 18871a066b60dfe7b4b36656999b767dbe8be79bba44aa8d0f9b84d0eac5c7ebe061c888392a93316753cee66f03cabb0f975fc8ee37804b7394c115a1167336
+EBUILD xrootd-4.8.3.ebuild 2620 BLAKE2B c3d7e283da7c22f9ea7290053ed84f4e3be59cbac25d80bad0a0b42c08e470a5a49ab2cf2537dc1b6cb58fd6a643793fdd16d87c9b1dbe2b4f82834c082ebf5a SHA512 3f98a43aa8e0eee1c5a511ace759fa7c191b254534e15acd6b34972601d6a5c7a5adcd291fd63a99bb6466c85f2e0038dd492f54c4f94007a24f932f3765a111
+EBUILD xrootd-4.9.0.ebuild 2630 BLAKE2B 3117b56d6a2bd7b41e0e7a2e8146615a4852cba3f4eafe49bb6e3b17a2a2074918aac9442e951f36b8d93e52c313acfda06ec8eac9f1ab888e15f8490a50d909 SHA512 6a36fd83e707fcf7a08192a1bfa3d7c0d5589d0e68bd8599ca686be8a0dca5073bff1840473cade6570fa09fb7970304441547129180d0f8f457b83ab7293f9c
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/xrootd-4.10.1.ebuild b/net-libs/xrootd/xrootd-4.10.1.ebuild
index c4d503164d30..84ac2910a28b 100644
--- a/net-libs/xrootd/xrootd-4.10.1.ebuild
+++ b/net-libs/xrootd/xrootd-4.10.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline rbd ssl test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	sys-libs/zlib
diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild
index 86a04bc9126d..90f82f05b9a5 100644
--- a/net-libs/xrootd/xrootd-4.8.3.ebuild
+++ b/net-libs/xrootd/xrootd-4.8.3.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
@@ -15,6 +15,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline rbd ssl test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	!<sci-physics/root-5.32[xrootd]
diff --git a/net-libs/xrootd/xrootd-4.9.0.ebuild b/net-libs/xrootd/xrootd-4.9.0.ebuild
index d0c6576d614a..f42a32f1833b 100644
--- a/net-libs/xrootd/xrootd-4.9.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.9.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline rbd ssl test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	!<sci-physics/root-5.32[xrootd]
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 380c9fb9964f..5b6086ad936c 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,8 +1,7 @@
-AUX zeromq-4.3.1-fix-test_security_zap.patch 1008 BLAKE2B 17f5a316601af1c8e7c307a964f69bf0d59c55ee0a9076eee4a909768307cef8be0d901d6ecae10381505b96bda95f20ffa0d1bde09e8c1bf6f0fc2959e9f065 SHA512 e813dc7488c5a81731f5649b2ecc533e55c4a3f69b904a1fbf2446ad6282ece96a64850b70f675c6cb0e20636c4654786ffdc99742ae1325c16469735e7ea616
 DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
 DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
 DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
-EBUILD zeromq-2.2.0.ebuild 1280 BLAKE2B 0471def5d47bf06f5560cef735faf909275404f8f9352578bba2e90b21e71b62cb00bbf002a84228d3ca316803ba9f58fbd3104403bbd72e244c1d1825e5d93a SHA512 12c947c2583f98d40c393cfd5e3dd04db3f9d8eab94195a75015dca7271feff15b3e5d3435b6d8b3dc8db87406a4e454ec36fb1e9f494ec555ecd779ab67c39d
-EBUILD zeromq-3.2.5.ebuild 1469 BLAKE2B 0c63cffa55d6ce54d430dfd3f4997f1426a80aec72e5778cdb3ba833c383d2c5d487824bda6ab413c7750de790755f266d3c69b79f8cdf6ae982fde417fb95d9 SHA512 85a0a5c8184dcafaa29d93e59568fb569ef015fc2f1cd7c26bd5c66f0333050c04505587e6922691641d43b679c34eac13dd7ced4cd2955a5c2e926ad559bfbc
-EBUILD zeromq-4.3.2.ebuild 1410 BLAKE2B 67d14de3edc28c07106685be656e92603347f0b5393cfc0d17ea5f6add9d5c6039e7a489b2558f36ccf8e211a332a5c107c8dc6a3643804a33cf6afeed04d233 SHA512 7ccd9ac284061cb9bf2fa615bb745f929f1e45acca46dde27b906b107d220550343964cbcb92d7677886d5a0dc99842351e05c0cbe6d02a4b4e3b0b5a362dec8
+EBUILD zeromq-2.2.0.ebuild 1230 BLAKE2B 3481bc6a49217938f6fff44ba4a72642ff3abb7dbc18bd911dafba960d698bc61ac88645dfeeca06b570d5730789c4d27344d60c2b75e188b30261b67465f5c1 SHA512 f11d23122d6ff6db52b5c625a5e2a994c0ab9741681e1be2dedd6f6bfdc3be9107141dedf9873a448447e61e1aeb1cab025ca37a2948930bc38ba780d25c612c
+EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
+EBUILD zeromq-4.3.2.ebuild 1437 BLAKE2B a46c410299ad9eb963c8caf1e5f08eed59d2bb90f7e66431ec48be38397f7ef35a6ee8b8b13191e3b87ad025b7d1569868389af88c6e3814125fc8453326af15 SHA512 3b1b7809d09e0f310682f73d1008962f37bcf40638482a833fc6c86e1628db7fa3b825a172f34a386c51c260368687835b160be52cb1a8da1806ce00caa5f038
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch b/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
deleted file mode 100644
index 3c89024b84bd..000000000000
--- a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4147957a5eec57ec7a2a416dca74c3c0299a3432 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Sun, 13 Jan 2019 13:08:10 +0000
-Subject: [PATCH] Problem: test_security_zap fails on architectures that
- disallow unaligned pointer access
-
-Solution: use memcpy instead of doing pointer arithmetics with casting
-and dereferencing to fix the error on sparc64
----
- tests/testutil_security.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/testutil_security.hpp b/tests/testutil_security.hpp
-index 90999118c..437bfb298 100644
---- a/tests/testutil_security.hpp
-+++ b/tests/testutil_security.hpp
-@@ -345,7 +345,7 @@ static int get_monitor_event_internal (void *monitor_,
-     uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-     uint16_t event = *(uint16_t *) (data);
-     if (value_)
--        *value_ = *(uint32_t *) (data + 2);
-+        memcpy (value_, data + 2, sizeof (uint32_t));
- 
-     //  Second frame in message contains event address
-     zmq_msg_init (&msg);
diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild
index 3aa9e3dd9622..faa4e909ee3c 100644
--- a/net-libs/zeromq/zeromq-2.2.0.ebuild
+++ b/net-libs/zeromq/zeromq-2.2.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
 
 # NOTES:
@@ -16,6 +16,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="pgm test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND="!net-libs/cppzmq"
 DEPEND="pgm? (
@@ -39,9 +40,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
-	doman doc/*.[1-9] || die "doman failed"
+	emake DESTDIR="${D}" install
+	dodoc NEWS README AUTHORS ChangeLog
+	doman doc/*.[1-9]
 
 	# remove useless .la files
 	find "${D}" -name '*.la' -delete
diff --git a/net-libs/zeromq/zeromq-3.2.5.ebuild b/net-libs/zeromq/zeromq-3.2.5.ebuild
index 4f3efab45985..2d97ae7df61c 100644
--- a/net-libs/zeromq/zeromq-3.2.5.ebuild
+++ b/net-libs/zeromq/zeromq-3.2.5.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=5
@@ -13,6 +13,7 @@ LICENSE="LGPL-3"
 SLOT="0/3"
 KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="pgm test static-libs elibc_glibc"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	|| ( sys-devel/gcc sys-devel/gcc-apple )
diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild
index d3ca50a8bf78..8535b875a1d0 100644
--- a/net-libs/zeromq/zeromq-4.3.2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )