gentoo resync : 21.12.2017

30 files changed, 358 insertions, 529 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 77e810e163f4..87034040cd17 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index bcb756097da1..444a24110508 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-online-accounts-3.22.5.tar.xz 1404888 BLAKE2B 421253a66fa3de76f0c4558bb61902524e8cef1fca76004a7809be31ff385a9b86d273c0fd0a9521a70c9d3be49947ba1a51010af6f60f1a13d4d37d3d4a5a6f SHA512 5c87decaeb64850be02c3191088d518a5c3b84cb8d202692ff50b59dbf83f28a56f5bf34873ec9cc16301da3f8b3f41a892cf6a67f9e9f9f2bf35a8bde07a258
 DIST gnome-online-accounts-3.22.7.tar.xz 1404820 BLAKE2B 7a9bd80c5a240ff7172dda5cfe93fa7410b83e7f3b14c615a465b322d5ee07b220773c7424e8dd4c2e0dcacbd11545cfa968f247e545a9eaa530e6d2ecebfb72 SHA512 76a5b6897540f05126786caeddd392d465063571e3884484aa68cd66de851f2f72351afe74dd7e38d8fb8a628d57bd8dde0c8379f909f9de19e451cdf9112b67
 DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a
-EBUILD gnome-online-accounts-3.22.5.ebuild 2349 BLAKE2B 9d4b0b6a810ee96fa2228f1746b0ff9ecacfd232370e79dede030f05161fe36612510498fe5efee0893c827e89eaeb5f4f836ccca32117263b7746e8d0ced375 SHA512 139d7c40e5fa01a3a9e4f90f3e2a350b450ef82c13f94ac2208fd9184099a01924e26616f7a17ccce826839a254f0b02f1eab9c4b0663d8249f389e92c9c366a
 EBUILD gnome-online-accounts-3.22.7.ebuild 2471 BLAKE2B 91861dafa0a3d5a4bca7664fcbd4a0f4b75942babd2763e5e2b0e2932a6c803597bd1869a22bd6a96d032f197aee5c33ece56e45acd2bc1f21cfa78fc9ba9a8a SHA512 b41c1207d37f821942ea448cc9cb69aee186b16888c2da5177790eac7cbd76a1d8672dfe2711d95903c87428616853aacdaae6bdc2711b3518dd20a069786005
 EBUILD gnome-online-accounts-3.24.4.ebuild 2473 BLAKE2B 162ab90468bccd5d6cdb6ef23ffb6832f50b338aec49a33981f8dafe8c1b9252571f7e080aa6aab498f7fef35e94d2df128acb46db47b0fc7412ad91580debdf SHA512 d4191659707cd43ccd3c843233890700fbfce1379fb4edc4d2f97d847607168d240b1d8ac82d46b3822b11f5042b8f2588a0e47ed7a9b03befe14efd2ab7480e
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.5.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.5.ebuild
deleted file mode 100644
index 4a28c5848389..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-IUSE="debug gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	net-libs/telepathy-glib
-	>=net-libs/webkit-gtk-2.7.2:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	# telepathy optional support is really a badly one, bug #494456
-	gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-telepathy \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos)
-		#$(use_enable telepathy)
-	# gudev & cheese from sub-configure is overriden
-	# by top level configure, and disabled so leave it like that
-}
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 2a499c6a4a18..05b8ccf67ea0 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -2,9 +2,9 @@ AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a4
 AUX gsoap-2.7.40-shared_libs.patch 6866 BLAKE2B 829a06165291a7887b8dc72b450b38a6f28cce51a6cf55d7d2ba1129a2f96036b5cbcf1a5e3b7d00c63a94674c42ea0b647818b9000e67191a75cf1a5660e0b9 SHA512 289c09f08d5881232fe169d37a0a76b58f8ec823305dd24f62b4cc04d7d1801be5b475ccd87c1f4ec3779c7972cb962a8a196d80e5fff91755d9b76bae0ac941
 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.54.zip 34520149 BLAKE2B 8918b9218b1857a520a56bb264b95d9ce1b192e3e0be9d523a1604c5b9b083f9d6370c331708b7700e71f5502e89815173b09ffa1af24cd9fc16e4539095eaa8 SHA512 59e59dbcb0c7b6f13771c0cd26412941da0a15e05c539dcfaa7deecd83e15b50656454daf6c80eefb85e2d8830748a4fd48970e6de68fd1e2b96ce9a7c0d1874
 DIST gsoap_2.8.55.zip 32571850 BLAKE2B 6f262c0b65c7704fbf6c0973d766c0cff788745d0f6331afdffc6bbabbbeeea38222f8038d7a96eae63453a721f2b52b1623f4691e7c677489fb8a3c49d80bae SHA512 e0cb6809d5b8e4a068ed937f253844f88d8275e58f7590ca0dd52bede1ea74d5781d35664586f9e29f2e22c508167df8044d45101f0773c9b8d79b80aa188935
+DIST gsoap_2.8.58.zip 32931913 BLAKE2B ab6e1b9f1e3b866199236b471e638a80c3542ce709e5cca75df9b3d5cd06fc498d09e768078a6863c549e721f657723d50bf53274c7d6603da23f1ea7a887879 SHA512 019c428aee0309ac952af349738a062d4e6deae28f2c5d38178bcd2aa3ead76a7a43faf952ca61f15e8928600a46f1a865b7996ded1c32e1749d1036c5354e2b
 EBUILD gsoap-2.8.51.ebuild 1636 BLAKE2B 45be6a22238369d019f5b8e8efe2c11c9db8e38171fbf90000fdd730648d2d1343c11b2eb9aded9fec714ea961248eb715e102bb720932cc9a65490339bd57e2 SHA512 b7dd63458a2ba950a066cb2ad498bd0c7def67b0bde38e90a20ab89bc71a17e8d39f7edb27cd21d721a0646cb351b26aed241b624e1718fb565e1d71d51d3b36
-EBUILD gsoap-2.8.54.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
 EBUILD gsoap-2.8.55.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
+EBUILD gsoap-2.8.58.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.54.ebuild b/net-libs/gsoap/gsoap-2.8.58.ebuild
index 28cf845a3274..28cf845a3274 100644
--- a/net-libs/gsoap/gsoap-2.8.54.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.58.ebuild
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 70a92b7620dd..f066637c0eb9 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -6,5 +6,5 @@ DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4
 EBUILD ldns-1.6.17-r1.ebuild 2502 BLAKE2B b1b54f8308b887e0f3e06d0bdc993cc29e7dc89a660dab105b943cc125025f545796917b940861c11afd311e5c2351be8d941689c2fb2e0b2a80b684cb7ab85a SHA512 30aa360319dd0e9e3a4095fa988ed940a899af72b448b2d4d33fa18f57eee3557eaa20fcc4988deb7821d7ec6a12de88a9f687edb7b964883ffd51e58d14ae83
 EBUILD ldns-1.6.17.ebuild 2196 BLAKE2B 5edd80744d5bed7892bb56a5a80305e04780cebd8ef064f3c2f63494eb46eaba4a7580ec285cce6d32e273b3b162024a0388503364abdca6ac0dc7f9e20e6df6 SHA512 70b0785d6380ae4ce03702a5ce396b00275e7dd1548abc96a49444a23e9e370aabc7585d5683fabfca6f512f70ce5acdb7e793d72417a451582920d1f9a7fad5
 EBUILD ldns-1.7.0-r1.ebuild 2623 BLAKE2B e1674ee9f5416ad7af79558c1477ae918bb8cf44936b5746643d7351a4fbe16d586de0f123090bf06951e615e2647508ae3b4a370d7e2b2efe7a429661d1be1f SHA512 512475f5857766024ebe7ac8b852825a4737d1a08122fb337fefe0e36fc5a1294c1067b6a8ad63fadc1f0f665aaccc390f42b8859b54338fd1f31f5a7818e39d
-EBUILD ldns-1.7.0-r2.ebuild 2253 BLAKE2B c0e5c048f0c114ebcb0f2dd5d69705bc00514e2c36a70ea99409f5f9ffb291591763152fba119a2fc7b7b953f825d6ff2e7fc7f3d9ff2bbe67c6c79dfc230ca6 SHA512 e3987574d47fd702421621e0fbece86ed32698f424baa146bdbef1958cec19155c499801572ac681d3f2c5ad26de5ccb639eed136e472bbf3196da0ecbdfe7de
+EBUILD ldns-1.7.0-r2.ebuild 2252 BLAKE2B bc17fc9072342f9ad9b80c07b0c49182c4e81b86b0121ef4a2b7e81e805e2b46aada05f04c6fc2ad582a1f683a110503e25c929cc8ed93bb884363ed64ac7f55 SHA512 76e25d41ca82bca064af1616a57589de33fda6ac9c7ae4fa6bbdcac02ff5286901756048a2d8559e9b958ea67538dee703c9b538289bfec5f91caa975721cfec
 MISC metadata.xml 743 BLAKE2B 31fe371130dca55cc2950a0892ddf2e97f1c7260b57e893932c14d2af254b1c9272a678a4365762247b5fd7a6e2e6c1a58dd326f3837e0e12389bb08f493562a SHA512 b8d5c5fd107fb7dd7dc2d7d19fbb91a07a2a619b6c9ddd9146d9359c06ed96059c87d169b7c2022760e4117283372c01b6f5231edf975bbab9c72a3ee8347f35
diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
index 2a155ab293ff..26162fe5a27d 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 7460370c0abb..beb8d4e46a61 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,5 +1,3 @@
-DIST htp-0.5.18.tar.gz 799444 BLAKE2B ad164267c8a30137424bc3259af1f3aa34772eb114e2022f3e967809a4f668930622512cd1fbe060358ffdb081107f7d5cb688cec800798fe16bf18cbe2f11f7 SHA512 e3efaedb74b8a0655b58922f2d0a079f5dfb5dcead117e21394d5d76ff93a3a7260ab56994468764ceeaa2dd584bcfa988b146efb85831e8a98efcda06b28876
 DIST libhtp-0.5.22.tar.gz 5773159 BLAKE2B ae3b759624ce7c6063013810142fbc12544d60cfaa482ad82114b65374923871bb732c86051822fe78a539efbe5e139f480117a28fd4ba2fac9201a46b8eb99f SHA512 3daf7241e8abca34bf348e0fc805c755472ebba01a869d5523637a81dfd6b9b3019941dff2e75d6e0978ebfbd60d917191e355aa43a2391500ecaaddab487ebc
-EBUILD libhtp-0.5.18.ebuild 802 BLAKE2B ee3fcd60c5bf73aa37b10e85c61d4dae764725bd491bcfec39cd3cfcd9167b204c65c1ea8867ad2ce8712d4943f77bbe8d9dd7b7030ebc015559066cebf30c5a SHA512 1c139e3f3a386782dff1ab7353770eae82a8c1279119a7acae157145f46495a48e6024679f9ff7883f1052662444a75d6a000aff0b396812adc861d72f2e30bf
 EBUILD libhtp-0.5.22.ebuild 802 BLAKE2B 952ed01b70409f28eabb0297cdfc9b0c3ee18616172a71a9d3a94d70da005b98fdc06cf3a944646ab90d8b7f95f78f426e5eb24facc27108f33d0716ef972e8d SHA512 16e21e57bf13a605e40900f81406b378f5c05332bdd537c5279968975b80ba78d76f0129b8c083d7c234c5520589f2eecad0e1328fee3a11af4ce90c4b072f67
-MISC metadata.xml 335 BLAKE2B 6fda597c9961d3619ee92715e452e7e7c6b0d0f8e9f8668ee8e499673457f46dac2b21a74ce63684b9b7e8ecca3302af52ef817c304cb5497a0ab1b3eaee6452 SHA512 90a08acb6435b763b420630ba709b4206cd9de5f026665c43cc51fee0c58cd711024c013e7ce07a1b80e960835d5dcec77d030ca99f67df379cc31eaaee39bd6
+MISC metadata.xml 239 BLAKE2B 5663c5db91a61423afef9ca57ba09e86a7510a559e5cc1c1eb31040d52992f0ff9ddda7d8da8ff0d1659f840a9945cf445d240467f3e4f3dcbeafdd88110ec08 SHA512 28e6cc728967776bcab01a267db4306577f203c0dd2daff89fb99af56f3414ba8675fe7015da268c246916d4d454382aae093f5ccbd233aa12ad605e85a5333d
diff --git a/net-libs/libhtp/libhtp-0.5.18.ebuild b/net-libs/libhtp/libhtp-0.5.18.ebuild
deleted file mode 100644
index f583f27a6312..000000000000
--- a/net-libs/libhtp/libhtp-0.5.18.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib-minimal
-
-MY_P=${P#lib}
-
-DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
-HOMEPAGE="https://github.com/OISF/libhtp"
-SRC_URI="https://github.com/OISF/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="sys-libs/zlib[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	# The debug configure logic is broken.
-	ECONF_SOURCE=${S} \
-	econf \
-		$(usex debug '--enable-debug' '') \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libhtp/metadata.xml b/net-libs/libhtp/metadata.xml
index ee432479ac41..3b1b37df5a69 100644
--- a/net-libs/libhtp/metadata.xml
+++ b/net-libs/libhtp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-	<description>feel free to update</description>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="github">OISF/libhtp</remote-id>
 </upstream>
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index a6f70470b77f..d0abdeb3421e 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -3,5 +3,5 @@ DIST libnetfilter_conntrack-1.0.5.tar.bz2 418516 BLAKE2B e887357aa5566b67602f8e9
 DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7
 EBUILD libnetfilter_conntrack-1.0.4.ebuild 966 BLAKE2B 82cb97d98d7688949054e07d0d25175f4e766d265f28caef1740b08d4a2e2ad60d04c3f4590f51de344c97131484ec36824af19f0c0ae068001e2c108585bd94 SHA512 360c5bbf5db8dcd6d2ead6373efee752b0a25da8af0a99f3955d45ddf4d83f2ef954eeebde360817b5d7c5931d2c4bc37f019a4c1074f98fb1bd51f1c7a82592
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 979 BLAKE2B b87414a8ebcfc582e36c109da3e9fb8f00e7d0cb4e43286f54dc34a76b4ceaecadbd38f29fed8cd36c9a9c030f28ae14aa418c7a863cd51c5a3ec7da8c82a60c SHA512 872f16047546ca0431a52b391dffaceb6b38503a3bb96900e6c7d38c79b43e5c7b3b4c79b15b468b07de6a5b934c9b088dc0e7ccde61be5b7165939f3a15906e
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 972 BLAKE2B a539756c7bee8a8297b7c73835d0fc3117f307007d5106a15e7ec26af2c73161ef60c635d87b316552715738f46f905c0d3e5a9f5fe2104c61bd302fe7da2d96 SHA512 4f9bc4136d86f6ba82daed9c1b72f7d0bb9224584e4b808df4b550abe8f0ee4db4fa740b1a15e6ec6891289a401ea15e302dcc48055c7108a5ee060ed6891afc
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 971 BLAKE2B e4cc6ac724b9cd487ac69dbb0d5748ceef3ccd7b165a19bd6b88a3c2b163f92101f78062f0eccbec2496e77456731ca089ec485de13ee2def574d5a29ba283ec SHA512 698ba8672749fba7250e6e4d2973954b1de3b7f60dea958e9cd075da101e1c7f85493b88d100ca2030c570a4cb35cbd8ba63ae6b28e31f2399c3eee8b843709a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
index e3dfdd49a2e8..faab14a34883 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 4d2cf020ff46..81bd8d6d79a2 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -9,4 +9,4 @@ EBUILD libqmi-1.16.0.ebuild 1033 BLAKE2B 41776532f8d59524b9e15c5ffba94d39c6e164a
 EBUILD libqmi-1.16.2.ebuild 1104 BLAKE2B d1c6fc14d1089b229d32c103b1737428eeac0d150614e752b1c517122cfaca9ee515ab0ac60fbccd39af17953bd425d6f0e32db3640664a9db466c71bd8052ac SHA512 1167f68f0a0d6edd26a8d66443c05c4bf7c4feced8ee7cbce1a1a7afc8a65e21eb2b7b02d8e79685d89a74f075b50e6852da6dfe6254a9a64677041112c9b3f6
 EBUILD libqmi-1.18.0.ebuild 1128 BLAKE2B a05b31d3c7e38c498738f29d30556a7bac32f0202733697e4f03377062c5f6605b83a7cbadb2d607fbbcfe20d4d13dba8af2f7d24036bdc670d420919b682659 SHA512 bc8d931bf49382b5955298516000fee2fb64a23ad1f1fa7b3ea5cca14e0017683fc94ddb078be344364e04164526e862a16e702cc8aa7564f52511fc7a852f31
 EBUILD libqmi-9999.ebuild 1128 BLAKE2B a79aaf1d60a996f5e9fe3d53a7b1d59b61763720cd3598748141e6d3cc21959a0c07fc327d9ebd508cab7bd1e787df20ad025dca55d22e2255c3ebdbe61fd1db SHA512 57703ca8652c1ff10d999184b55f0e69006602d4ac29faf66eb044f9b3db961adb92c4aab91196e089724755f947c4af203e76aa91e612dd7a140ecb53197c8d
-MISC metadata.xml 543 BLAKE2B 45684b9d4a7ac5842cec646eb10a0a09ed751f06b22b5f9b1f5038bdf9d88c2933a96a66d2f36b74de32bf9c0a63de50726ba6ef887907c0a739312de1a603be SHA512 b0285ce2d4cb22f9e3724a53f77dbdd0b029f7402aab7fa223169482cfe6e848403d309561e3c1ddd9ee7ea47e5175ce849ba9c212a3d3ee1fe9c05071a0f690
+MISC metadata.xml 416 BLAKE2B f391913e78bcdb06b9c686a460059b4ee38861fa09fa0d50c19418ac3e1d966efd2646694d89d240d13f0a9bf2eb910d952288de153699b9564040efed8b04ab SHA512 4ebf9f46a3c7c6e18e0eb83341bac1b087bb6471a0f3f11663975b8a6e0e1a78f8db680a628dc693c4c3eb825d50717f0b7ed086d90c9d33818f094de2611fe2
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
index bca6a9f230ee..dacd578ab6f3 100644
--- a/net-libs/libqmi/metadata.xml
+++ b/net-libs/libqmi/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>feel free to update</description>
-	</maintainer>
-	<maintainer type="person">
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 447648f6145e..9941338c8e48 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,11 +1,4 @@
-AUX libtirpc-0.2.5-stdarg.patch 667 BLAKE2B 1b8b1345310883ad7f62cc22882306dc8f549aceb85fd25ad58f4cb21bbf4bb85e94e524f419276644005c0b967be0dfd74387a925efde9c73a62ab97c8bbfff SHA512 2197f8c2ed3b4dbfc54ee37e973a6e275d19c6dde5d066b9ce45beecdbb17c9e620d7c6f0997b7ebfeb2bd1741327028a793b34edd94d59a89c8b36ac102b025
 AUX libtirpc-1.0.1-CVE-2017-8779.patch 7032 BLAKE2B 0dae8a3ee695bc1216973a7fd92d30ad7e1bd426f27cac7c64cd6f2cef741509e63431483afb0b1206fd9648d4a6c61df59f9637ed4efe5a20cee219f8bcfcca SHA512 b7c97f6f202cd57c988ff026e2805011942f470c71fdfd81a2647a0e197386db937b022f0056e6ad106bb143c36323835748965b4915a293b89efba3cd171c84
-AUX libtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch 1207 BLAKE2B 869327fad2e99c9902d2a2d0571eeef65f8ff0bd4c0ef78a54f4db45f2a012c0c1a01b78d0a85906e015c9a480c4ac16b0a4f4d8846362cd0e65938792af6e78 SHA512 dd6c61bc885dace248bf69d9fa15d79cb8a73530c434f834a3c53ad5d3f5598b0b04786d9d708b25c53202d2421c0888e00b9c1a260abcafa776f25cef694c19
-AUX libtirpc-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch 821 BLAKE2B 30bc87afaa835766322830e853d42b7e9d38cf9d25bea97238f2b30d246a3a9b974335e4d4f0b736530119387d14972a9c4cd1662246c28b3139083e83738706 SHA512 3733c1e88acf91f30ec647f83f6ad44d1dbe087e89996db7cd4197b7eed7924443fb4854bfb4c0e5ce0e2c7b3569e2af444a1e6a8a4139ea3c408e9838419b88
-AUX libtirpc-1.0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch 1232 BLAKE2B 5bb0c96d675e29979e86d99fc5317cc1ed149da4ab38c7627b395b10361d78ddd9dfe1635f7cf018dbd8e3a0e0109e28611c4b823ac3f72fcd832cd0800bb86a SHA512 24a5012481eae9d8152267287546b390edb0fe9925bc043df50a3b82057517487e8a1b94782adc9e14ac1e72ded9b1cb44dd25e09c9a5451053a26adb3a821a2
-AUX libtirpc-1.0.1_remove-nis-h-dep-5f00f8c78c5d.patch 4015 BLAKE2B c0bc2c0575c8b94a799544a5281479e6c788a4ebe85bd8ec3e2c68fda0dfe1045589a86c335d4b6642c3de6b16228a804e4ad011663c2248b860c8ecb83849c9 SHA512 fcd76037bd78e298a261f288b51de6ff25d362c40a416e86ed2c766b3c106339e4633e92546b96b727d38d14c85566250be25b82c1093c470e8c8cb1c86faafa
-AUX libtirpc-1.0.1_uclibc-dont-use-struct-rpcent.patch 2010 BLAKE2B 28c10e2a780c9e469c7aed6f5e202cd9532a0952e54775438fda9cba508cc59ad72c0af4725d3d75f13c4c00172c325dc885b8665809ab247686fdaeea1992b9 SHA512 0486bd17ab67aaeba1ed536c20297f78091c2b5badb7ce41cd0cfdb0c6139e8501b827d40798b03f114e2bf03f4c98a684aa43f47cc5a1953f8245292a0f036a
-AUX libtirpc-1.0.1_uclibc-use-memset-not-bzero.patch 759 BLAKE2B 756df66fbb89b869979059e73ca0894200f7b10b8e8588803b48eda9413c0e3c1249c802c87f7b359dfeffc4f6cd4b7a31fbb7330ce090ef5a0614dd332ef466 SHA512 122a1ae24fc08ede5580d31749f7e1cfc21266b628e2f82936feef856b2ea5b0da99f60291e5bdf87d87c5711891515b0c6bdc351b0bd46f97192ab215e5f25d
 AUX libtirpc-1.0.2-bcopy-to-memmove.patch 2226 BLAKE2B c0a5244f21d9a5531303b317946fe53b695aafc54095f617a3918f28a94033cd0a30b5f3bfd6fe671b64d4919d255298b55fbb4fa6179c255ff561517361d4e5 SHA512 221c85c47ec56edbdb4ce95e0f67680050b8d9f666c6795ceef7f7720acdf05a535e4afbcdc4e2e5eaeb6edc04bd43f65486df772ad2a0c87987d1c204661f00
 AUX libtirpc-1.0.2-bzero-to-memset.patch 1587 BLAKE2B ae0358514dedcfa3d7e156dbccf4e8bea9749c37b59e1b187bbc34600bf7980e05213da38287077be08e11a2916cb3c787d83860400e2831ed95f99fdd7ef1e3 SHA512 aaea43a11e02094f9e43640866dffe7ef509362ba169500d6032b088f048eb855a3a7a75f2e7a2c999d6a252cb4b66d970cd8cc76dd0747376cb382b53e43385
 AUX libtirpc-1.0.2-exports.patch 424 BLAKE2B c5292cd01b7b8ffd6be3fcd5842f66ce20b7b4b2bfed02c10bb5f5b83db6cacc43949aadfc60fd2023229c6246f3cb3f991413ee1704539625f759ae39b77dbd SHA512 66a4925ed0236aea2e181e9a07677dc9f41c287311c9cb02129d17b9a61b6102997258082d38e45d193a0ceb4b8e2bc0b8dfe1610a298bc508c1f5c70c1b466d
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch b/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch
deleted file mode 100644
index 8006de39e4dc..000000000000
--- a/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d26607bade0893fe8652e1a0983f9fae59c64649 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 12 Aug 2014 03:11:41 -0400
-Subject: [PATCH libtirpc] include stdarg.h when used
-
-The debug.h header uses va_list but doesn't include stdarg.h which
-can lead to random build failures.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/debug.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/debug.h b/src/debug.h
-index afc8d57..c971ac3 100644
---- a/src/debug.h
-+++ b/src/debug.h
-@@ -21,6 +21,8 @@
- 
- #ifndef _DEBUG_H
- #define _DEBUG_H
-+
-+#include <stdarg.h>
- #include <syslog.h>
- 
- extern int libtirpc_debug_level;
--- 
-2.0.0
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch
deleted file mode 100644
index a62f23d87e94..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Thorsten Kukuk <kukuk@thkukuk.de>
-Date: Mon, 4 Apr 2016 13:48:04 +0000 (-0400)
-Subject: Compile des_crypt.c and des_impl.c
-X-Git-Tag: libtirpc-1-0-2-rc3~1
-X-Git-Url: http://git.linux-nfs.org/?p=steved%2Flibtirpc.git;a=commitdiff_plain;h=7f6bb9a3467a57caf43425d213a06aeb7870086b
-
-Compile des_crypt.c and des_impl.c
-
-Add des_impl.c to become independent of deprecated functions of glibc
-
-Fixes: f17b44048003 ('Revert commit c0547c56dafb')
-Signed-off-by: Thorsten Kukuk <kukuk@thkukuk.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e4ed8aa..fba2aa4 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
-         rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
- 	svc_auth_des.c \
-         svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
--        auth_time.c auth_des.c authdes_prot.c debug.c
-+        auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c
- 
- ## XDR
- libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch
deleted file mode 100644
index 481ace7e6fcd..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Thorsten Kukuk <kukuk@thkukuk.de>
-Date: Mon, 4 Apr 2016 13:37:32 +0000 (-0400)
-Subject: getpublickey.c: ifdef out yp headers
-X-Git-Tag: libtirpc-1-0-2-rc3~3
-X-Git-Url: http://git.linux-nfs.org/?p=steved%2Flibtirpc.git;a=commitdiff_plain;h=742bbdff6ddff4dde0d610a842cd8ac0408af0a0
-
-getpublickey.c: ifdef out yp headers
-
-If we don't compile in YP support, don't include YP
-
-Signed-off-by: Thorsten Kukuk <kukuk@thkukuk.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
-
-diff --git a/src/getpublickey.c b/src/getpublickey.c
-index 764a5f9..8cf4dc2 100644
---- a/src/getpublickey.c
-+++ b/src/getpublickey.c
-@@ -38,8 +38,10 @@
- #include <pwd.h>
- #include <rpc/rpc.h>
- #include <rpc/key_prot.h>
-+#ifdef YP
- #include <rpcsvc/yp_prot.h>
- #include <rpcsvc/ypclnt.h>
-+#endif
- #include <string.h>
- #include <stdlib.h>
- 
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch
deleted file mode 100644
index 0ef15290ea14..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Thorsten Kukuk <kukuk@thkukuk.de>
-Date: Mon, 4 Apr 2016 13:51:15 +0000 (-0400)
-Subject: Remove des*.c dependencies to glibc
-X-Git-Tag: libtirpc-1-0-2-rc3
-X-Git-Url: http://git.linux-nfs.org/?p=steved%2Flibtirpc.git;a=commitdiff_plain;h=503ac2e9fa569d95e366766202a7ca840e28b28a
-
-Remove des*.c dependencies to glibc
-
-Our des_impl.c has dependencies to glibc header files
-and different arguments then our header file has.
-Bring our own code in sync.
-
-Signed-off-by: Thorsten Kukuk <kukuk@thkukuk.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
-
-diff --git a/src/des_impl.c b/src/des_impl.c
-index c5b7ed6..9dbccaf 100644
---- a/src/des_impl.c
-+++ b/src/des_impl.c
-@@ -6,7 +6,8 @@
- /* see <http://www.gnu.org/licenses/> to obtain a copy.  */
- #include <string.h>
- #include <stdint.h>
--#include <rpc/rpc_des.h>
-+#include <sys/types.h>
-+#include <rpc/des.h>
- 
- 
- static const uint32_t des_SPtrans[8][64] =
-diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
-index d2881ad..018aa48 100644
---- a/tirpc/rpc/des.h
-+++ b/tirpc/rpc/des.h
-@@ -82,6 +82,6 @@ struct desparams {
- /*
-  * Software DES.
-  */
--extern int _des_crypt( char *, int, struct desparams * );
-+extern int _des_crypt( char *, unsigned, struct desparams * );
- 
- #endif
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_remove-nis-h-dep-5f00f8c78c5d.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_remove-nis-h-dep-5f00f8c78c5d.patch
deleted file mode 100644
index a8ad182f76b4..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.1_remove-nis-h-dep-5f00f8c78c5d.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From: Thorsten Kukuk <kukuk@thkukuk.de>
-Date: Mon, 4 Apr 2016 13:44:19 +0000 (-0400)
-Subject: Remove dependency to nis.h
-X-Git-Tag: libtirpc-1-0-2-rc3~2
-X-Git-Url: http://git.linux-nfs.org/?p=steved%2Flibtirpc.git;a=commitdiff_plain;h=5f00f8c78c5d13437d50c0737ce77ad67fd4361d
-
-Remove dependency to nis.h
-
-libtirpc needs rpcsvc/nis.h for compiling, but does not
-provide this head file. It's only provided by glibc,
-if the sunrpc code is not marked as deprecated, and
-by libnsl. But libnsl needs libtirpc to compile...
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
-
-diff --git a/src/auth_des.c b/src/auth_des.c
-index 4d3639e..af2f61f 100644
---- a/src/auth_des.c
-+++ b/src/auth_des.c
-@@ -46,8 +46,8 @@
- #include <rpc/clnt.h>
- #include <rpc/xdr.h>
- #include <sys/socket.h>
--#undef NIS
--#include <rpcsvc/nis.h>
-+
-+#include "nis.h"
- 
- #if defined(LIBC_SCCS) && !defined(lint)
- #endif
-diff --git a/src/auth_time.c b/src/auth_time.c
-index 10e58eb..7f83ab4 100644
---- a/src/auth_time.c
-+++ b/src/auth_time.c
-@@ -44,8 +44,8 @@
- #include <rpc/rpcb_prot.h>
- //#include <clnt_soc.h>
- #include <sys/select.h>
--#undef NIS
--#include <rpcsvc/nis.h>
-+
-+#include "nis.h"
- 
- 
- #ifdef TESTING
-diff --git a/src/nis.h b/src/nis.h
-new file mode 100644
-index 0000000..588c041
---- /dev/null
-+++ b/src/nis.h
-@@ -0,0 +1,70 @@
-+/*
-+ * Copyright (c) 2010, Oracle America, Inc.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef _INTERNAL_NIS_H
-+#define _INTERNAL_NIS_H 1
-+
-+/*  This file only contains the definition of nis_server, to be
-+    able to compile libtirpc without the need to have a glibc
-+    with sunrpc or a libnsl already installed. */
-+
-+#define NIS_PK_NONE 0
-+
-+struct nis_attr {
-+	char *zattr_ndx;
-+	struct {
-+		u_int zattr_val_len;
-+		char *zattr_val_val;
-+	} zattr_val;
-+};
-+typedef struct nis_attr nis_attr;
-+
-+typedef char *nis_name;
-+
-+struct endpoint {
-+	char *uaddr;
-+	char *family;
-+	char *proto;
-+};
-+typedef struct endpoint endpoint;
-+
-+struct nis_server {
-+	nis_name name;
-+	struct {
-+		u_int ep_len;
-+		endpoint *ep_val;
-+	} ep;
-+	uint32_t key_type;
-+	netobj pkey;
-+};
-+typedef struct nis_server nis_server;
-+
-+#endif /* ! _INTERNAL_NIS_H */
-diff --git a/src/rpc_soc.c b/src/rpc_soc.c
-index 1ec7b3f..ed0892a 100644
---- a/src/rpc_soc.c
-+++ b/src/rpc_soc.c
-@@ -61,8 +61,8 @@
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <rpcsvc/nis.h>
- 
-+#include "nis.h"
- #include "rpc_com.h"
- 
- extern mutex_t	rpcsoc_lock;
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_uclibc-dont-use-struct-rpcent.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_uclibc-dont-use-struct-rpcent.patch
deleted file mode 100644
index b2760d2b77b4..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.1_uclibc-dont-use-struct-rpcent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From https://patchwork.kernel.org/patch/5499671/:
-
-    Subject: [6/9] Define struct rpcent on non GNU libc
-    From: Natanael Copa <ncopa@alpinelinux.org>
-    X-Patchwork-Id: 5499671
-    Message-Id: <1418718540-13667-7-git-send-email-ncopa@alpinelinux.org>
-    To: libtirpc-devel@lists.sourceforge.net
-    Cc: linux-nfs@vger.kernel.org, Natanael Copa <ncopa@alpinelinux.org>
-    Date: Tue, 16 Dec 2014 09:28:57 +0100
-
-    This fixes the following compile error with musl libc:
-    getrpcent.c:65:16: error: field 'rpc' has incomplete type
-      struct rpcent rpc;
-                    ^
-
-    Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
-    ---
-    This patch could probably be better. It assumes that only GNU libc has
-    the rpcent struct defined, but the BSDs probably has it too.
-
-    I am not sure if uClibc has it, but uClibc does define __GLIBC__ so it
-    might be broken there too.
-
-    I looked into using AC_CHECK_MEMBER but I don't think it is a good idea
-    so depend on config.h since this is a header that will be installed on
-    the system.
-
-    I also found out that struct rpcent is also defined in
-    /usr/include/gssrpc/netdb.h but I am unsure if we can depend on that
-    too since GSS is optional.
-
-    So I am a bit in doubt what the proper fix is. Meanwhile, this works
-    for musl libc.
-
-We fix the uClibc case by checking for __UCLIBC__ as well, since uClibc will
-define __GLIBC__ as well (why?) as __UCLIBC__.  This should not affect the
-musl case.
----
-
-diff -Naurp libtirpc-1.0.1.orig/tirpc/rpc/rpcent.h libtirpc-1.0.1/tirpc/rpc/rpcent.h
---- libtirpc-1.0.1.orig/tirpc/rpc/rpcent.h	2015-10-30 15:15:14.000000000 +0000
-+++ libtirpc-1.0.1/tirpc/rpc/rpcent.h	2017-07-05 04:58:27.141468000 +0000
-@@ -49,7 +49,7 @@ extern "C" {
- #endif
- 
- /* These are defined in /usr/include/rpc/netdb.h */
--#if !defined(__GLIBC__)
-+#if !defined(__GLIBC__) || defined(__UCLIBC__)
- struct rpcent {
- 	char	*r_name;	/* name of server for this rpc program */
- 	char	**r_aliases;	/* alias list */
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_uclibc-use-memset-not-bzero.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_uclibc-use-memset-not-bzero.patch
deleted file mode 100644
index f7657f74db43..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.1_uclibc-use-memset-not-bzero.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Inspired by a similar fix here:
-http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/packages/nfs-utils/files/uclibc_bzero_fix.patch?id=39d8c0fc4a9d14b7bad1442e05c536e28b196a47
-
-Because uclibc does not have a working implementation of `__bzero'.
----
-
-diff -Naurp libtirpc-1.0.1.orig/src/des_impl.c libtirpc-1.0.1/src/des_impl.c
---- libtirpc-1.0.1.orig/src/des_impl.c	2017-07-05 06:16:07.441468000 +0000
-+++ libtirpc-1.0.1/src/des_impl.c	2017-07-05 06:19:57.351468000 +0000
-@@ -588,7 +588,11 @@ _des_crypt (char *buf, unsigned len, str
-     }
-   tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
-   tbuf[0] = tbuf[1] = 0;
-+#ifndef __UCLIBC__
-   __bzero (schedule, sizeof (schedule));
-+#else
-+  memset (schedule, 0, sizeof (schedule));
-+#endif
- 
-   return (1);
- }
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index d51148b32cb4..de9144348c0d 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,10 @@
 DIST nghttp2-1.10.0.tar.gz 2086580 BLAKE2B 207b3906ec3a9e38fbac6331cdb2300c6bf440ee9704d14cf0068c192e1aa95f8ba70e1fbbb9bd9d10a4dcc18d3e3ab52f2305771be7fa3f4c38362b1db533dd SHA512 4341f76ead38ba30e0dfda492e2e0f4c842f453e235fa90ee55b1e556092828236f21c6b212d0099cea005f149e4be3e63ad007009dd5228999101e563009a6f
 DIST nghttp2-1.19.0.tar.gz 2159530 BLAKE2B 09e71408e527f5cd42ed224377042d4b68ff869e86c8727f63f2a4777253da9d03bd2cadfafd655b9984c7b71a52f928906db7b73d3adf74f36e69e28dba5618 SHA512 50f45082f725c237a0e1d25af57992b9cded6c9b68f0aa95c44c16eb4448e05b14e06c853032924d03034115286163de0ad684827cfa5d70896656868fdb4e01
-DIST nghttp2-1.27.0.tar.xz 1546064 BLAKE2B c45049b5532076e228b423ad774efb0aa933891c098f9b6dbd4faef1e7b6eb0aa72d765c4c1201235164ee860ac11160dd26fa646637ed2d084d7928928e0252 SHA512 8156ae4084155d000d1655d43790698b0bf89af3ba3a360cedf6a5744aa2ca9485094e65e09da2850ed6dd55479fe33de0948b734b987c85a63f0b3c83dbafd1
 DIST nghttp2-1.28.0.tar.xz 1553032 BLAKE2B 81991f7b2ebd74c9a730e22b1f220ef9dbd60f38221313b83db71f92d32590c2a8387412a494be7e33adb2f855b82ed2a9f12c1df40e4602662874f5b1881620 SHA512 c49d4e02ec8e894e01aff0b3573e5ce6a33e37ddbd777f6363a2890681a2d09d9e29794c7a6aaf20dd094b4b6da4b535f3e81ac58ef4164b1f8cca9e0da26ee9
+DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe66cdcff481615ac0bd9dcc92099946d9e5563a70137029dec54f8cc4244ef22813e0c2010572cd070ff272120bdb SHA512 a518ff1dcc9ae93f8228f4fa9110b9cbc460260a794d455530218c66317c6b96a5b14971aff25428e37326b5ce9f4d8480eefe6fcba17af23efa4ebceb56f23e
 EBUILD nghttp2-1.10.0.ebuild 1772 BLAKE2B 06a02aa841f53f66fa01ad309041510f1deb98afef97894b6784e4b05f4e4fbe36f60a33c2033cbde16e9835a29df4f77f42b37a8c53fac961937a47b43fff19 SHA512 65a431e382cc6b7494674b0c662f1f18d0c3fa0b6ca7bb16dc3ad0f60213f51113a73aa1252680c63d687424bae54bfa2fc813501e90ded0cd08e06cb6088809
 EBUILD nghttp2-1.19.0.ebuild 1815 BLAKE2B 718ebd7a82095f71f7a327d6bff2070eb80b3cfcd9d6fbba537d973f7c576c10d3cefdf9e5e580e080753c7f2c2facd92aad2c98f220969ba695f5861d3d6f2e SHA512 f27e9ccb9a772a90026d4293ff53e6758de29d8baa02e02b2d8a69c987ecdf81f08c7e66153078c0f4e33218c4e24b84123c4a0908860aed7574a07e211b84a2
-EBUILD nghttp2-1.27.0.ebuild 1815 BLAKE2B 0e9dd0e955b6e595ef5177078b3653554014ae22e58e5400c419bd465bfe8804235a5e4ef1a1f37f04c1792d1982fc8856259560cd5f97926d5b769b83a82db7 SHA512 fd44ab40a68379bbef08e3471a38db2509b0f8f6fd29db8928e0310ee758a35c1c6b5c032b442aff437020df1e079af59e849aa83e3a019dc9ea6d7fb1c564c6
 EBUILD nghttp2-1.28.0.ebuild 1815 BLAKE2B 0e9dd0e955b6e595ef5177078b3653554014ae22e58e5400c419bd465bfe8804235a5e4ef1a1f37f04c1792d1982fc8856259560cd5f97926d5b769b83a82db7 SHA512 fd44ab40a68379bbef08e3471a38db2509b0f8f6fd29db8928e0310ee758a35c1c6b5c032b442aff437020df1e079af59e849aa83e3a019dc9ea6d7fb1c564c6
-EBUILD nghttp2-9999.ebuild 1885 BLAKE2B 0311900818c9e566fe1219640165de5dd64b2bd3a30a617104371969e50ec9d064b9f86ee78fa6d6def768b6d201e1792b64709f10dff1ff11dbb83503643b70 SHA512 567ca5388d045641606ad995c5b033202bc171247027ee6e40a836db617c5f94faf9294bb5f00a8c726f27bfeb2e8c0002253ead9c0e5d4f07d6b4adaf822ef6
-MISC metadata.xml 544 BLAKE2B a8b00f8fc17f0f786d19e04de123ce37e18bf6bc0daa558c47eb436cd50115a42db55b4443e016517803064d7c4e1856ff33be7e28bbfff0cf835501d4e6d24a SHA512 81588ca1912525e085b71baaa8512b22ff47f7dc2834115c12ccfdc86d42e62048cdf53c3cf2e91d9af50a02dfec352f3b3e0abb47c27fb9056070d553007afe
+EBUILD nghttp2-1.29.0.ebuild 1812 BLAKE2B 99dfd26c8b47044eea26c533d68084bd7e546364de9e56f6d04e768971185cf3bd6ce8367205bdd4ffabda80f19d940387d582b86e304e37b9f9f587366e2e48 SHA512 9e4498388d8c28cd259d9fdf012175704ea81566100646fe6c81f6534e4a0be3f03d4713ce1ed32f9db9c120ecbbda81b4d1eb6484ab4b87f2830754600588bb
+EBUILD nghttp2-9999.ebuild 1886 BLAKE2B 60947f82b8cd1efec3ef0fdb07769e88ba384cc9d92f12cb20856cd05875bac76eb1026ddf0fdfeaabfeaa1ca5e84d6850e89e904f3607f1de2d8dc74688197a SHA512 d1c5a738b4998c7d2167d3ab4c984a140a9e0b3de9cc4d4bcfed8da9fcc8d3e52a0fe809adf3c2ebea762b44b26f200ddd742b4d766a930dc1d67e3d1f26d34c
+MISC metadata.xml 494 BLAKE2B 528df8af2c336fea2aa480b2eaf12ce8b8011704f088ddf16d4aaabd799c2a5443fef35aae656a11e37f8f5109324272496dd0f0b7fec90fd41f7894a54da65f SHA512 4e28fa2dafd2358abe1fbdbe6a5314c3a67549a0974d94428dd4fc75abe340b52190f29f575bf069fb9b3effdc202c12fd0e6ed6c132961fb4cbb5aef1f36942
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index 39dbfe2a8944..425825101bf5 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<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>
diff --git a/net-libs/nghttp2/nghttp2-1.27.0.ebuild b/net-libs/nghttp2/nghttp2-1.29.0.ebuild
index 73177fc62199..b3f6d04b3eac 100644
--- a/net-libs/nghttp2/nghttp2-1.27.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.29.0.ebuild
@@ -39,24 +39,24 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(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) \
+	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
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
 }
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index f340b41cdaf2..f7c762907e06 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -44,24 +44,24 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(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) \
+	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}" -name '*.la' -delete
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
 }
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 6e63b4723059..eb8e8c3203a2 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,7 +1,9 @@
 DIST socket_wrapper-1.1.6.tar.gz 54150 BLAKE2B c9d655d87e4462bf36289c7800e17fed9db24153fd82e11eaa1007a1507e3ec146d94beb6425c6e43941f904698eaddbf138707adda74735d7812845751176f8 SHA512 8d5868877cdc7b20efbb8073276574d65d61a8fea73df2924a3fa4581284d30d7a1f03351c470a473e0e2eb6ed1a1513a98559a620b3976741892bb807cfe7ea
 DIST socket_wrapper-1.1.7.tar.gz 54774 BLAKE2B 132b3875cc3434b2ae9c9e37c664737c7916fee9f1c0a6207b85e881c37c6222d17f8ca191519d8bafcbfad7700c7e24726fa807a5cd2ceb233ebf129a282e54 SHA512 3ddf7c1e0bf75268ed9bb44dfb02028d2d678a206ce6290ee1fc8da851ccf0cf97255c2cc498212abf65b96a9114563c4f922816d0109d379b096682a6bfe1f1
 DIST socket_wrapper-1.1.8.tar.gz 771657 BLAKE2B 83474eb48638abed2937caf01e85c1405a9b539ce91d3f710bce8ee253a7e69c605a0f1c19186001573e07e5a49d0a676a7936ce9d69910de6a300a6607b5c77 SHA512 55c64a4897a09bf2680132337d24bdd5f01e57369b0e1611dea9daca8a57f44d3b6625d3c3e631f954db3f4fc7e85f7ca229ec647f4bfd756f0bcabc6558498d
+DIST socket_wrapper-1.1.9.tar.gz 772252 BLAKE2B ab8031ddd5b22fc9534daf996dd137466d2592bb83dfac4f15fb1adc3f0369544ad74b5b8fdb8dd61a09b6264f445604571d1b6b886401b96720ccd0499219bc SHA512 62458c7881c0d4e0e7f1ef3ec8dc4277a0f886cd1e9c73f6a20f23ed4546bcc959169fbac909e193e60567985f196358f6567de68b89ac4d4d5ec8473c8afb64
 EBUILD socket_wrapper-1.1.6.ebuild 701 BLAKE2B 60d422829b34f9b374d386b56f868bf19fe5a88ca963f0f6858726f04a4389f7281d1f1ca47d74fafa4200aba4f5d6a2c1ed1b04e0a8434b465202c488f4510d SHA512 f3929eaf574cb4eee26e44015436160149d000f49c385b8d543c685e6ccb650d8c3b0b18ea2a13d9ca41e45be44874c0ef80106c4eb8a4f0187daa1c7d2661f0
 EBUILD socket_wrapper-1.1.7.ebuild 709 BLAKE2B e54636c66023e6a39f6a6fe590a908569d5bd0449987b1e68054bf51e8900e279b40eb1ca3d97fb210d7b000bae23d51ce7e0674aad4b2d01367f655613ab683 SHA512 15be0a8e54836a01abbdea3f76f86383cbda45da334758bb5d58d7dd46e3b83f1bd35b9832fd76d8887c03acba87fe1f0f29f2ed066fca4787134c029527d2e9
 EBUILD socket_wrapper-1.1.8.ebuild 716 BLAKE2B 8463e9537cbdbad9e34433d7f0518c70c0cf58200ee26d6972d83a07c663a65dcb8f44c514be6769925fccc8101ce5b1615e1510f6ff91a28cbfd31b5b7985e4 SHA512 5cbc2731f5ed327e10149267c2fd6e2b4517dca4196d30fc99cacf85127835677e013dc88393b9811ffbcec585564fb04c84cd6622e8f0699429b65742855991
+EBUILD socket_wrapper-1.1.9.ebuild 716 BLAKE2B 8463e9537cbdbad9e34433d7f0518c70c0cf58200ee26d6972d83a07c663a65dcb8f44c514be6769925fccc8101ce5b1615e1510f6ff91a28cbfd31b5b7985e4 SHA512 5cbc2731f5ed327e10149267c2fd6e2b4517dca4196d30fc99cacf85127835677e013dc88393b9811ffbcec585564fb04c84cd6622e8f0699429b65742855991
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild
new file mode 100644
index 000000000000..4cbcd2bedf10
--- /dev/null
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A library passing all socket communications through unix sockets"
+HOMEPAGE="https://cwrap.org/socket_wrapper.html"
+SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+	cmake-utils_src_configure
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a4dd5f3155b8..a3d49b538224 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -10,8 +10,10 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3
 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 BLAKE2B dd539bc80529b737d1fa613dcdbd2445e062234533df8f12c6b7ce2f4852e22f912e5199701863b8c1f947fd3dc0ce52c8c0c357af006eb6160f8ce8e3f8b52d SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
 DIST webkitgtk-2.18.3.tar.xz 14824668 BLAKE2B 1ae21d17084a27465c462171f043f2d776398ea077e5dbf0d20769143495290990da91120df5fe9dcae426c7a87232a466d198b69f05cadd336fa6a30db3d549 SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e
+DIST webkitgtk-2.18.4.tar.xz 14828528 BLAKE2B 447092ebe258b58e0e70bf8f7b347adaf77ad8391b65163528591d403d363894ed50676212390239cc2adfbc8458745b9f873481cb0bacf40b5ea598abb19999 SHA512 c7440668cc097232b7eb9ea15e1047f7110cd06249cb61501b0414175693e0b11b22335abf17c62582dcf16c41ae49d0a713cd069f7df32955e440b9d23194d1
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
 EBUILD webkit-gtk-2.18.3.ebuild 8282 BLAKE2B 2074b46db74e014544724ee1e2cd5f56f232c77d1f8e254378485acec7cf423fc5de60a737b669428b38451b7cfc7f44b745acbf9f68444e9ab72af43af245b2 SHA512 442d5e8b7ed6aed95366620cf61ea335d504db7cf06d5faf791bd77a1ad0cbb8e0bad556d85bedb2c6aca50523def4fdb7a413d15621e87552e5b321c8614386
+EBUILD webkit-gtk-2.18.4.ebuild 8283 BLAKE2B 8c98320b1f647e424113d3cd44784e3abd51c1b2823282c5d00696fe169d4690cf80dac366eb96e674258e90c24d13257a58d76952d14cff4f0bebb7c29b3610 SHA512 d0ac7f2682c1fee759b755888ce35ba6ba26597d9e32027b92f78e601382594d71dff5013c1b19d272a36303782fb2bcb0947d41052549564f5f14aaae375d19
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 BLAKE2B f54135230b3e5d12303f131bec732e2163c32a58c8571d566810f6563b285c11b253d5e46b80752a1e15a3f6c8462aaa3e856ea1c52b1bb9032d80f1e1b3f021 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 BLAKE2B 9ee92280f93c2aa1107aab98faabf9c3298b0b70b9e5c30fdfd6c8d9cb3f7c9ab5362248c19a9d0d6ed49ec81ca4e6f0b5510413e16dbdace7941f051d0872ca SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca
 MISC metadata.xml 771 BLAKE2B 219d1c257311262d452b02b19b387cca0fc17cdc675cb4c790277c2c4f2ae9863a6039738a9151a3d6912ca024bc1d2348f5ca786f50412295fa8455c90fc8b4 SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
new file mode 100644
index 000000000000..e25e0fccfa3b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 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="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://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 ~x86-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 )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	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:=
+	>=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
+	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[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[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
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		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
+
+	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 ) )
+"
+
+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() {
+	# 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
+}
+
+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)
+
+	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
+
+	# 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
+
+	# 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)
+		-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)
+		-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}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_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
+}