gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /net-libs
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
41 files changed, 653 insertions, 338 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3ff70db93b20..916f561c2719 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index be1daf83aa48..25f3aef04bc0 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -4,6 +4,6 @@ DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f7
 DIST courier-unicode-2.0.tar.bz2 446215 BLAKE2B b5e24f47f1714b71aa2fe176b4517eb49a04780a62f025c5a6546353a03defeedef5cd19f69a35a2646edbf88b4774abcf30c718fa4aee8f17feed6d3f947172 SHA512 32fe0aae62d7f7f7ac6832b28515b83642753c6bd881e95494254b7055686dc38d85488aa26a99d82a5b42aa5cce308bccc2b471580603f690ed6e405cc91e8a
 EBUILD courier-unicode-1.1.ebuild 440 BLAKE2B 22249cf6ba2a420b508cf69e49373178f275c7859bbc5825414ffdb3f3ef4be761225f698ce0692d16f8641c8e12e346667b710ae9252b5fee83313252d57a3f SHA512 3e2e121bedf09408d04c80666d840fcc6716b26b6adef9089d9c90e0b7f0ad9e61625909136a91491bf5adec8229e5e0548ccc5874cb88aec67c7e5031ef57da
 EBUILD courier-unicode-1.3.ebuild 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
-EBUILD courier-unicode-1.4.ebuild 476 BLAKE2B 771db130fe65e6706575a479e41da3c7d682c22686ad5b6d653825dbde257ebb4be4c8eb517f63bbde86f980d794dc076a68e7b260959b3be0eab9c2b3cf6745 SHA512 fcd044aa0ae0369605ce07b06ea8da6dcb7fda9b6c11890c18277941371ef7f1f59d07e96fcafeeb1cf82f57054036d0c6e9e104c39588f77b0653a41299739d
-EBUILD courier-unicode-2.0.ebuild 482 BLAKE2B 9fe175a175903d8482aa7e8656e2c86f2eecc404a84559a2b7f9a986fd3481f56ccd69e25704cbf3af19f82d070858efbcd38dfffb3448f3f3eceae7eaf1e826 SHA512 8091fb06b485407bca3119709ac8b71d209ff2dad451c632ec79e66ab72b7c1c6c69e3f7e4b348ab2d5d43b660e502bc0ccbf4f6686624b4bcabeb6909ada654
+EBUILD courier-unicode-1.4.ebuild 482 BLAKE2B 3fdea0cfc161491269245510980306507858542849875d6f83f69818605d034e8ab4dca431f60d60c76b9865e0a23644eccfac7a60362f7a3a401a6fdf218d0a SHA512 d81b2150497ec92019c62dbac7c0efd7171be4d514f19652a01cce9e951c007dcbee3ab75e52ebba25e772091a4577c2d8d182b4c1f8f8210cb6e210640a2cfc
+EBUILD courier-unicode-2.0.ebuild 488 BLAKE2B c44f85d0fdcaff8802a0584da050c37be350a6d1cdc0c2435ad10e8cfb4d8652f7884d9949c8ad6be7ad079922c141c0a22fcf6a1d034d3bdf4f1e28c803229c SHA512 616ea1f8edd9d164dfd2129cb528e8b591d8e987359652d552ebe5d792487b19af4a35dbf9cbf1f46603315ef5de68d2cb7cc3511fe6164a72b29044417e0650
 MISC metadata.xml 398 BLAKE2B 5a29532863617f727864e5a02b31d9170bbe09d5bed8641c94aad759997613832940cdffdaf8ed31c44b41b3c5e769ba220b5e6fa53c9d3540d9646e9c31a492 SHA512 78789db4f9e2b92e56c3833245f64c31bc274f6986b70af9c3bda21e5c6d3c6b3987a6a97e0ec73aa619d71ee814fa6a263ed8d295ec7473481134769414396b
diff --git a/net-libs/courier-unicode/courier-unicode-1.4.ebuild b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
index 3d7b8fd6cb3e..bb7c46bbdfde 100644
--- a/net-libs/courier-unicode/courier-unicode-1.4.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/courier-unicode/courier-unicode-2.0.ebuild b/net-libs/courier-unicode/courier-unicode-2.0.ebuild
index 1915f69cb71b..98cdf2d64ab4 100644
--- a/net-libs/courier-unicode/courier-unicode-2.0.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index e3de73076544..eec03479d868 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,4 +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 1812 BLAKE2B a4f39f68e2b3533b512d50545037642f1d733180aa494b0a62abcc4254c39c8d03939b7082ce2036cf9dfc9ec82d69fb300c1817ddfe118b5af3971961f12378 SHA512 07604f2af4787b842aee1c9f6c8c72b38cf9234cb1dcd833ce97cceb5134f71b7c9b9b23da7d11dbfb306fac444ad9a132b7439099978aeec381892b04df919f
 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
new file mode 100644
index 000000000000..e199f1c8e300
--- /dev/null
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+introspection test upnp"
+SLOT="0.2/5" # .so version
+
+# Tests need shmsink from gst-plugins-bad, which isn't packaged
+# FIXME: do an out-of-tree build for tests if USE=-msn
+RESTRICT="test"
+
+COMMONDEPEND="
+	>=media-libs/gstreamer-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0
+	>=dev-libs/glib-2.32:2
+	>=net-libs/libnice-0.1.8
+	introspection? ( >=dev-libs/gobject-introspection-0.10.11:= )
+	upnp? ( >=net-libs/gupnp-igd-0.2:= )
+"
+RDEPEND="${COMMONDEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+	media-plugins/gst-plugins-srtp:1.0
+	media-plugins/gst-plugins-libnice:1.0
+"
+DEPEND="${COMMONDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.18
+	virtual/pkgconfig
+	test? (
+		media-libs/gst-plugins-base:1.0[vorbis]
+		media-libs/gst-plugins-good:1.0 )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	plugins="fsrawconference,fsrtpconference,fsmsnconference,fsrtpxdata,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable upnp gupnp) \
+		--with-plugins=${plugins}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #539224
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1e6db267dc36..6dba74c12ce0 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -3,7 +3,7 @@ DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce41
 DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
 DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe
 EBUILD gnutls-3.5.18.ebuild 4111 BLAKE2B d6816f40d5e8fa8f27973621fa9001f0a344f60018fb3cad8619ad14182ce2f033ebe7bec47dcbaa5968870899bca9268447c45a35d4bb9b3f64239eb6b83ab4 SHA512 edc5a18ce84d09ce916f7d0a87558a5ae238f0dcb6a2f6de849e406d067af241d4ab104627e3864bf1ebd84c5ddc79f44cb60e60db4c756fa8b9d8acfb1c901c
-EBUILD gnutls-3.5.19.ebuild 4122 BLAKE2B f191754f29796bedc0534d47872767e6fd7e77b34ba7f109f5b06476cf9d5a945bcb9c1d15371428905ee33c4b61f4790117f0221439c7a88c60a28fc05d3a4d SHA512 10d2879c1bd4743191e9e8abba3a4502609f7df69b1d6b376a45baa64e16840c7e805439c502aeb0c691ad2e437639a96cc6b381fd9f28b263bc0b637562c536
+EBUILD gnutls-3.5.19.ebuild 4115 BLAKE2B e703c107322f50a529a4b0f3ffb286470535b40b695e224d858ce510ce51b5059c2ee3e13c61e06da298c45b7f77b778100a7878e198561e93d39c55097646e9 SHA512 73eb580f54bac0382fa5c3a0696661557dc665cab6ba9b0af3cdd10d9934133fb420224c9c37a12be846d8c3f6e54a32310144d8ac21209e1d588f110236a35f
 EBUILD gnutls-3.6.2.ebuild 3751 BLAKE2B 9777ce3562714525ea3442a8ede4a654e4fa80d67418a9eae8ddde910c934593b3f6c5ff33042cdefbb2d403ba4e403cd51998e2167a5b38c7ba4e367bdeea60 SHA512 d64c7e65868e2aac58ed783a415a8756c1b225bda0a4082798d52c8eb332ddd03ba5f07a9fa34c7831d975a17e0def85faa0b6f5ba9046b3ac49472d5756f96a
 EBUILD gnutls-3.6.3.ebuild 3758 BLAKE2B 8a98397c7b84752d60b5d4f96cf3c7eddce0b95c6d0616ad125b004cd9037baca34b906a275f7fba034626bf36e0a91cfa32c4286632004d83f6f8713e80b483 SHA512 f9093b9acbf2b3752daeae530bddd049be189340ad3f379519026827ef8f7281b31fbb4681b1e5441b9c870c7a3debd7e2cd4a17734802b2998be3fdaa17c331
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild
index 9837a01abe8b..3f815626bc57 100644
--- a/net-libs/gnutls/gnutls-3.5.19.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 700a121d2ba0..fc9396547b40 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,5 @@
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
 EBUILD libgadu-1.11.4.ebuild 1301 BLAKE2B c5e78bcf29f9cf44871f66bbac467d5af33abae86c2ac456c8bfdb760fd8a6b1d589df7db6eb389b82d226c696222edbf90b69db358f5a0b3e521ae73d78ed0e SHA512 513bc3032113c4edaba532198eff84c04e34d158f68a6477a7cd7521ad7cbe99f04f33811f56a5c8fcca448b19fed97579fb519e12779874b8de031e62ad5324
-EBUILD libgadu-1.12.2.ebuild 1393 BLAKE2B ae6c1bc6c49b3d2e5c0800ba0bf72240141154830a15b3dc609a64c91b0ffa04d4c33f5dc0052d8bee443b27d39b852d72e7878768541838f6616fd99b2d20ce SHA512 944b3d1f2f70ef67e154415edaec6c044bd777771473de7d1b464a7ad51622e7ac7665e1bfaab053729fe77b7ae9f9ee1286ee5139577211d3096ddac2332f74
+EBUILD libgadu-1.12.2.ebuild 1392 BLAKE2B 444b38e4b14909db0e0fd1e3ad75a16727cc928f32c145c5d1a05ab261c601375f2af081d3bd6e09995e2a2761af2fc04dd2f0cf8066f42c60d80ec79ae8e505 SHA512 476c5e1c85448938bc9a7bc08acd09c96c71662c22056d3fa3e5e4007f38ddde8f0ef2fb833d0f40ef958b2b6b959409514a6d05576d7d8cc2a2bcb96b0084e4
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
index eda0ca3fa582..88009169cfd7 100644
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index c4e0e68d7316..5509ff46a8a2 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -2,10 +2,16 @@ DIST libmbim-1.10.0.tar.xz 384480 BLAKE2B 68e038b680613316a748fcae7be6a60241cb74
 DIST libmbim-1.12.2.tar.xz 397268 BLAKE2B 70d6ebfadda141b118ecb2c2476ba8c3b2ed1c8803295b6dfc4c32af4c4a0a14f8055ec0fd278e6be85676f4139823a01475ad5da56799425fa6adfd1b97c1f4 SHA512 d9ae50fecd39f2581ca8db21ec66ac6bfe13e10fe9298a7ec60338f66421ca8411dee3042f58692d60d491d17324d25233623674d322e81f0205c0dea486361a
 DIST libmbim-1.12.4.tar.xz 401816 BLAKE2B a9d28eea7e0cdd5aae1a6f38a3a80d9e84e9fe8e471d7637da6d2352ddc79c2df659c95a1a3d89c8794b9e6874ca32d7d912db06298be770203c0c5648d5b696 SHA512 74b0290eba3c83c13d1a8a07c1eaa979eae79cfadccd1b7acef0729c9d4c90e721dee9503a7cf69dd9c13a11c4a876716000cf78c22017d7e2d4e2b7906a3fbf
 DIST libmbim-1.14.0.tar.xz 401460 BLAKE2B 702bb0bbfeaf48f982986da9f5c57a09534d5fae8e42af2c8735822f832ce9a08473deb4fb20c65597d854aa73311ff317f8c99dd466d1874ed57bae1dbe684b SHA512 a9b1ba59828fd1c8cf39705717c56e3b75f34d6b3b9cd9f8be40fe245c07f4ea4d211727322c8b3c6d92f004c670e2fe6de76a3117e38b1e8de6673cfb6168bd
+DIST libmbim-1.14.4.tar.xz 402924 BLAKE2B 0dec5cc540c2d57a5f98d2619c0c478c2b1377fcf446a1d40d5f978ab99a79d83f1fc55831483269fc12225ea08f6f7516310b23ab7e068916b58ff6c352b589 SHA512 0471cf1647aeaa4ee5c304fc3719d4ad9a631752458d71dd7cd24bd17215fada4ee47aa65c05903f24bb2d4e2f637e577ff30cbf8c22b5de5af2107bb05970e3
+DIST libmbim-1.16.0.tar.xz 453532 BLAKE2B 68732c02f7ee56d898895fe61a1aac44b0c1e858d5bd8fbc4a962429d86ffd1e58442f8ab7c74211d312cc8efb549d3dda14f2c13e16d5d12f8b790299d268be SHA512 90dcb4bf0e4d1d8da5f8bdc0d5a788b51775c55289c416e4dde1020dc353604a4ce40d723c500f8fb9099d7e9061b5c83148106dfd167128bae2cbafbda1279c
+DIST libmbim-1.16.2.tar.xz 455096 BLAKE2B f29eaea16ab1f627ed7976fb84d6d1234bc58009e140e70e5ef4f3b9d2a37fcbc3a5492ccbf94d83c169cc64d4f7b545ce556704ce3c750bc00da80d5431119d SHA512 6081a5b40b7fc5cd21adf1948c16c57919c452bc2eccdccb561412ecada5aca7ff1fcac79568eb3dda83d49c780b0dab95a0b15bda0c4f2712b735cbe95402be
 DIST libmbim-1.6.0.tar.xz 360800 BLAKE2B 28b36b14ee8b28793ae0dbe2b2cd421b1d5cf7c2c8aa853d9920fb2f413239fcb5cff7c341f2841ee68052621b2a60e1dea3f212a0ba62a7310353f9215191b4 SHA512 60c20da65cb5e0e5e3d73434c8b7960ebb7138d6b004d4e6223ba63ea95fdc97b35697a329f12a81033c39c36efcbb3bcb5d8ae813a569dc6e6ca928a1cd79dd
 EBUILD libmbim-1.10.0.ebuild 960 BLAKE2B a190ef655958889842c61f795dc41a1b183f987f7d6e3962dd5c232b00c66c7fa6178e3455e58afddb0d9e5e44c0c8626646c0246343fc50519bffddf03ca0eb SHA512 a1c46d4576dd8017937fa8c375957ab8108ddd2fb7684eb08b026504a500b0d20cac9fb0632730d0b523a8a8745ec53c088723d5a681286de910222a36171ad2
 EBUILD libmbim-1.12.2.ebuild 969 BLAKE2B f6833fcf3b1211d86d72b721da3e534ac37bd475d03e6a5a46f190f396a280c2f5d1b423c8f78067a3fdb8b883ccea5e1ef8a0a3a51e240c6a1f377c7e291417 SHA512 dbb14b53f4ab7d7a15ce2fd5ee0a0006d4926869553d07d0fd8f940dd990cfd26b3b600001decdcdd4ddf3cbe21afa0de4c24534eaf604d8707a75e87d7cc03f
 EBUILD libmbim-1.12.4.ebuild 970 BLAKE2B f00432c17fc3e4747b3d94656ca1ec3ff4bd184e20d541d6206cac4d64f057fd0b76f4155a5bcc9d61bca851d0d1bb9ada75a25e23882fd39162f5040b9778ce SHA512 59af5c7676226488c31faaf99e7e877c6b0e63c5552d08e7b70e9839a22365507c2a4fe28b245da802fb61a60e38c4a83b5eafe4e1a09a94823c6baad00bbce2
 EBUILD libmbim-1.14.0.ebuild 792 BLAKE2B baab7b9bcd41b4efc820d0b5dcd1b35886f7bdbf8b8ffaf4f5235c4df080e469dab4e2f59a96c55af06719b79851fc140a64c41c1b49c4ad02792aa5fb9551bc SHA512 97ae08b48db295a2f2050a72a9f264b95ee4a9997c591240486ce2c32032a4f71a2ae3068aaebb2c9290af0fe787e3a71b0604877bda64e45e0496484d40bde6
+EBUILD libmbim-1.14.4.ebuild 797 BLAKE2B 576536bec5766361261d5f587a5312de737993f4f13a96d069bf84d2617bee1aa97f692eff2c9f37a46fc0ac98785242331494b5eb1d61a44c35af2039ce9ef0 SHA512 15c691bbc9d508a32967e5ad187e8ba776fb91acdf6bdc2c2b1e17a565d6de0469a64f47d040c684609d014419e5165fdec067e993d845af338bbe275a5d1a89
+EBUILD libmbim-1.16.0.ebuild 797 BLAKE2B 576536bec5766361261d5f587a5312de737993f4f13a96d069bf84d2617bee1aa97f692eff2c9f37a46fc0ac98785242331494b5eb1d61a44c35af2039ce9ef0 SHA512 15c691bbc9d508a32967e5ad187e8ba776fb91acdf6bdc2c2b1e17a565d6de0469a64f47d040c684609d014419e5165fdec067e993d845af338bbe275a5d1a89
+EBUILD libmbim-1.16.2.ebuild 797 BLAKE2B 576536bec5766361261d5f587a5312de737993f4f13a96d069bf84d2617bee1aa97f692eff2c9f37a46fc0ac98785242331494b5eb1d61a44c35af2039ce9ef0 SHA512 15c691bbc9d508a32967e5ad187e8ba776fb91acdf6bdc2c2b1e17a565d6de0469a64f47d040c684609d014419e5165fdec067e993d845af338bbe275a5d1a89
 EBUILD libmbim-1.6.0.ebuild 1005 BLAKE2B 5d96c699231f7153f259f5110253a667f3b7079cdebe5309df2339ea7f38c6a0c8796c67d92232226d5fe0d6313a4b41b7fc887d433d1c94218d3cb4fbf3a364 SHA512 1071f96b2ffa1e45d42a2a3c115e0463d5fc069800755461599474b91268d59b12dc81a7a224b3c6974fb693474948f3e6a7ea3bd3f3d28e48c5a01da5efa0fc
 MISC metadata.xml 241 BLAKE2B 5323e3cc2a6d62c9fe301f465f7e03b145f6877adc893cf9e3f0fe4863fce3423f3471f62fce04fafc65428fb4781d2d74d796281d9332d0707e45bedec9a1a0 SHA512 d85c72d707e2c7290ff4bf18bbbd34b938cddb7e09528c5d10fa7f141122e3836687c2fff91c1000791457b7f808d3222fe671755a0fc25c157d80c908bc3cae
diff --git a/net-libs/libmbim/libmbim-1.14.4.ebuild b/net-libs/libmbim/libmbim-1.14.4.ebuild
new file mode 100644
index 000000000000..30d61f25ae34
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.14.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="static-libs udev"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		--disable-gtk-doc \
+		$(use_with udev) \
+		$(use_enable static{-libs,})
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libmbim/libmbim-1.16.0.ebuild b/net-libs/libmbim/libmbim-1.16.0.ebuild
new file mode 100644
index 000000000000..30d61f25ae34
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.16.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="static-libs udev"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		--disable-gtk-doc \
+		$(use_with udev) \
+		$(use_enable static{-libs,})
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libmbim/libmbim-1.16.2.ebuild b/net-libs/libmbim/libmbim-1.16.2.ebuild
new file mode 100644
index 000000000000..30d61f25ae34
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.16.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="static-libs udev"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		--disable-gtk-doc \
+		$(use_with udev) \
+		$(use_enable static{-libs,})
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 81bd8d6d79a2..0adb0649c1ee 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -2,11 +2,19 @@ DIST libqmi-1.12.6.tar.xz 710564 BLAKE2B b7e16b1f8da62815788355a4ad54bb819e53ad8
 DIST libqmi-1.14.0.tar.xz 759472 BLAKE2B 4826105830037fe9dc6e6b3341060e3821a7b586641156bf2db7d5fbec27ae03a0a354e928a51f087c4b7722400fb5dd3503fdcb97e031d5435eddfe33182f87 SHA512 d5b4affe479e4704a9d94232bbef096533322413de8ea3c27d3ab7d6fd077fbbae779b49633fa22833ab1ce25f76cf341bfb84ec81d75fdc477f2a355ac298bd
 DIST libqmi-1.16.0.tar.xz 734280 BLAKE2B dd8614ef16e8de2bde0babbb487130b3dc13da776238d4e2aae100a150c7f05a20ca24e682f7a160ae56fad3a7ee4e8b8f4ff31971e1ac5e1cb22a9960ecf99b SHA512 e8ac10b72a15ab3d102ab5dd45ed2960f552d37c291b7ef2818f41d5a46121a5c25e60bb549f96d4982468607a11f33866632c13b0454c5cbe0d61aa95992996
 DIST libqmi-1.16.2.tar.xz 735124 BLAKE2B e99aa20e8030610b1958cab3ed7f91a3f4a3cad76fcad3bf25ea6cf82176a8571660e0fb301ed6b7cc27fbb7243d8437f16485275fcb2c42644acadf12ffe791 SHA512 7d0977d1904efb76adcdde0ca52cef864fc66a065e641f1d2b905d74fa5d314e6eae5b6ef58a508725f631823308fc8ddcc67a0547bd0e4c87dc8e3eb39b4cfb
+DIST libqmi-1.16.4.tar.xz 735220 BLAKE2B 52651eb4dc886b3b56ee0e6c47da930be2547c491748664a24dc7f012ad999377800a2d410bf1b605c40784756bfce15231fdc430419993b58e330cc8abbc968 SHA512 1cd3df8602e4ed7a8e0e068146490a0cd2581244ab5d1dd961129c1a58fa384a8d3bb6bbf715f799660f44ab3b1d20ae744c4eee3972b7392e2ac560cee6e75c
 DIST libqmi-1.18.0.tar.xz 873176 BLAKE2B ff60e3616d2ac94576df993f8f03020e19b8745541287ac069a1d15ff166f37a661f4778c1a92921791ab43ccd583a8162564e87507511a5faa85e536493f976 SHA512 3890501fa2299ce5ac8fda732363e39738c95ffb153708d8f727e88c082014018463c569a0d9666385f6394d060ec41052dec400f3f6c733e78748ca7ee56b76
+DIST libqmi-1.18.2.tar.xz 845560 BLAKE2B 732c7385d149073a9cf89a58f0e2977fff593b00ca86f4d1abfbbc1a4521a257f57d56fc73ba5e46bfc902b9aa882eed6e3e63ac00cab2649ab35b8a547c844c SHA512 769e67534e0eeb7454849b69be72674ba07f65ec26adec668c0a0cf91c22c11bb6d91546606a33036d2a05fcd290efe05dcc1d4ab0740d625756628a7a7d3428
+DIST libqmi-1.20.0.tar.xz 859464 BLAKE2B 146b07b47aa5d40d93ce381aca107ec554918a909aef85b28751228fdcb3a518ffa9479a88b1f17a94f9251a1cff1cb606c4cfd4689e8d5e813a6467f078e5cb SHA512 fceec9aff22942fa64f7a568527033354dc379f347b96c9b37844bbdfb7bfa0936f554402b855c4b191fd63ca488776b94ee69e84502a460e941caddbd648b63
+DIST libqmi-1.20.2.tar.xz 860408 BLAKE2B d6f757c7eb7d93101763714f32dee1bfc4de1f4b58fe2b6f457b938e42175da12ba6070395f06542f4edb9c6b3264ad74a718f7fc58ac25de4f4d5f2692ee123 SHA512 2d1ceda25ad995b27dc20d9b5d85ee23a841c43f33aa68b3543df10cc1da72062e648c1136a2706740659ae2cf8c17373d7c6c6f5f8d075864f47e4fb89d7b50
 EBUILD libqmi-1.12.6.ebuild 936 BLAKE2B e292e687296175fc85b3c357aa810b4a17ae477d3bd59b083f2d22f01b4e8360e23ddc9749af97d0c95afaa3acf7b98bb92c5d9d83229a7d71e6def926b46036 SHA512 46a02f498c46266ec7b6c2cb155ce5adeda72e97d82a57376adc48f6ac67bab6ab9840c34a5b20ee88324f75b60a049550524fe405900f1a3afd1cf779d1d69d
 EBUILD libqmi-1.14.0.ebuild 939 BLAKE2B 92e709ac26f9e53b52bf4dcd1cdb4a1dc574c2dc585c91e0c8bbd3e7f2d08728fe7b59683650d6288f12047a5eb0cef00f2abbab871d8170067006a65f83e72b SHA512 b7a1ef6349c65602ba2117a211345850681bb9166118cd9f96bdb8d24cc64751f3d2654c7bbae3c08797ea1378457e852512a73d2b35162f888282d52b8476bd
 EBUILD libqmi-1.16.0.ebuild 1033 BLAKE2B 41776532f8d59524b9e15c5ffba94d39c6e164a90224b4e6091bbb3c5e8725a38f159816a7db31f85d9da4cb4f39d2cf230a6a31f19f012861211d6712c0b1b0 SHA512 18dca52d046cfb903f792a6d0b3b1bb668a249ea531db723481c8e0665640b85a911edebe62164865e9c865f8ee7a923cc23da07879cf81d741fe379141ede4b
 EBUILD libqmi-1.16.2.ebuild 1104 BLAKE2B d1c6fc14d1089b229d32c103b1737428eeac0d150614e752b1c517122cfaca9ee515ab0ac60fbccd39af17953bd425d6f0e32db3640664a9db466c71bd8052ac SHA512 1167f68f0a0d6edd26a8d66443c05c4bf7c4feced8ee7cbce1a1a7afc8a65e21eb2b7b02d8e79685d89a74f075b50e6852da6dfe6254a9a64677041112c9b3f6
-EBUILD libqmi-1.18.0.ebuild 1128 BLAKE2B a05b31d3c7e38c498738f29d30556a7bac32f0202733697e4f03377062c5f6605b83a7cbadb2d607fbbcfe20d4d13dba8af2f7d24036bdc670d420919b682659 SHA512 bc8d931bf49382b5955298516000fee2fb64a23ad1f1fa7b3ea5cca14e0017683fc94ddb078be344364e04164526e862a16e702cc8aa7564f52511fc7a852f31
+EBUILD libqmi-1.16.4.ebuild 1108 BLAKE2B d2be43c1b65dc95941f1aa6c63472f7edaf627892bfb2d53a986fac98aa59a2ee43d2f83f152456bc021c8fa10c3dc7ae25827cf28c52b795896bb19622b6262 SHA512 1263e89c91947b5385a7e9e744dca9a992bc6fccf72b8e85d651a638ce7cda232764f8a3efdb1863f26ab99da5d035d65b2b46f3dc40ada3597decfdb98b182e
+EBUILD libqmi-1.18.0.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
+EBUILD libqmi-1.18.2.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
+EBUILD libqmi-1.20.0.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
+EBUILD libqmi-1.20.2.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
 EBUILD libqmi-9999.ebuild 1128 BLAKE2B a79aaf1d60a996f5e9fe3d53a7b1d59b61763720cd3598748141e6d3cc21959a0c07fc327d9ebd508cab7bd1e787df20ad025dca55d22e2255c3ebdbe61fd1db SHA512 57703ca8652c1ff10d999184b55f0e69006602d4ac29faf66eb044f9b3db961adb92c4aab91196e089724755f947c4af203e76aa91e612dd7a140ecb53197c8d
 MISC metadata.xml 416 BLAKE2B f391913e78bcdb06b9c686a460059b4ee38861fa09fa0d50c19418ac3e1d966efd2646694d89d240d13f0a9bf2eb910d952288de153699b9564040efed8b04ab SHA512 4ebf9f46a3c7c6e18e0eb83341bac1b087bb6471a0f3f11663975b8a6e0e1a78f8db680a628dc693c4c3eb825d50717f0b7ed086d90c9d33818f094de2611fe2
diff --git a/net-libs/libqmi/libqmi-1.16.4.ebuild b/net-libs/libqmi/libqmi-1.16.4.ebuild
new file mode 100644
index 000000000000..5a9f25d5a371
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.16.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
+HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0/5.1"	# soname of libqmi-glib.so
+IUSE="doc +mbim static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32
+	mbim? ( >=net-libs/libmbim-1.14.0 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		$(use_enable mbim mbim-qmux) \
+		$(use_enable static{-libs,}) \
+		$(use_enable {,gtk-}doc)
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/libqmi-1.18.0.ebuild b/net-libs/libqmi/libqmi-1.18.0.ebuild
index b779f7ac0bae..3c9b3648c603 100644
--- a/net-libs/libqmi/libqmi-1.18.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-libs/libqmi/libqmi-1.18.2.ebuild b/net-libs/libqmi/libqmi-1.18.2.ebuild
new file mode 100644
index 000000000000..3c9b3648c603
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.18.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
+HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0/5.1"	# soname of libqmi-glib.so
+IUSE="doc +mbim static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32
+	virtual/libgudev
+	mbim? ( >=net-libs/libmbim-1.14.0 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		$(use_enable mbim mbim-qmux) \
+		$(use_enable static{-libs,}) \
+		$(use_enable {,gtk-}doc)
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/libqmi-1.20.0.ebuild b/net-libs/libqmi/libqmi-1.20.0.ebuild
new file mode 100644
index 000000000000..3c9b3648c603
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.20.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
+HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0/5.1"	# soname of libqmi-glib.so
+IUSE="doc +mbim static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32
+	virtual/libgudev
+	mbim? ( >=net-libs/libmbim-1.14.0 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		$(use_enable mbim mbim-qmux) \
+		$(use_enable static{-libs,}) \
+		$(use_enable {,gtk-}doc)
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/libqmi-1.20.2.ebuild b/net-libs/libqmi/libqmi-1.20.2.ebuild
new file mode 100644
index 000000000000..3c9b3648c603
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.20.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
+HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0/5.1"	# soname of libqmi-glib.so
+IUSE="doc +mbim static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32
+	virtual/libgudev
+	mbim? ( >=net-libs/libmbim-1.14.0 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		$(use_enable mbim mbim-qmux) \
+		$(use_enable static{-libs,}) \
+		$(use_enable {,gtk-}doc)
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 33d27f9c49ae..ae63b8b88f4a 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -6,9 +6,9 @@ AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba65
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 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.0.tar.xz 409280 BLAKE2B ac777167db69a956ecee172995dac0d13781b80f395b79f2aa4b691da9d33c886ecbdfe12f9ee926525cc97f358ddbda4f31be719386ef78cebfc9be51626fe0 SHA512 63512871f77a3dee52ace4434844647d5715c08f7803e2ffee3b0aa1effe287452e7601df56f7628608d3d58b6cb48d5c909501457e7a3ead5414b7b260070f4
+DIST libssh-0.8.1.tar.xz 409572 BLAKE2B 65bf38c5bba803a588ff4a1cc5f774cacc43c500bf0aaa77674f9120eccda26027e446aeb9e61a2418eb81077fdb0aa55d8e014f6d466877a9cd96b665c5e7ce SHA512 6630d0b101dc109116ba7a6cffb00db1bc9b5bc6004c843c5361d3d97c6cf4c323129ebf3bbf25ab2fc1961b74520490d7a16999504849c07b26a25679724b93
 EBUILD libssh-0.7.4.ebuild 2481 BLAKE2B da53e49934deb1984710a1a10f5955fa25b4b0c953566d287ff11e7a90f1991f4f5d58784cb78dc620fc522b0713be1ded8545898909a19bf18cae79e5f6e569 SHA512 e89b9b43fcef2b218cf099dbdee607fbddec3d25ffb11371029b98492ed151dc84d4f0c53050f10b48330c29066c898c83f233858edb2b19fdfa95acc1f6a369
 EBUILD libssh-0.7.5-r2.ebuild 2691 BLAKE2B bd987e06bd7418f27ddd0bec9917df13958547bde473965ac53928d68802e311c6e26a023c0de0a81c01e8861b9c8acf5553a508538e2ab09da6df826ffd644a SHA512 4c64f74e75efe58acfcb5bd75de8341428c50a837441416719fae63dee449405aeb8df2d4bbd83725aba8df35e1b63715501049f730397a55200fcbc0d83c2ee
-EBUILD libssh-0.8.0.ebuild 2729 BLAKE2B 7d2dc81eb803d787d3da9b74fd5c301a6950deca785d8708bf66a49b1d9bed9d995defafecca2228fe6e914a02c4a6c8460e12f1bb4cdbc4ee30c77fd9bc8ac9 SHA512 d3c9a57e26abaa9f946aa19b91117d427860d2ce0405310ea243f4cf85858942945b18bec300e011bf1810b84328189c1410ced16b3e34f4507a70ad5a4f7bbf
-EBUILD libssh-9999.ebuild 2729 BLAKE2B 7d2dc81eb803d787d3da9b74fd5c301a6950deca785d8708bf66a49b1d9bed9d995defafecca2228fe6e914a02c4a6c8460e12f1bb4cdbc4ee30c77fd9bc8ac9 SHA512 d3c9a57e26abaa9f946aa19b91117d427860d2ce0405310ea243f4cf85858942945b18bec300e011bf1810b84328189c1410ced16b3e34f4507a70ad5a4f7bbf
+EBUILD libssh-0.8.1.ebuild 2877 BLAKE2B 11cd07217c02f8dbc5efa1da22d84abb4aebc3f452693f0462d8160cb804aa4af541bf7140fa2571bf1e7427d9ffab157c00ae37cc260d507b6f057caf5f1fb4 SHA512 e7f0a748700a9a0e6c4a107cf25242657285657c885078317eac21b419c03a6c174652da07882dac1bb672d042f7a68ce925c47af5e0a44084b06b03f5fe88ba
+EBUILD libssh-9999.ebuild 2877 BLAKE2B 11cd07217c02f8dbc5efa1da22d84abb4aebc3f452693f0462d8160cb804aa4af541bf7140fa2571bf1e7427d9ffab157c00ae37cc260d507b6f057caf5f1fb4 SHA512 e7f0a748700a9a0e6c4a107cf25242657285657c885078317eac21b419c03a6c174652da07882dac1bb672d042f7a68ce925c47af5e0a44084b06b03f5fe88ba
 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
diff --git a/net-libs/libssh/libssh-0.8.0.ebuild b/net-libs/libssh/libssh-0.8.1.ebuild
index f29e2283d91c..8aaceace64c1 100644
--- a/net-libs/libssh/libssh-0.8.0.ebuild
+++ b/net-libs/libssh/libssh-0.8.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	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)/${P}.tar.xz"
+	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
 
@@ -97,7 +97,11 @@ multilib_src_install() {
 		dodoc -r doc/html/.
 	fi
 
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index f29e2283d91c..8aaceace64c1 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	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)/${P}.tar.xz"
+	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
 
@@ -97,7 +97,11 @@ multilib_src_install() {
 		dodoc -r doc/html/.
 	fi
 
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 7a956ae079c0..e8f76a0aa0f2 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,5 +1,7 @@
 DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d8980363a6b92a3378339349609d64d3b7a38a58baf6c2898a26f70e92b0de0d6a1f4b6725a576a850aacaa5764fe7d96fa0b541dfa2d7 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7
 DIST libtorrent-rasterbar-1.1.7.tar.gz 3951887 BLAKE2B 4729a718f5ce5bf2a41506f18f48bc588ad863ea8e640dde6f9e0a35bb909ff651fca3c8729668b25507fa3928218be579964c683d9d6bf3dc1c3abcce0f9452 SHA512 e35e95eec55a69b81c1d21f73e230dc4de7502b5adce99193c01b0d89a04b0f484788ff235d3f73cc77eeccba8d8d441fac92aa76a17afb56bafabd318b4a75e
+DIST libtorrent-rasterbar-1.1.9.tar.gz 3903742 BLAKE2B a9f942e7d06e076dec98314bc44e8633731c51e8469095ebff8c9c8084305714ca40663a0d963f16188ba17fa640f273eaa1396784514bc04e4bc4cbcdc3aab2 SHA512 2dcf81fdf34b81790012a6c20dc344dccb89535359cffeb9a2725763f0a1842a00af1ae06b63e4e32054f06ceb14e32031afe479dc36897ddab28494241eb756
 EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2398 BLAKE2B 319dd61c379cc1e0b92f938c9364eb9af477e017fd2595ccf6bfde65a05bb8d7d27ac3ed7396233aedb24a1b02296e33fd66d42af74bc8b31f1ee97efc6c5a0d SHA512 ba767f43b744e9f1a50c7a559b91a8b45009a1b08820852c9a005d3d6a2c7f6114a6091cbfed2df34e9e7bb2c75ca10873af69bc067356913774f027b27dd2e4
 EBUILD libtorrent-rasterbar-1.1.7.ebuild 2402 BLAKE2B 56c5cd008f5228123a10ff5947d181fade302610184e6f5e17061f67644876f3b7cfe1531a0844ec16ecfd2b7c2b506e12566f06cbe4fd9e51e27a67f5426b83 SHA512 7381f9f833bc83d01504b4d47312185d6459cd0e9ec4c49999e31c877220260326db5136d7d6390d014af52a5abd20ec9523f3491b8bb91a4af5d068d1453a19
+EBUILD libtorrent-rasterbar-1.1.9.ebuild 2389 BLAKE2B 070a26370780dd74a6066a10669822918d3089c7d2d3480566b991829d30f40c8e02baa658b8657fdd4ab83400d46ca5767a780a3b980206084a9a64ada30045 SHA512 fd0c27c7c6ccad5f01fce80a3427933a950ea3bb4f7b9a1ceb803640667c9854edefdb1ae7504f023d7d25797ec0ad6ebe93b4eee2738e9b7c8ba736b8c7739e
 MISC metadata.xml 444 BLAKE2B f9abe9123b6f4b841accff6c9eec879a0aab90abeba75ec1d08b1a97d179e18645bf47d2f0ba039fafe43b3340a5c67479c67e09fe25910429fe6fa382c0eb20 SHA512 5d8a3bc354ddba410e8b394303f4faebc8072738f1ac1d44b7a3af02116c8a67b4edab39e730c35c313c8abc44703fc7b22709766e62da9aa46de15ea2c3d962
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
new file mode 100644
index 000000000000..f9f8a919d1d5
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+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} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug logging)
+		$(use_enable debug disk-stats)
+		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="${EPYTHON#python}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index b2f964b25b42..6daeeb1a5d1a 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,4 +1,5 @@
 AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a5824479d110e2bd235a4decc79456f11d3c57d1288c0043fc15c466998b9e52687a9a0d59fe3269c043cb2daaf88f SHA512 f5636e0745f81d4a7c85efa45238bf26cf70b5c43fbf32e9746a7ad534dd33abf10b7547ac7361ae7d5f7b5fa422a1a3028b8ffaa9fe0e5b843934a056e0b0ce
+AUX loudmouth-1.5.3-skip-gtk-doc.patch 394 BLAKE2B ebcfed350077bcb67b0f7da9d0c9a31fa7483d4d927323490920f7d56b7cf78bcb6dfe04b4f59a36fac07c24267653ce8bcb2e17f2e19f4d2ad7037dca0844b5 SHA512 02ec191f33dd5601f9d875d3a5d0e1bc5baf904c18ca47c90280f860ee1449e51dbc7f2be841de85c8baf23d615574592ca8f9a913ae6b5dacd2583497bf8889
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
-EBUILD loudmouth-1.5.3-r1.ebuild 1151 BLAKE2B ad54e1a653b1e27630ebb2ed60107c37c63ecf355aeb6e7ac9e08912412fe7b0fd85a59386a241f834f056266edfe63691d71ffd3aa2db1bcc0232c81f9d4886 SHA512 ff451267450544ba74462ef6d742b568a7cd9f50b33c495a2c8159c457e45f1582e860530b79ff7e22091c6eda0dfc6d80607ab00d4713bee91d80d9f0ab2abf
+EBUILD loudmouth-1.5.3-r1.ebuild 1144 BLAKE2B c0f5f6d6d538cc0661c678a00fe31ad6370b444ee01aa999ef19b1bd2861a8e7647df192471eba6756d121a0ec3ccf5a7360eaa47e2db0682a95c4ee5ddeb34d SHA512 1dbd2faec2ffbbad86a1e651a679c6994b7d1edb3e84460f174f78fc8d333bdf238e7c3d6a6b251fb61144cfe6b34bc33f00f8d6102c4d1f5b7bf58d1ba4648b
 MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/files/loudmouth-1.5.3-skip-gtk-doc.patch b/net-libs/loudmouth/files/loudmouth-1.5.3-skip-gtk-doc.patch
new file mode 100644
index 000000000000..097447cc7a1d
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.5.3-skip-gtk-doc.patch
@@ -0,0 +1,12 @@
+--- a/docs/reference/Makefile.am	2018-08-22 18:11:17.138111534 +0100
++++ b/docs/reference/Makefile.am	2018-08-22 18:11:23.105118175 +0100
+@@ -80,9 +80,6 @@
+ 	$(top_builddir)/loudmouth/libloudmouth.la
+ 
+ 
+-# This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
+-
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+ EXTRA_DIST +=
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
index 8538a223d36c..6f91b5632614 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
@@ -27,11 +27,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-1
-	>=dev-util/gtk-doc-am-1
 "
 
-PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-skip-gtk-doc.patch
+)
 
 src_prepare() {
 	default
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 7aa82510ef4a..9d4fdc5dc3a0 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,26 +1,24 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
-DIST node-v10.7.0.tar.xz 19770604 BLAKE2B b869f11c3b14dd078f5d8b228108ff60dbafa5e3ee3948b4323bf86233ecbfe8a6e06c24d8545fa364d3880997c298fab834b33660f2cffc7bb0f7e34744e9a4 SHA512 ceb70f79a3251a6243082f17a1c96617df7c40a6e1e3a24ecdd9e4d7f1203562d586e7a85a1e8e642df1de69839a9c0ea33e4a753643c5e8a1b502fd1f2debaf
-DIST node-v10.8.0.tar.xz 19910236 BLAKE2B 0f75e1ae40db52d9fdd2643406c4d1e5378ab0e2846c08c9cc3cc3c01d989b4ee96c89b028b7bdec811aea258a32510ed81436fefbf85d7ce4923eb30e09f825 SHA512 50863e4db68de2af5448d43f5d035dcda0c982a6d9daff85a67112aa3af6c7120789e41e12b2977d679e6cc010cb0c0efa8b8e97554a7e5d7eaea838a908aa0d
+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
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
 DIST node-v6.14.1.tar.xz 15758180 BLAKE2B 63db5d1f73cc16f5c73012953799193cbd58da3aa92d3d48c5419d4e5c4e9126a2eb45b7e27e7396269deeca7836cac62c5f89e5d23b695a3455305739d5df90 SHA512 c1f725c76bfad914d8d607e1d0bddbb6cb75a99adcf781d12291830bc41610ede346a5ab29648d16ad8bb3031dade89f7f4e16708083b5fcda2def965f0c7d21
-DIST node-v6.14.3.tar.xz 15841972 BLAKE2B 2e061adfb3947cb0a074771f9f40a5cb7eb7bf2822138b88ec0292d7dd6bf4b9f0c59ea39be4b27e7049bf5dd476e9c63e1bba279241b70c7171571fe47f4272 SHA512 b2568db5b17d694ab123d8f0d4c7512bf849edd5fe5b284654b90c3cb91aca857e692d4aabdcae9c17c79f88b7ceccfdcca9c3a640f4756ec3fcbb861c22ea7b
+DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951be7a644fafbfcac9cce1bf33ed8ca47929e0a5d0df72034a6c2b967c578e3c78a2ed27ba85e41c4af1de2307293 SHA512 0ca0dead15a1623ece7f972d420dec623141a795ddd984c32ce7e92ae32ead97bb0153ebd8c1c249b91a1bd6efcef7fb313105455f66d4d181473153c4e0736f
-DIST node-v8.11.3.tar.xz 18319672 BLAKE2B a45715ffc066f378a06b84cdfc3fee96510b2fae62790965ab6f7454ccd3029b4f83cc7f8604e3bc08fb967adbbbaa419e0e2a8fda48319e7375d46a0ba469c5 SHA512 48f50f400d61c8ed35bb2b0771f31da453359f312574fdf7f2b29cba0cafa008fb0d4ad11c2cfbbcc5aa4a5c7270dc9356fe0389292136de6e2a82ed3ee4d7b4
+DIST node-v8.11.4.tar.xz 18323120 BLAKE2B 8deeb1d577ec5b8547fae79dd212d2aa92b567f249afd59f8668ee5cd323949546f744f9e42b37b4a1f2683d2589cde8842304ecd83c2a49204345dedcf1c93f SHA512 b1650148e9bdebeff639f0d313719589a9727fa620a9be46b4ceb9a60038b5c5f4f68e6e0f9806fa56e6bea03c3de1b0e5878a2548c3921dbccf8be3fe411f26
 DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd09670dd8bd736dce2c7ab2fc87c3a717cda11c2a09c325b25a72d99431cbc79c0ee7c202ece5fc41786f1f0aa68e4 SHA512 ca49a1f3aaa8b25faa62c411a96551c8977bb43a22f8f171f27d3585306f379b6a12e55e60ddca04a6f2f8c62a1b3fed9e66c02898d80bf7ca59278536e04c13
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.7.0-r1.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
-EBUILD nodejs-10.8.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
+EBUILD nodejs-10.9.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
 EBUILD nodejs-6.14.1.ebuild 6170 BLAKE2B f8f9b6ead741f993da24c760daa48a7a5ac9415a9fec05c313257cd02c9f86ba03b4c15d7e2d0ef18dd1ad1e23b5d5152edb794756dd356368ac2fb534b68148 SHA512 c49be4f51d5fcace57544a7ab35ceac10870cee4e8341b9fb7303b2b030e21b65d3d158a854fe52b5d6813a5bf15cf5cc6c5dff254c2824c6fe8c8bc826aa634
-EBUILD nodejs-6.14.3.ebuild 6171 BLAKE2B 7946e4fcd461d071fcdb81c1642d0eb6d812e5660aa308ca3bf78501aaf9cc9430f9be3a806e371c9216774a545507759faefcb30ff4861a91fc05915b4d9601 SHA512 3e77ce77a4d9453d36eb252834ed056751c8805d4e89e47448bc1bdeeb41732a8d380eb8b4c1d13254ce14ff37bd586ecf381a5878901528b5a50de777056f6a
+EBUILD nodejs-6.14.4.ebuild 6171 BLAKE2B 7946e4fcd461d071fcdb81c1642d0eb6d812e5660aa308ca3bf78501aaf9cc9430f9be3a806e371c9216774a545507759faefcb30ff4861a91fc05915b4d9601 SHA512 3e77ce77a4d9453d36eb252834ed056751c8805d4e89e47448bc1bdeeb41732a8d380eb8b4c1d13254ce14ff37bd586ecf381a5878901528b5a50de777056f6a
 EBUILD nodejs-8.11.1.ebuild 6362 BLAKE2B a1cc2e39202ee307f4792a17ffa1df456bca2c9a26427038c83080a1ecb7c4502e874a391eedb3a1b13b6e7dbd7c9b8ef715234f646b87a80eee446f15b4eca8 SHA512 07da9779295676e44c6849de2ffd8a9ac3673608c8a53ae53fd4ad04a8081887b1f66dfac8add40f57c297c212ea01d4b9f2de4add352abc98f8af73e6f24e95
-EBUILD nodejs-8.11.3.ebuild 6363 BLAKE2B 3e18355fadb75884ecd68df2b2757305919c847e27429615e1fce655c9c06c9586e0d0381b7af9ff1d1068fb979918c05a5322174b84b5b4bea009f7710a8b41 SHA512 a51d9012b4f5d6ce9c2c4f4fdbaa4c8a7418b5915c865ba6bf51bdf30f9b4a2ac1d7325cd03bcc7b05f85f617a39fffda4027976bc9b94c6588af08b918039d3
+EBUILD nodejs-8.11.4.ebuild 6363 BLAKE2B 3e18355fadb75884ecd68df2b2757305919c847e27429615e1fce655c9c06c9586e0d0381b7af9ff1d1068fb979918c05a5322174b84b5b4bea009f7710a8b41 SHA512 a51d9012b4f5d6ce9c2c4f4fdbaa4c8a7418b5915c865ba6bf51bdf30f9b4a2ac1d7325cd03bcc7b05f85f617a39fffda4027976bc9b94c6588af08b918039d3
 EBUILD nodejs-9.11.2.ebuild 6348 BLAKE2B 8e74887ad5e17570c3ecdb608ff21a22813b53d3049de6a608d8a71fcd562fc8f96208601c390861a4ec0c05b4d7219131da93e35e82bb96fde7fa54921c5793 SHA512 6fdd51157c30021589e7d6c2637ce02d376f3e80da578ff1bcefdb3d2473ef689d8fca02c49e1673245a158a90d19af7cf45241d8190d0b76e563c1bedee8449
 EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06
 MISC metadata.xml 581 BLAKE2B cc99932eb293981a0b4e1f48a5fc2289b0b932545efaf00fdfbec10aeb52d95d7ad02268560495386992ff543e043591102415ffac04209b4d473b61a6528f3d SHA512 eb9bf78b19041213354232372bf9f31b8c73073b369abd83d1a399466ecf6f647da60ff393093dd16ade8aa6254bc782ab55cb2a655b0d685a04d84fc13d2706
diff --git a/net-libs/nodejs/nodejs-10.8.0.ebuild b/net-libs/nodejs/nodejs-10.8.0.ebuild
deleted file mode 100644
index 34e08649c75d..000000000000
--- a/net-libs/nodejs/nodejs-10.8.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.22.0:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.29.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-62.1:= )
-	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-S="${WORKDIR}/node-v${PV}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.7.0-r1.ebuild b/net-libs/nodejs/nodejs-10.9.0.ebuild
index 34e08649c75d..34e08649c75d 100644
--- a/net-libs/nodejs/nodejs-10.7.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-10.9.0.ebuild
diff --git a/net-libs/nodejs/nodejs-6.14.3.ebuild b/net-libs/nodejs/nodejs-6.14.4.ebuild
index d00288db71c6..d00288db71c6 100644
--- a/net-libs/nodejs/nodejs-6.14.3.ebuild
+++ b/net-libs/nodejs/nodejs-6.14.4.ebuild
diff --git a/net-libs/nodejs/nodejs-8.11.3.ebuild b/net-libs/nodejs/nodejs-8.11.4.ebuild
index 8f2f243c0b08..8f2f243c0b08 100644
--- a/net-libs/nodejs/nodejs-8.11.3.ebuild
+++ b/net-libs/nodejs/nodejs-8.11.4.ebuild
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index cd5bf25f9a58..446bea82d054 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -3,10 +3,12 @@ AUX initd 533 BLAKE2B 0e5b218af1b78b3613bfcd33b9c6c941ff708e55dff6383d234aea19b1
 AUX tox-bootstrapd.conf 2171 BLAKE2B 25021453c2be24bad5ff8e5484c41ebf0c2487f326e30af305fd13f949242098c4a0392caafed2653196b56b8c7f495964e465a5ef0d0dbe22100ee58e8aae89 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
 DIST c-toxcore-0.1.10.tar.gz 820090 BLAKE2B 071e530db2dd6ca387a6cd88f1145515ab8741017626fcb744fdc9940263b6c2604b456b6d1357bc78be5e33b544ecf882e608bc7b4a4227d44c5507e5dbad56 SHA512 428fee2d811d0b6d5d005f082aa06f95765794b1a8bc77ec4411bb9ec9085b99675535b88db50f5ad7313850a0bb3c54c4e2e8d8864cea7c0c7d81be9879b157
+DIST c-toxcore-0.2.5.tar.gz 482160 BLAKE2B b56511d9cf7bd3a9d2b9177b33bdbf60ac571f6c95d7ee26e6ecae7c9395d8cdd4f6650025f8b727ad9b825b304c4555efaee0f17d60a26bc5bf599905ec27ab SHA512 a425a106054f29533b43b14cb8916706d04158d91b66cdada0e9e007aebd3f68a253b8519a75ca94bffba3adc57362b4e7c44e9356fce416f081a7eda6a61e18
 DIST tox-0.1.6.tar.lz 314837 BLAKE2B 087a6f5d5ef55709b5f6188d661d556326bb3e6eac33e55f9faf598d433e33dabbd983ab452e948bff97f82cdc336e0fd48d3f0a6ec57551914884a809b9118d SHA512 57ed7cee2c621c57e24f5ab36d68d99414d9820cdb3e8b7c4390818222f9d885f352f9cf76c8eb522c238bebc7d420bcf3cdd5f6ab65b9801aadbd225765166c
 DIST tox-0_pre20160904.tar.gz 395495 BLAKE2B d59358c5ff904b17e9c5297a0ce2aff39777f8dd4bfeba1e5e78a284a5016921794d0e0699f91a99f53428809a859ce959e17b4ae9fffdd691005c377834057d SHA512 c0da52ac908141e97e96510a05431cbfb4b9aae81faf4c136c95e21b90a23e3bbe6db88303e48c0f4f3c74ca954229787564b7aa41bfb462afb0d8f8430cdaa1
 EBUILD tox-0.1.10.ebuild 2214 BLAKE2B 5d2003fadd0af8870610f10f0f5f1ff310de209e9efe83606ea781cba75f38033eed23edfd03b3b2f2291e48c95387949dd35600c76a850d1f6590d98ef5441f SHA512 c57222375a9135a00053ad05567658ab5c108015733e23b2aeb89e4ef93a835e3df3db9b65d3f01dddc38336d97bca366a4e1972c7d44471cf6a47c3913cebc4
 EBUILD tox-0.1.6.ebuild 2250 BLAKE2B e4fdb58e9a9861eaf3420e05228d2dcfb213ea2ed839562394cac6207afe3a97947ff34c8c31c9c737669758d49a9f757eb03fe99da98ed134d4d96a90dd5f7b SHA512 3566194ff9f4afc1ccb95cce44ecc47b13c3ad1b0ee8eecd6acbfd4e122deed63342ccd23eda9202070aba9f59e21328e610d454a2209edc3d513d54ed2963c1
+EBUILD tox-0.2.5.ebuild 2087 BLAKE2B 0518bf2d70a2390bfc92397c864f54c9612d0346dd0752a7b8c6259242518b2c57d4df3cc17b34ed7b6780d76bdb7e1f2e347fe4fe379f0975fbb079aac02ff6 SHA512 574c84ed7ccbeb7480ad7f2140d4ca1e703f44be05f60c24a7aeb5a1c843798017a9615905e7ab619bb1af7a70b179a53523a606f9e22b370a5c723664afe6f8
 EBUILD tox-0_pre20160904.ebuild 2237 BLAKE2B fbdd8f30956ad73dcd398468e537260e0597c8b6f1a6f3d75987167b1b16da38a0c3e9b1159d25e6f58b4ecbcb4d99dc63870c71cb6c3d2dcd4d9863efeb452a SHA512 123f25a734fbd69c6d48d594359264b1ddfe9ad2423ebf8bf5f768e352e38b9d59d3be42932d6709340900fcc45131d5496bf0f474ea9ed70753a3d97c841543
-EBUILD tox-9999.ebuild 2146 BLAKE2B 8388e75e8cce0532cd18c3053b5fcda8adccc155c5c426e5ca5457ef4e842b379a1eabc13b789929dd2df4b2e6875265b8469c40f90ff1d6ebe4335d335530b2 SHA512 d4f6aee075b56a8e034488c3f4b0808544dd718751a4cbcaf2ca81d6fdf04b4b4dfaa68f17665faa7457af36398769ba26d73545b1e1a6ee803001eeb9ce36dc
+EBUILD tox-9999.ebuild 1794 BLAKE2B ec371c542ac51f12bda1b26e59716a766d1e7824d3203288064c3fda280d891c2429a7b7e0c26b840981187bdb0568103bd012bcd1e676a3c3878e42a209e9cd SHA512 b3a45120acc50594bb2f66dc4dc13f638e5cda5500f666a1b68ce2e0fd53637dfd36530a2eac370da01b4bb4e86cc7a7ac7750194ee5f31de22a116256ef7756
 MISC metadata.xml 731 BLAKE2B 7c279eba74cd218439392afee1509adcdc022a54a87545f98fb1b9fadecd31efc383a1fd6e44bcf2db53ae82b3cfdf4fb2d14d427d94699278ff978250510b0e SHA512 952aaa54d9b72cae58e6ac6852435a7394fee3805d5772c223dc48757066d457efa1094682f2afa5056ef782a8c2ab61b45e724f1cf80f33643a57152f75a8b0
diff --git a/net-libs/tox/tox-0.2.5.ebuild b/net-libs/tox/tox-0.2.5.ebuild
new file mode 100644
index 000000000000..71e771406fa3
--- /dev/null
+++ b/net-libs/tox/tox-0.2.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd user
+
+MY_P="c-toxcore-${PV}"
+DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
+HOMEPAGE="https://tox.chat"
+SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av daemon log-debug log-trace +no-log static-libs test"
+
+REQUIRED_USE="^^ ( no-log log-trace log-debug )"
+
+RDEPEND="
+	av? ( media-libs/libvpx:=
+		media-libs/opus )
+	daemon? ( dev-libs/libconfig )
+	>=dev-libs/libsodium-0.6.1:=[asm,urandom]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# disable tests that need internet
+	for testname in bootstrap lan_discovery tcp_relay tox_many_tcp; do
+		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTRACE=$(usex log-trace)
+		-DDEBUG=$(usex log-debug)
+		-DBUILD_TOXAV=$(usex av)
+		-DMUST_BUILD_TOXAV=$(usex av)
+		-DBUILD_AV_TEST=$(usex av)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/initd tox-dht-daemon
+		newconfd "${FILESDIR}"/confd tox-dht-daemon
+		insinto /etc
+		doins "${FILESDIR}"/tox-bootstrapd.conf
+		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if use daemon; then
+		enewgroup tox
+		enewuser tox -1 -1 -1 tox
+		if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then
+			ewarn "Backwards compatability with the bootstrap daemon might have been"
+			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
+			ewarn "    ${EROOT%/}/var/lib/tox-dht-bootstrap/key"
+			ewarn "    ${EROOT%/}/etc/tox-bootstrapd.conf"
+			ewarn "    ${EROOT%/}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
+			ewarn "Then just re-emerge net-libs/tox"
+		fi
+	fi
+}
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index e7b2b5569ca2..6480c17e2cc6 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools git-r3 user systemd
+inherit cmake-utils git-r3 systemd user
 
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat"
@@ -11,43 +11,37 @@ SRC_URI=""
 EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
 
 LICENSE="GPL-3+"
-SLOT="0/0.1"
+SLOT="0/0.2"
 KEYWORDS=""
-IUSE="+av daemon log-debug log-error log-info log-trace log-warn +no-log ntox static-libs test"
+IUSE="+av daemon log-debug log-trace +no-log static-libs test"
 
-REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )"
+REQUIRED_USE="^^ ( no-log log-trace log-debug )"
 
 RDEPEND="
 	av? ( media-libs/libvpx:=
 		media-libs/opus )
 	daemon? ( dev-libs/libconfig )
-	ntox? ( sys-libs/ncurses:0= )
 	>=dev-libs/libsodium-0.6.1:=[asm,urandom]"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
 	virtual/pkgconfig"
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	econf \
-		$(usex log-trace "--enable-logging --with-log-level=TRACE" "") \
-		$(usex log-debug "--enable-logging --with-log-level=DEBUG" "") \
-		$(usex log-info "--enable-logging --with-log-level=INFO" "") \
-		$(usex log-warn "--enable-logging --with-log-level=WARNING" "") \
-		$(usex log-error "--enable-logging --with-log-level=ERROR" "") \
-		$(use_enable av) \
-		$(use_enable test tests) \
-		$(use_enable ntox) \
-		$(use_enable daemon) \
-		$(use_enable static-libs static)
+	local mycmakeargs=(
+		-DTRACE=$(usex log-trace)
+		-DDEBUG=$(usex log-debug)
+		-DBUILD_TOXAV=$(usex av)
+		-DMUST_BUILD_TOXAV=$(usex av)
+		-DBUILD_AV_TEST=$(usex av)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
-	default
+	cmake-utils_src_install
+
 	if use daemon; then
 		newinitd "${FILESDIR}"/initd tox-dht-daemon
 		newconfd "${FILESDIR}"/confd tox-dht-daemon
@@ -61,8 +55,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 -1 ${PN}
+		enewgroup tox
+		enewuser tox -1 -1 -1 tox
 		if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then
 			ewarn "Backwards compatability with the bootstrap daemon might have been"
 			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 77a3f6bb91bc..0f152b4d14ab 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,5 @@
-AUX 2.20.3-jsc-build-fixes.patch 611 BLAKE2B 63491442c9836873401fc58a2a2ed44d4f24fe52d67f21f98cc11a21e19572763cc6e0d656806cf60e4b2cdb11234ece232baa9619c54d33b69323984c573cb2 SHA512 90361785e3f562f55e37315600ab9f096804e755d0dbfa56eafd2fcb9448639467c6a707c8bf641cfa714489a8819bde706b9fffeb0229aca82c3f135e886725
-AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
-DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
-EBUILD webkit-gtk-2.18.6.ebuild 8242 BLAKE2B 1e8058fdf46994b372aabdb0e03bcd19ee95b042cfd6f12b12396273b6f887e2f802a40445426cabe724e5044bbf138209a3cf5dc13027dc21807491b45970ae SHA512 ac334598eae40b438c8504e9d5ba93dd7902b1ee55d79f07a171b7aa78088e2bd2d54cbed7e528e32cc03835e0a027f13244a14a806d350e1861a222457c4ec1
-EBUILD webkit-gtk-2.20.4.ebuild 7855 BLAKE2B a0d932575d5f7ba224db1579469877ec9520d9c0c8d97e0f7f08b162d50ece4e85979ee839845eb7c07b391736e73236844c74ceca33d35e0d3444150575a0eb SHA512 0358d76289f7178aaa8da7684f2715f859390bea803305bff6d966aef86e633ce6e88380faf2054d2c027107f3d9cb35ab31deba8849442663c92671ce79af3c
+DIST webkitgtk-2.20.5.tar.xz 16625200 BLAKE2B 1fd803d81df1659fd87a93821413326eb798fe9c21af86deeb92f16b3f8eab14350851db499e79745457b708305d013032769416877660db3d5bc7c6058b13cc SHA512 d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7
+EBUILD webkit-gtk-2.20.4.ebuild 7860 BLAKE2B 425c3127e95c99e99a2289fc81d192a5290f2ec4df98a68f0263576d74b47b6b9084bd04fed17ed932bc1a5a13bf4cbd567764677f4244a70f42b66ae496d591 SHA512 78720140f6b08e3e109dd4edd14fbd9990095cbed1379d140173d5426a3cd90febd335e7edd3d80f515c7cb5e5b2f51308c461a85a82845dc6d64323e92228c8
+EBUILD webkit-gtk-2.20.5.ebuild 7881 BLAKE2B ab258b918df65d10a7a3a80654d86f03f8bba4f5506e3f81054a21539bae5cb59c0e550eb22f480210b9f8dc6039e83362dafb83eedaa0cc03e0fa38cb9ea7af SHA512 0820914a1c191cadd33a53caaafdf9d5a3e0274ec8efe296758c76c07594c5c629cb0f9134190155dd1777352a65f82d520286529d296c4e19976ea30756a6d7
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
deleted file mode 100644
index 32ff3a52844f..000000000000
--- a/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/662002
-https://bugs.webkit.org/show_bug.cgi?id=183788
-https://trac.webkit.org/changeset/229282/webkit
-
-Index: /trunk/Source/JavaScriptCore/CMakeLists.txt
-===================================================================
---- a/Source/JavaScriptCore/CMakeLists.txt	(revision 229281)
-+++ b/Source/JavaScriptCore/CMakeLists.txt	(revision 229282)
-@@ -248,4 +248,5 @@
- )
- target_link_libraries(LLIntOffsetsExtractor WTF)
-+add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
- 
- # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
deleted file mode 100644
index 6c88c49d8b9e..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,6 +98,8 @@
-     set(WTF_CPU_PPC64LE 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*")
-     set(WTF_CPU_HPPA 1)
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
-+    set(WTF_CPU_IA64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390")
-     set(WTF_CPU_S390 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
---- a/Source/JavaScriptCore/CMakeLists.txt
-+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1147,6 +1147,7 @@
-     endif ()
- elseif (WTF_CPU_ARM64)
- elseif (WTF_CPU_HPPA)
-+elseif (WTF_CPU_IA64)
- elseif (WTF_CPU_PPC)
- elseif (WTF_CPU_PPC64)
- elseif (WTF_CPU_PPC64LE)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
index 6a241552a2b4..b7b46a2a59f4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.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="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+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"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
index 52bf62e9d38e..67e35f0c639a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
@@ -4,9 +4,9 @@
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+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"
@@ -15,19 +15,18 @@ 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 ~ppc ~amd64-fbsd ~x86-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"
 
 # webgl needs gstreamer, bug #560612
 REQUIRED_USE="
 	geolocation? ( introspection )
-	gles2? ( egl )
+	gles2? ( egl !opengl )
 	introspection? ( gstreamer )
 	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
 	wayland? ( egl )
 	|| ( aqua wayland X )
 "
@@ -41,7 +40,7 @@ RESTRICT="test"
 # 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:=
+	>=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=
@@ -59,6 +58,7 @@ RDEPEND="
 
 	>=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:= )
@@ -69,10 +69,9 @@ RDEPEND="
 	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[opengl?,egl?] )
+		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
 
 	X? (
-		x11-libs/cairo[X]
 		x11-libs/libX11
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
@@ -84,10 +83,8 @@ RDEPEND="
 
 	egl? ( media-libs/mesa[egl] )
 	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
+	opengl? ( virtual/opengl )
 	webgl? (
-		x11-libs/cairo[opengl]
 		x11-libs/libXcomposite
 		x11-libs/libXdamage )
 "
@@ -109,16 +106,16 @@ DEPEND="${RDEPEND}
 	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-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		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}"
 
@@ -150,8 +147,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }
@@ -190,17 +185,17 @@ src_configure() {
 	# 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=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
+	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?
@@ -216,14 +211,6 @@ src_configure() {
 		opengl_enabled=OFF
 	fi
 
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
 	local mycmakeargs=(
 		-DENABLE_QUARTZ_TARGET=$(usex aqua)
 		-DENABLE_API_TESTS=$(usex test)
@@ -237,6 +224,7 @@ src_configure() {
 		-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)
@@ -245,7 +233,6 @@ src_configure() {
 		$(cmake-utils_use_find_package opengl OpenGL)
 		-DENABLE_X11_TARGET=$(usex X)
 		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
 		-DCMAKE_BUILD_TYPE=Release
 		-DPORT=GTK
 		${ruby_interpreter}
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /net-libs
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)