gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /net-libs
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
87 files changed, 669 insertions, 1594 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 49a2428cd968..67f7f66dd09a 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
index d7b40540ce9b..329ed1d92870 100644
--- a/net-libs/ccrtp/Manifest
+++ b/net-libs/ccrtp/Manifest
@@ -1,5 +1,5 @@
 DIST ccrtp-2.0.9.tar.gz 751786 BLAKE2B afa105375a95cffc649704915e0532b20af2188186a6f7d9459285996dfcf583fd2cc1be8e4dc917d4a1acf4022d13db95c617710a2a13a9da9b7badab257fba SHA512 2e63a049ead5bd8a2f3c65d3badb6d6b2a20e185698f62ea9f7e559e8d0aac6151e7a314317d63ea33282c891d75af32571da3471254600abea462097c47dfe3
 DIST ccrtp-2.1.2.tar.gz 764869 BLAKE2B 8fc3aa22e715078dae64407da8b8c2dc6740994dad7bf7dab6369b1708e6261619107dd7484b1ec801b7a8bbb30d3387d8fab9c3503adf09209b2b8aeb6df56d SHA512 a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9
 EBUILD ccrtp-2.0.9.ebuild 1094 BLAKE2B db56a4a22024aa65cc8cc80c92156d29df1057ce4a9d2b0a83bd77815a2d92314140cea73653a76e03af8b4cc1fb9699cbd00fd304ef785a30c85e59810adc12 SHA512 b7e86d6d707151f4bda0cb5fd22cae8a1fdade7cd6d4e7fbd821fade8d4cbe446b1da2fb4bc878bd4837eb03b1ad1998ca2cc08c5f124b4d995270845aa4038e
-EBUILD ccrtp-2.1.2.ebuild 1096 BLAKE2B 17dff7b748fccf5188f6f2443a665af7299d4771bafd0f58bf46ffbd8fece7c6353f9ba00257bf4fe87de23a712856ebbc2ac511d524159da419c88e8c23ccef SHA512 a0273ca7d0015e0bd4bc625ab7b7c99b5af2aa427938edf87df752b2f1b12310553923fc049fab47e1225bc5e8e3762ec7eef2cd2454384cf116459a858c8cde
+EBUILD ccrtp-2.1.2.ebuild 667 BLAKE2B 5ac5b4ffdb0a8138b0c6a608b44cbb4e6f61c219cb2c4e41d1384dd1b61b85807c90e861492ef4f2e3ad684596d743aa6876ce81734ebaab7a11f36722871bac SHA512 262ed129e83a9e757196078a98a0f4b91f255498744d4619a7cf25893b5404c2b38f4967548ac3edfa947d97d1e8fcebdaf6e8ef2b8f3f61afd47ff22ce052a1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/ccrtp/ccrtp-2.1.2.ebuild b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
index 02cf6d4014df..0ed701175c1c 100644
--- a/net-libs/ccrtp/ccrtp-2.1.2.ebuild
+++ b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="GNU ccRTP - Implementation of the IETF real-time transport protocol"
 HOMEPAGE="https://www.gnu.org/software/ccrtp/"
@@ -13,31 +12,22 @@ LICENSE="GPL-2"
 IUSE="doc"
 SLOT="0/2"
 
-RDEPEND=">=dev-cpp/commoncpp2-1.3.0:0=
+RDEPEND="
+	>=dev-cpp/commoncpp2-1.3.0:0=
 	dev-libs/libgcrypt:0=
-	>=dev-libs/ucommon-5.0.0:="
+	>=dev-libs/ucommon-6.2.2:=
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
 
 src_configure() {
 	econf --disable-static
 }
 
 src_install() {
+	use doc && HTML_DOCS="doc/html/*"
 	default
-	prune_libtool_files
-	use doc && dohtml -r doc/html/*
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.6.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.6.so.0"
-	fi
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 38beb3e7033c..176c672cc815 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,5 +3,5 @@ DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec0856917
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
 EBUILD farstream-0.2.8-r1.ebuild 1805 BLAKE2B 60c9a9e789c6cbf48ff33e53b1a4bb7d0e59d88f7f3b8a71254d3b18809fa79667836c60f55a756c7d271ef09e40b173c7c573e6ebb530aaa97bd992d382da45 SHA512 99f415b8069ebfe61bcd65d7679d61d7c12188e3c95955bef8ec0fcff71a2ec9cb3ee5d3bed6db3b0411080c1bf625e210530d855a2f9abee716029128316ab8
-EBUILD farstream-0.2.8-r2.ebuild 1819 BLAKE2B 9dcc52ac72766c36649fd13d75ca7efe7641237671a5bbd952fec059f3aee6150615c65d07a663117112dd8aaac3593b4e254c4e1002e99bb4f2066c86402607 SHA512 4c7308a49043f7b0b5801baefb43c83dec0bbb9c741e1a8d667190beeff8fa18f9b842bdd7bc6723a993d12368783d75893dff2e143d8f82d0848954cbf3ef1b
+EBUILD farstream-0.2.8-r2.ebuild 1828 BLAKE2B 2344f6d75489a3b8e80deed6519d4f6e2da828413ca37603db4369f3c4beae1f0461fee294ef4a98df48f6f88e8407a94246d39a412d1274a1d9345bbdf4a665 SHA512 139b9f3cf63894eade81da0bdfa9242f3921c02a0f87b8371809d03ebdb08bf14fac4c92a19d4cf9e9e9848b96b934dca43d3a1d8c5bec9ea3d400b57a1ce826
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 5e47397a3ad9..a37762705792 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 017d6da106c7..9f83965e4723 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,15 +1,10 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
-AUX gsoap-2.7.40-shared_libs.patch 6866 BLAKE2B 829a06165291a7887b8dc72b450b38a6f28cce51a6cf55d7d2ba1129a2f96036b5cbcf1a5e3b7d00c63a94674c42ea0b647818b9000e67191a75cf1a5660e0b9 SHA512 289c09f08d5881232fe169d37a0a76b58f8ec823305dd24f62b4cc04d7d1801be5b475ccd87c1f4ec3779c7972cb962a8a196d80e5fff91755d9b76bae0ac941
-AUX gsoap-2.8.51-libressl-2.6-compatibility.patch 1394 BLAKE2B 738e50bf8b8aad35e21b2ac03d9ca18713cbc694c01916163f0f22b8e16c11b156a9c92a209da56016cdc23e0438d23dc99ca7efed1eaec892462e231c9b9cac SHA512 51e1419bb88bf9de32caeaf4f7507eec05a65b4cac9aa02715c933d66c3685c1e611a52dbd1e77219bfffc8bd99c838f3c1e9270520a9e7b46a1651f79f00bab
 AUX gsoap-2.8.52-shared_libs.patch 6582 BLAKE2B beb15d19f782edd0fd0ac518001001f194fc26ef8e7964114809776d3b0dc5359f2cf39e0fe6813650afb7805ae389dc5e26ac4ac4bbe424e81135073ee7bd27 SHA512 7ddbd3c2597892357da0ced383b2286e057e5e3c44eec3fd96b2ecbb4759bb5624c047e77482c495d46796e20d0e587e637f7b3a0ca3a05ceeae40e63fd5049c
-DIST gsoap_2.8.51.zip 34505931 BLAKE2B 6f2d6ee2bd405054dc75105f42f6edeaa2300f1e7e6bea15f9e8f0dfcc2df56b36cddfc8f0a038b029f36a6dd1fd63f39eadb8d7f363335344eb142ec27be726 SHA512 491e31ce6be02c577b6184335672a0805e2287418a7e26d9b0f009aab8af462ddef7d7a1893dc867db5362c5f2a1e0022d0a45865d81e43286ce16c649da6910
-DIST gsoap_2.8.55.zip 32571850 BLAKE2B 6f262c0b65c7704fbf6c0973d766c0cff788745d0f6331afdffc6bbabbbeeea38222f8038d7a96eae63453a721f2b52b1623f4691e7c677489fb8a3c49d80bae SHA512 e0cb6809d5b8e4a068ed937f253844f88d8275e58f7590ca0dd52bede1ea74d5781d35664586f9e29f2e22c508167df8044d45101f0773c9b8d79b80aa188935
-DIST gsoap_2.8.58.zip 32931913 BLAKE2B ab6e1b9f1e3b866199236b471e638a80c3542ce709e5cca75df9b3d5cd06fc498d09e768078a6863c549e721f657723d50bf53274c7d6603da23f1ea7a887879 SHA512 019c428aee0309ac952af349738a062d4e6deae28f2c5d38178bcd2aa3ead76a7a43faf952ca61f15e8928600a46f1a865b7996ded1c32e1749d1036c5354e2b
-DIST gsoap_2.8.59.zip 33109898 BLAKE2B d05ddf0c1e24afc03a33592cf8abef6f0bb6c8a8a216aee9ce7614720a8e3cd015f1e03429113ac8bdc05e6b916fee022914db22d0c29b5c9c4d0fb60c549168 SHA512 d43320e6965c3f17d122ea7aeeecbc0b608dac52204e630c3254d32eadd3c93aaca446c92bb439b98207f8560b2ad6bff220c0502b75ebd18b99e37402570624
+AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6dd7bb1dc933216a1770accc94c2d1ef02fe6a3ad7643cb7d748a54e55e9ba3591d48f107485c9b9e4306763f2634 SHA512 d49527ae34788f8bc1a74c9a59890bdc13eb343fb3293fcc756b7dd7259cc7cd544bafc58a0c271cf7268b0a9c986db36e587fdc7fcc520ea05ab559e292649e
+AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
+AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
 DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96
-EBUILD gsoap-2.8.51.ebuild 1793 BLAKE2B ac37c5aad219f159d1341f13d20ab187d70fd87619930ab13df8fd127f46ea15793c6d1f74def667c2a2f3384037193877d662eebdac7f73e530b8ebf7d9fe6b SHA512 45b0dc686746e51454340f1c8d59fb803e94666b50db4d2cc6b10ed31f0cb09daa3d1cd46f851b6fababb2363e1e14de5da6bf978a3b41b172170385d06db76f
-EBUILD gsoap-2.8.55.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
-EBUILD gsoap-2.8.58.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
-EBUILD gsoap-2.8.59.ebuild 1635 BLAKE2B 108f7d24270342c82c34c3ef000814a2af1de429230744aba9a819a988bc16619e79b3a59efd72939c57503698d3921b8ab8339a3c9ea7c2f1a5242c43ac8b7a SHA512 786bbd285e707c55acba1b1a357d51583cea9e1040673ebf35264d0d5d2ae8af1eb65e61123ce1b36865c57f20a942ed0e9deeab7c98ad2603a3bf7f730a9bc3
-EBUILD gsoap-2.8.63.ebuild 1635 BLAKE2B 108f7d24270342c82c34c3ef000814a2af1de429230744aba9a819a988bc16619e79b3a59efd72939c57503698d3921b8ab8339a3c9ea7c2f1a5242c43ac8b7a SHA512 786bbd285e707c55acba1b1a357d51583cea9e1040673ebf35264d0d5d2ae8af1eb65e61123ce1b36865c57f20a942ed0e9deeab7c98ad2603a3bf7f730a9bc3
+DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
+EBUILD gsoap-2.8.63.ebuild 1630 BLAKE2B ec07675d8a315a780c4f43b617099aa6211ffb584ea3a3e718500ad34063f28e6498e62d6fd040a108aad36cfde3aa41ceb8b52181d22b4febcaf66de457649b SHA512 310be6db4ad09a75b5a61ea91cd82f648e21102ce783009f13f1a97d390ed9cca59db06d707c0e3635a18ca5a4c35a359479755b38f218440b729b73fa84e397
+EBUILD gsoap-2.8.70.ebuild 1875 BLAKE2B f3d471fc3467e7c88c470b48f1d242bf7483a133d6b668e1cfe39e36e54eaa508e678881943ad1b7aa7845dda3b3f667e863b5a34e517f1c562769337ecdd364 SHA512 024549d143921d38866924105ed0d93b8445d2ceef717506575d26b7070697bce57e18df8b24e8aab20257f35f4c328ccaef4bcd286a7ec665cd6fdc4914ac34
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
deleted file mode 100644
index 8f13a39d32c6..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/gsoap/plugin/smdevp.c	2018-04-20 15:45:25.112658174 +0000
-+++ b/gsoap/plugin/smdevp.c	2018-04-20 15:47:58.826360980 +0000
-@@ -479,7 +479,7 @@
-   /* allocate and init the OpenSSL HMAC or EVP_MD context */
-   if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
-   {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX));
-     if (data->ctx)
-       HMAC_CTX_init((HMAC_CTX*)data->ctx);
-@@ -489,7 +489,7 @@
-   }
-   else
-   {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX));
-     if (data->ctx)
-       EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx);
-@@ -642,7 +642,7 @@
-       *len = (int)n;
-   }
-   /* cleanup */
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-   if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
-     HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
-   else
-@@ -687,7 +687,7 @@
-     }
-     if (data->ctx)
-     {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-       if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
-         HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
-       else
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
new file mode 100644
index 000000000000..8abd36d937c9
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
@@ -0,0 +1,10 @@
+--- gsoap-2.8/gsoap/src/Makefile.am
++++ gsoap-2.8/gsoap/src/Makefile.am
+@@ -5,6 +5,7 @@
+ ## you have all needed files, that a GNU package needs
+ AUTOMAKE_OPTIONS = foreign 1.4
+ 
++include MakefileManual
+ 
+ #LIBS=
+ AM_YFLAGS=-d -v
diff --git a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
index 829e0e45a58c..cb3f11ed129a 100644
--- a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch
+++ b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
@@ -1,6 +1,5 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac      2016-12-11 04:12:26.000000000 +0000
-+++ b/configure.ac      2017-01-10 13:41:24.743162628 +0000
+--- gsoap-2.8/configure.ac
++++ gsoap-2.8/configure.ac
 @@ -17,7 +17,7 @@
  AC_PROG_YACC
  AC_PROG_CPP
@@ -10,7 +9,7 @@ diff -Naur a/configure.ac b/configure.ac
  AC_PROG_LN_S
  AC_PROG_AWK
  AC_PROG_INSTALL
-@@ -242,16 +242,18 @@
+@@ -278,15 +278,17 @@
      WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
      SAMPLE_INCLUDES=
      SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
@@ -20,10 +19,9 @@ diff -Naur a/configure.ac b/configure.ac
    else
      AC_MSG_RESULT(no)
      WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-     # an ugly hack to get httpda and smdevp plugins to conditionally
      # compile with wsdl2h when OPENSSL is available
--    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz"
-+    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lcrypto"
+-    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
++    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
      SAMPLE_INCLUDES=
      SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
 -    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
@@ -32,15 +30,17 @@ diff -Naur a/configure.ac b/configure.ac
    fi
    if test -n "$ZLIB"; then
      WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -270,13 +272,15 @@
+@@ -305,7 +307,8 @@
    WSDL2H_EXTRA_FLAGS=
    SAMPLE_SSL_LIBS=
    SAMPLE_INCLUDES=
 -  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
++  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
 +  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
  fi
- AC_SUBST(WSDL2H_EXTRA_FLAGS)
+ AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
+ AC_SUBST(WITH_OPENSSL)
+@@ -313,7 +316,8 @@
  AC_SUBST(WSDL2H_EXTRA_LIBS)
  AC_SUBST(SAMPLE_INCLUDES)
  AC_SUBST(SAMPLE_SSL_LIBS)
@@ -50,12 +50,11 @@ diff -Naur a/configure.ac b/configure.ac
  
  # enable the compile of the samples
  AC_ARG_ENABLE(samples,
-diff -Naur a/gsoap/Makefile.am b/gsoap/Makefile.am
---- a/gsoap/Makefile.am 2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/Makefile.am 2017-01-10 13:41:36.487140423 +0000
+--- gsoap-2.8/gsoap/Makefile.am
++++ gsoap-2.8/gsoap/Makefile.am
 @@ -49,6 +49,29 @@
  libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
- libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+ libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
  
 +lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
 +SOVERSION = 0
@@ -83,18 +82,17 @@ diff -Naur a/gsoap/Makefile.am b/gsoap/Makefile.am
  BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
  
  include_HEADERS = stdsoap2.h
-diff -Naur a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefile.am
---- a/gsoap/samples/autotest/Makefile.am        2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/samples/autotest/Makefile.am        2017-01-10 13:44:39.954389922 +0000
+--- gsoap-2.8/gsoap/samples/autotest/Makefile.am
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
 @@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/examples.wsdl
- SOAPHEADER=$(srcdir)/examples.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
  SOAP_CPP_SRC=soapC.cpp soapServer.cpp
 -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
 +SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
  
  $(SOAP_CPP_SRC) : $(WSDLINPUT)
-        $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+ 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
 @@ -40,6 +40,6 @@
  autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
  autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
@@ -103,18 +101,17 @@ diff -Naur a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefil
 +autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
  
  CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
-diff -Naur a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/Makefile.am
---- a/gsoap/samples/databinding/Makefile.am     2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/samples/databinding/Makefile.am     2017-01-10 13:43:51.788258087 +0000
+--- gsoap-2.8/gsoap/samples/databinding/Makefile.am
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
 @@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/address.xsd
- SOAPHEADER=$(srcdir)/address.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
  SOAP_CPP_SRC=addressC.cpp
 -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.la
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
  
  $(SOAP_CPP_SRC) : $(WSDLINPUT)
-        $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+ 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
 @@ -28,6 +28,6 @@
  address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
  address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
@@ -123,24 +120,22 @@ diff -Naur a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/M
 +address_LDADD=$(SOAP_CPP_SHARED_LIB)
  
  CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
-diff -Naur a/gsoap/wsdl/Makefile.am b/gsoap/wsdl/Makefile.am
---- a/gsoap/wsdl/Makefile.am    2016-12-11 04:12:28.000000000 +0000
-+++ b/gsoap/wsdl/Makefile.am    2017-01-10 13:42:08.991078959 +0000
+--- gsoap-2.8/gsoap/wsdl/Makefile.am
++++ gsoap-2.8/gsoap/wsdl/Makefile.am
 @@ -10,7 +10,7 @@
- AM_LDFLAGS=-L$(srcdir) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
+ AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
  AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
  SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
 -SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
 +SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
  SOAP_CPP_SRC=wsdlC.cpp
- SOAPHEADER=$(srcdir)/wsdl.h
- SOAP_FLAGS=-SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gsoap/import
-@@ -29,6 +29,6 @@
- wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH)
- wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
- wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC)
+ SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
+ SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
+@@ -32,6 +32,6 @@
+ if WITH_OPENSSL
+ wsdl2h_SOURCES += $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c
+ endif
 -wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
 +wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
  
  CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
-
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
new file mode 100644
index 000000000000..fd550dd2670d
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
@@ -0,0 +1,20 @@
+--- gsoap-2.8/configure.ac
++++ gsoap-2.8/configure.ac
+@@ -196,15 +196,15 @@
+ AC_ARG_ENABLE(xlocale,
+               [AC_HELP_STRING([--enable-xlocale],
+                               [compile library with forced inclusion of xlocale.h])],
+-              [with_xlocale="$enable_xl"],
++              [with_xlocale="$enableval"],
+               [with_xlocale="no"])
+ 
+ AC_MSG_CHECKING(for enable xlocale usage in library)
+ if test "x$with_xlocale" = "xyes"; then
+   AC_MSG_RESULT(yes)
++  SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
+ else
+   AC_MSG_RESULT(no)
+-  SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
+ fi
+ AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE)
+ 
diff --git a/net-libs/gsoap/gsoap-2.8.51.ebuild b/net-libs/gsoap/gsoap-2.8.51.ebuild
deleted file mode 100644
index 5dd67d3686ff..000000000000
--- a/net-libs/gsoap/gsoap-2.8.51.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Fix Pre-ISO headers
-	eapply "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	eapply "${FILESDIR}/${PN}-2.7.40-shared_libs.patch"
-
-	# fix building with libressl-2.6.x.  This will not be needed when 2.7.x goes stable
-	eapply "${FILESDIR}/${PN}-2.8.51-libressl-2.6-compatibility.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.md
-
-	prune_libtool_files --all
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.55.ebuild b/net-libs/gsoap/gsoap-2.8.55.ebuild
deleted file mode 100644
index 28cf845a3274..000000000000
--- a/net-libs/gsoap/gsoap-2.8.55.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	# Fix Pre-ISO headers
-	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.md
-
-	prune_libtool_files --all
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.59.ebuild b/net-libs/gsoap/gsoap-2.8.59.ebuild
deleted file mode 100644
index 84b2601d54ef..000000000000
--- a/net-libs/gsoap/gsoap-2.8.59.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	# Fix Pre-ISO headers
-	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.md
-
-	prune_libtool_files --all
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.63.ebuild b/net-libs/gsoap/gsoap-2.8.63.ebuild
index 84b2601d54ef..55a5b33b16db 100644
--- a/net-libs/gsoap/gsoap-2.8.63.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
 LICENSE="GPL-2 gSOAP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
 
 RDEPEND="
diff --git a/net-libs/gsoap/gsoap-2.8.58.ebuild b/net-libs/gsoap/gsoap-2.8.70.ebuild
index 28cf845a3274..f09037b2e0fd 100644
--- a/net-libs/gsoap/gsoap-2.8.58.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.70.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${PN}-2.8"
 
@@ -35,7 +35,13 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
 
 	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
+	"${FILESDIR}/${PN}-2.8.70-shared_libs.patch"
+
+	# Fix --enable-xlocale configure switch
+	"${FILESDIR}/${PN}-2.8.70-xlocale_h.patch"
+
+	# Fix parallel make
+	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -46,18 +52,16 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
+	local myeconfargs=(
+		# Don't include xlocale.h as it got removed in >=glibc-2.26
+		--disable-xlocale
+		$(use_enable debug)
 		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
+		$(usex gnutls --enable-gnutls '')
+		$(usex ipv6 --enable-ipv6 '')
+		$(usex ssl '' --disable-ssl)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -67,17 +71,19 @@ src_install() {
 	# it contains info about how to apply the licenses
 	dodoc *.txt
 
-	dohtml changelog.md
+	docinto html
+	dodoc changelog.md
 
-	prune_libtool_files --all
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 
 	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
+		rm -r gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
 		insinto /usr/share/doc/${PF}/examples
 		doins -r gsoap/samples/*
 	fi
 
 	if use doc; then
-		dohtml -r gsoap/doc/*
+		docinto html
+		dodoc -r gsoap/doc/*
 	fi
 }
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 582d528e6341..cdffc840fc81 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,5 +1,3 @@
-DIST ignition-msgs-0.7.0.tar.bz2 327753 BLAKE2B 7709b7fe5bc8d3ebd16ae30ac91d088a7e3891bc378f24ca48b34b88c541c3583182c3d9d3d6c72b7005f01ae5383f6391b4e754adb26f8ab06e9a31680e99dd SHA512 78b35eb6c9b53bd567d227191009cfb8628afa70f244cf05ad9440f370aa9c51a649160c9c65d13e81a48a3a34553614e9835e9a37fb91cad330c363f0a5f62f
 DIST ignition-msgs-1.0.0.tar.bz2 315469 BLAKE2B a481f740ffb0795e64d1fa222ea4925e09839d56212f5218b4849c6f49a3e3a899af757ac1ad1997a95b57a401bac831a754ffa351cd142e6e9cbf07e7bae0ac SHA512 3ec16d68c35b1c7d77373eb3ed72304f5a990f57fc15a91f49af49bf0c6b43e6f31e888e4b0a8308cc63840aa995dd423d5b23d28a98f132b4be13c46f5d7d6e
-EBUILD ignition-msgs-0.7.0.ebuild 902 BLAKE2B b003b1f8aea21a1ba7d4d567e9793a09030a77eee4a8b60351fad863914837bd6d6127f1fbcf9235b02d87f8d2a09ec210927391e498f70432eabcb812864e93 SHA512 604b6673fc62042fd151b7abd1a0861ba17615e8df02b6138439d5e5ec9b7de768c2332a875e888f623530c61a66002178ac58b592d1b67b7f8eb63122125d01
 EBUILD ignition-msgs-1.0.0.ebuild 653 BLAKE2B afcc192b543a7ae2fc9f859943708e40ba36e2e0f260a729927c9d38a651e078995879e3c2cef643b342c35b1d3fe4fa93c8e2b8526579261adc91c427b3a20d SHA512 4c769905c78b7bf5b91c80a2188ba5e29ba91aaca55ceaec0434347858b2fe8d657521382380881ab455c98897bd911ced6425e5749047caadb10a916914b869
 MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
diff --git a/net-libs/ignition-msgs/ignition-msgs-0.7.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-0.7.0.ebuild
deleted file mode 100644
index 6618d9aad104..000000000000
--- a/net-libs/ignition-msgs/ignition-msgs-0.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Protobuf messages and functions for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/protobuf:=
-	sci-libs/ignition-math:3="
-RDEPEND="${DEPEND}"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-utils_src_configure
-}
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index 618764ae1706..4f6dcb9016f0 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1,6 +1,4 @@
 AUX zmq.patch 1378 BLAKE2B 4fd868bc3d791e2f17fec392f8cdc5a6ce076b96453c35da46e8717e7274f29aa323dfc1985e819c49b587963b22813d4eb11b685d24c417d67720a7c5e3ac84 SHA512 9128f976e51dd333d856c15f1899955ff4879db229a174839be8e6d8c464cd7e0932c58098bcd1aa2e45fefdf5527bbe8a301306ddc75c022bc1fc0fd4ea9edc
-DIST ignition-transport3-3.1.0.tar.bz2 385946 BLAKE2B 0ae44f0e1cd17369de9ee39f0d128ee5edbc68c1be672be5476d7cf8c161f59c069af63cec1966f6e0ba1c9e56ade0563b6546f7f285bdc49b6941939e2a4379 SHA512 438ab49f1c506e098c00becccf1856b3e0129d60f9aca32f713a74b38aefb178833353ff479c8512e7ffec812bdc0a06eb7f28f09766dc0cc5a9707184151555
 DIST ignition-transport4-4.0.0.tar.bz2 396662 BLAKE2B cb4c56954ddcd863d60941c43e38624747ca07e6cb5c7404309012dc9d22fb8a053e1113b117a0ee8447e32b6b52318b5b4844a050e4b8c1feccc2de391c46bf SHA512 90facd527e953d3319b4b3b7c5efa610d6c965fcaaf053b8b32039825fccca89c17f153ffec5c0562d4d3d534741f3d6c1a603eb2c75fd5cb217bf22a6d6e503
-EBUILD ignition-transport-3.1.0-r1.ebuild 1051 BLAKE2B 9b9121d78653d91eac64929de06aa7e67a6a37e9968c286bdb686bd2346b34bfee3f2059e3af19f05fa59acdea3eb0db1cbc52b49981bd6b040165fb17f9589b SHA512 69559e48cb18de8dec8003c05352d506aa5348cb233be5d80bf37c782ab89e73f57414052b1c439b2e1055ed1fbbb5869990e30913da701bf7afa7c6bb131483
 EBUILD ignition-transport-4.0.0.ebuild 780 BLAKE2B 66873b9eb374d0775ce5ecbd794504c740a7c10279b35e76df328adc4c697db225f23d8ade9ffbbb08b8df976fbec8c752f477d0eedad6fdbd9084f7ad3c2be8 SHA512 df93993a6794f2d17f2f1c223bb944ce1b6b8eb8c45f865c247ad0bdee9c84b9095cbdb2062e6029a89d0ac0a2e5a9365fed44fec873aa7f0cac0590c0947f73
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild b/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
deleted file mode 100644
index d061cf3b13b0..000000000000
--- a/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils vcs-snapshot flag-o-matic
-
-DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system"
-HOMEPAGE="https://ignitionrobotics.org/libraries/transport"
-SRC_URI="http://gazebosim.org/distributions/ign-transport/releases/${PN}3-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3/3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	net-libs/ignition-msgs:0=
-	dev-libs/protobuf:=
-	>=net-libs/zeromq-3.2.0:=
-	sys-apps/util-linux
-	net-libs/cppzmq
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-utils_src_configure
-}
diff --git a/net-libs/kdav2/Manifest b/net-libs/kdav2/Manifest
index 7cae726b6620..55d7dedca0c6 100644
--- a/net-libs/kdav2/Manifest
+++ b/net-libs/kdav2/Manifest
@@ -1,3 +1,4 @@
-DIST kdav2-0.1.0.tar.xz 47012 BLAKE2B 29d2c663590371dc1107a7a9408ae539780ab039af163b4e8b80c575ad7dda8d96f70ca4c43c0bbc1704c7583341b20f61ea567d912d7f4575bb2944190f93d7 SHA512 4d4e19ed9b8b44f5eea7d40d24dd4accd6b41ea5020b492d83d85ff7fee1e0bc72f50667a31b8021fe9aaa45fbaa6dea86fdb81a4f4db45d9d16ba98adb636b4
-EBUILD kdav2-0.1.0.ebuild 475 BLAKE2B a82a65715ecc0173c91bbb4d5f37071a017de8cc29e4a5e1178f4c035e489fe5830c7b6125bfc09c099b7dcdf0a05bafd1c18799e2cd9d8f7065adb07230c4ec SHA512 947b7a85e1e99ed2f842b72e3fb6e5186efef1a91c4072bd22ffbfadb9fe542b3336b718cd6d89ac4b54634364f0db857607326ac5a95b7796b67c818ba6967e
+AUX kdav2-0.2.0-qt-5.11.patch 209 BLAKE2B eb03b7877db105894d19d0a597c112f760b68a4d556762b8101f10cb8203a1fd0d417f124065cf0d9dfc1c3f40f5201c8e86bc083073acb3e65bc1ce21f863e0 SHA512 1e7ad2451b709b9c8fc301f4f7975dd725b02ae3f8640b1e172a8ff3fc21e91c62ea892ff42ae298331b20a01f967cfcf047955f87b38082a02553e6314a01d1
+DIST kdav2-0.2.0.tar.xz 49440 BLAKE2B 965f38b854f8aa95b907fbde136fbffdfdf47690e7816cc6a5e3d8014b97a57bad991a0a1aa488a855065eeba50bd7bb73f25ac05ccc9dedee563044da293519 SHA512 ef2510ae36a8e5be0903eb7e576c0f62c5e17d36cb42a9e6f07bb8d06f2e2a46354cf10256509f7c252e58f281f5e32e1c9dae682c421ac96941b7785df6a6a3
+EBUILD kdav2-0.2.0.ebuild 518 BLAKE2B 8124867db55fdeac5ac251850fe8c351377c9bb569657928b97785d475fe3b66e2cd33c831eb52e7cb9867e8a6869b16e182492356d87c060be041fcdbab710a SHA512 09a3152d2febd5b90863859dc0dd0f8aa70c4b59cb971c32106be0a0e79cff681cdfc27eb712568fef878244dfff4e476e4a78bfaa817739f9096a6b1d4facc0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch b/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch
new file mode 100644
index 000000000000..b5db5c1966e2
--- /dev/null
+++ b/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/645392
+
+--- a/src/common/davjob.cpp
++++ b//src/common/davjob.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include "daverror.h"
+ 
++#include <QDebug>
++
+ using namespace KDAV2;
+ 
+ class DavJobPrivate {
diff --git a/net-libs/kdav2/kdav2-0.1.0.ebuild b/net-libs/kdav2/kdav2-0.2.0.ebuild
index 4cab5434a661..1652b2375aeb 100644
--- a/net-libs/kdav2/kdav2-0.1.0.ebuild
+++ b/net-libs/kdav2/kdav2-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,3 +21,5 @@ DEPEND="
 	$(add_qt_dep qtxmlpatterns)
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 0f859656e20c..b4b24c48b1cd 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libaccounts-glib-1.23.tar.gz 127931 BLAKE2B 2379786bb4a658eaba632a1788782a0b5620e69fa058e991a41feeedf5b8f4786592077f237513fde9ed4ea00db015a7dd0be6ad852c265a5b7f8b1180ac01e4 SHA512 88fec1fed7a135375516363e4b7f1330d45a6337bbfb45dd35dabce87097ee4e550e968870541e1b496c2ee3db1bd26e0665f4155f1e64d1cc7b6b74d5b71b5c
-EBUILD libaccounts-glib-1.23.ebuild 818 BLAKE2B 5dd620e3cffa76ef1bfe5b28d51c59a2484026dd246fcf8f8c9d874023133aa2252564288d703ff7cb90fda7a5e85c0814e4eaddac654963a62144c4b741c501 SHA512 ed750fec2937c287744effc8bd5059779b7c042a5bee1e6ceb0a1ed20356d4349a17f6df598cfc068b2c7824e60f385e5c1a82abaa3cd631d8e3a067b96ca981
+EBUILD libaccounts-glib-1.23.ebuild 849 BLAKE2B 003c98a278c6aef16ad363e0dcfb6963134f643814e2c2e62a4bb47bcd1e8fdcccdb17dde3dab22dd3b68fa61040870e33db7611070db19b32a34ee65029e9ee SHA512 574ec15032d41dfe802b1d7f88e93b214df30f61e73fa5b65b2a9f5fb5cf5c4896dd90d89696a02b594388e7f4e2154c0eb48c22e41d82097aaf7f4545d2aa32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
index 94c1a275a838..5752429d98ee 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils vcs-snapshot xdg-utils
+inherit autotools vcs-snapshot xdg-utils
 
 DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
 HOMEPAGE="https://01.org/gsso/"
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-libs/libxml2
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc
 "
 
@@ -43,5 +44,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index 2e361babc44d..a19fb5b68ff0 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,3 +1,3 @@
 DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
-EBUILD libbloom-1.5.ebuild 465 BLAKE2B ebabfdbbe91d970999ffc2d4d4e855a7fa99ebc940b5b0dd6a058726eb76190aa4ce32639eb7b5cfc61ddecadf9f3c136789c9e802b7cbde690e3455b1f3fd08 SHA512 26f81fa54486c1a0524305e5cfc57a22d1bc56b6049c58cf0a3b8b70bd3f879c737f004a935c633b6144d83ad4b35bf6086d2ce80a582574b8d6b1c1b2bf6bd0
+EBUILD libbloom-1.5-r1.ebuild 546 BLAKE2B b456b74c3cdf402a327734716cf2547d232277b9a280b1f77f22735e9e40bedb246c439f1122ff64bcbd99d352b29ecba28ec281a2a5da895703abfe897efdbb SHA512 36f2d61b296fb01d533e7038b3efa3ac582de7d16c4501d60c6c6de1e04adea5bd5f2535b7d3ca803429c3ba6f2f47bc1832b527bbaf60a254e885e71258ce3a
 MISC metadata.xml 321 BLAKE2B b9276958b83d4101521b0946b8cd6db70acfc4e7257fe1773cf0e85a1f6d9434c2d27022f3628578aad4156fedafd635f89c273b09933918149491c96918d207 SHA512 c744f0f8c72f05d96c85a7dade513d5aae40413450902b66d30a0eff88c92e4f9bbf2a1f0ccfef29bef817115dd85ff7ce4386592a25ee9f5e492a398a9ff4f8
diff --git a/net-libs/libbloom/libbloom-1.5.ebuild b/net-libs/libbloom/libbloom-1.5-r1.ebuild
index 665848c2f38d..7e255245ef90 100644
--- a/net-libs/libbloom/libbloom-1.5.ebuild
+++ b/net-libs/libbloom/libbloom-1.5-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="A simple and small bloom filter implementation in plain C."
 HOMEPAGE="https://github.com/jvirkki/libbloom"
 SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -15,6 +17,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+src_compile() {
+	emake CC=$(tc-getCC) BITS=default OPT=
+}
+
 src_install() {
 	doheader bloom.h
 	dolib.so build/${PN}.so*
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index a2731c543f4b..803eb0a57e7f 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,6 +1,4 @@
-DIST libdom-0.3.1-src.tar.gz 868959 BLAKE2B f132723aa9387b44cf2b07285eabb2f831103125a696a2a9d4a73275ea555663b26534b25f31f4da8211d6b70b2f4739d61934d8e9b33b3150d442c15249f538 SHA512 a7acd64a99145483274a44bd47af16474eadab5e6cf46847c61775c8d9fc03aa8cb4ad21fa63377b8c758c9556c140d626a2c3b2be31072fb5afdc2cee589e0c
-DIST libdom-0.3.2-src.tar.gz 869599 BLAKE2B 9a7a9cae1604624884be331e7d9ee578ffaa90a1fe4a29c97ef8f68e5ce40156ae87ad1345074b752a07298f8921955d786407d17d5d1dd612ec382e7daef72d SHA512 dd7a9e17539b0ac6088f6c395133296e2b200a5c6d342c8dd837e71d62826fa77cecf9b716e53102bd90b03c4653689c89e72683057dab0d62a530e940d6b6b3
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libdom-0.3.1.ebuild 1066 BLAKE2B 6a26b9cdd7b5ec0b818f8fe62556e023d6e0e38418ab06b9c53614611c13a534e429caa026134bb89969812f54dca6dff4a08c316478df9b11772c84bc19706d SHA512 ca234dbc7f51c92e2877a693b1bb713984f98032b85f664a522ea64e5047690814d528ada14433352ec7e8f730f7f6f1451cafb5fa455aeda5920ab30c74f476
-EBUILD libdom-0.3.2.ebuild 1066 BLAKE2B 6a26b9cdd7b5ec0b818f8fe62556e023d6e0e38418ab06b9c53614611c13a534e429caa026134bb89969812f54dca6dff4a08c316478df9b11772c84bc19706d SHA512 ca234dbc7f51c92e2877a693b1bb713984f98032b85f664a522ea64e5047690814d528ada14433352ec7e8f730f7f6f1451cafb5fa455aeda5920ab30c74f476
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libdom-0.3.3.ebuild 1154 BLAKE2B 97f611afccded19c7292e00a39187662116fac41740a7ce5d8afdfb2b92b33e7d412f5ad7eed97d15b83e0e3b46889cdf566017d8bf724c24479a6f4ee064ad4 SHA512 2719a5b91644a7ff0628cfbeb3a9c63e627db62e19a717f308e8b704f04179b8481fe973e2e7168b92113d44f2494717c96493622f9ef7f02a67ca4d4cb20313
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/net-libs/libdom/libdom-0.3.1.ebuild b/net-libs/libdom/libdom-0.3.1.ebuild
deleted file mode 100644
index 460b2a411916..000000000000
--- a/net-libs/libdom/libdom-0.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="expat test xml"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.3.0[static-libs?,${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	xml? (
-		expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
-		!expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-perl/XML-XPath
-		dev-perl/libxml-perl
-		dev-perl/Switch )"
-
-REQUIRED_USE="test? ( xml )"
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
-		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
-	)
-}
diff --git a/net-libs/libdom/libdom-0.3.2.ebuild b/net-libs/libdom/libdom-0.3.3.ebuild
index 460b2a411916..d245b9d4989f 100644
--- a/net-libs/libdom/libdom-0.3.2.ebuild
+++ b/net-libs/libdom/libdom-0.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
@@ -29,6 +29,12 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="test? ( xml )"
 
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
+
 src_configure() {
 	netsurf_src_configure
 
diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/net-libs/libdom/metadata.xml
+++ b/net-libs/libdom/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index e9fb2170e486..15a42c9b5b89 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,7 +1,7 @@
 DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526
-DIST libhubbub-0.3.4-src.tar.gz 784522 BLAKE2B 462de8bf233a5ab8e6b90d20ea544b9efbcadd25421c1184544f99d5cebf4b8955d0d689f7fcf81246ff7fa38d5f6c6470542830f6c9c3390521dbaa44e239ac SHA512 3e97f8b8669d27d58026e73f4545462bf2cde4ffdb7f2435760311cef3655844146f5bcb448bd0a18345e7a345ff14c619229c8bd2e7c8d78d345ba480912f55
+DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libhubbub-0.3.3.ebuild 789 BLAKE2B 66d8a14f88b288a3c2754d91b74f2694f44b569571992a007fec785e8d6c1e0bd098b748e230d330402e6a774e9dc71b285328dcf24f2be38585142299b1d501 SHA512 0ceede1752f74cf990b992070435f27ffb516fe4af3fe5099478d1197e554ace10580d01be3798e6abe3c27d80115553c85e2efcaefb8bfc8eb004d713980ddc
-EBUILD libhubbub-0.3.4.ebuild 792 BLAKE2B daa109131a4c7509504178bd8ef8749be2ff1c55f3447981ccef54c674c117ad035c6a8717c836eeaa8b0495badfca3b85abc7044b52c037f86e2724994c85c7 SHA512 b02eb5f317151c93253b14daeef072a2b35453082a492379ce43e68313a1f4995750da665467211932e6381d3dc401155effe402bc398a9d0a97e14f08668ab1
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libhubbub-0.3.3.ebuild 786 BLAKE2B b995a7361dc41af100c17b781ac3f9daf3d5fc47d22905153167165b256765747a8199bdfe6041ac3147f51beb047f6c1010177d60ac0197fa82daae28126b62 SHA512 80f415406e399aa5045f5f946590a07e2f94c173e5bf34e1326d17658e0f89a775c1a689934ad93dec404e8f00195155cd747696b611482f90475f97adfedff7
+EBUILD libhubbub-0.3.5.ebuild 840 BLAKE2B 6de72af9228928530253017d73e57d840f9cce3c319743fa504dc81e1c342903d70a227910bd571d7778465f6c3832e68ea52eea9a0bf68f47b38f101d35026f SHA512 6a587b178d8e0a17c426a3375a1266b988e06b2249a33c8c9444348b77cbcba1901355e5e84604e1d614a21b9484e6e0a394830cd7278768f41431b4de737461
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/net-libs/libhubbub/libhubbub-0.3.3.ebuild b/net-libs/libhubbub/libhubbub-0.3.3.ebuild
index 54fad5a9ace2..833850b112d2 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-libs/libhubbub/libhubbub-0.3.4.ebuild b/net-libs/libhubbub/libhubbub-0.3.5.ebuild
index d1bc2bf99a28..8277a2ae87cc 100644
--- a/net-libs/libhubbub/libhubbub-0.3.4.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.6
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="HTML5 compliant parsing library, written in C"
@@ -24,8 +24,10 @@ DEPEND="${RDEPEND}
 DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
 
 src_prepare() {
+	# working around broken netsurf eclass
+	default
 	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
 		-i test/tree2.c || die
 
-	netsurf_src_prepare
+	multilib_copy_sources
 }
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index d8fa2c78b6ea..0e39af11e77a 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -1,13 +1,11 @@
-AUX libircclient-1.6-build.patch 376 BLAKE2B 2a55d532c9f738600b5b5686a9785409da7cd4fd53433aebc72d270f1c7d8e3b00f7d54b5b7c9a914b5e412a7067697eb95c74678667b5df18f55abfa7285740 SHA512 1dd6a8a7c71b331ab1fc6a5d5f0c204bcc0c09362271df1f3304f78291555f3cf7c4fba278123c4d12f59793e9cf8cc867aae365aef82a51bb2b019c804b558b
-AUX libircclient-1.6-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
-AUX libircclient-1.6-shared.patch 2286 BLAKE2B f3d7556050684e950d3c50c82b42e19024c5110fb4ba51844b70b66dddab004a8503a9ba3889d659bdd7ecb57533ecec44687c735d9729f819cb3ed753730b9a SHA512 aa0cb079d206748c68ac5fbd066f78271b15f76e06a443c38ea54d35e1e2ccffb500cddd4d6a361c094b199ded876d7b47a1d08ebadbc48ea57d2bbefabf3f30
-AUX libircclient-1.6-static.patch 213 BLAKE2B 3922125e04f4736baa9a80a81fee828e424ee74c8629cb4fbcaf9791f09c6939ebf0c15c79a00a971d11aff49166cca146e80abeebd128ec4e7b3ca862a0ab9f SHA512 b370de10c348928dc75c1844b2c9f02b832ef4f44a6c7ab887e1ede35e8dbcc7fcfd427e472e35ffebc33fa98556d1cbac25be233c4ed4d5d267912c12ee9397
+AUX libircclient-1.10-openssl.patch 1210 BLAKE2B 500273e2a0665fd1f6085651bf9292bea0fc33829f1bfa9a4f5eca585e969216738e029b5e54d88a581c88befa8841c740865d29d595b45f1c8c45fc527a07e2 SHA512 66381f37e660c2663a1a6d4e28f25129b4fa3dd418860360665d0a115964507916eb0fe55fc92ca23dbcbcbbbd9da4744fb00e938413e5657b1c9da815d25029
+AUX libircclient-1.10-shared.patch 2521 BLAKE2B 09a7af8fe521c57fc9da6f63ee6a5be69e6d8633e0ede3af0def8c4c036722125ab9ffd0e48d8b93fac63a92410cdbc3465a07003cfc5f062d66c8398b747830 SHA512 bc5fbe085139c1062f901a1fa2dc38dc91ffe8031df563144c53a3c0077f3d2997a7d769de601db900a504f4fcf892ef3c42464ef0ed56010a972c9a79693447
 AUX libircclient-1.8-build.patch 340 BLAKE2B aae0969fce33301022fa11f93a2eb1c81b2a9419aa5e1bd8e2116b21f16133d3a068751bfd23d723dafcd35d5ca09b9cedb1d8b8e5bf726e320718e5e1b6da2d SHA512 44ab22464672b1f5e5ff8266ce3b4ebd8356175da2803a6f8cfc2b1e581f03c5a96f2a12a4b0bcef7bce4aeb8b6c9e31a0f149ffb2ac1b200d040e734dbbb640
 AUX libircclient-1.8-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
 AUX libircclient-1.8-shared.patch 2348 BLAKE2B eea99254aed77d0f9f05968c7d08bd6d90d223d4865a0ed85ce919f1597834cb6430cb732b88e4f40a851f51b7ac1b506a64e1d3836ea0c357ab79786cfc857f SHA512 e61b6c2d56be6cefb4320a93dae96d2fb0dbaf9818246ba1b9be88ab21d3302108d4cfb650cf0db564c50b2913d67ac24183221f2f522eab21097cbbbb37b642
 AUX libircclient-1.8-static.patch 209 BLAKE2B cc25d264d6d1801584ee06ca51921f7ad1dee1499b1e604c8d732779b44f22aa93fc076c97fee45d131d10cb46cf611a4e03220e61462d2b0003653554667217 SHA512 b1161ce28e5a8d668c852ee0ac336c186426a9467156c66ebe4805a722297ec225cc6b859c13003741d05a15ced1ccfaca0a20d98bf0bf933fc84fc1a97d8827
-DIST libircclient-1.6.tar.gz 392788 BLAKE2B 143b080389442b4106715c4437e319a08ebfdf55cb8d2d510d4e10a68157f791d9ab01379c89facbcddc1e690cea39c8649cec65367d436ab57381633a1b9565 SHA512 94a68f27fcb12c918fa347d4ee44747e08e016245048c81f179b9a45081bd336c329e7185a3bc46deb28c9c77e1eff5dc53de7e723b1ed5ee2c1d3cc57ce0548
+DIST libircclient-1.10.tar.gz 288863 BLAKE2B 28bcfb36553c04be28ef4ffc0cf5fe3af8538704997f628f311719d245a0629ff49bee2c512d29e4d43a24a2803cbafc99512ebda7d5c991d9ecb2f1786a9d24 SHA512 d677ceae0bfabc112671b351fb94d048399a7ad025ff33a2ff1ae6313382fcc78b64d499f2c882eb8b894abdde949562395819e4059fd14640dfae6757b0c259
 DIST libircclient-1.8.tar.gz 291803 BLAKE2B 7fcbf8e8466ac95ca5a27475551af45f828b29385b28071d02271deae03d6bbd3589e86efe56b1fe5020be7894e699534ef1e3a2f2fedca1909e4d8e0c04d067 SHA512 f19e4b55cf49091ab2c83ff3d5cace2252daad6bf23cb61b7677b9c6055fe8a8a7d891f6e1e5962481c836f47b7dcd35ef563c8807737ac81e3c4cee253cfc4a
-EBUILD libircclient-1.6-r2.ebuild 1097 BLAKE2B 75dd684c0918d713e5fe96e5dcc9488ca92a448203b87f1ca09e445452d3421a287c90db0a716383e3c49c0f2aa8b0981c558cdb6c68ee580b4b182361ff0f8e SHA512 afa58d5fc2e91249fb9f97e3b366be1729714c0af38fcc93482cf8d2c7d23def5f47a387ec90596475174a7282e6c3540d7d8a5b3dd1c649ec84289f290b2919
+EBUILD libircclient-1.10.ebuild 1298 BLAKE2B 8014b74bf17844f0f658d0e6aecade76235e7e2aec1d010c0146ba8664aa676533cde6a5a09ab88b88e7be1f412baa60df6208f88b059acb5793b35849ec1349 SHA512 0df4434ad26da9256aec34d5a6e82ac8eb4e7f83e9e6760611e8406f8abc0989e791eb530f49c0689eab46382fdd9c39a39465ce86cefc40910bcc16de158468
 EBUILD libircclient-1.8.ebuild 1135 BLAKE2B f28f32d1a8a08987f214ca78c4c53a7108644495a9136b2145c36396a1bfcebf8e205cc69381b261183006ed1beec1f89c39ecb23e5e5d99d22f5f5c209bcf29 SHA512 c638d79b35913a4c095ce6a8b2b7122bed056fa0dd01242837067fe1273181d898970961647afeed42311a9cccfb1c6cdf00f0af4f33b6bdcbe899fa76517d03
 MISC metadata.xml 335 BLAKE2B 9616df0f3f19ee3ece536dfb658a60a9ffb53bed2562086cc5d0f15f27116a86d3ace0c0a796c476045a74d49e803008d9c345ad027f8bdfbb5923e008445268 SHA512 af62ea7ba30a57f3271bded0d53a9122693e992d1050667701ba54bb33d6851b6ddabecf5f54bbdf8aebb212bd3e6a5999a8e8c1b2bbdd6666243ccb24a6182b
diff --git a/net-libs/libircclient/files/libircclient-1.10-openssl.patch b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
new file mode 100644
index 000000000000..b488f7f626c7
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
@@ -0,0 +1,38 @@
+https://sourceforge.net/p/libircclient/code/141/
+https://sourceforge.net/p/libircclient/code/142/
+
+--- libircclient-1.10/src/ssl.c
++++ libircclient-1.10/src/ssl.c
+@@ -114,26 +114,23 @@
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_library_init();
+ #else
+-	OPENSSL_init_ssl(0, NULL);
++	if ( OPENSSL_init_ssl(0, NULL) == 0 )
++	 return LIBIRC_ERR_SSL_INIT_FAILED;
+ #endif 
+ 
+ 	if ( RAND_status() == 0 )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+ 	// Create an SSL context; currently a single context is used for all connections
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ssl_context = SSL_CTX_new( SSLv23_method() );
++#else
++	ssl_context = SSL_CTX_new( TLS_client_method() );
++#endif
+ 
+ 	if ( !ssl_context )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+-	// Disable SSLv2 as it is unsecure
+-	if ( (SSL_CTX_set_options( ssl_context, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) == 0 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+-	// Enable only strong ciphers
+-	if ( SSL_CTX_set_cipher_list( ssl_context, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" ) != 1 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+ 	// Set the verification
+ 	if ( session->options & LIBIRC_OPTION_SSL_NO_VERIFY )
+ 		SSL_CTX_set_verify( ssl_context, SSL_VERIFY_NONE, 0 );
diff --git a/net-libs/libircclient/files/libircclient-1.6-shared.patch b/net-libs/libircclient/files/libircclient-1.10-shared.patch
index 44fe9ded64b6..33a1cc1d54e0 100644
--- a/net-libs/libircclient/files/libircclient-1.6-shared.patch
+++ b/net-libs/libircclient/files/libircclient-1.10-shared.patch
@@ -1,42 +1,39 @@
---- libircclient-1.6/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -1,10 +1,13 @@
- # $Id$
+--- libircclient-1.10/src/Makefile.in
++++ libircclient-1.10/src/Makefile.in
+@@ -1,8 +1,10 @@
+ # $Id: Makefile.in 137 2018-08-27 01:11:08Z gyunaev $
  CC = @CC@
--CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
-+CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
+-CFLAGS = -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
++CFLAGS = -fPIC -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
  AR=@AR@ cr
  RANLIB=@RANLIB@
-+INSTALL = install
-+LN = ln -sf
++INSTALL=install
++LN=ln -sf
  INCLUDES=-I../include
  DESTDIR=
-+APIVERSION = 1
- 
- OBJS = libircclient.o
- 
-@@ -14,19 +17,24 @@
+ APIVERSION = 1
+@@ -15,19 +17,24 @@
  shared: libircclient.so
  shared_mingw: libircclient.dll
  
--install: lib
+-install:
 -	-mkdir -p $(DESTDIR)@prefix@/include
--	-mkdir -p $(DESTDIR)@prefix@/lib
+-	-mkdir -p $(DESTDIR)@libdir@
 -	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
 -	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
 -	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
 -	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
 -	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
--	cp libircclient.so $(DESTDIR)@prefix@/lib/
--	cp libircclient.a $(DESTDIR)@prefix@/lib/
+-	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
+-	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
 +install: install-headers install-static install-shared
 +install-headers:
 +	$(INSTALL) -d $(DESTDIR)@prefix@/include
 +	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
 +	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
-+	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
-+	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
-+	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
++	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h
++	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h
++	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
 +install-shared:
 +	$(INSTALL) -d $(DESTDIR)@libdir@
 +	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
@@ -46,8 +43,8 @@
 +	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
  
  libircclient.so: libircclient.o
--	$(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
+-	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
++	$(CC) @CFLAGS@ -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
  
  libircclient.dll: libircclient.o
  	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.6-build.patch b/net-libs/libircclient/files/libircclient-1.6-build.patch
deleted file mode 100644
index d3d6c0f3edf9..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libircclient-1.6/configure.in
-+++ libircclient-1.6.new/configure.in
-@@ -61,9 +61,7 @@ AC_CHECK_FUNCS([localtime_r socket])
- AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
- 
- if test "$use_debug" = "yes"; then
--	CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
--else
--	CFLAGS="${CFLAGS} -O3"
-+	CFLAGS="${CFLAGS} -DENABLE_DEBUG"
- fi
- 
- # Choosing the target
diff --git a/net-libs/libircclient/files/libircclient-1.6-include.patch b/net-libs/libircclient/files/libircclient-1.6-include.patch
deleted file mode 100644
index c5bce1dfd947..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libircclient-1.6.orig/include/libircclient.h
-+++ libircclient-1.6/include/libircclient.h
-@@ -130,6 +130,7 @@
- #define IN_INCLUDE_LIBIRC_H
- #include "libirc_errors.h"
- #include "libirc_events.h"
-+#include "libirc_rfcnumeric.h"
- #include "libirc_options.h"
- #undef IN_INCLUDE_LIBIRC_H
- 
diff --git a/net-libs/libircclient/files/libircclient-1.6-static.patch b/net-libs/libircclient/files/libircclient-1.6-static.patch
deleted file mode 100644
index 4ecbb3362223..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libircclient-1.6.orig/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -9,6 +9,9 @@
- DESTDIR=
- APIVERSION = 1
- 
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
- OBJS = libircclient.o
- 
- all:	@TARGET@
diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild
new file mode 100644
index 000000000000..940b5f0a3967
--- /dev/null
+++ b/net-libs/libircclient/libircclient-1.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
+HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
+SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 ssl static-libs threads"
+
+DEPEND="ssl? ( dev-libs/openssl:0 )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-build.patch
+	"${FILESDIR}"/${PN}-1.10-shared.patch
+	"${FILESDIR}"/${PN}-1.8-static.patch
+	"${FILESDIR}"/${PN}-1.8-include.patch
+
+	# upstream patches (can usually be removed with next version bump)
+	"${FILESDIR}"/${PN}-1.10-openssl.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable ssl threads)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C src $(usex static-libs "shared static" "shared")
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install-shared $(usex static-libs "install-static" "")
+	insinto /usr/include/libircclient
+	doins include/*.h
+
+	dodoc Changelog THANKS
+	doman man/libircclient.1
+}
diff --git a/net-libs/libircclient/libircclient-1.6-r2.ebuild b/net-libs/libircclient/libircclient-1.6-r2.ebuild
deleted file mode 100644
index 1f6a2f5bbe59..000000000000
--- a/net-libs/libircclient/libircclient-1.6-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
-HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
-SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc ipv6 ssl static-libs threads"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-include.patch \
-		"${FILESDIR}"/${P}-static.patch
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable ipv6) \
-		$(use_enable ssl openssl) \
-		$(use_enable ssl threads)
-}
-
-src_compile() {
-	emake -C src $(usex static-libs "shared static" "shared")
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" $(usex static-libs "install" "install-shared")
-	insinto /usr/include/libircclient
-	doins include/*.h
-
-	dodoc Changelog THANKS
-	if use doc ; then
-		doman doc/man/man3/*
-		dohtml doc/html/*
-	fi
-}
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index c2dc2fb690db..85372603cb93 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.14.ebuild 1756 BLAKE2B bb5a3f42035dee0647b6e13f040c766ab1b78210cd4fcdf39e05869e22e9a56ec9b7d4e7a10643765407a16ff173eb646b52599fc6ce6748b53d9b8cb6cb8d6a SHA512 1b11907e4a449014fa1a75ce0b06e1cc6790d9843dcf5725b4ac7bd5ce6e3ec33e8ae58702fcc5c0b0bb72eee27091528f7963a0325e55db7387ba1b776b745d
+EBUILD libsignon-glib-1.14.ebuild 1700 BLAKE2B 854e8555d79b659070278d39b16e60d616de010ae3b7b5053e2e5b882d94ac5297193a270853d5a6ad2ca905bf53853bad02bbd0d2b4882e3aed2d4b6c76580d SHA512 c26d4017da7a744631788a630a14bfbe01ce86cbf7592eddf5c5a2173eb5e19216f2017cc95746a45ebe0c519bc7936b4ab78c86c1990732f47e004427a3a947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index 51eecdc3d558..740195845377 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gdbus-codegen
 	doc? ( dev-util/gtk-doc )
 "
@@ -72,8 +73,6 @@ src_configure() {
 }
 
 src_compile() {
-	# fails to compile with more than one thread
-	MAKEOPTS="${MAKEOPTS} -j1"
 	default
 	if use python; then
 		python_foreach_impl run_in_build_dir default
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index d065910db0c9..82ffaabcd5c4 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,4 +1,3 @@
-AUX libsrtp-2.1.0-pcap-automagic-r0.patch 692 BLAKE2B 2d4f182d12b97dbf1a06ef178c4e0562e1ff91a8a194076c4aef9a73dc9a7dd5e47fdd8036d334f460c3aade43350b885ab05287842f287a0738c5d0aa9d377d SHA512 ac5ffa640d61332fcdb41e99895e2934e19211809011a9a8250a1e15dcc565072f7e2a6b4b24602769bf7c70a98ec3606832ef9ab2225bfa9fded2970b07d5fa
 AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cdddb6a959dc59d0fcaa340faf5d04ad9b6803d676d626ce6cecdee1e097defc3c69df7e1216f012276e81c22fb043e6b0e633c4 SHA512 b3c80f5d05748eeb5d93f1c5fe2cc73b3380529a8de44315291fe2a9fbf32df861dec511038f551df65c2cb2592ce337d497c06c8855ce8dd1def9a67bae40ad
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
diff --git a/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch
deleted file mode 100644
index b29fa1ba4f95..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr libsrtp-2.1.0.ORIG/configure.in libsrtp-2.1.0/configure.in
---- libsrtp-2.1.0.ORIG/configure.in	2017-09-18 23:53:18.241631991 +0100
-+++ libsrtp-2.1.0/configure.in	2017-09-18 23:55:30.077635461 +0100
-@@ -272,10 +272,13 @@
- AC_SUBST([HMAC_OBJS])
- 
- dnl Checking for PCAP
-+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)]))
-+AS_IF([test "x$enable_pcap" != "xno"], [
- AC_CHECK_LIB([pcap], [pcap_create],
-   [LIBS="-lpcap $LIBS"
-    AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `pcap' library (-lpcap)])
-    AC_SUBST([HAVE_PCAP], [1])])
-+])
- 
- AC_MSG_CHECKING([whether to redirect logging to stdout])
- AC_ARG_ENABLE([log-stdout],
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index a4626de0bcc0..0883d3fbcb78 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -7,12 +7,9 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28
 AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
-DIST libssh-0.8.2.tar.xz 408412 BLAKE2B bbd531ed511baa84d40c2e156cc63fca09345196e24e485930d8f42fed451529ea6ec2ce6f50276dfa56d5523062bbc45774891ad47ce7c748e8b95bc28b9f8c SHA512 ef9877d2a35f1871139c12452c917a3888172ea29f71d880e824de182695e5a8786bb39ca2f4874a160e156648d52065a8b2e7c040220badf65eee35dcfddeb9
-DIST libssh-0.8.3.tar.xz 422244 BLAKE2B b24e4eed3ad1cd336b1864c68e366788ea62d0df2d527afaabf8d57c2f3e7b490a999bee8e4bfbfac512a77ee2a32cb1a95dbcdbcef2bd8aad5addbed1aeb01f SHA512 09e7ccbb2c584a9e51366a43f08f80cc5775c649886736629ab10f3520432d107c93e94a54c7d7e49a68f8f3b5d268bf1985acbe08d29dbffbfc0c53a4937ea5
+DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf8720a7619f3fc310a3d724cb7e85bcf81d31761c3fe4e3c29010b67d3fc81cf391d5c2f7e051cb8cc2400763248 SHA512 73d685bab2e88ff6b03c95cc13f1bd341bce4c527353c7e4870865d236cfbe23dfd2d198a1ec1531aed1afd700ce8e5b738ec68ca9152a4b6ae63dd6cbbf0d51
 EBUILD libssh-0.7.4.ebuild 2510 BLAKE2B f644104dcf0707121f141a2b75bdb57935daf4a01d897b5ffb96d6875e681aecfd9730cd02d6330acdf96256f012643659951ca4cd97e2126bf6991fa88ab14e SHA512 1a7bf07e67bb6caf4a183095347fc512dcfcb98a729db2cc1416f39a3bb201ad3046eec7c82c3aa07c7a9f3c5e6b3d3e908a4d32252b0697bdc76173f287a8df
 EBUILD libssh-0.7.5-r2.ebuild 2720 BLAKE2B 76d98f803d58cdea91439451e4842c3079bc19c052845d4f18d27fbd94faf4f3028c244b9ccacbfc27edf87490cbad7af73c3f540f012b3c597ca3596f65c20e SHA512 80148669a5bdb2b0a1cdfdd295ef833ccd51270cfdc2986109b2a6b1bad5da3908642c89e929fed5dc2fda20d8104b3dace60c0d87c7c6450bace22d091efc82
-EBUILD libssh-0.8.2.ebuild 2883 BLAKE2B f59deaa0db71faae34fb699be9102a6d5c7ac88722390cdf16de2cedbea66368bc102105e6d200edcbaa525f12e5a3553d9a4dc1a852dc45c2989bb3e11c99d8 SHA512 da54bac3c25d77bfbaa0d6d6a1ab84a5fa4d00581ac31cd26c95d26ad669cca65f8538a7829dda348828c9e445bad4953ac8722dc46d443cf5fb5aeb5344e206
-EBUILD libssh-0.8.3-r1.ebuild 2966 BLAKE2B 9eed97687ac93fa78c65d9f6d0c939fd91ffeec0452ff76f5efd5ee64b21eb62075f09d52f674cba7d6b3e1acbf39e53311657530ea54202da7914afd365ed94 SHA512 af0724b5943b3c11f667508c8a232c5cf2dba642d6d72b0f4e307f5d93a26545ede0ce3dc1546d675c37b91c9367e1c6f45341d2ce42e32a907781fd324715d9
-EBUILD libssh-0.8.3.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
+EBUILD libssh-0.8.4.ebuild 2959 BLAKE2B 57816055c70eba2227d28b3fda732b8dea5e9a6051264148e5e9f799bf28c7056d5f814abf3cae9359072cb3c39a54c589a79832741ca7ba9e4ea07daeef36c9 SHA512 27cd551e09bab6ad5551f9c0c11fe6501d6ed638762bf59d1d3728b042a21d63bf09f6ebacdd2ab9fc2afafe1b74b05e9c4c9f43ab11ba369c4d77ac2f410439
 EBUILD libssh-9999.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild
deleted file mode 100644
index d187c20721b6..000000000000
--- a/net-libs/libssh/libssh-0.8.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	inherit eapi7-ver
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.3.ebuild b/net-libs/libssh/libssh-0.8.3.ebuild
deleted file mode 100644
index 0c794b8a473e..000000000000
--- a/net-libs/libssh/libssh-0.8.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	inherit eapi7-ver
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.3-r1.ebuild b/net-libs/libssh/libssh-0.8.4.ebuild
index 7b660604f3aa..9d50b41535eb 100644
--- a/net-libs/libssh/libssh-0.8.3-r1.ebuild
+++ b/net-libs/libssh/libssh-0.8.4.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	inherit eapi7-ver
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index e307766d4f9a..3d76137f7302 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -4,6 +4,6 @@ AUX libssh2-1.8.0-openssl11-memleak.patch 823 BLAKE2B 3d2abd43798a23b551ef5ba97b
 AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d51065ceb9be22e450984aef9dea0a59b5b93cac7498e3c3e9cf8057ac13dd93330bc470bd717c9a06af9d9294ef7172eed SHA512 3cfd11ef23884a3de173422e001b0ec0f9af48c832948b5d0f90f0be2008334c30ed769a642786cad9aa68ea445b66780b10d3c64434178978018e709510deab
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
-EBUILD libssh2-1.8.0-r2.ebuild 1617 BLAKE2B 78ec1143fb31a0903d31d00b3fb3af2190dae86eb3bb29832e3c3624694683401536bc43e8101589f46291d745ee96bc38690e2ca19a5b12e892e9a5847e2ae7 SHA512 c24e7aadb9c74629644dfe3ba4daf9618cd12c582b3da35c7510ac4d268eb9d063ecff49836aa74be69933094264ec60b511d13a170cabeda6ddd19d3f3beafc
+EBUILD libssh2-1.8.0-r2.ebuild 1621 BLAKE2B ce45c14d1f62ca3fc41bb1c0b3f3c51bb7b752fce9f24b53b4b6b59567ad89a02a0191e67935d93969b8b464eca017c5e2d6025c4dc648eed07103964793a08b SHA512 472bd3eadc918e6d785ce0af09bce7a811236dbe3a62de12612556a66d7c89fc20322a47c4779b389175ed39041a1ad710fd8956c2d11a1f79685b2f862980eb
 EBUILD libssh2-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index 501d50e45694..bdab253bbeed 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -53,7 +53,7 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
-	rm -r "${D}"/usr/share/doc/${PN}/ || die
+	find "${ED}" -name '*.la' -delete || die
+	mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
+	rm -r "${ED}"/usr/share/doc/${PN}/ || die
 }
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 90bff5635980..8b7912afc4f5 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -3,5 +3,5 @@ DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d898036
 DIST libtorrent-rasterbar-1.1.9.tar.gz 3903742 BLAKE2B a9f942e7d06e076dec98314bc44e8633731c51e8469095ebff8c9c8084305714ca40663a0d963f16188ba17fa640f273eaa1396784514bc04e4bc4cbcdc3aab2 SHA512 2dcf81fdf34b81790012a6c20dc344dccb89535359cffeb9a2725763f0a1842a00af1ae06b63e4e32054f06ceb14e32031afe479dc36897ddab28494241eb756
 EBUILD libtorrent-rasterbar-1.1.10.ebuild 2386 BLAKE2B 36723a88c2ac601e4cc474171d44130db9844403b6e15cd0a3c2a3137e8e7de6936e03bcce3c0afc2b42ce698569eff9e79feaa8092bb1fb6121a70c2ccb38c3 SHA512 4a81eedf874f80c4ea4168d909fee0a98b5110643e1decba90d323cdbd67fd87d8cca367fb2935b8d1c37ffba573fd29132371fd9a3f25367b8bbe6673fd346f
 EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2398 BLAKE2B 319dd61c379cc1e0b92f938c9364eb9af477e017fd2595ccf6bfde65a05bb8d7d27ac3ed7396233aedb24a1b02296e33fd66d42af74bc8b31f1ee97efc6c5a0d SHA512 ba767f43b744e9f1a50c7a559b91a8b45009a1b08820852c9a005d3d6a2c7f6114a6091cbfed2df34e9e7bb2c75ca10873af69bc067356913774f027b27dd2e4
-EBUILD libtorrent-rasterbar-1.1.9.ebuild 2389 BLAKE2B 070a26370780dd74a6066a10669822918d3089c7d2d3480566b991829d30f40c8e02baa658b8657fdd4ab83400d46ca5767a780a3b980206084a9a64ada30045 SHA512 fd0c27c7c6ccad5f01fce80a3427933a950ea3bb4f7b9a1ceb803640667c9854edefdb1ae7504f023d7d25797ec0ad6ebe93b4eee2738e9b7c8ba736b8c7739e
+EBUILD libtorrent-rasterbar-1.1.9.ebuild 2382 BLAKE2B 66850d5bd5eaa2760aa47dab753bc50935bdde25dd22f9b725b10e9749b54f479526018d26c45fb1a3447b95aab0d13f173e3b8f998511301b61a9370b32c2c3 SHA512 9be66c60b007b3e7b077deb7bcbcd3d84b2667143d5869729cb3b0a003f8152aabdcea2330a094802a6fad58ced81df5ccee3a0267d06cbc0d9af85f219d53f3
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
index f9f8a919d1d5..dea208929568 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index aa4d1e71ea77..6cb7d16dc57a 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,3 +1,3 @@
 DIST libupnpp-0.16.1.tar.gz 470523 BLAKE2B f587633e796c34ed38c35559c935a7f1f4b6042f69d5cc76f268312b0a871988ee5521fba2de125a50c0067d4a5674850eb7d01cb36ed62c0f2b17267a1b3ad8 SHA512 c63eb8ab8a76b7e161625631bee645e7a1f8d779ea6b16ed0bbf43d0972e8875613f04dbf44cd43796273f7b20b4fa71b791d10867c6d220f0d78c15c016c275
-EBUILD libupnpp-0.16.1.ebuild 532 BLAKE2B 08d729a245056bbcb076c036fdeeadeaa1e69e6aaeadb4e3c14a98ce1475e9bdc3efc0d00b5ac18a74f2a93f1dde08d53674b312c50d1cdc0666334cd7ece318 SHA512 c76cbe559a83512ea841c31ed954f6a676e5372009a161faabadd4240b3bb5693642711faf13f77a2bee1881b44025b73b175c52dcb93d6675e6c154b2ee0b60
+EBUILD libupnpp-0.16.1.ebuild 528 BLAKE2B b8642e512974e10f081013e5722dff178e4da1e4ee6d88f1879091d5150d2656c7d36e8ed1fcbcead1e0a5e7bf10ed7118ec21c773dd8f1cf336c96072cef9e7 SHA512 8844b8d81e1b6738838f1644dd34f28f82e85f21e4883030ffc562f446f59701aa2d3cb80a013f02aee3a21caa68ae40c1756e57ddd8ccfeeb4fa54ca36404b6
 MISC metadata.xml 332 BLAKE2B 7d198d8b62aacf867ddb819dfeaf466ce052ae797b0d512fc14c294a2b7bb0adf9514ab0ae0055a38b5eec6d79ffa4b4e0970d5438b9d9b38a29ca8ea7022cc6 SHA512 1fc1d07c136b613f42418b92272c3d4093c9a3691fa9ad8a96ed0dd09639f50a5f55c2d41584511f64e4675f075fdd74faa33922b0b75a1ae6451250dacda682
diff --git a/net-libs/libupnpp/libupnpp-0.16.1.ebuild b/net-libs/libupnpp/libupnpp-0.16.1.ebuild
index 3cc8d14e6b9f..a9708d584ec7 100644
--- a/net-libs/libupnpp/libupnpp-0.16.1.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Unfortunatetly I receive segfaults from upmpcli on any newer version
 DEPEND="
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index b43c1e06dbd7..a4acc2a1e11a 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -2,6 +2,6 @@ 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.13.1.tar.gz 2345612 BLAKE2B 0b78a04407076016fb7f74b635cd2fc86119a9cd8571c6356715e3a680f5b16787c2b002830d103ebd4b995dda956ec874a35bf1a824489dc56f509a9485b1d3 SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b
 EBUILD mbedtls-2.10.0.ebuild 2418 BLAKE2B aa3b1703e9054f1dbb4ad55eaf2ed3b286a1c3bd0f8a369f6123b1abfbcb42156bb2c71885c0ffa7710b6f842071532dd07776943cefd35728040c54ab307b87 SHA512 0ccf855ca1eb9cbf54a51ddd969bcf5feec66b3619d345be6cd480c782ddb36203f2e733475a5e2cf011c24ee1960f5f6ce03cc061cc55470328724844d8a942
-EBUILD mbedtls-2.12.0.ebuild 2446 BLAKE2B 7b6cff2d3aa000039062e1757044bbf9ee19830c990da4fc43ac8b9e3f7e32ecab248190a536cf5c6faef787ebe5861953ac83cc42868b3ed58992e3b7e93a7f SHA512 5e935a03dc7d638bfe7ad9d7664652d0078a23f6c6c58d2b8bb38c79c67b33a6571651bf62f47c283742263815856ea1ae3cf26255c1d5a0b428ea225c0adcc2
+EBUILD mbedtls-2.12.0.ebuild 2442 BLAKE2B c45bfa98c90f49219f6189a7f345aa64f4c5e6b4e6ea9037f323377b773d49ab3f8ad72858dbffd8a3112d85fe4938df8dfc01927bc9af36e7100d2921d84ead SHA512 a01f5cfecd3c93d95a65673659103d18415d9a72e464149bce3e20e8ccb4c3df97579571e5a8c3f6cdc550a3a6afae92af5e366db3efa8aca76813a9fdcfd20f
 EBUILD mbedtls-2.13.1.ebuild 2455 BLAKE2B cd57e8c219e29481e51c967ab0aa2c0e4f815293905114696dfa4a24ffa3a0d7c851cb8625a66d38e24a8d64b5661d26517b4521f5f451b18ff7456f8b9d0741 SHA512 0b292eecbd94c51a619310cf4ed7ebe9857c67e98815d590bc2dee84c6b8057128486f3da442f9d6bcc62a1c3bb58e584942f9177144a8444ae1fb74b80bec51
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index 78a3d9a831f2..9b2bfed227cf 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index faf6dfa1facb..cb6581adad6d 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,3 @@
-DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d2bbaec24cf44b5910d4fc1a956723a8ed8fecaa428aea361a7ec8a3ff60b82e0d9468ac21d251c16ac8c2b52eafec6ab3 SHA512 0cceeedff6c584d2d7037ff91fbba0fe580fabfda810b9a9ed7c8d8495445339e3ff115d63d4429bcd3eff2b13b123e1bd5855ff1bc9dcd986b968a82c368591
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
-EBUILD miniupnpc-2.0.20180222.ebuild 1337 BLAKE2B 12e0b065bb728b59c80a5604b34ec47916ed4b678ec3d774809a27420ed8c10c0f533b315978de8c50b1ea6070729bea941a45580f633816c8d02583953ffadb SHA512 e5c7a6a99f8881dfa57212b0765478a93d70e35cb9a0bb0503a9dd5fc06052ad5c4c05205674b8d09c8464d61ed690dbfc77c2ce4c391b690580e318ce8828c8
-EBUILD miniupnpc-2.0.20180503.ebuild 1333 BLAKE2B f06fb80639cc99208bcf620091990acc024d72f250331dd6c45000917ab41a376fa7a73deb760ddf87d20840ac61760246da8af9b182d77ab756e3d208792848 SHA512 feecafac74b3f269cce4b352155244488e60655ab4ccca8ef4e64fdf065f917976082eb4972e8f1b89d04f7c40b4c32d0b292a44f02c7a825dd2b458c79ec49f
+EBUILD miniupnpc-2.0.20180503.ebuild 1332 BLAKE2B 05167f65f6d6790d2bdc25d69b457f578767bac0c4b7aa578ab772f31cb5034c0bde7aec5e480a74d04b3e4de87b7d46cf2c4a5c7a31a8e9a5b1801dec91c5e3 SHA512 ce5dfc326f083c136ab99086262958f5b86b94c04bea773c3bebc64dee0850f83c895ccbc1f5ae322dc309bb6884508881dcc8906af83cc2a0c529cae29ee8f2
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
deleted file mode 100644
index 3547f9b9507a..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
index 82b0fa4708b3..62fc8c8aedd2 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 38784a3cb1ad..0efc1efb3304 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -7,5 +7,6 @@ AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86d
 DIST i2psource_0.8.7.tar.bz2 18473515 BLAKE2B 9f79cd2e69f26ba0fadc24b6cad0ff43301c65fd640313688687895de908c6a0c6fd9d1be6c82a6d7478cd4ecf633ce3b8fd4d200cce644512a7b4fa275a0927 SHA512 32b4eb4bf8bc7d6bb692b3ecd6b0a34c4d3d7c94b0d09a4ff330151979ccdaca9a6c88fef9b7e7965a1bba8ef54dbb710d89e0bb19265ee177ce547ff50ca969
 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 EBUILD nativebiginteger-0.8.7.ebuild 1760 BLAKE2B 2b5d1d3bccc75e254674b87f53563279dc474165f48d567e4e467dbcdb24f02c17f073e88ce597ff4948054af5e0f7d256109b3e90cd40cc0b83745ba190e5a4 SHA512 b6ea041425c3a69962dce78836aa0b0ec08d25cbbe513ddc9a0cf44cfb62d6686baf2491e600abe213b672d2fa675b7d1939284dc00b5210c8432c63426968ae
+EBUILD nativebiginteger-0.9.36-r1.ebuild 1450 BLAKE2B 56c42caa16590ca0bf44f401f0a3b75b6400d71f876bc0a0279ac27b2032450fbf68af66d066d9d10804b3284ff910dda9cf7984ad1612cb177262837a618dfa SHA512 31731ab0a369bb304e45bfca41ad42f0464601a97df1202ec9d7a5e8e2734ba9e06f817416631da18594fe2e5de8342e9f9ee965524a17274d81085710a787e6
 EBUILD nativebiginteger-0.9.36.ebuild 1528 BLAKE2B 6743746aca34ab8a4032a968e5bf2e1036707055ec7bbfe1f5a8cb3a1956cd1f274437db14d3e99c0f1f0732f0302e4dfdb9eb69d6c7e76bff8ddfa81ef83f6f SHA512 c9e455cd73955dbc6a65f39e4c6d83ddf5680d879871893a01656313f72fd7fcb890fa7c2cac3faf85cd1fd9606c575727ce4a6251dab1a1dfefa0ce7c71a661
-MISC metadata.xml 357 BLAKE2B 226a850638c4dba950a9a5f323e318a517dae550e18744deba0bf1252e84341c7e981aed1969ffe38dd441600cd2ca8c10793e663b1263fd311a65aa22c3c69b SHA512 77ead199b8c319b85982036765c8371a888121b3264669afb0a09aba0c79e7587f8da6910a130f737e12d395216cc0d2400ebc8877ecf14cc9e6b9ae0c31e307
+MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml
index df6b33c99127..01c39ff1e755 100644
--- a/net-libs/nativebiginteger/metadata.xml
+++ b/net-libs/nativebiginteger/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tharvik@gmail.com</email>
-		<name>Tharvik</name>
+		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
new file mode 100644
index 000000000000..a4f330caaee7
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 toolchain-funcs
+
+DESCRIPTION='jbigi library used by net-vpn/i2p'
+HOMEPAGE='https://geti2p.net'
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE='public-domain'
+SLOT='0'
+KEYWORDS='~amd64 ~x86'
+IUSE='test'
+
+DEPEND='
+	dev-libs/gmp:0=
+	virtual/jdk:1.8
+'
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/i2p-${PV}/core"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asmfix.patch"
+)
+
+src_compile() {
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/c/jbigi/jbigi" &&
+		compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die 'unable to build jbigi'
+
+	if use amd64 || use x86; then
+		cd "${S}/c/jcpuid" &&
+			compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die 'unable to build jcpuid'
+	fi
+
+	if use test; then
+		cd "${S}/java/src" &&
+			ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die 'unable to build tests'
+	fi
+}
+
+src_test() {
+	cd "${S}/java/src" &&
+		"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
+		die 'unable to pass tests'
+}
+
+src_install() {
+	dolib.so c/jbigi/jbigi/libjbigi.so
+
+	if use amd64 || use x86; then
+		dolib.so c/jcpuid/libjcpuid.so
+	fi
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index eb3d4a247780..1ba4e51ec96c 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,6 @@
-DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
-DIST nghttp2-1.32.1.tar.xz 1548812 BLAKE2B a4c1f4f8d5070d1ddc5a5680d9fda28ad0b3ee6b1241b58b2be2b63026af249a1bcaf62c158c084061802ce93934dc5648e20c54887df330e07407d5879d1412 SHA512 477e6f4ccdba5c86436d554be819fd10a715896173029aa72f9c90c2ee64dbe20e2ff4cde614be3a7683dec9e0feaa21d124493ed5fc12ad4c63a37a83bad57c
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B 7a7dd9bb67e6f900d02ab38353764655ac32b5f7d62f44cbb0d6daca3e476626666330a27e85abb2297cc507206767f26fd7566c7e01b079d4ae213d552e2e4f SHA512 879b31dee79958bc567f0730718dbd2da3046e5a1104f8b619d2fe19f8fd3729dd3892a3e5c1856ef9cecb71bd4a2034e32ca99ef9121499ca5606bed06cf3ed
-EBUILD nghttp2-1.32.1.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
-EBUILD nghttp2-1.33.0.ebuild 1866 BLAKE2B 98df11188b329e536a77e47fe4313e9b04f36830461e98aefd70df142df51e586093ac269077a2b418fa7abd68275fdf5f543846e7483e9a40056012c2b9756f SHA512 772fc19a8eb1eb9d8a8ebf897dc55a90bf3dc1a7c50a52e9765c67f52843dfdcf2e4b443a0626e93f2d241654e7c927ca41e56f295d4b0cca9fda98dbfc6d0a1
+DIST nghttp2-1.34.0.tar.xz 1612432 BLAKE2B b5a53d5ffdb68e509cebf50993c3b9de4e597ae9079db505db6e6df67c1eb5f4b095f18dec9f1b946f05b83f3db8ba15e5e5cd7efd4921a94350bd47533a9164 SHA512 5ddc4ab443c51ce286a656d2013421172fc37608f14c0a7ea02fa9e5a0dd155e162d5602b55f34dacc69709525a9a8110dc4c42d92607bbad1951075d094c6a0
+EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
+EBUILD nghttp2-1.34.0.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
 EBUILD nghttp2-9999.ebuild 1949 BLAKE2B 56a3fc7ee584692bbf9219aaba3a56c0aa57f7b4479d6da0a12c77ce8b999a1db1aec3cf76203536cdd42254dd8c42ef2df63ba08fade93a0dc674502012858c SHA512 fe76714b538e6f49c44c3beb212f98b17644575a9b049981c44a4537d7501cf9b3f6bbdd2351a3c286d8c1e1c9acce09843eb86660b5ecfb38785ce920db4aef
-MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
+MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index 15ee3405227a..474284272d93 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="hpack-tools">Install HPACK (header compression) helper tools</flag>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
 		<flag name="utils">Install nghttp, nghttpd and nghttpx</flag>
 	</use>
 	<upstream>
diff --git a/net-libs/nghttp2/nghttp2-1.31.1.ebuild b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
deleted file mode 100644
index 26138c1a2905..000000000000
--- a/net-libs/nghttp2/nghttp2-1.31.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
-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"
-
-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}] )"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-werror
-		--without-cython
-		--disable-python-bindings
-		$(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() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.33.0.ebuild b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
index a0e6cd2b5638..8e3d343e95f3 100644
--- a/net-libs/nghttp2/nghttp2-1.33.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.32.1.ebuild b/net-libs/nghttp2/nghttp2-1.34.0.ebuild
index f472f1d77c9e..990e99d6dd0c 100644
--- a/net-libs/nghttp2/nghttp2-1.32.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.34.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
 
-EAPI=6
+EAPI=7
 
 inherit multilib-minimal
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 2fa261ddb4b8..69d7fcbe36d1 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,6 +3,7 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.10.0.tar.xz 19960760 BLAKE2B dc16e2afba4be727c5169ac5cd77324e0e8d7270c96da141da21a175cfbd64a38f7b51b86264396f3866174abc9095f7c840303208f7193739a1970818d4ff3a SHA512 482518a72cb0bdd5d987a7855856eadaa4fecea933ff7791918edf3097588246782d86b27568c06764ef9f2bca62b64a4d65e4cbd0e934931a72dc5719db7446
 DIST node-v10.11.0.tar.xz 20144576 BLAKE2B 956d940554748f420589adab0f14bd6fcc6a4781cdecd537abd6eb9aa43e9cf754ef009b20d416f1ef4c9a01ef91a27a59a8c080c1c0a49a59388f75713d6286 SHA512 00a678a829de9b836e77dd0806799029b657cf000369ca653540d7e1b82c3895da43dbbfe4d3c2b3b2b1e711bf55b3835a351fad18affdd0c25dcceea8e3406c
+DIST node-v10.12.0.tar.xz 20185168 BLAKE2B 1a827ed08222900ef196921a57d64466fc558412bb27a26759553686c69d59d8e6686394a484156d254a01030077b09c9abfec87a7716aee06dbe9937a861efd SHA512 3b59bbe7b795e7a85520f6b4691806d8939d26cc2a5e5d22e6406d3d373ee7758da225bd25b6f6b71b105e3d7ef4c58220bfa5e558afd0cd873fbd7d6ba9efc4
 DIST node-v10.9.0.tar.xz 19987812 BLAKE2B 4a5bd257cd527500b691b15d177bde53158b5e46e710ffeaa45224bae821cfaffdf59f24ad6bdc822cf468b90c1a4422a2f82d29e1d4b2dc0f838e3e0ab5b4ac SHA512 19c7366b4c9d1e255b5ac56e974ff86b9ca87c363534b467ecc3c59e170b891e86c479a2bcda6647c6df686b018caaedea84270e848b93a4f1c80ff04af12461
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
@@ -13,6 +14,7 @@ DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd096
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.10.0.ebuild 6353 BLAKE2B fdb46cd02319dff1cce1b3c19523998da5b7d6ea69058f9b9f3763f093614a84b4dab91151797ce32d529b41d227a051ba489b3c41cffdf3597816bd1a9b926b SHA512 58a08d3e3d69784c41dccb32a3a7cced78e112ae8f30d86ea0d865255292941f953bca23a22bfb8a8a66135a688fe4c87f6af87f0526dc716ce177ab0f41ec66
 EBUILD nodejs-10.11.0.ebuild 6353 BLAKE2B 844b108d90a89a4fc70e1294b3e1efc4181a3555787a3446806ed62b79685a07544184da74face287074af67d2ec8abb9b1a91f3d0370b0d48d7185d1b7015ed SHA512 606e610f800ce9792d689fc813fdc09270ced425b4e76e07e8767853c33041f69d5cfa117976cf583c2bb811cfabf9ab2f86a287ed25b8bff9af4618bcd92660
+EBUILD nodejs-10.12.0.ebuild 6414 BLAKE2B 8f684f966fbc4e4a01a11dfae5bdd8ffd67ddbf896c229cc885e08e7b6360d07e3f3bc4eeee7086bde006d1098714c7077b777fc01d67383edfa37ffefebf147 SHA512 4e5782138680633590896771b5f548952a8b2f7665d0040d00bb37779616c44e3740bc808ed5a51114bcdd7b51d70a35183a1febf78eeaf53680137ecccd84b7
 EBUILD nodejs-10.9.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
 EBUILD nodejs-4.8.7.ebuild 4424 BLAKE2B fa72291c5b44ce0ba1a592b329be2cd9afa3539bf8419be567c457ef223d4ef3db32ae612795da32345c69bb8b141c350b312989df2869fea37e5ecd5afe44bd SHA512 461f777fac4899b55829edc55961ac021cbe6569fcec87bdb842c8a8b3db117ef74b0ec1e1ff01264f74ee71153e6a771d94d9bbea8fee753c1ea53b8c26dc9e
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
diff --git a/net-libs/nodejs/nodejs-10.12.0.ebuild b/net-libs/nodejs/nodejs-10.12.0.ebuild
new file mode 100644
index 000000000000..c543c3b59b1e
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.12.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.1:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.34.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-62.1:= )
+	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		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 "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 5ce5bafeeff0..009c2f3c3e16 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -5,4 +5,4 @@ DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 EBUILD pjproject-2.7.1.ebuild 2612 BLAKE2B 19a3d988b01545ecf7c7682239ebf0650610d31d45fb39fb2e0d96962b1bc3cc3f76a6fc7b2d93fdd7f798710d92f69feea2cdae42f8517f67943b47fb8aae78 SHA512 00c6eaec1aaebbb6e7751c93eddb52dc3a0f329a781b3c715656b5a0154ae362ed0f11e1f7e066bf0a7fa40b3cc03bf99b040d6665608c5d30e39b7a03825a41
 EBUILD pjproject-2.7.2.ebuild 2753 BLAKE2B 126dde2738b6fed3554cdf49e30c819eee37608e272e2c8a1e48ab55e084586877bb03a549eff5dbe413a9a08ac9ddebeeb96f39c5ab57bbc1679e26b461ae1c SHA512 f4aaba317de182271d73ea91dec0e4fa8afd63353104eace94e513621d2b30ff30724d4fbd8cda0daec89709aa187714b02ea53dbdd8313b9007c02fd824265b
-MISC metadata.xml 1157 BLAKE2B 1b40ee1b635cb8cdafaf001ad458264c4e55344393fd76ac7263521069bd355e4febd7ef534b24bd3879a75e5229863d8b93b8d89019639c49bb7511e1044ca5 SHA512 1171e638d0320d07b0bf3d6a6d31a75722dd659b296d9f451cfe1d3cc12016ff5b1c94b690054bb3772462d7a8d70b47fcb8b5c760c8677a727743ecebb57dce
+MISC metadata.xml 1096 BLAKE2B 03a918c911b8a3c8bdd0aafaabc820b2750dbf5a3b7573ffe987e71ee8edad4a369e7c15845d4ad748150c8972d646d44f6489a9a54e16895dee7a6048b5eac5 SHA512 d2547bfdc7aced6f242f7493a39425f4c2ba5881ab2cc6b8da386e84c092780ab0f876dcf947436150a5060faedc3a0a55377ad389f3a53f6142ef188b321a92
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index 339310ecf077..3d82a0d2376c 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -16,7 +16,6 @@
 		<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="opus">Include OPUS 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="webrtc">Enable WebRTC support</flag>
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 46c4cdc56e90..4e691a2118fb 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,4 +1,4 @@
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 EBUILD qxmpp-0.9.3-r2.ebuild 1815 BLAKE2B 7e800dcaad27d3d876a07b41dbba5dfd2f27c506c8a95f0c75b42778054a25b584828756437309787fe0b585868e433e4cce764b8ce8325c044ba6218d4f0fdc SHA512 69a64ff108de9d7d0b70bc5f21d18c1bcc0c2949a701ba5b89eef13412fa4f85c7084ae3c6f3f70e814cb9aaeb027bfbf5afdd83c2ed7f43e40652f3766092b3
 EBUILD qxmpp-9999.ebuild 1770 BLAKE2B 8d0527aae9d208fd4272fbcde1dd3594a20a061233fc397cf602908aa938b687889888be6c9c0633376bdb35ad17b62e54e80542d5d7f71f7bcabfcfc9c756be SHA512 82826b15736b6f8b05ffe41dce048ca56ee321d6b2ea2bf9ed58908260091ce1f963d5ab3a4c3e1d7496991d926088bfe1030245d10eb7abf4cd0da6358fed8a
-MISC metadata.xml 794 BLAKE2B 039cc3d356927e6f18091e93f9c39a5bd07ee255eb71d588e417bfc9d446c2d00121a316f0c86e68296631c428358bdecab8877226ffd982f82ef8d001391402 SHA512 0486690da78f6876a4dc81eec34dbcfdb63df109ed9135c9fce5fe8355f3adb216e7766def8d87870a9ece522f57b295ed48aa7cca36f7bb2a64eef7f77bb74d
+MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index 128b3f2f7fdc..6fdcab97b78b 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -15,7 +15,6 @@
 		<remote-id type="github">qxmpp-project/qxmpp</remote-id>
 	</upstream>
 	<use>
-		<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg></flag>
 		<flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 977f1c9c1436..72d71fd804fa 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,3 +1,3 @@
 DIST rabbitmq-c-v0.8.0.zip 249220 BLAKE2B 171ae0ffc093851089f4dc11cc1e8ef25ae90cbb0cce75ffb93c04a765b7d195e5bde8bbdaa4ce0c598c7f4bb291ed204d157443ed927db373a89f8ab9e7ebc0 SHA512 e386979ce1bc05c02cda06e8582981e0df25f9b31ca950f8a921bd2b249020f751ba65a6f38b8f5ba0be1b3e89492b29b72c6cd1d5ed3d6f19440799d6419ba6
-EBUILD rabbitmq-c-0.8.0.ebuild 1105 BLAKE2B a7d1ca217963a2e10f3da769b315e5f1b021ff47f48517aecbf687f762775ef9b2366c2861a069b4a018dc834d4fb978953089be2bb66fe651fa944b2d457275 SHA512 8b71f307de3b83cd21e941219012e3e41d56a4f5a7e7880247129f2b214d84d03a34e27c0b059ac1b2979de91d339cb75267fd97b0f9a462320c740c4f38402b
+EBUILD rabbitmq-c-0.8.0.ebuild 1111 BLAKE2B 949f7f843f362345bab652f2bc7a7eb0d261fe8f6a5fecc50107ed01b4c99afa3ad744193819c21120ec3cebd997d3772eb54240124ed3e597dd2da10ae39cc1 SHA512 81e05977f399034885ca1699634e9403d8ec140e884c732415ab9e76309122d862b62b471143026a69dd2b1c4d0e7cc90794aeb39f23ab46546af039ef2da819
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
index f932c68e33f8..0a03a2d4ffab 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="amd64 arm arm64 hppa ia64 ~ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index f21ff9777143..bf5f239fb524 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -5,7 +5,7 @@ AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.8-r1.ebuild 2086 BLAKE2B 539a84cba24b83dbd97a31ffd2ef8926555819bde39ef744bfe2fec2f5bc5afc83e329cbfa95fd20c4d46aa804244faf56cfa3c58a10a96dea7dd3254e1024fe SHA512 485fc3a9f2f303400498d3f7af02cc861b19fd306bead6da555f8af3a5c6e4518f6fa840dad8fd921c530c256e754e1406149436eae777ba603a85c2c7ec8b11
-EBUILD serf-1.3.8.ebuild 1467 BLAKE2B 06135ef40f6702fee26ae8fbd609260edaffd9461c62dbed325728548ef126867f211b77c1629452855e26f2c79558b6ed5198dbb3bacfa41c034daed8e46d7e SHA512 fcf34f98fb8f03a4db6c5140d3538308b3dffbbed2b5cb649cb6e7871ca59fa204f29d5df63667070f783aa1a2eb4c402ea1d0bfc41fc0b7ecc7dbef9c9b9f95
-EBUILD serf-1.3.9.ebuild 2092 BLAKE2B 94920aa41d663d406b572cb21adaf596e9bc67a2bc6ebf98f475955f13da1adb36fedb382723066605308b641c01c305397f6ef408896e04d16b73539cd53405 SHA512 b0fd733f83306234c0e93cb0fe9eefce2abc7cbbf71ef084a268fa231864580cb6f5614f261f9c0cd2d586c26bc7a5ff3343d8a37a30acd26da96cc29ec22fc9
+EBUILD serf-1.3.8-r1.ebuild 2131 BLAKE2B 39fdb4921083fc3d58e8b0104354bb912940fe4efaa61abf03dee18f9ed9d68ce923ad2f0c936259ab51499ec2d61880bcdbda08203ace585e28754c44d04f1f SHA512 3ccf27be31998557a14dfca50a64e974efb4cee2a7c999e9a70328ac216a84327b09f38704de5b6f095369f9529ccb98cfae5746b569ca5074e48aa2b65e178d
+EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
+EBUILD serf-1.3.9.ebuild 2137 BLAKE2B 89bf9822603a39f7b0d7e70dca6fac80833cf4f51bc11581210f7439e7349eabbb60831380924d02454613798d658cded8dfef694acd13ed4ae50343b9b99963 SHA512 43dc08a91fe547b4511aedf0c1f2d6d920d42935a9b1f9f2ae2950f344ba853e344d945044d2570ff67c2beb72c9e329ec47e65900d7d370164b4729f600e007
 MISC metadata.xml 339 BLAKE2B ff1bd30899bf67f73610a584e1d012632c801f3fecc39b5dc1a79025abdc151c650d26e5363bce5aace53798b20ec8931fc3532e83814b89fce767a2ecdc4e0d SHA512 b98b7e682407dd662a866336f76031793f13b0d76a7dae86b542afb515fdda1224b8141c71ff1f502294c2bcd88f3f80d18d654dcabe77088bef049bf462f18c
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index 4fad8345c3b0..7d6405b86653 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2008-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
+RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/apr-util:1=
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index e5e7ae30a441..b0d5faed2f3f 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2008-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="kerberos"
+RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/apr-util:1=
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index 031df82e090b..66d367644854 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2008-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
+RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/apr-util:1=
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index 2472424389af..6ed01d2c54c8 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,5 +1,7 @@
 DIST stem-1.5.4.tar.gz 1915722 BLAKE2B 37c278eab0d7c7c305d7fcb498ff39460921ff59ea16cbe97d985c742290b8ca938218cbc7d5e4d1106ffc9f6a20461a4692afd14565698abbdfbd8015cb6f18 SHA512 1ea74341a1013f1f98d3d5ed1d552e79277cf54a6337d1a8b66bda0baae022d70c4c0c9ce35c843222d183a716466d93e1df3ee55ae6cd16cf10c6cf415d3cf7
 DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca46db140463882cbc1f5701893e6a4a28820100e05e3ed4fa5ff76135a3b20ec1af917a63f63b3abdf5361df6 SHA512 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c
+DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
 EBUILD stem-1.5.4.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
 EBUILD stem-1.6.0.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
+EBUILD stem-1.7.0.ebuild 1368 BLAKE2B 05517311fd06cc2d8be9fee630872b6c5d709224b4d7053faade360fe1e5060ab9ed7d0fc60efc36736c1b186e74ab55cc8fb8daa35c062d54a785d172748044 SHA512 8e1a04b8089da0d90cb057eea67c94622fb304b47db9e38c604f8d827e7c5e43600332a169c90e52140bafe6b1cfd48a918eb680b1229018de7be2df72bdd5cd
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
new file mode 100644
index 000000000000..8b3cd202ca92
--- /dev/null
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+	net-vpn/tor )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-vpn/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+	# Disable failing test
+	sed -i -e "/test_expand_path/a \
+		\ \ \ \ return" test/integ/util/system.py || die
+	sed -i -e "/test_parsing_with_example/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_parsing_with_unknown_options/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_saving_manual/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_sdist_matches_git/a \
+		\ \ \ \ return" test/integ/installation.py || die
+	sed -i -e "/test_connections_by_ss/a \
+		\ \ \ \ return" test/integ/util/connection.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 67c8cb6242a1..759333caaf68 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,3 @@
-DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
-DIST webkitgtk-2.20.5.tar.xz 16625200 BLAKE2B 1fd803d81df1659fd87a93821413326eb798fe9c21af86deeb92f16b3f8eab14350851db499e79745457b708305d013032769416877660db3d5bc7c6058b13cc SHA512 d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7
 DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
-EBUILD webkit-gtk-2.20.4.ebuild 7860 BLAKE2B 425c3127e95c99e99a2289fc81d192a5290f2ec4df98a68f0263576d74b47b6b9084bd04fed17ed932bc1a5a13bf4cbd567764677f4244a70f42b66ae496d591 SHA512 78720140f6b08e3e109dd4edd14fbd9990095cbed1379d140173d5426a3cd90febd335e7edd3d80f515c7cb5e5b2f51308c461a85a82845dc6d64323e92228c8
-EBUILD webkit-gtk-2.20.5.ebuild 7881 BLAKE2B ab258b918df65d10a7a3a80654d86f03f8bba4f5506e3f81054a21539bae5cb59c0e550eb22f480210b9f8dc6039e83362dafb83eedaa0cc03e0fa38cb9ea7af SHA512 0820914a1c191cadd33a53caaafdf9d5a3e0274ec8efe296758c76c07594c5c629cb0f9134190155dd1777352a65f82d520286529d296c4e19976ea30756a6d7
-EBUILD webkit-gtk-2.22.2.ebuild 7899 BLAKE2B 61241a8651d7eff60f6b61623fdb612d5f43b6a9130aa150692cb639c34651eb5ed98ad6ad144008f21bbe5ab3e9736e5175d2f4a5a311d852aabe74305d7f81 SHA512 6d501935101283b5cfac537840efa82fdd9a87c420ec802603ae90480986244b6381bdb5e531d05fd2915ebce9c58a1870ca4f1bf5a8901256d7989a45ced1b4
+EBUILD webkit-gtk-2.22.2.ebuild 7897 BLAKE2B 41f73330349d83b62f2dae73fda624561ae0ad0f15462051dc50216bc4306981832d14030c78527beb8ed50bad3ce92892e24745d85e5409356f95f520a7b6fc SHA512 a43489a7166d8ae74a35bafa423b268c7ab9276854ef179a7f4cbe891125ecbe57b5b2e8d9c92f50cc08c765fe3cfedecf5b7107596443990c63e5e7e4cbd6bf
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
deleted file mode 100644
index b7b46a2a59f4..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
deleted file mode 100644
index 67e35f0c639a..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
index 57d749ac75cf..71766f4371b4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /net-libs
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)