gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-libs
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
163 files changed, 3518 insertions, 2539 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 68abb3897729..fc6a2c4c2213 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 23ad91435c4e..dec20808a87a 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,15 +1,14 @@
 AUX courier-authlib-0.65.0-sqlite.patch 798 BLAKE2B 305fb4f7349b030b98f4a13c7d104ecfdc61c098659b05a6c8258ab7311fdea586682ec5566447a3dd767540b2038fd45049db97bdd180a25a5114bdd7adc55d SHA512 f9148c23195cb9ec3265fcc86a2c8ea4c0d114046d81e527dd5759f45844b425f5270fcec52fd497e82b8272fa99984e7facb8cca6f696956896ad177c5f81fb
 AUX courier-authlib-r1 985 BLAKE2B cc970ee300a367c6c742a8fc4266bf0a1c3113e7bd16c8ab4a73d49cde013fcc8500ca1288c81f530edaca96ad0fb79a2b15d471cb3e0fea5af814064202b820 SHA512 ff5022dcc50c9bd9c112cac0ac3a47b37d496603aaef4db2cdd1b96236b5c3deff085e742301a9144dd8113cf5b51d0ee32b4a50e574274855fc1614f4769cd3
+AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
 DIST courier-authlib-0.65.0.tar.bz2 2303751 BLAKE2B 595a91a87d9f0f87ded7db73f88a9a74f8e5140452cab2bada43de9836b4f3e8b123dbb10295493e71e52e1920950f28d67a74ec026ff33c27ffa14024d079a1 SHA512 edc4a51bc0d748e7d6cdbf9e9c67c43eeedd9e3846d91a8eea24613f6fb5125d2e713ef7fd63cbbe1905205f2a406b4ff3f31d7c3fb7028939123dbc728d8e38
-DIST courier-authlib-0.66.3.tar.bz2 2085083 BLAKE2B eeb4fe55cf3abd087d6e3a8185f57d7b90ecd12323dcfa0f1a2a0dd2a34e315662569c5beead6bf2d231a5e11592c9568b4ed44fe239c12cd51024db6ffbb146 SHA512 09d97c8efc79d84437feefca13f5161c0e113864b9c971a4a980b359c9c14699f8d07eac6b52ac0a7d30f9770656e672f64c3445ecf4dcad88f51a427310d530
 DIST courier-authlib-0.66.4.tar.bz2 2192331 BLAKE2B 8fd68153b2defb63bbafb44b34c0f7ab5f7156800dc3eeb3c31fc0952c9a4637d4937babceae624c1a22512076bb11a1a356e0e0332c13d61026470a03b7e1c9 SHA512 0987bc9d33a013ae842e0ea3e4e83ef9d6196c2f923a6970e049a36b8ccddbf0c4465c43c7e27d6718480e981f573795f6417478de1ff685264f3439e8dffdc9
 DIST courier-authlib-0.67.0.tar.bz2 2194546 BLAKE2B 2ccb6ed15c2f02d206606f8bba04c9f2da415da3d739e456914e44010c955c9aaeae1f1c0746c8812f5165eb8db1997284e1c378132a6144da2b8f77d77a6eff SHA512 6e3da28d555761177727c44b1422bf5baf6ffbf28f53cea89a4a8e13daa5433803deba1614295d9679c41b5be4750f464e7869a2d3ecbfd91ae84e7281c4f3ef
 DIST courier-authlib-0.68.0.tar.bz2 2194982 BLAKE2B e463390b49bb3ca147467d3054a83d5a8ce96b604bde0b624c4d7ce81235c6f747e5d847dde794c81c4ad36aeef49bdd27cf904142b4542df833484c5eb7a57e SHA512 5c4adaf0fd69f4b9e780962aa3f9eeac6b15cea3f302288ff4549ce2b0be9ea0808b4501670ef3c4e0419c3d27505c256c082f795dea4683dd5265fd7dcab93b
+DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
 EBUILD courier-authlib-0.65.0-r3.ebuild 5163 BLAKE2B 6c096213af78df0374243ba9c783157f848870b4bb7afe97cb93381c9b152597688598eed8f45bbf650609c5532257691987d6d2ee311c7fa15aef5613a1c009 SHA512 a79b21359604c6536bc0bfb2686e0752147d091bf8c9c1297b849d99aeddcfa99651c0f0466d7491a2a35e2042403db3f21d7505ed9c2dd7f21d943411eef596
-EBUILD courier-authlib-0.66.3.ebuild 4465 BLAKE2B d2dd6e77898e81a731678e37c9c3a438a83fb5497d978b50eb02074438b22a63b2ffe37a3eedf7457209d94e1ee02d616cb72145cc87673ae307420a6a274554 SHA512 0738d4d20f42b55e5425142f215c3f10fbce26a1c4cd42b0a93c94b6de9d6ca657ff2891e2258279a0fa8c7ded193739c15ccba9dbbb74460e15b6685c8d4323
-EBUILD courier-authlib-0.66.4-r1.ebuild 4516 BLAKE2B 6babad0243712dc97ee8e717460962482bdf7f31f9a5d059d35f5e876cd1e8aedac11f4606795ccc9b86f414445126b3b6faf8c9cb6a6eab001e0567a3b12257 SHA512 7d3f38818e17602829e6ff0f30f00c32abbaffec7419fd482a973bd30239fce34933b78ed1fab7b6b149771ed4d3e36da43eb2eaf4caf994efcf624956dc02c4
 EBUILD courier-authlib-0.66.4.ebuild 4507 BLAKE2B 7ccddf9fe24f3c2787bdebf26ac5cc721ed64b6a3acb94d778a51dbd5ac177f08af4e07406d4bda38bf30dcacda24a4ffecfbb878b66c4115edde49ec153eb07 SHA512 f23af0db15399330915a10eb8cf24dae2724c1eba1810ea010db6ebfe6b98127c4ccf4e7b122c7ccc857381446eb18eb81d62d9b9aec187612a3344f80751cad
-EBUILD courier-authlib-0.67.0.ebuild 4559 BLAKE2B a6ccafc2841c77b7f20d4a9345d538b981e6720ef7ce8c3c2c7a6945150cd5443061d1966de7852ea95e0adb7df06cd9d2be6188b52aad285f906e56c91e19aa SHA512 8e2d0c01762c859d77db022637afae695d6f412bdc28e272d6e0431fcec53ecce8e66a573387de80ad7316889af114eff202d96ac55ee7d9d0b847a9db28d47b
+EBUILD courier-authlib-0.67.0.ebuild 4556 BLAKE2B a7ce689042a690e58f263a4dbcc0ccf31d322ab8a3aa58215cdb8dd6bc00510e868d80c79159d8fef8a7798ac7b2b29fe433a31b83c9789e6824b9e9675fc4d8 SHA512 addc437779e8afe7ffb797f9f472ac9edb5138e08e1cdfe5069d434ffb1749df2718afc3a9c2700f7868a9fad0a1a8a4f8abb3b1da7faa4eedb7f31ae11520ff
 EBUILD courier-authlib-0.68.0-r1.ebuild 4560 BLAKE2B df061f092e834802c5c9b7ed00dfe2dc4689d125539ceea03d19dfe0cd5a2d98369cf38254b592d86b522767631699d582b35791a462a32c4c0e67f0d74400df SHA512 7951967aeda9b1c3a0fa51ce74e53a98605db8216b276bf8b3d19deaffe2af1bd2b2273dd8d1d11fa07836c0f0baf0a3858dcb45f0e1ff67bcf2c6a35347bb86
-EBUILD courier-authlib-0.68.0.ebuild 4560 BLAKE2B 0f6e95e479106c135f25227f998c6f66082661d27cec454c63a7814be242a3c96a024bf3b4fe71ee0d7d26860dbea14f031c9d3ad5d3f8f27136eaa247b94e24 SHA512 45919327d442a889a1c7803a64d2b93c9549e01aebbb72d10670002bb2b9d5dd8a6cdac11e68cefb237b4f5f665b76604ef5add6f3a63dc947b2388c310aa2bb
+EBUILD courier-authlib-0.69.0.ebuild 4566 BLAKE2B 25cbfef129e3ad98804aae80d20036b4d98c6ccd479feffbc96a9099b87f9945d0529b56b04fd7306f0c1dcfd8eabd65d8e8c9fc2425152534020f8d6b8541bd SHA512 a06799d8ff498e1ed743ce7ac134a0d75e81cbe69c626fbf7aad53fd103f827679ce4ccdc33771c867c84fbc29a940f46fb1692d47bb7db88b51bd450ae55fbf
 MISC metadata.xml 405 BLAKE2B 825e1751581d92e1716769ead19217a1fbd01e31acaace5ef73a51fcb92ef7737e6e73fcd5d3fb124c586fdb39bed2c837b0057547581bd0529ea9034504c21b SHA512 ca3fcfc719c6c05c2f693a1e4896f7788acbfd083dce4358a94e1c0227b7d50d4e06f657ba80236a574b052fca6c03bce45a256bd65aa963915f4f577a413bbe
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
deleted file mode 100644
index d956b78af02f..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib user
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail"
-
-RESTRICT="userpriv
-	!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		=net-libs/courier-unicode-1.3
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	if use mysql ; then
-		dodoc README.authmysql.myownquery
-		dohtml README.authmysql.html
-	fi
-	if use postgres ; then
-		dohtml README.authpostgres.html README.authmysql.html
-	fi
-	if use ldap ; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		dohtml README.authsqlite.html README.authmysql.html
-	fi
-	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4-r1.ebuild
deleted file mode 100644
index 2930679a0653..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.66.4-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib user
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-1.3
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	if use mysql ; then
-		dodoc README.authmysql.myownquery
-		dohtml README.authmysql.html
-	fi
-	if use postgres ; then
-		dohtml README.authpostgres.html README.authmysql.html
-	fi
-	if use ldap ; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		dohtml README.authsqlite.html README.authmysql.html
-	fi
-	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index fd7d8f6786c4..b181779f7a08 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-libs/courier-authlib/courier-authlib-0.68.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild
index 951b69d639fd..fb790c542669 100644
--- a/net-libs/courier-authlib/courier-authlib-0.68.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -16,13 +16,13 @@ IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-lib
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-1.3
+		>=net-libs/courier-unicode-2.0
 		gdbm? ( sys-libs/gdbm )
 		!gdbm? ( sys-libs/db:= )
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
+		mysql? ( dev-db/mysql-connector-c )
 		pam? ( virtual/pam )
 		postgres? ( dev-db/postgresql:= )
 		sqlite? ( dev-db/sqlite:3 )"
@@ -55,7 +55,6 @@ src_configure() {
 	econf \
 		--sysconfdir=/etc/courier \
 		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
 		--localstatedir=/var/lib/courier \
 		--sharedstatedir=/var/lib/courier/com \
 		--with-authdaemonvar=/var/lib/courier/authdaemon \
@@ -135,9 +134,11 @@ src_install() {
 	fi
 	einstalldocs
 
-	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
 
 	use static-libs || find "${D}" -name "*.a" -delete
+
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/courier-authlib/files/courier-authlib-r2 b/net-libs/courier-authlib/files/courier-authlib-r2
new file mode 100644
index 000000000000..4d810007cef1
--- /dev/null
+++ b/net-libs/courier-authlib/files/courier-authlib-r2
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	provide authdaemond
+}
+
+checkconfig() {
+	if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
+		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
+		return 1
+	fi
+}
+
+setauth() {
+	. /etc/courier/authlib/authdaemonrc
+	AUTHLIB="/usr/libexec/courier-authlib"
+	AUTHDAEMOND="authdaemond"
+	pidfile="/var/run/authdaemon.pid"
+	logger="/usr/sbin/courierlogger"
+	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
+}
+
+start() {
+	checkconfig || return 1
+	setauth
+	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
+		/usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+	eend $?
+}
+
+stop() {
+	setauth
+	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --stop --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index 25f3aef04bc0..9605efe8bf9e 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,9 +1,7 @@
-DIST courier-unicode-1.1.tar.bz2 372684 BLAKE2B 2df6941cc41aba3f67b06ab52f90327bb83a78c47955763af45307f74958a0c561c5b353b5aeff425fa008d78f437b89e6dec42a766601eae1ca7893d89f1e93 SHA512 df373663ad0fbeafbd89b7265a9623ff74926a396689e5309c3fbea327686e802659a87a8b308c3d0d9c1819c7299834c80694b2230dfe901d555d3febfa2d8b
 DIST courier-unicode-1.3.tar.bz2 394011 BLAKE2B 5d5c2a9cf04976819f2bf1d01c9193fd5ef441461cebeaec4b53d9a9402fb97b605d6ac08d4e7339f56d39d4bdd85693990eefd90c4b5a20788d8b5fd9413156 SHA512 4384874f0f2298ff5034d7541ffd3155a3aa6a6b2d73fb108b5072a0dd0bb8236389b83161625bed7f923f724fa11bbed42af28234d5c6e5b6d370c407e8f677
 DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f73d101cd3966d67b1c0e28c0271001a5b263a43385b73a473b6a263bb6ab7ef94faa453fa9a7f0c15bba4691b6ab421f5 SHA512 1d9cc3efbbafa88631e37de0647d2e873a8264a02a0ce588687b90e15dedb60c23058312abbc771ed1ddf824ba7c81b16adebfe9db69da953b9856eb66d31264
-DIST courier-unicode-2.0.tar.bz2 446215 BLAKE2B b5e24f47f1714b71aa2fe176b4517eb49a04780a62f025c5a6546353a03defeedef5cd19f69a35a2646edbf88b4774abcf30c718fa4aee8f17feed6d3f947172 SHA512 32fe0aae62d7f7f7ac6832b28515b83642753c6bd881e95494254b7055686dc38d85488aa26a99d82a5b42aa5cce308bccc2b471580603f690ed6e405cc91e8a
-EBUILD courier-unicode-1.1.ebuild 440 BLAKE2B 22249cf6ba2a420b508cf69e49373178f275c7859bbc5825414ffdb3f3ef4be761225f698ce0692d16f8641c8e12e346667b710ae9252b5fee83313252d57a3f SHA512 3e2e121bedf09408d04c80666d840fcc6716b26b6adef9089d9c90e0b7f0ad9e61625909136a91491bf5adec8229e5e0548ccc5874cb88aec67c7e5031ef57da
+DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
 EBUILD courier-unicode-1.3.ebuild 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
-EBUILD courier-unicode-1.4.ebuild 482 BLAKE2B 3fdea0cfc161491269245510980306507858542849875d6f83f69818605d034e8ab4dca431f60d60c76b9865e0a23644eccfac7a60362f7a3a401a6fdf218d0a SHA512 d81b2150497ec92019c62dbac7c0efd7171be4d514f19652a01cce9e951c007dcbee3ab75e52ebba25e772091a4577c2d8d182b4c1f8f8210cb6e210640a2cfc
-EBUILD courier-unicode-2.0.ebuild 488 BLAKE2B c44f85d0fdcaff8802a0584da050c37be350a6d1cdc0c2435ad10e8cfb4d8652f7884d9949c8ad6be7ad079922c141c0a22fcf6a1d034d3bdf4f1e28c803229c SHA512 616ea1f8edd9d164dfd2129cb528e8b591d8e987359652d552ebe5d792487b19af4a35dbf9cbf1f46603315ef5de68d2cb7cc3511fe6164a72b29044417e0650
+EBUILD courier-unicode-1.4.ebuild 479 BLAKE2B d7f051ef5cba4aa2641aa3dc6fba505a1dcd1fb13a59bd2b41d3ae9165dcdef37c20b98aedf2a5e9a9900dc9b54731e34261ed6fc5d9d8497b540e48fb85f154 SHA512 5a4c74f25b4e4a07f7b1be28385b990ddda5156a343330278191084b8baca73de3ec86044f73768638a9751354853d4205b9195f35e3577f5f9defe5721092e2
+EBUILD courier-unicode-2.1.ebuild 486 BLAKE2B 8d4c7c8861f115758328bc49430285a1db26e6f6ce02ec5716c8738df4810a59db965ee45e38ecd1bd9b35a6d4b2db7983a792856152816cf4e08c3eafbc809e SHA512 bd4b0a0ab60514ed5204054079baabe0b3c41e4bf458b83c8e57c90b7d167df7615505ef988c43f5e0ad6fffe7518ffd943d797306a3413ab8f1b74494fce422
 MISC metadata.xml 398 BLAKE2B 5a29532863617f727864e5a02b31d9170bbe09d5bed8641c94aad759997613832940cdffdaf8ed31c44b41b3c5e769ba220b5e6fa53c9d3540d9646e9c31a492 SHA512 78789db4f9e2b92e56c3833245f64c31bc274f6986b70af9c3bda21e5c6d3c6b3987a6a97e0ec73aa619d71ee814fa6a263ed8d295ec7473481134769414396b
diff --git a/net-libs/courier-unicode/courier-unicode-1.1.ebuild b/net-libs/courier-unicode/courier-unicode-1.1.ebuild
deleted file mode 100644
index 746220b94881..000000000000
--- a/net-libs/courier-unicode/courier-unicode-1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Unicode library used by the courier mail server"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86"
-IUSE=""
-
-src_install() {
-	default
-	prune_libtool_files
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/net-libs/courier-unicode/courier-unicode-1.4.ebuild b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
index bb7c46bbdfde..37c109098512 100644
--- a/net-libs/courier-unicode/courier-unicode-1.4.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-libs/courier-unicode/courier-unicode-2.0.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index 98cdf2d64ab4..f46c2d652945 100644
--- a/net-libs/courier-unicode/courier-unicode-2.0.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Unicode library used by the courier mail server"
-HOMEPAGE="http://www.courier-mta.org/"
+HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 74971b7a5187..c14588da709f 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,10 +1,14 @@
 AUX daq-2.0.2-libpcap-check.patch 1000 BLAKE2B 9407ae9fee8095143ad63fef090b49bb1f6048d7fbd22eb03fd88d9a3266b5b0f0add7ad17b1e95040ca429a163c946d7bc1236c6a21bb64b93990ec07f42213 SHA512 9382026f9d93ae922299ae25a98b6e38c2bbb0619009f73feef6a7ce1ce499b5bde886323be80c7863cf8ed0c245f2b04d244166073f2435c6db915ca5afa17f
 AUX daq-2.0.2-parallel-grammar.patch 1355 BLAKE2B fe4c2938da34cfaafb4918e779c5675b8ae0befd9878763cb8f67c62b73485c0ef825b9a4eb2fe7386001579d22f1a00615349879ab702ef1db0f9dd518ba309 SHA512 18ba4e4cdaf9551504d201b76f3983e3eb33a267c2f5952006e9297e7c5de88ff1464adb103ffce9dba99339bdbbffc616ff6b659ce20179c55a1bb0173b4483
+AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3fce93f0d66328a840003b0b538792bd8439745081bbda3742d59b5f0880a4a844e919b6db6a19601bebababfe138d1ebe SHA512 d22182c91be6283a057f7f33ea093ba064f8a880fbebc3342ae0ab2d2923fee2fbb2ef1ec69b144b0dfb2fbca09c0f6a6421a961a88832d7b952907e6c2e2665
+AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
 DIST daq-0.6.2.tar.gz 451581 BLAKE2B 64eebeb669eefc6715b206de19e823708a8e4255d5898d5f6d4b80889360611950764432c941a2a930582ab9b8c2300cfdb41784f008f4ef1c248f3469819d4e SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125
 DIST daq-2.0.0.tar.gz 480030 BLAKE2B ab25ce133833babbdaecd74c79d319739e5bfa34bfa100d35c19569c935fe58b425ea817a12f6d2fc1ff47a6e8097b822e2d5ac5dc295cdde516811f139accff SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c
 DIST daq-2.0.2.tar.gz 474447 BLAKE2B fa80d435056d672eaa15f003649d90dba91986780f372cd4e953b676e414232516c5fc43065f5497d38299e0309c58b2734458f9e5aa1b93cdfa29dfe72b622d SHA512 b2a47e174155f21cb1c6f1e1c431ea7cca6aa9f7371228e77def3c526a67fd42d0e26e4c94263195e041b203cdf0c2aaef14f9035afb23dde0bd5df3bf422cbd
+DIST daq-2.0.6.tar.gz 518013 BLAKE2B 702ab20c776b9047230bb1ac36574068e461a850ed5d15959c314d62b0b828c792cf23d19cdb411ba8c067348ae74dd2f011376ccbe0376c44536ad58fa1bba9 SHA512 61dd5408c587e57999445b9549ac539ffc5bb16ddc179601de1065fc5e251c1893536d8aa2251096e34b54093529d3578e7b5d97e3514cb2bbf4de113639b08c
 EBUILD daq-0.6.2-r1.ebuild 1902 BLAKE2B b63c75041b5cf855b68b86a316cb47636e8e491ad3d5c92dd9c68e467ae711ebee4f60039bba687a3234905dc87c61c62bc45541f6d221370cacd3fdcbcf122d SHA512 aa0552a61045f7332930082e9ed36557f973a39acc449143c35fda76b5e7a7f9da3dc521ec041956b038e70aa125fb75a0c2d4a3e4cdf660c9dec479e082ddf8
 EBUILD daq-0.6.2.ebuild 1932 BLAKE2B c8a683e11312124f500f67f390231270d114ef480a3cd75653f12e4c767645f8229ab52079c904df9be11babfb2fb7487b89050870ef6edb18eb29449cddfe7a SHA512 9b25bca43e52172bc9f1a3c43dc90d6bebfa2934eeeea579f7e4e8e3d0a9ae3210ae53249f4aab723fbf2d026dc053755462426f1d14cfa0f2a420222c2a091a
 EBUILD daq-2.0.0.ebuild 1901 BLAKE2B 60904e1b66d7c02e650e54bba013b8f64087404efee0121e7e91994201396ba0a0b3d5c9116c3132dfe4a4c7a50e916f347e0861ef0c338a13d0f556487b3c1b SHA512 ce7a7fbd708e662da4b1ebd4bed6b688e8339feb9a15db188e74925f122ab421775e1a5698d2bec1d6a204a7c9667fb0a54749cd98595d45e89ba925e012d254
 EBUILD daq-2.0.2.ebuild 2001 BLAKE2B 98a7568d9bfba601bcf36e87f9a5002c489415aaf5012b891b5f129f054848549a797b921bccb051df93cb8d56d385c4025ffeb304576920b565a66d0b1d2b9b SHA512 554b8c496b10d62ca9cefd1239738c64108b6d63a61401dbfc57109f22b255f7a24a5f419f859bd8672b073850b6604f233ac0be15d4739da15c2c0bad6435a5
+EBUILD daq-2.0.6-r1.ebuild 2054 BLAKE2B e7015e149d24266328350ce2a9f68ab92ea242a4398640c03d777c1d98bb6dcde7f7803183c47eb8d4fac94a48dee15e0647480afa5f3758d4f1ec28ab447574 SHA512 320b47135f5184ba74a09811caafe4cc5c9736999eec76e9b166032a355581944839f3ff97c7945db43d8f6f5e9b3600f277b33678e742f6da58f05a538fc0ae
 MISC metadata.xml 1416 BLAKE2B 33ab28e9bac28d75031405b2ce3b47f2b797d244853bef86f586330a1bc7558a21edf325297e0aeccce08e5eefdd29fad45cb50da6f6e6d62ee82c56d7c17b81 SHA512 77a8d9f238958948d3582b3d9a9bf859c03bae5d544728270a18a5db1c221745c4fa7044fb1959e4b0811864f33de5f9bae67bcd25aa6c74d3ca74f386e6bdaa
diff --git a/net-libs/daq/daq-2.0.6-r1.ebuild b/net-libs/daq/daq-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..ff91d75a4a1d
--- /dev/null
+++ b/net-libs/daq/daq-2.0.6-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools multilib
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="https://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/snort/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
+
+PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
+IPT_DEPEND="
+	>=net-firewall/iptables-1.4.10
+	dev-libs/libdnet
+	net-libs/libnetfilter_queue
+
+"
+DEPEND="
+	dump? ( ${PCAP_DEPEND} )
+	ipq? ( ${IPT_DEPEND} )
+	nfq? ( ${IPT_DEPEND} )
+	pcap? ( ${PCAP_DEPEND} )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390
+	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# We forced libpcap to 1.x, so we can set this cache var so
+	# cross-compiling doesn't break on us.
+	daq_cv_libpcap_version_1x=yes \
+	econf \
+		$(use_enable afpacket afpacket-module) \
+		$(use_enable dump dump-module) \
+		$(use_enable ipq ipq-module) \
+		$(use_enable ipv6) \
+		$(use_enable nfq nfq-module) \
+		$(use_enable pcap pcap-module) \
+		$(use_enable static-libs static) \
+		--disable-bundled-modules \
+		--disable-ipfw-module \
+		--enable-shared
+}
+
+DOCS=( ChangeLog README )
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# If not using static-libs don't install the static libraries
+	# This has been bugged upstream
+	if ! use static-libs; then
+		for z in libdaq_static libdaq_static_modules; do
+			rm "${D}"usr/$(get_libdir)/${z}.a
+		done
+	fi
+}
+
+pkg_postinst() {
+	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
+	einfo "calls to PCAP functions with an abstraction layer that facilitates"
+	einfo "operation on a variety of hardware and software interfaces without"
+	einfo "requiring changes to application such as Snort."
+	einfo
+	einfo "Please see the README file for DAQ for information about specific"
+	einfo "DAQ modules."
+}
diff --git a/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch b/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch
new file mode 100644
index 000000000000..1911caf72ea6
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/673390
+
+--- a/sfbpf/Makefile.am
++++ b/sfbpf/Makefile.am
+@@ -43,13 +43,14 @@
+ libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
+ 
+ # use of $@ and $< here is a GNU idiom that borks BSD
+-sf_scanner.c: $(srcdir)/scanner.l
++sf_scanner.c: $(srcdir)/scanner.l tokdefs.h
+ 	@rm -f $(srcdir)/sf_scanner.c
+ 	$(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l
+ 
+ sf_scanner.o: sf_scanner.c tokdefs.h
+ 
+ tokdefs.h: sf_grammar.c
++
+ sf_grammar.c: $(srcdir)/grammar.y
+ 	@rm -f sf_grammar.c tokdefs.h
+ 	$(V_YACC) -d $(srcdir)/grammar.y
diff --git a/net-libs/daq/files/daq-2.0.6-static-libs.patch b/net-libs/daq/files/daq-2.0.6-static-libs.patch
new file mode 100644
index 000000000000..fb91c2c39e44
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.6-static-libs.patch
@@ -0,0 +1,151 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -268,7 +268,8 @@
+ 
+ AC_CHECK_LIB([dl], [dlopen], [LIBDL="-ldl"])
+ 
+-AM_CONDITIONAL([BUILD_SHARED_MODULES], [ test "$enable_shared" = yes ])
++AM_CONDITIONAL([BUILD_STATIC_LIBRARIES], [ test "$enable_shared" = no ])
++AM_CONDITIONAL([BUILD_STATIC_MODULES], [ test "$enable_shared" = no ])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([inttypes.h memory.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -4,12 +4,15 @@
+ 
+ include_HEADERS = daq.h daq_api.h daq_common.h
+ 
+-lib_LTLIBRARIES = libdaq.la libdaq_static.la
++lib_LTLIBRARIES = libdaq.la
++
++if BUILD_STATIC_LIBRARIES
++    lib_LTLIBRARIES += libdaq_static.la
++    libdaq_static_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h
++    libdaq_static_la_CFLAGS = -DSTATIC_MODULE_LIST
++    libdaq_static_la_LDFLAGS = -static
++endif
+ 
+ libdaq_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h
+ libdaq_la_LDFLAGS = -version-info 2:4:0 @XCCFLAGS@
+ libdaq_la_LIBADD = @LIBDL@
+-
+-libdaq_static_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h
+-libdaq_static_la_CFLAGS = -DSTATIC_MODULE_LIST
+-libdaq_static_la_LDFLAGS = -static
+--- a/os-daq-modules/Makefile.am
++++ b/os-daq-modules/Makefile.am
+@@ -6,7 +6,9 @@
+ 
+ pkglib_LTLIBRARIES =
+ 
+-lib_LTLIBRARIES = libdaq_static_modules.la
++if BUILD_STATIC_MODULES
++    pkglib_LTLIBRARIES += libdaq_static_modules.la
++endif
+ libdaq_static_modules_la_SOURCES = \
+ daq_static_modules.c \
+ daq_static_modules.h
+@@ -15,88 +17,88 @@
+ libdaq_static_modules_la_LIBADD =
+ 
+ if BUILD_AFPACKET_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_afpacket.la
+     daq_afpacket_la_SOURCES = daq_afpacket.c
+     daq_afpacket_la_CFLAGS = -DBUILDING_SO
+     daq_afpacket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_afpacket_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_afpacket.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_AFPACKET_MODULE
+ endif
++endif
+ 
+ if BUILD_PCAP_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_pcap.la
+     daq_pcap_la_SOURCES = daq_pcap.c
+     daq_pcap_la_CFLAGS = -DBUILDING_SO
+     daq_pcap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_pcap_la_LIBADD = -lpcap
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_pcap.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_PCAP_MODULE
+ endif
++endif
+ 
+ if BUILD_DUMP_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_dump.la
+     daq_dump_la_SOURCES = daq_dump.c
+     daq_dump_la_CFLAGS = -DBUILDING_SO
+     daq_dump_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_dump_la_LIBADD = -lpcap
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_dump.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_DUMP_MODULE
+ endif
++endif
+ 
+ if BUILD_IPFW_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_ipfw.la
+     daq_ipfw_la_SOURCES = daq_ipfw.c
+     daq_ipfw_la_CFLAGS = -DBUILDING_SO
+     daq_ipfw_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_ipfw_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_ipfw.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_IPFW_MODULE
+ endif
++endif
+ 
+ if BUILD_IPQ_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_ipq.la
+     daq_ipq_la_SOURCES = daq_ipq.c
+     daq_ipq_la_CFLAGS = -DBUILDING_SO
+     daq_ipq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+     daq_ipq_la_LIBADD = -lipq @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_ipq.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_IPQ_MODULE
+ endif
++endif
+ 
+ if BUILD_NFQ_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_nfq.la
+     daq_nfq_la_SOURCES = daq_nfq.c
+     daq_nfq_la_CFLAGS = -DBUILDING_SO
+     daq_nfq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+     daq_nfq_la_LIBADD = -lnfnetlink -lnetfilter_queue @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_nfq.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_NFQ_MODULE
+ endif
++endif
+ 
+ if BUILD_NETMAP_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_netmap.la
+     daq_netmap_la_SOURCES = daq_netmap.c
+     daq_netmap_la_CFLAGS = -DBUILDING_SO
+     daq_netmap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_netmap_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_netmap.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_NETMAP_MODULE
+ endif
++endif
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/api -I$(top_srcdir)/sfbpf -I$(top_builddir)/sfbpf
+ 
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 3efd29dfb243..67dc127537ce 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -4,4 +4,4 @@ DIST enet-1.3.7.tar.gz 522150 BLAKE2B 8a2efee0aec375dc4f9e3594c81ce7d6b8ba846ac7
 EBUILD enet-1.2.2-r1.ebuild 432 BLAKE2B 0ecff244e19cf28f3d10ccda1dffaa128de330313e8926dd53a0fd0bf2832da3738d4e74b5ad6925ded4fdd52aa09b24a8d6dec7dc6819de25c814255ee0f8eb SHA512 5d8df97625fa840418aeb15a9a804042ca714cf4bcbb0b2d68d7c8b3c5da9747e1b4859cd549f23ae979cf974316ad72ba7e347951b9486d181a4dd74f7fa819
 EBUILD enet-1.3.13.ebuild 534 BLAKE2B fec01d1aa98b343cf7627f7eadb07ec29e750e74b83b0796a43d5088ee094a4cb47749c2b92a8ed804bb2e0658612413214d61b302e73cf751df5aa42196f3c7 SHA512 7ac184be6f2044d08ffcc7ec58596711d1aaf4fb406b8896eb0dd05a62ccec33bdf157ced6992d5d5683d6f87af3b0a1d1a6d81f72af9739c4201e15feca5429
 EBUILD enet-1.3.7.ebuild 680 BLAKE2B e261b7f92064353aeabb521b2e444d4f2b1fbc937ae2b3d66ccd0b4322f8b3094ed0faa780c9945e37372f5bda4dd41723948873fb67853ad382c79ad0388a88 SHA512 65280725be46ef84c6ffc5035352fbb37e3038a5abd39b294ee8b05d155393bf11711ab8e947d91dba2ab90b540de884c3d2857983578a5bd9e6145a4bcba858
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/enet/metadata.xml b/net-libs/enet/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-libs/enet/metadata.xml
+++ b/net-libs/enet/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index fad69f25ae5f..21f769b215e6 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,5 +3,5 @@ DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec0856917
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
 EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
-EBUILD farstream-0.2.8-r2.ebuild 1855 BLAKE2B ea92e0e3ce8ba9ff2311ebb4f8770c6e490d244ecb2bf4c669e207c100d562d38cc9ed6f3abc989598676844e03d0d579780c3a89ff511141da2f433644fc825 SHA512 67b3fd28c39b270362e0464468e15fbe850a039b12579cd46d1a60bc7ac7a5fe575e60cd67a5bc929a76d9b2a5860a92467619c8af2e87099e1c5e15e473c5ed
+EBUILD farstream-0.2.8-r2.ebuild 1867 BLAKE2B d8c03b35640b192a61b66cd56d97dd528159faee3326c41bd65239717fd1c2d2db5de5d7619224685bb9abd102677bbd45cb70598824e633dc8b6a1f23566745 SHA512 fedf07dfc91f650737be63e7be42a1cfca91527a6a8bec513515b9e8c7432a479ef5c35bc3c9f913d42ca8d591f62356776b3f2c93925345fcde37848fdd64fe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 49efe0757aa3..1f577d2f0c3d 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 3d8f496fbfdf..c7e59f19c5eb 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,5 @@
 DIST glib-networking-2.50.0.tar.xz 435380 BLAKE2B 02eea0692cf20c9b1df8efc7e65eb144675fa307851450d461a73df6ccd55cb2ad4e8db5790ca8b0a38a14e30391e583dada30e858154e7c5b7fa0970658410a SHA512 a1e9d28a546f83d461057f088ca2467a32be110f444c8ede1cbfeb20244637d8d5fb5b5b0ee4485feb517beebc3536671442bbfdd3ba01663b52e6da138bd7fe
-EBUILD glib-networking-2.50.0.ebuild 2297 BLAKE2B 3718d5152e81516797b18be99e7e15e5f440c2ef0d7e3ddd267a86f953050d7f9a6dcd989cea8762416a65e4e6a3e7cb7e6e246fd2ad8de454f78ebe324ec0ee SHA512 627eab8efae60e19bf1b74c3fb0a0846020cd26c75d58673694b5e5f739d8743fac59290f50351cbf6917ca837fb24e0f98dbe92a891e9b320c77e3c031895d5
+DIST glib-networking-2.54.1.tar.xz 441232 BLAKE2B 4697ac5fe248d12839d2a3c1340e2e699fa2ea65a9b5d741c50d069c904e82eb23feb89d648bc127959d9ac15e18d3a4cd2bd8b08202d48d33937affb9df13c9 SHA512 8356d835914e33df43f4f2bb6a915ddcd48dd0565e4d5bc1f1d692e9c3124ee4421b99f87f2586f74e9fed24ef7421159f3242fd1eb7bd74950bd25e860896ec
+EBUILD glib-networking-2.50.0.ebuild 2293 BLAKE2B c92ae68d866e7e2f802a979cd821249e35a0a75b69bb1818674ff15744802ce7516dc0ec8666393f3922579b39df3f17ee736f1a49e5c4a8f9d3b7db06c5157a SHA512 c7ff70b244989b2e179bcb43ab3a96f60fb5cdb7341db95b0ee08ed74619f537286d5d2fb9b0318e2d27b484837297a390f93eee07bfd324ea8248a5d80fa79e
+EBUILD glib-networking-2.54.1.ebuild 2303 BLAKE2B 89d5bcb3def0c2f317178a3f829a4b11e6ed7be8f8fd84c30ab7c557f745efb409c5ffaa8a4b25fef356d8db684e1da4043e421554b9868314eae753fa75002b SHA512 e189a1c150af2e8b8cfbc569b91c6cf27ece865ed6d6827baf39f5ce63bb6fbe985d70a9ec742827a49cc65cb95368f6858321db1cf63d2134b6576f81813ac1
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.50.0.ebuild b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
index 9833c8f9bcb8..0042a4910c5e 100644
--- a/net-libs/glib-networking/glib-networking-2.50.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.54.1.ebuild b/net-libs/glib-networking/glib-networking-2.54.1.ebuild
new file mode 100644
index 000000000000..d8202c0db40f
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.54.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	smartcard? (
+		>=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
+	ssl? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-3:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.4
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	default
+	# Disable SSLv3 requiring fallback test, which fails with net-libs/gnutls[-sslv3], bug 595952
+	# https://bugzilla.gnome.org/show_bug.cgi?id=782853
+	sed -i -e '/\/tls\/connection\/fallback\/SSL/d' "${S}"/tls/tests/connection.c || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(use_with gnome gnome-proxy) \
+		$(use_with libproxy) \
+		$(use_with smartcard pkcs11) \
+		$(use_with ssl gnutls)
+}
+
+multilib_src_test() {
+	# XXX: non-native tests fail if glib-networking is already installed.
+	# have no idea what's wrong. would appreciate some help.
+	multilib_is_native_abi || return 0
+
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 2e00601569f5..346889f0468e 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a
 DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4
 DIST gnome-online-accounts-3.26.2.tar.xz 1405424 BLAKE2B 99b6bae527809e3c37248b35c0783e8f884577d93d1de04537f19cc2776f6204242469e78b51198c062272736c676bc67e1a3ef1cc4325eea94bb505e060ff0b SHA512 be1a9f4e1944f19937c2718db64c6968fb1f7538cdb6f7ecfa0b48136d37b1aa0c8054ff7a91cf037fac72f1e8ac7b59b69af3db39c585674113538dccf19114
-EBUILD gnome-online-accounts-3.24.4.ebuild 2471 BLAKE2B d5748c5b547daaba2a7eddd8141219d00f102f3522bfd3e7d03547db3a7114a9fb739a7d93a642fdcca6a549734ca4c20bd724fbd2d72b9453d8eae407f143fb SHA512 a7356397015414a0a4908eef03f38cb96286268bda14a82bb996ef2df1bdfde5969b0761b0f4a7ded9c4e4d065f682f16f60559b3af6b946fdb53cfc6b56531d
-EBUILD gnome-online-accounts-3.24.5.ebuild 2473 BLAKE2B f589b5a55606011a556628ec04375cbc47b330100665409a693f8eec7ba15c23de2323b6e5c0f269ca8fc71a118f8a6b493a410b7b7890d569050b353d6b73f6 SHA512 18b212a9b3b3896252eff5d6455adeadea67c8a7f036c2e7018615aec0cd7002babbc431b2d4360d50752a1a5937f7ccd5226970b7f95b7ae61cbc9f5077504d
+EBUILD gnome-online-accounts-3.24.5.ebuild 2468 BLAKE2B 44ff777518816283b6d9a39083245973389526557b04c7188fad30a8f6b36cc136cf4edf034635cf3fb9784acf517181bb9d18deb9b360c83ab8b06fe9a0b25f SHA512 fd6585c4cab9ba0d6029655c2a2e44819e2bd77071aaef69a5762a67942ec3345d8411608ec6464c0aebffcacdc7753c95a4ebbb9ac33b3ea616d6b9a04381b4
 EBUILD gnome-online-accounts-3.26.2.ebuild 2538 BLAKE2B 0945a91ffdedf584f314027b7cfb428b11075437f274ee1b2e7fa91b2c68992d239404d2e17fe787d6a20acc771c21bf27ef391eb4a747ccc191b260d0f6efb4 SHA512 3279189b7c01a292226819024d92cc42e67ef20595ed23c5785242622a89e72f95b36dc8ecea790d1c92af6606cf2936e495129840ecc20cc177c4004f58bd0a
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
deleted file mode 100644
index 728d55bc04df..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 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"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos vala" # telepathy"
-REQUIRED_USE="vala? ( introspection )"
-
-# 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.44: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? ( $(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() {
-	use vala && vala_src_prepare
-	gnome2_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 introspection) \
-		$(use_enable vala)
-		#$(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/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
index 4acaf6e21902..60812b5c5994 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos vala" # telepathy"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 71d27988805a..a08382c4bac7 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,6 @@
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
-DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe
+DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce
 EBUILD gnutls-3.5.19-r1.ebuild 4025 BLAKE2B e166a177a1530255660c59e775d715b03a0140729c9dcb20bfd17f91a7a7c5a8f1edab502be03e33980bd23c01cd1d9b667a5f1f468585e8db6ba646521e15c5 SHA512 ec3dfd1a35e14528fe9765360ab623bc6f2f93a2ff8e6d9421add6a100da2937344986ff909d7036e00caf8806e87923daf4ce381671e9c0cb79d0a85d6053be
 EBUILD gnutls-3.5.19.ebuild 4102 BLAKE2B 8b4eec009a005860f2b138ceca61ce81e59263c640c2214d9729a3dce4c20df09da82c9a9f56b7e44c7f48d70c44c974bef1597f9d97531c03a716bf372e1a10 SHA512 09257ab61c491b99910db2b8b3a39ce4fb9d484d0d5e1a19006b0ee0073f6261b4c6f18d9a86bfe53a2472c4e285c829a256354676c380fa48cff05bcead0e6e
-EBUILD gnutls-3.6.3.ebuild 3672 BLAKE2B bb978d2c2b2903e10707874da1c3a896159c46bcb9505e9632a31e69e2bde8f73f3784ea723ce38c96d41b9ab2d5b034f5fafd367f56d8130f7768fc92c24675 SHA512 e1f082e5fa7f744a61a7f1936dfdd9e71e83327b59e86a57ad447a22d4935ca5453ade48e99ff8809f696dced9c108693176700251822370b01ca502e10c3264
+EBUILD gnutls-3.6.5.ebuild 4044 BLAKE2B 2ea665c6b1b62648fc660b694c0cf244ec9c971a0d0a103c94b940bb712515df28bf4c9489d7280eea4bab9a0198b16f48b0f4dd149f3adaf71192cfe4e498aa SHA512 faee8caa028f4fe75fd7c453e2f1af351001b0f3fe9cd44744ea6c3d549737f7c65776d34e6c7387107ab889ae808fff054370ce7f20e3954fdb2640ee4c0ae7
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild
index e28279bbf276..7f3b673fd300 100644
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit libtool multilib-minimal
+inherit autotools libtool multilib-minimal
 
 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
@@ -21,7 +21,7 @@ REQUIRED_USE="
 # use system libopts
 RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
 	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
 	tools? ( sys-devel/autogen )
 	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
@@ -73,6 +73,11 @@ src_prepare() {
 
 	# Use sane .so versioning on FreeBSD.
 	elibtoolize
+
+	# bug#673574 - until upstream builds with guile.m4 of guile-2.2
+	# eautoreconf will run gtk-doc gen so let's avoid that
+	eaclocal
+	eautoconf
 }
 
 multilib_src_configure() {
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index dddb397c4a1b..48ca6d3aa3e1 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -20,6 +20,8 @@ DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20
 DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06
 DIST grpc-1.16.0.tar.gz 14442543 BLAKE2B bceddb5cc9b3439523523f16e0a34b45ddcd1b4bfc00556639b6d0ea84b886c7a9b3204b73605181d76997b42ba1a3ec3ccb95f43a0396a5cb96c7ea7644a800 SHA512 af088500bb7055f91a856efc91a718f3363a3047bc568e6419dc5776037d9a20493772b34d75a78225fb6bfc339da6493881c6744f3f98607bf9d3c7f91bfb75
 DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
+DIST grpc-1.17.0.tar.gz 14639325 BLAKE2B 4a94d2072de6ce055a910015fa2ff4e9be898d0a51e907091c77eac15c6d49cfd76bdac0bfc8c1a69462a4c04273785f17ac91214b3c6e5cdcf3b249831597e0 SHA512 c1c6a1c668975e454abd36fa13550ffd40e04e752a2a5090541463c20683ad9382052d22874115f2772ad9c0dda74c4dfb1835176b07ea69a1b99186afeb5cf7
+DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD grpc-1.12.0.ebuild 1530 BLAKE2B d2abeea3fa12c68427d1ac0769715e85bc73393b0b08ae57a42cb5ef88d4126fb0993e7f3b4efc77667ba63239793cd436da8e8fb9d006d569b6f2ba3338f5af SHA512 4758b67f830e8c2d40add0d6f8fb2aae9b5856c8e0ca02a78f1ae0b7fbc974a5a0f066da252f1e10111fcf99299b12881632386bde9c511b7f54d2b961612811
@@ -30,4 +32,6 @@ EBUILD grpc-1.14.2.ebuild 4482 BLAKE2B 527731a7613488f4fd344d8d3dc4d072dc86105ff
 EBUILD grpc-1.15.0.ebuild 4477 BLAKE2B 924634776e7258bf0d1e407bf3f98edb0af932c33a7e9ceba65f39bac58990c64951fce51208363ba4ee5d6f76a3d8102ba7d84c238d7312c04b577de3bdb451 SHA512 142a6d60aa75fecfe27195bd222dce80e40dbcb57b3e868b38619df923f6cc968e296d520f6f60e76443d0e60f0c2868fd55ab04da2ac5579287973b4f2b4e38
 EBUILD grpc-1.16.0.ebuild 2336 BLAKE2B 227d1fdde55627d925b99eb32e07ed909a8fcc7264a75807cd71fdbe91fe56e8e40ae0acf87575b2d9185034b11a416f814b2e71571dcee2d1b507ab01e7eec3 SHA512 7a597c9c5243a306a90687b0414540dda5498c64062fb4c485458ddcbff70c9340bc282b564448c26fb33fa9866906356be9b15aed08ea501c3eaebfa08963a2
 EBUILD grpc-1.16.1.ebuild 2336 BLAKE2B 227d1fdde55627d925b99eb32e07ed909a8fcc7264a75807cd71fdbe91fe56e8e40ae0acf87575b2d9185034b11a416f814b2e71571dcee2d1b507ab01e7eec3 SHA512 7a597c9c5243a306a90687b0414540dda5498c64062fb4c485458ddcbff70c9340bc282b564448c26fb33fa9866906356be9b15aed08ea501c3eaebfa08963a2
+EBUILD grpc-1.17.0.ebuild 2360 BLAKE2B 833456fec4fbe906a7aa95d4207cbe7abce79f727d7df6341297f9762eb41e9099ebd75900bc4fa112204410292d846ee8194d5bfe5c927b0c11afb7b9af30eb SHA512 86ab9cdf77ca6510665aa6897db580218b0914f7f682244ee155f4468f183d3cdf2f0ee3adbbf1c4390d0809a1bec6c9848a664c5cfe8a0b2cda97d8275cfae5
+EBUILD grpc-1.17.1.ebuild 2360 BLAKE2B 833456fec4fbe906a7aa95d4207cbe7abce79f727d7df6341297f9762eb41e9099ebd75900bc4fa112204410292d846ee8194d5bfe5c927b0c11afb7b9af30eb SHA512 86ab9cdf77ca6510665aa6897db580218b0914f7f682244ee155f4468f183d3cdf2f0ee3adbbf1c4390d0809a1bec6c9848a664c5cfe8a0b2cda97d8275cfae5
 MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/grpc-1.17.0.ebuild b/net-libs/grpc/grpc-1.17.0.ebuild
new file mode 100644
index 000000000000..306060617908
--- /dev/null
+++ b/net-libs/grpc/grpc-1.17.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc systemtap static-libs"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	dev-libs/protobuf:=
+	dev-util/google-perftools
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+	systemtap? ( dev-util/systemtap )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
+	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	emake \
+		V=1 \
+		prefix=/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		AR="$(tc-getAR)" \
+		AROPTS="rcs" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LD="${CC}" \
+		LDXX="${CXX}" \
+		STRIP=/bin/true \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		HOST_CXX="$(tc-getBUILD_CXX)" \
+		HOST_LD="$(tc-getBUILD_CC)" \
+		HOST_LDXX="$(tc-getBUILD_CXX)" \
+		HOST_AR="$(tc-getBUILD_AR)" \
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		STRIP=/bin/true \
+		install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
new file mode 100644
index 000000000000..306060617908
--- /dev/null
+++ b/net-libs/grpc/grpc-1.17.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc systemtap static-libs"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	dev-libs/protobuf:=
+	dev-util/google-perftools
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+	systemtap? ( dev-util/systemtap )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
+	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	emake \
+		V=1 \
+		prefix=/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		AR="$(tc-getAR)" \
+		AROPTS="rcs" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LD="${CC}" \
+		LDXX="${CXX}" \
+		STRIP=/bin/true \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		HOST_CXX="$(tc-getBUILD_CXX)" \
+		HOST_LD="$(tc-getBUILD_CC)" \
+		HOST_LDXX="$(tc-getBUILD_CXX)" \
+		HOST_AR="$(tc-getBUILD_AR)" \
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		STRIP=/bin/true \
+		install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/gsnmp/Manifest b/net-libs/gsnmp/Manifest
index 9d8dd7953544..28f62c0a0cb5 100644
--- a/net-libs/gsnmp/Manifest
+++ b/net-libs/gsnmp/Manifest
@@ -2,5 +2,5 @@ AUX gsnmp-0.3.0-g_access.patch 264 BLAKE2B d19fb56bc2c4acc33a26395475f939f10408b
 AUX gsnmp-0.3.0-pkg_config.patch 710 BLAKE2B 08eb07f74a31713e30342fcce11dbdea36b32133fff2a3c11ef8e907aa0d4dc4b5f0a7d2b0870f1ff0ae5863ef2f6017b856ddd6522461bbde2c146765ef7368 SHA512 95c9413863152970705273a54e6ecd51a071cd7bba8ce0d1614dd1bf677f11b9f948caf02de450e261a50cf65d468bc7f11e300ccea9cd21a0e41a659616e55f
 AUX gsnmp-0.3.0-underquoting.patch 181 BLAKE2B cd12cf9802ef532b6e52e315b6e92e111ef9fb0c5501121ac912057af6cd8a87a20e8258f3fc338253a8fc72931afc5d381193ee6726d7a364dcfef871fcf06b SHA512 5d77d7c36e79dfc78499f83957a0e40628fc67011c15f44f6ae8c8c731d1429acdd95a43c6a39e0353d1b0ce7702fb9c1facbf51800d11141e408e815d91ed69
 DIST gsnmp-0.3.0.tar.gz 423137 BLAKE2B 6987b1d13b946b2e4b78618e0910cb6f787c71c1658178ca1ced866a82ca5f6467c1dd21d7c2e40dfbf9150d860539e216d4be197ed705a38517a57fc7220d66 SHA512 dcba2eb5ae31704fe6dc3e0b98f3032666b7b2be1efdff0f60a3cf4d0e0c3384563d72e5289a8d10c447f00da73f646a1963ffe08b46c7bc165972ac1b07c8b1
-EBUILD gsnmp-0.3.0.ebuild 785 BLAKE2B 929edc76467569b1605458a7fba712c6246f9db6d045d3a038175602db750729860ac739f294fdb80f07599b6203fb0d12cafe07ce488c0cae547b8b481f0cdc SHA512 efb513c20efcd56fff191a39a0d14e68dc086ed0f94a91c8cf0cd6258c4e1fe13cadf4c89133e2b77083a3d2c5a71c5246e3ec5360f311eeabe50561ab91f7be
+EBUILD gsnmp-0.3.0.ebuild 734 BLAKE2B 81db1765382a5be054cc10dd2b3165e525ddb741dc2aaaf43c5542e6b1e59050d0e7a7da89a328c0b9c779c630a5fa146beeab1b5b0b0efedd8d582d115f71ea SHA512 f013ae9f47da35c27b05e7871d99684ebb18b77121528458990989800c5bf14aa6690d01600d6c3e9e9a3c3fbfd3dc25fbdb8bddc59a40c655bc60d5cd1feb46
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/gsnmp/gsnmp-0.3.0.ebuild b/net-libs/gsnmp/gsnmp-0.3.0.ebuild
index 0adc810d0566..034f03a34df1 100644
--- a/net-libs/gsnmp/gsnmp-0.3.0.ebuild
+++ b/net-libs/gsnmp/gsnmp-0.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="An SNMP library based on glib and gnet"
-HOMEPAGE="http://cnds.eecs.jacobs-university.de/users/schoenw/articles/software/index.html"
+HOMEPAGE="https://github.com/schoenw/gsnmp"
 SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 6f00acf2e7dd..86a3e8fa2ed0 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,12 +1,11 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
-AUX gsoap-2.8.52-shared_libs.patch 6582 BLAKE2B beb15d19f782edd0fd0ac518001001f194fc26ef8e7964114809776d3b0dc5359f2cf39e0fe6813650afb7805ae389dc5e26ac4ac4bbe424e81135073ee7bd27 SHA512 7ddbd3c2597892357da0ced383b2286e057e5e3c44eec3fd96b2ecbb4759bb5624c047e77482c495d46796e20d0e587e637f7b3a0ca3a05ceeae40e63fd5049c
 AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6dd7bb1dc933216a1770accc94c2d1ef02fe6a3ad7643cb7d748a54e55e9ba3591d48f107485c9b9e4306763f2634 SHA512 d49527ae34788f8bc1a74c9a59890bdc13eb343fb3293fcc756b7dd7259cc7cd544bafc58a0c271cf7268b0a9c986db36e587fdc7fcc520ea05ab559e292649e
 AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
 AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
-DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96
 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.71.zip 32395469 BLAKE2B 47038e70e297408f5599319b229d2bd15136d43646fe082480ae6cc29316a7f45c056e6c5859e9bfafcb24f5b10455d2209a3505c801d02299493c3b5435d06f SHA512 3e4494681b2669ea7eebaee19aa23fd31a339966f7af106258eb1bd676aff42f1069d55e6c80ae09fd60b2d48e456b0cb788d5d54829301ee62a2ef64742ddea
-EBUILD gsoap-2.8.63.ebuild 1630 BLAKE2B ec07675d8a315a780c4f43b617099aa6211ffb584ea3a3e718500ad34063f28e6498e62d6fd040a108aad36cfde3aa41ceb8b52181d22b4febcaf66de457649b SHA512 310be6db4ad09a75b5a61ea91cd82f648e21102ce783009f13f1a97d390ed9cca59db06d707c0e3635a18ca5a4c35a359479755b38f218440b729b73fa84e397
+DIST gsoap_2.8.73.zip 32303580 BLAKE2B 1484fb2df66627db12e52459091e163affcb2a73913657467503501423bbdf2da12651567cae517b3f7d0d632f997a37c0b244b1cda811046d078477c990d581 SHA512 171214b285e9d89108271da52c010cde81fc6f54de5aaa678e10b273857f91e6afb301fdc6e91fa836b6aa609fb75131c2247dd5f4b79f41158db2f4917b55bc
+DIST gsoap_2.8.74.zip 32304642 BLAKE2B cca698d25c837fe70969379a63f849e7623b7bb3c6e4f1fd4e22b159f03a17214981eaf6d9f632a85a6cbff87b4f1ac6411896bb86c083720a94d2bbfd8501ac SHA512 85284b88a94f07f433ffaeb9031c24d4c9c3eb82f8c590fa257cf9392fa0382cdcde5b3d5c7df903c6ddec41b876643b21ea24d18186b03db9dc8a4d6e8477ad
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.71.ebuild 1876 BLAKE2B fd95d1228e01e40e6be151a59f47bfef79550d690c8640736ca0f3eabff8f2eda1f924254aec7420c792cf92dc215ed79813ad83bbf9a24c380a71db9c1571eb SHA512 8694c4a63556b64077464ec09819711aa1f44eca00de3f9d049876866c229c57e38eba72842e737b6820ff6ba83902e9a8f1d0339266ed7a60043961c479c60d
+EBUILD gsoap-2.8.73.ebuild 1789 BLAKE2B 923bac516c7b3640f758c73e40d77459905a44eb123a48988d52d34785ebf7b1f81980003ee77bda640915f9f915101cc5fdd1960314efd6268d986d55d822ab SHA512 c1aedb4c6f0d4aad1b22e49e3ac203b99e7f0060942b96569b4d3797811bd1a0325880140f5bbc961b5a34d3d6e497d33aeaa18ead81241da7350f141e07d756
+EBUILD gsoap-2.8.74.ebuild 1789 BLAKE2B 923bac516c7b3640f758c73e40d77459905a44eb123a48988d52d34785ebf7b1f81980003ee77bda640915f9f915101cc5fdd1960314efd6268d986d55d822ab SHA512 c1aedb4c6f0d4aad1b22e49e3ac203b99e7f0060942b96569b4d3797811bd1a0325880140f5bbc961b5a34d3d6e497d33aeaa18ead81241da7350f141e07d756
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch
deleted file mode 100644
index 9437de86f61f..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- gsoap-2.8/configure.ac
-+++ gsoap-2.8/configure.ac
-@@ -17,7 +17,7 @@
- AC_PROG_YACC
- AC_PROG_CPP
- AC_PROG_RANLIB
--#AM_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
- AC_PROG_LN_S
- AC_PROG_AWK
- AC_PROG_INSTALL
-@@ -259,15 +259,17 @@
-     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   else
-     AC_MSG_RESULT(no)
-     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-     # compile with wsdl2h when OPENSSL is available
--    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
-+    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   fi
-   if test -n "$ZLIB"; then
-     WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -286,7 +288,8 @@
-   WSDL2H_EXTRA_FLAGS=
-   SAMPLE_SSL_LIBS=
-   SAMPLE_INCLUDES=
--  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
- fi
- AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
- AC_SUBST(WITH_OPENSSL)
-@@ -294,7 +297,8 @@
- AC_SUBST(WSDL2H_EXTRA_LIBS)
- AC_SUBST(SAMPLE_INCLUDES)
- AC_SUBST(SAMPLE_SSL_LIBS)
--AC_SUBST(WSDL2H_SOAP_CPP_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
- 
- # enable the compile of the samples
- AC_ARG_ENABLE(samples,
---- gsoap-2.8/gsoap/Makefile.am
-+++ gsoap-2.8/gsoap/Makefile.am
-@@ -49,6 +49,29 @@
- libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
- libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
- 
-+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
-+SOVERSION = 0
-+libgsoap_la_SOURCES = stdsoap2.c dom.c
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
-+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
-+
- BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
- 
- include_HEADERS = stdsoap2.h
---- gsoap-2.8/gsoap/samples/autotest/Makefile.am
-+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
- SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
- SOAP_CPP_SRC=soapC.cpp soapServer.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
- 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -40,6 +40,6 @@
- autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp
--autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
-+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
- 
- CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
---- gsoap-2.8/gsoap/samples/databinding/Makefile.am
-+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
- SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
- SOAP_CPP_SRC=addressC.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
- 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -28,6 +28,6 @@
- address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- address_SOURCES=$(SOAP_CPP_SRC) address.cpp
--address_LDADD=$(SOAP_CPP_LIB)
-+address_LDADD=$(SOAP_CPP_SHARED_LIB)
- 
- CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
---- gsoap-2.8/gsoap/wsdl/Makefile.am
-+++ gsoap-2.8/gsoap/wsdl/Makefile.am
-@@ -10,7 +10,7 @@
- AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
--SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
- SOAP_CPP_SRC=wsdlC.cpp
- SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
- SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
-@@ -30,9 +30,9 @@
- wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
- wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC)
- if WITH_OPENSSL
--wsdl2h_LDADD=$(SOAP_CPP_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS)
-+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS)
- else
--wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
-+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
- endif
- 
- CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
diff --git a/net-libs/gsoap/gsoap-2.8.71.ebuild b/net-libs/gsoap/gsoap-2.8.73.ebuild
index 4f3a99893774..c0cdf5ada9c2 100644
--- a/net-libs/gsoap/gsoap-2.8.71.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.73.ebuild
@@ -37,9 +37,6 @@ PATCHES=(
 	# enable shared libs https://bugs.gentoo.org/583398
 	"${FILESDIR}/${PN}-2.8.70-shared_libs.patch"
 
-	# Fix --enable-xlocale configure switch
-	#"${FILESDIR}/${PN}-2.8.70-xlocale_h.patch"
-
 	# Fix parallel make
 	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
 )
diff --git a/net-libs/gsoap/gsoap-2.8.63.ebuild b/net-libs/gsoap/gsoap-2.8.74.ebuild
index 55a5b33b16db..c0cdf5ada9c2 100644
--- a/net-libs/gsoap/gsoap-2.8.63.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.74.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${PN}-2.8"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
 LICENSE="GPL-2 gSOAP"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
 
 RDEPEND="
@@ -35,7 +35,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
 
 	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
+	"${FILESDIR}/${PN}-2.8.70-shared_libs.patch"
+
+	# Fix parallel make
+	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -46,18 +49,16 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
+	local myeconfargs=(
+		# Don't include xlocale.h as it got removed in >=glibc-2.26
+		--disable-xlocale
+		$(use_enable debug)
 		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
+		$(usex gnutls --enable-gnutls '')
+		$(usex ipv6 --enable-ipv6 '')
+		$(usex ssl '' --disable-ssl)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -67,17 +68,19 @@ src_install() {
 	# it contains info about how to apply the licenses
 	dodoc *.txt
 
-	dohtml changelog.md
+	docinto html
+	dodoc changelog.md
 
-	prune_libtool_files --all
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 
 	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
+		rm -r gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
 		insinto /usr/share/doc/${PF}/examples
 		doins -r gsoap/samples/*
 	fi
 
 	if use doc; then
-		dohtml -r gsoap/doc/*
+		docinto html
+		dodoc -r gsoap/doc/*
 	fi
 }
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 030be3a8ea73..2375bd536aa8 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,5 +1,4 @@
-DIST gtk-vnc-0.7.2.tar.xz 447088 BLAKE2B 539cc9214735cf73c6e578029b33892c3e2d0d1dc402f82fa6d8d107c9a410e551020d9201192b69e50b75bb8297919ab0961752251dcf0bd75823d7426e01b5 SHA512 b95b1da6ff512c466feaa6efc831e9c36c5a77390b518c647c60fddda9dd850eea8658174682ae135b95bfca7bf2b4e85a5e5ac9adb43e3ddd7aa690288655ce
 DIST gtk-vnc-0.8.0.tar.xz 448984 BLAKE2B e9de98a969297832ff6eaba79707a44494b20d944264ac6902596f882b95e8ab1bc6b7eb25e040d17f939d678a81eec730f983942db38d73c81751fc2afd45df SHA512 9b66e4028e56b01af8d0ded5b833fc6c0ba752ac72cd664293b0009868bbec0bc8750b619ece9786eddc06155e390ecccc4c5bc84717c49ac4bd866e6febd8e3
-EBUILD gtk-vnc-0.7.2.ebuild 1505 BLAKE2B adf616b435a52abe1b2d19a9cb46fa0604b0da89d0cd23ff4b6fe3293059723719642a86365ab83c2b20cbfa39f4ca9ab2a7497970b788674c1b9831199adc0d SHA512 5bc465dfb2f9c9038afd28576f70715f6abbde76075b494f3955fc2ce58d2b38a2766599797702c4e64d4ee091e4e339f2deb094e87d524a8204084646c9b328
-EBUILD gtk-vnc-0.8.0.ebuild 1670 BLAKE2B ad2b87c1b2b9058e9358f281d171f8c2652b2753d6cda8078f83b2eff2eb5b8622b1c19657b861a9fed1cd04031477ae9bb7c4bcc6c611eb966c4de5a256f365 SHA512 f028c55af206e8d7c61a6af4269dcebce79741501fccbc51de3e54e367246c0f1b1790180edb13df09647d77363d2cfc248bcdd69cbd27330a065ef16047f644
+EBUILD gtk-vnc-0.8.0-r1.ebuild 1700 BLAKE2B 9d293c7a2c0a3e4009fe8fdf080a90fe130f0a1486e5ade6e9ed48d033a3a09c001ecc9490f5646f9db47f6c4b052b98715405f9b8aada894adc9c12c8722bed SHA512 2dbbc1ae4f10f728a0ffa96f584721e3e959613243c6d2e534b275b7b4f316a811ef2b8a631281f464a5cd14a3a3a01a258b3b761971fb4e5677681a7b8f8042
+EBUILD gtk-vnc-0.8.0.ebuild 1668 BLAKE2B 2e86531f529ae179dc07cf1a4b71975422fe3abcc06ef3acabeda89fc287d77b73df1ebc238509c806a3d4da62fbc51854622e28532e64d86452ab94af7a2cb0 SHA512 b618a30a9c9503787a819e113457f33978ec85d90e21c7fc41df55fa20c9db88cc64047ca487156e5c353880c5be86bbe92d06d80b87e9d4c5a1a11a928c25c6
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
index eaa330565575..16545aa4b3e5 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.7.2.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
@@ -2,17 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
 
-inherit vala gnome2
+inherit vala gnome2 python-any-r1
 
 DESCRIPTION="VNC viewer widget for GTK"
 HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="examples +introspection pulseaudio sasl vala"
 REQUIRED_USE="
 	vala? ( introspection )
@@ -32,7 +34,9 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	sasl? ( dev-libs/cyrus-sasl )
 "
+# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	>=dev-lang/perl-5
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40
@@ -55,12 +59,11 @@ src_configure() {
 		$(use_enable introspection)
 		$(use_with pulseaudio)
 		$(use_with sasl)
+		$(use_enable vala)
 		--with-coroutine=gthread
 		--without-libview
 		--disable-static
-		--disable-vala
 		--with-gtk=3.0
-		--without-python
 	)
 
 	gnome2_src_configure ${myconf[@]}
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
index 7adbe4ab1f1d..75ca0f822fbb 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="examples +introspection pulseaudio sasl vala"
 REQUIRED_USE="
 	vala? ( introspection )
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index deb2eb9ab760..2baa1d01a229 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,5 +1,5 @@
 DIST gupnp-1.0.2.tar.xz 421792 BLAKE2B f89bd5f345637718a90fcd90bb4b0a17cf143042018d6a529a6cbac9c411218f1b014b5eee2a09e888e0dba195a1a8a31c078f0be749bb1b6d059a665c4ca2fa SHA512 a22082b10725abe233a8b3212a988a7c7e52a617aefe2029f25572d371560264cddd15eab2ad4637880b4be3b4bdb85dbc5c47c8da338667152c86eaecd7e165
 DIST gupnp-1.0.3.tar.xz 422912 BLAKE2B 900a2a81982a50239b26ddd5df3f57caac1ee66103e857b9014db7dc694e303c1eaa0633cb467887f3370e97058abc221bd0175c9df11ca4af31e3f802145a66 SHA512 f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448
 EBUILD gupnp-1.0.2.ebuild 2011 BLAKE2B 42671e326dd838016cff57ccdd59ca52eb4438bba27bd54eee5cfd94dc6a239d0e8385878477076ac2db85084401b1bb4d14ea7d253e24e3f3a2fdd86e5ad710 SHA512 c3dee380560695f76e4ad94fc473ba1ade3281d7006692b7a155073304c1abc0b4e3df0173ef56f1c24609253c504566b2505fd278e6c3b827f08bd2a5243ea3
-EBUILD gupnp-1.0.3.ebuild 1957 BLAKE2B 39893024403be98f0df39efb7cfb1927f82c4fb312aa21b160aa2e48dc7b50c2a048f31ee09932fe4380116daa6848cf9e05e19d5b25d3117801f7633659b7d1 SHA512 7c4fc535159979c758ab5643b81274386949dbae0d695b58d0b259df3e682a6999cbd91687a55f7da5018c40864f898a36f841520d3455656797b8a21d950086
+EBUILD gupnp-1.0.3.ebuild 1954 BLAKE2B f0bac2e98cb246f7c0c92fdf870404738779f2654856779697ba735c5bae493fc605f0ff2da190e74e5d68f3f1311b3db5a3f28fb2c61f27d25ed4f4825e8ae5 SHA512 7eb2daf6c42ce79a22fdb05150153570249983f350e774be19f05eee5730ec647035bfb28f4ce927e77a9fb402b06c33458229dd37636304950b8565001f43fc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.3.ebuild b/net-libs/gupnp/gupnp-1.0.3.ebuild
index d9f07afd5dd0..ae408ebb09ad 100644
--- a/net-libs/gupnp/gupnp-1.0.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="connman +introspection kernel_linux networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 4aaf2818aefb..91f063de4977 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,14 +1,4 @@
-AUX 0001-makefile-fix-DESTDIR-usage.patch 2216 BLAKE2B a653a6d5378e099c4509061ad4adac974ad4a525d99e7db508ba6d9a686d24dfda639b949e8e40a3a1a85d145a3e17604e993c5c32b8405ea7cc20bdb00f290c SHA512 ebb481df21cb312824ed65e7d6a3e7b237451071235566595da97c09b165767693ec3c47c27c451bfbdc2d62cc45c7d5d9f996b80789dc7fedaa2543c94c9065
-AUX 0002-makefile-quote-variables.patch 1848 BLAKE2B b80c374ddb43f446c4a20f3a2cd98bc97ef5ab1077961b3fd1d8ed0622e982f206c7d9fce7fa83f6c844d4171853190468dd932d469056fa07bd0ce366dad76a SHA512 3637abedbf330af0f4a9721081db99fe0f6400322f21f77ab16d580546a9d200d40bc584e8dbb51adec249c2d468730c6e2487ccda3786626909d988b7f8856a
-AUX 0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch 1286 BLAKE2B 85c81a759333073e0e85569354587b80135c01200a9878f264908647950831b00916309e3e79fca82d8a4d12b6dcc265fedde596f8a9e05467e05bf1f565e628 SHA512 8202d665963234ce6dd84439f281921cb959424024c2fec8a27b65693b3466cab8674a3549d22fdb2fc07edf69f94440368ef77738ae4be2a5d94c13e3c814bb
-AUX 0004-makefile-add-CFLAGS-to-linking-command.patch 1038 BLAKE2B 38eb7d25cc5ff46a093a0992fc0be764a9ad912e9c1b49fbb755e3009975756e96e3a039752cb31431bd803960e7eb208e4259953d3e661d9dac612d8e3479ab SHA512 e18c163f2069795fb6b744ad9f6e44eb9efca7f560460a6759bc0121a404bfe8109031c0f43d36d4987bda3411e0a433dbab6d0eabb2dbb5c79f1ce878251aae
-AUX 0005-makefile-fix-install-rule-dependency.patch 1090 BLAKE2B ece26b7808ca7769258157699b11ff5a70fde04a431d792f25fc66c2393ffb5fcd7299d2b7e4b3c1ab7c2ac65a2e4188cb61d154421a8139dedc366203490df8 SHA512 4cd120f406eeeb1e5a60c7d8955cdfead50d99b60f91a0fcdb2ae19403d08e5ed5619885c9e434ce40ffb442b317ee8c32ef636960429036f9bff92492f03968
-AUX http-parser-2.6.2-darwin.patch 452 BLAKE2B 3c300ae1a9d484c8c3d188df421b4ea28b60c4d16faea45ac552242e0a9b28ad00761fa10353729cb7290dbdc00b41ea44f556b6bb79a57eac81c5a97d657a78 SHA512 32b6e637597d57ae511dd421f300f74c9f12c72746989d61455ea00cd0585ed96e2787e0ca0d965f66bc4b7875bd157e90e20f6f6682b20a8d95ae7ccbccdeb1
-DIST http-parser-2.6.2.tar.gz 48292 BLAKE2B 054ffa66960bad29a31e1a697a035447eb551fb85ed2af3786664f161d8d5a62aad8142ce859b7f1af85489b703b188d09980bf82b56cb190c21ecbe9c3a2f5c SHA512 e19e5377b3eb7f149c428196826fb878564fdfa3716ff6df5a3845c51586aee0582e252e09d1f8ebad1163b3e66632ff0c6e78f6acb2f0da20d7a06e734406c1
-DIST http-parser-2.8.0.tar.gz 50575 BLAKE2B 0ea1973b452b62915ad2a92be95e09281c1aa2f152ff4a67580e99ab113b44544f98b2e33fa1fadb259144975f15dc69c8b0ecc9de59e603dbd0e0a0785b7976 SHA512 57252a29b75f91452fd9bf2d3805bf1ddd95c32aee864cbe47dc676861512b9db95a7b3a4e1b999d5c046ab0d50809e7f184994c24ad48fe97cc2bcc27d9eb7b
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
-EBUILD http-parser-2.6.2.ebuild 1395 BLAKE2B 3ecf77d59826d0b5a82c3bb6dffb25b98837027e0ab915bfde595b38d2633203278422db4a60c6be2fcb142055b64ba9862e71b9bdf409fc3c074cb765a51bb3 SHA512 ff59a0b6f3b7aef3ca79483384df88eafaf7ad80f05ea809288c6798ce0234f83a9dd41b5b2c80a865c70cb449574b0f2100c87bec2a5c2fecf432874b5a07f3
-EBUILD http-parser-2.8.0.ebuild 980 BLAKE2B 95c2d5c50cb8571adc4ab93796c8622a816f6f94a20642cecc60e1ab5721c4d1016bc1b92df9e0da66067dc074350c52795de4bda35e17e96371681dbf358482 SHA512 20de8a72586400fdcd94da20ebadcc59c4c7dd22e60772d736c6b1b27bfe7fdbe16b89f0ae45f93c2524c2f3fedf3b7bc9fc6580fd15d7824feeee5442ab3f5d
-EBUILD http-parser-2.8.1.ebuild 1004 BLAKE2B 55aee0eaf8b64cbe81131fe94fdda20d6774655f460a0a5a3d4b38e0dd6b71219dc8a4f579c7188a08f8afeea7c6e0d780c421eb66b3bfcf1e4e4ad75d34e3c6 SHA512 9ed1a395feecfd25ad17455429dea4cc93880dff36834e07c565ecad359bf96cbb3c6be7e1c51483f40f552ba517d47a7b6aa22cdf5cfd4197c923974d5dc305
+EBUILD http-parser-2.8.1.ebuild 1010 BLAKE2B 41fd9e9bc96b39e583f49ec1c01befc7a0b68af0ae21dfff5523c5a8e54bd141fb7b470e47c7ef7c5ab9eda7a19ec64ce290371307c974e753c5477daa70330f SHA512 e1690bdcb1a2b1bc9f1e255e8d494d0e53f46937f89abf24a8106e1194961213f2f2d72370e81be29e3d1a8568df143c9a7fd80967a5d4df3975ba724e89bd56
 EBUILD http-parser-99999.ebuild 878 BLAKE2B f542c8332672550422d4de016d5921ca6972bcd1395bc466090a3d0f7cb8b2169a3424cfd017e9b42d676fd86bcfcce19577cb0cfa3a69a1948403608e7dda93 SHA512 49b9a884e6518be420614a59457eb6fc58f791e56c9c8ad2da866013331ae6b2413a21921c4298a0f9c9d5cdaf505d45d2368aa97a5d247531acfd1887721c62
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch
deleted file mode 100644
index a819cf441d32..000000000000
--- a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Mon, 2 Nov 2015 16:24:43 +0100
-Subject: [PATCH 1/4] makefile: fix DESTDIR usage
-
-DESTDIR is not supposed to be set inside other variables. It is
-standard to have this variable in install/uninstall rules, so it
-can be reliably set separately no matter what other variables are set
-to.
-This also avoids potential bugs with setting SONAME or seds on
-installed files (like pkgconfig) which then might include the
-temporary DESTDIR directory.
-
-DESTDIR is really just for installing into a temporary directory or
-a chroot, mostly used by package managers.
----
- Makefile | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 33c8ba0..76153a0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
- LDFLAGS_LIB = $(LDFLAGS) -shared
- 
- INSTALL ?= install
--PREFIX ?= $(DESTDIR)/usr/local
-+PREFIX ?= /usr/local
- LIBDIR = $(PREFIX)/lib
- INCLUDEDIR = $(PREFIX)/include
- 
-@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c
- 	ctags $^
- 
- install: library
--	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
--	$(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
-+	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
-+	$(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
-+	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
- 
- install-strip: library
--	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
--	$(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
-+	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
-+	$(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
-+	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
- 
- uninstall:
--	rm $(INCLUDEDIR)/http_parser.h
--	rm $(LIBDIR)/$(SONAME)
--	rm $(LIBDIR)/libhttp_parser.so
-+	rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h
-+	rm $(DESTDIR)$(LIBDIR)/$(SONAME)
-+	rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so
- 
- clean:
- 	rm -f *.o *.a tags test test_fast test_g \
--- 
-2.6.1
-
diff --git a/net-libs/http-parser/files/0002-makefile-quote-variables.patch b/net-libs/http-parser/files/0002-makefile-quote-variables.patch
deleted file mode 100644
index 096ac6b6bd69..000000000000
--- a/net-libs/http-parser/files/0002-makefile-quote-variables.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9bce473ba7417b45bfdb59d4151a8857dcfff4ad Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Mon, 2 Nov 2015 16:27:06 +0100
-Subject: [PATCH 2/4] makefile: quote variables
-
-Make does not take care of this in make rules. If any of the variables
-DESTDIR, INCLUDEDIR or LIBDIR contain whitespaces, then the related
-install command will fail.
-
-This is even more important for the uninstall rule.
----
- Makefile | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 76153a0..8c4a9d7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c
- 	ctags $^
- 
- install: library
--	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
--	$(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
-+	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
-+	$(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
-+	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
- 
- install-strip: library
--	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
--	$(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
-+	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
-+	$(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
-+	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
- 
- uninstall:
--	rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h
--	rm $(DESTDIR)$(LIBDIR)/$(SONAME)
--	rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so
-+	rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
-+	rm "$(DESTDIR)$(LIBDIR)/$(SONAME)"
-+	rm "$(DESTDIR)$(LIBDIR)/libhttp_parser.so"
- 
- clean:
- 	rm -f *.o *.a tags test test_fast test_g \
--- 
-2.6.1
-
diff --git a/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch
deleted file mode 100644
index cafe68d220c9..000000000000
--- a/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f45b38c42e7e92a5d0215c44dcf306616536011e Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Mon, 2 Nov 2015 16:32:11 +0100
-Subject: [PATCH 3/4] makefile: fix SONAME symlink, it should not be a full
- path
-
-The symlink destination being a full path doesn't give any benefit and
-may break a few use cases of copying these files to a different
-destination, while preserving the symlink.
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8c4a9d7..cbe93e8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c
- install: library
- 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
- 	$(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
--	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
-+	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
- 
- install-strip: library
- 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
- 	$(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
--	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
-+	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
- 
- uninstall:
- 	rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
--- 
-2.6.1
-
diff --git a/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch
deleted file mode 100644
index e21cd715499b..000000000000
--- a/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 62b1450cfe2e0df2d912279d38edf1b916020101 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Mon, 2 Nov 2015 16:39:31 +0100
-Subject: [PATCH 4/4] makefile: add CFLAGS to linking command
-
-Although we compile the objects explicitly there are some CFLAGS
-that may also affect linking, which is not always obvious.
-
-This can also be a problem for toolchains that support multiple ABIs
-and need to set CFLAGS=<abi selector>, which will cause linking
-to either fail or produce an unusable executable/library.
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index cbe93e8..ae16f08 100644
---- a/Makefile
-+++ b/Makefile
-@@ -102,7 +102,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile
- 	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
- 
- library: libhttp_parser.o
--	$(CC) $(LDFLAGS_LIB) -o $(SONAME) $<
-+	$(CC) $(CFLAGS_LIB) $(LDFLAGS_LIB) -o $(SONAME) $<
- 
- package: http_parser.o
- 	$(AR) rcs libhttp_parser.a http_parser.o
--- 
-2.6.1
-
diff --git a/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch
deleted file mode 100644
index da966373063f..000000000000
--- a/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b67bfbe6a07529dd82e2ee83b6848d017e6e422f Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Mon, 2 Nov 2015 16:51:28 +0100
-Subject: [PATCH 5/5] makefile: fix install rule dependency
-
-Otherwise the install rule will recompile the library, no matter
-if it has already been compiled.
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ae16f08..df0b59f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -122,12 +122,12 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c
- tags: http_parser.c http_parser.h test.c
- 	ctags $^
- 
--install: library
-+install: $(SONAME)
- 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
- 	$(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
- 	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
- 
--install-strip: library
-+install-strip: $(SONAME)
- 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
- 	$(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
- 	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
--- 
-2.6.1
-
diff --git a/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch b/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch
deleted file mode 100644
index b04b4a32bb01..000000000000
--- a/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Makefile: set install_name on Darwin
-
-https://bugs.gentoo.org/show_bug.cgi?id=546098
-https://github.com/nodejs/http-parser/issues/356
-
---- http-parser-2.6.2/Makefile
-+++ http-parser-2.6.2/Makefile
-@@ -62,6 +62,8 @@
- ifneq (darwin,$(PLATFORM))
- # TODO(bnoordhuis) The native SunOS linker expects -h rather than -soname...
- LDFLAGS_LIB += -Wl,-soname=$(SONAME)
-+else
-+LDFLAGS_LIB += -Wl,-install_name,$(LIBDIR)/$(SONAME)
- endif
- 
- test: test_g test_fast
diff --git a/net-libs/http-parser/http-parser-2.6.2.ebuild b/net-libs/http-parser/http-parser-2.6.2.ebuild
deleted file mode 100644
index 33986a95474a..000000000000
--- a/net-libs/http-parser/http-parser-2.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Http request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-# https://github.com/nodejs/http-parser/pull/272
-PATCHES=(
-	"${FILESDIR}"/0001-makefile-fix-DESTDIR-usage.patch
-	"${FILESDIR}"/0002-makefile-quote-variables.patch
-	"${FILESDIR}"/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch
-	"${FILESDIR}"/0004-makefile-add-CFLAGS-to-linking-command.patch
-	"${FILESDIR}"/0005-makefile-fix-install-rule-dependency.patch
-	"${FILESDIR}"/${PN}-2.6.2-darwin.patch
-)
-
-src_prepare() {
-	tc-export CC AR
-	epatch "${PATCHES[@]}"
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.8.0.ebuild b/net-libs/http-parser/http-parser-2.8.0.ebuild
deleted file mode 100644
index c4563e4bf414..000000000000
--- a/net-libs/http-parser/http-parser-2.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.8.1.ebuild
index 2057dd48dc95..b1cdb5d9ae19 100644
--- a/net-libs/http-parser/http-parser-2.8.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/2.8.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
index ae5894a55f56..d4a0bb44ea2d 100644
--- a/net-libs/jreen/Manifest
+++ b/net-libs/jreen/Manifest
@@ -1,3 +1,3 @@
 DIST jreen-1.3.0.tar.gz 287827 BLAKE2B 93204ed95d93377be6515ef2f1cf5eaba7194d168a3dda3ceee036693fead1db36c2e34c94aca7ba46dd859f6a29646719f867582a381b730c527cfc7e877474 SHA512 7b8267aa7d0e18c28dfeb6a1c7c0495d87bd2712fe10a0c6283f0cf89b72d2c67f98f97a812c9f34496af43eb00ddd94b7e60e942634fb03d0119f94a3d08464
-EBUILD jreen-1.3.0-r1.ebuild 756 BLAKE2B 0d26d8c4d3d59778260f9115b9fc11e1317f37da3417df3e0f927e26e6f64c8c68c89dbb909c5bf64fc88b3b42c651a408bb674ec8901fe64d066e3349762f50 SHA512 0357cbce2b6e4f75c5402f30b1affe715d01b9af86130542c1671e69f0c2747f4cf31f2b5af073b5b0a6eb08e6ac6b84af08d1b74af3ecfd6b5157a45472364a
+EBUILD jreen-1.3.0-r1.ebuild 718 BLAKE2B 98ed0b87677c71ac63b20e74dcd68413a898acfa573141a2dce5d0803534b80c0e9ebe56125028927cb497fe68831ab1e73c5cd1cc240d641cc9510c69483c18 SHA512 1f14857c77693a144a2246164db06c3473671cd863689c55821263bc41722f80a99e9765be8b2c82b389d5029620f13ee039536aadb9bf3d666ff915472f0ca6
 MISC metadata.xml 331 BLAKE2B 7b2a944d9d2af106a11e08cf6a7840acb1ef2a0464d43f56a32148c9edbace174b4b9cedcd4b58a442f6c99fb2a3a45d0e75c33ed7e900b424f0d4c7256163ea SHA512 0fdd8e27d2048fc9430b7f0e079794298095dc3987fe7bfedb81dbc6fb85490fd0642f6f7b1d669a00b2a657b64b0b7b0f155d9787f5082954ad2c840355d301
diff --git a/net-libs/jreen/jreen-1.3.0-r1.ebuild b/net-libs/jreen/jreen-1.3.0-r1.ebuild
index d8834856d8fb..c004a9cffb9e 100644
--- a/net-libs/jreen/jreen-1.3.0-r1.ebuild
+++ b/net-libs/jreen/jreen-1.3.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -29,8 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( AUTHORS ChangeLog README.md )
-
 src_configure() {
 	local mycmakeargs=(
 		-DJREEN_FORCE_QT4=OFF
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index da2607937631..50187dd9b918 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.0-CVE-2017-1000231.patch 396 BLAKE2B 60225693e684ce9b7850fa416da879b91543b08573b36eaa1da40cb26c6726930d0d0c31a68b7aa99852859ae4554cc7b111c8318ffa832c7140a1a9cae80668 SHA512 c9119730ef74aaa89a362fa5354267da7e0336873a66a9e68b1d634946ab7938ac8833a8b1dbd27d51add226008b0b9336e4e4e06f20d714b225e35cb3efcbcd
 AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1b1f393d151a5822ad4d40f385620fd7f78168e581a6e2d50164240ffe368d4926687a860f5555432d2a9b5b389a3287ea7 SHA512 2eaddaa4ab7ecf8e54a7fef341406e1f8bdb278a2caca3d8cafdebcfc349c7e3ba1247f194a5fc0fd50074c8836f29b4e5427b2ce7c3b8513191aa1b4b08c681
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B d062305d7326af8b6d945f83163af65be20d3db24f4564973308055efe0af48e1e3258c704c57988109defedb5bba27723ce11b31c9bce53c61965efc8670828 SHA512 50f01f2baac2ce3e6ba676ffc6c9475865164f5decae3574581625300ccd3df19dcfdde83da78c7dfe3ae22a91eb99800786a6e5b611daeda95000c90bdbdc36
+EBUILD ldns-1.7.0-r2.ebuild 2248 BLAKE2B 7eff6554ccf00c88afa00a09ddd8eb17c2f3fba304b3295d62d142c6797e1aaec7509d3326b3d1a021ec6a97464eb2db61cd8a410e87120d0bec51255b9b7fda SHA512 1a0de7d3b4de4ac3c14c6431e12988c508a4b758e0fd6416d1d5a2ebaa57d63eac736ca922f4241dd5a5d090e205204793e4503a2a7e796da8b9d9537f0982c5
 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 3a6c156757c0..0ce9c2460907 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,9 +21,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0[-bindist,${MULTILIB_USEDEP}] )
+		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
 	)
-	!libressl? ( >=dev-libs/openssl-1.0.1e:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index 488e83c142c8..72133808e6e7 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,3 +1,3 @@
 DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
 EBUILD libdom-0.3.3-r1.ebuild 1185 BLAKE2B c6de672965f301871fa75fc13f0d00b0d9194a1c31fa6598eadbc2f1bcc218fe96fd583a234d42f09208226e1440ce1e3bf91fd79f4c3d8a1d6bc4b271347a2b SHA512 c89a58ad9f4077eaa68b506934793afce125c41cea3b3fa71bbd0acac6da5ac8f1aaf28de806867061a5ccdf1a9c7eb69062f6bcec7acfd3a4d37fabc57b4c79
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/net-libs/libdom/metadata.xml
+++ b/net-libs/libdom/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 528572e5f790..3e1bb338b129 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,6 +1,8 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
 DIST libetpan-1.8.tar.gz 6188927 BLAKE2B 730d9fc545ea2fbd4dbc0eaf3cdbd0540ec85984dee5448c5f22c83ad12e568a9e066e53734da96ef6a9c77942e5aea2eb241c2228f0ca7577755e67646aa589 SHA512 a5e97998803cc56dbd54356153c8579b52a9675fe95fbf642c3158215428d9d2cb30c4e0060c5f4dd760634fff5b1c2a32ce4bb70a5f2bc6398a071ce95e1efd
 DIST libetpan-1.9.1.tar.gz 6189971 BLAKE2B d6cffd9c333c76451d7ac26e978e09b7f1a0b225ef1f318c80f28fe00047c523f2bba32cef5892e452bc84593ce0d635a4cd075e32575c812ff853d0932b01f9 SHA512 1dd72644672e15eecc9883ffb4b29ef34d4355c55aec950cac44e7b59f252d9355f37ef0ad37007c89728c09e057144b4c3b853496a011d693598b6027356286
+DIST libetpan-1.9.2.tar.gz 6191522 BLAKE2B a5b3b93c94596d64b49150680a2599c930b5f010d29be7fbd325e43ba82b8d61032bae65155d2c5e0e2bbcd219db3d916b10a6ce5a98df2ac31fb88811491d71 SHA512 3e2e1de77fae2212374e909d15ed8564eee90883c38fee0ca69f58785733b1ac2df848da1bda6f55577d647e0ad27bc3057199e70b6ef01f2a7e2823b24113ba
 EBUILD libetpan-1.8.ebuild 2093 BLAKE2B 4d24c6398d9de5b50433e3c2b4716331280fe0c88f70ac64192bedb570ce955e1002d520e0c1ff7132aa1b957020bddfbc4d4ab08823645b1e16b4b85f83bb4f SHA512 23d9195d9665ad24c58cc1c7b570e48ddc157cae14cc69dbd814124525bc70de3aaa33687a5a914aade21241c082c1b16f5014f8618795cc53ebdbf6b8b0e933
 EBUILD libetpan-1.9.1.ebuild 1865 BLAKE2B 0cc278d72d4f3e270f03b2b64c8f2a874349b6f60fcacd6985eab1b2ad58c303e2a3f8b1fea86f0cfd73239d1bb5c4e58ecfd4dd7e1a6153efcc3b66c3092eba SHA512 a008360891145c5d64e560933a0129f029675f7b1e0d95f4dcc77f6fdb58744f22289e2772d30ae94f7668246bf17e9a0c2e7e2b84acab490d7d256fca26c43a
-MISC metadata.xml 755 BLAKE2B 35e32e2b1ea6d17e7333154458354aadd3d54d5d42278e5c48cded4b8c5603f2ad19b2a7bd053627e01803e4bd0f014bc0e3fbff5b0a0e1129440dcfc92b27e4 SHA512 ed262f3a54d66d8ea1dc9e3b397cc206045a951578014fd99be5750647006da91c63a430556f1ee58b3f8bb22ccfd50699ef942dce7f3a75706f288e83d4cb19
+EBUILD libetpan-1.9.2.ebuild 2059 BLAKE2B 302400ed74c1f3a142f0fbec6ae2fe01467d26bd7ee604d0b098965588ace7a5afef0ee16eeb1f5fe81e0daca13cc09fd9b685cd1d02bbdc0273a512dfca576c SHA512 35d05d4da2bc6c234db47fd048f3beccfb6ab9b6144f1f1d6ff445185d8c4c79a7f67e8e2615d934104601e7e0719e9f4225e3b0678832241559b400acc406bd
+MISC metadata.xml 821 BLAKE2B d1402bb748677b9c50c815807cb5658f42a0f2f9c6a82b14ac83ad96c51b1580d85d36ee748da9fae051de5ff3eb112f37cfbc698541dcb8d9a647d67d5fc094 SHA512 45e47b781f67a7dd186bca6c48afd6283ba3b67c015c246e173ee37b368705b461461a6e5877157deeb2479e1bafb22eae4c4d9a0c01aa6ce59ffc66c860da9a
diff --git a/net-libs/libetpan/libetpan-1.9.2.ebuild b/net-libs/libetpan/libetpan-1.9.2.ebuild
new file mode 100644
index 000000000000..d364a29f58e9
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.9.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
+
+# BerkDB is only supported up to version 6.0
+DEPEND="sys-libs/zlib
+	!lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) )
+	lmdb? ( dev-db/lmdb )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+)
+
+pkg_setup() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
+		ewarn "No ssl support will be available in ${PN}."
+	fi
+
+	if use berkdb && use lmdb ; then
+		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
+		ewarn "Using lmdb as cache DB!"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+	# libtool recognises it as valid shell (bug #300211)
+	use prefix && export CONFIG_SHELL=${BASH}
+	local myeconfargs=(
+		# --enable-debug simply injects "-O2 -g" into CFLAGS
+		--disable-debug
+		$(use_enable berkdb db)
+		$(use_enable ipv6)
+		$(use_enable liblockfile lockfile)
+		$(use_enable lmdb)
+		$(use_enable static-libs static)
+		$(use_with sasl)
+		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index 4161e28785b7..8c89a487037e 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -13,6 +13,7 @@
 	</longdescription>
 	<use>
 		<flag name="liblockfile">Enable support for liblockfile library</flag>
+		<flag name="lmdb">Use <pkg>dev-db/lmdb</pkg> as cache DB</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">dinhviethoa/libetpan</remote-id>
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 765275ff8645..58a71a2374e7 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -3,4 +3,4 @@ DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbad
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libhubbub-0.3.3.ebuild 786 BLAKE2B b995a7361dc41af100c17b781ac3f9daf3d5fc47d22905153167165b256765747a8199bdfe6041ac3147f51beb047f6c1010177d60ac0197fa82daae28126b62 SHA512 80f415406e399aa5045f5f946590a07e2f94c173e5bf34e1326d17658e0f89a775c1a689934ad93dec404e8f00195155cd747696b611482f90475f97adfedff7
 EBUILD libhubbub-0.3.5-r1.ebuild 1071 BLAKE2B 76f4f027a5df87c391c97d61f2cc883f578668dfa01156097b8b8b53266c0e2a28fe1771d2dfc58c082ccd1934f80ceda0a1b50656c20e5555b3d5bbaacc1151 SHA512 ad7fbf1d635b16152224c7ce41e4b9b3e2589ad66e6439a24f9e1e294e4d2433a1b19d23418f66f6371e378932375d2c656744eb9ac90c0eb286af27a063a23d
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/net-libs/libinfinity/Manifest b/net-libs/libinfinity/Manifest
index 0d8ef6043575..d2ab50bf15a8 100644
--- a/net-libs/libinfinity/Manifest
+++ b/net-libs/libinfinity/Manifest
@@ -2,4 +2,4 @@ AUX infinoted.confd 395 BLAKE2B 74c3e1867db538ada0b721621cc03691deb2e15fb9877711
 AUX infinoted.initd 527 BLAKE2B 158aba0ab854f2aec7bb02cff127cb781491dfa0b553a5de2b39beb83eda3508c426e8703539f5229cb62749e4f1ed2fee6433570cb9f2ecdafd1b4e34858ee3 SHA512 f652f40e82746bb9592968b65c64a59dda9373671d04a17e1054d69047f5463f72f9d7f08fe3eeb0b718a3631f286d60713e48d4178ab5850f44b71905def72e
 DIST libinfinity-0.6.7.tar.gz 1989993 BLAKE2B 4b5e963dc0d20f95d5acef5056ddc6f45fdcbe1c7044911d1c529b81291854721cffd119316c153516d0a6feff29aa9a2b298f774e02c87b4ce7cf06dddf6449 SHA512 9142badee0976019937c29d9badd404d64e49031007863c254c312d999b9790fa4f2ff80ac982b709744e1bfa532b1bc331b3bf1d55aac3ac70c9cae6a7afd3b
 EBUILD libinfinity-0.6.7.ebuild 1668 BLAKE2B 1c106a2301e3a484a23668370e1f442ab3aa83f293ee855628baa523d59aa1a7ae1a02c8e37fe19f321809d9bf970e621945ea9928abee1f74aea47d8dce6ab3 SHA512 68609acd0b74fb5bbfefd428940a27b239f0d3fb49d96af82d24a722b7bc85f4fefdac2c094b26724680df197568bc87f3fa2c9916128bcfd81526ea88cfccec
-MISC metadata.xml 448 BLAKE2B c02ddbf434e6927c86ff478859d1ebe351245404fd43035eb055a400a8f35dea3763b2c0fcc02f975f27bfe5e0e57528a87cf56eebdd567807c516482783fee5 SHA512 5788fac149e97927026493acd5db7e7898123886971a2a09f29584587556db38ad992db7422be6b111896199708836ce8b5c5485461f7d5511fd7a6c0ef53c0e
+MISC metadata.xml 360 BLAKE2B 96b11f0422fe80df4ca8902684fa2fb53593eb88027099cac7d95bed9cb71f105cb34c773fa044acea17d43f526efa61f3cb8b89bc17c48f703737a4a91da55e SHA512 b8ad86dbb81a83888c29b8faa697bbea0c7806bfcc74afda474a6a009d65bd14782b243358fe50103551963bd160874875e39bfc81a308434b26b68d61e6fd69
diff --git a/net-libs/libinfinity/metadata.xml b/net-libs/libinfinity/metadata.xml
index 33f9840bfeb4..b3c3a5e76107 100644
--- a/net-libs/libinfinity/metadata.xml
+++ b/net-libs/libinfinity/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>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="server">
       Build and install the server binary including init.d/conf.d-scripts.
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 9a89a6a62205..d20208b6e96a 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -12,6 +12,6 @@ EBUILD libmbim-1.12.4.ebuild 970 BLAKE2B f00432c17fc3e4747b3d94656ca1ec3ff4bd184
 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 792 BLAKE2B c598d3d327f5e3d0bf49e3d6360fee16ad02ca4513548c0d2e0d458044945a3d99c768b5c6425aae724b5e8e60e29ee8f14072e920637f6211d0b7e10c75ec63 SHA512 8d884d2d64ed94132542b159f48cf3649c7178e59e1c7a66ea5c2e2516bc203808f12760bf097f830d96d47a37183e6ef9f97d9ba9c29260fcc3b6f66aef06c8
+EBUILD libmbim-1.16.2.ebuild 789 BLAKE2B 5313b4f7554171036a0938450986bef3b7c48bce0237e6cf7c757d2a1318d9319ad5a9d018bfc0c7a873f4a4bdcfaa7bbb6476e01c4b067da10c24a607e2869d SHA512 83c3d7b459136eb76d80d7e8927b008a61df34de01c01ca4cdce95b31453114f60c7a967080c787b8028d789d2eef0aa048ddb50da755839c53c2ec76213ead5
 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.16.2.ebuild b/net-libs/libmbim/libmbim-1.16.2.ebuild
index 1b578f7e23a1..b2159d5d4421 100644
--- a/net-libs/libmbim/libmbim-1.16.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 9bcc7fc79027..205ee5ba3dd6 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -4,10 +4,14 @@ DIST libmicrohttpd-0.9.57.tar.gz 1332713 BLAKE2B 52e46726b220229ae722b4b94478bcd
 DIST libmicrohttpd-0.9.58.tar.gz 1333687 BLAKE2B ef3dfb4684f2c387399d9044eb46de70c387b89bc4600529a9cdad7f2f31a25e0b0996b91d03cf42421979279781161b72d35eeb94d4bb101dd4d73bb6181bb7 SHA512 f68268bb0a0776ac0654a682fc598f4778561c2cc775e7315505c0e2f26f0633590d01f157984d348fdcedfb63d31d39add760a4ddb041694330015293d161b6
 DIST libmicrohttpd-0.9.59.tar.gz 1396234 BLAKE2B 9cb2d52dd39bdc6c54267751e21a224ffa926f4200b392a28009c6f717b5059580884f4de1bb272f49f7c48bdae276df2832b413cc60db77222b7b1278ba6004 SHA512 2c9080ebd520631b5ab6eed42770c7911079365c7bc79ea74fc5502ebc370fdaea9a84a4d9db7cbd8ba1c4797c7531e127e3b73ad8d38601d700529f2bab84d5
 DIST libmicrohttpd-0.9.60.tar.gz 1818383 BLAKE2B 693da0a02e289000bb657d843cd577311e97ca4d8cd698d659410e669295314d429eb9679eedac98398420f3386c1fa6800c33b883481120ea199585412f8e83 SHA512 418afc302e93ac93141c2457c2bf03c6a1da4a16ff19aa655312f9953e1d0b132b0dd983fc36ccc703688b0acd68fc0900f5927efcada354a10078ba5e577325
+DIST libmicrohttpd-0.9.61.tar.gz 1823891 BLAKE2B d7704f36790b7f14e03a02b7fbc5eaaca5fc22702f1fadfc94f9fe05329505d5bf9422a1ff38daa1f33c82db3e1196a8db754227574cc2cb9441c08a50d65d72 SHA512 d409ca2164a55b0eab948a8a4a17e0d6547942039354f593b293a286a3cae247bd67d7de4ce0dd4f1a3f3684948250076f582a8086546eb72598a43d7f41a27d
+DIST libmicrohttpd-0.9.62.tar.gz 1837529 BLAKE2B eb06d6ee05af2b37909ad1c60e16de29d94278a7ffea6e7b98391330e3778950537f9c2d6b057186b4ed45af66853570c0a386b6e9b1f0164956bd0856ecbaa5 SHA512 337f29dbc5e8c30132c17aad6142f21ea1c794b0ce80a3fc4c5e1e14b3dabb300aa410bf9413ef9e65d5d486fcfedbc3716725763a1fa28b4687c9f2aa3158e4
 EBUILD libmicrohttpd-0.9.52.ebuild 1187 BLAKE2B 00f635699d0ecabd004a9b9003cee412425207baddd3a4d54510aba6f4bff6741bf6400d527f4628b1977c5358460da5e4aee13dbba6dff14cec86c81e371d16 SHA512 74a4a07e0beb590bb10064c50402f504df59e4fdccb837f844b47d72e9ce1795fbf78f02e3ca7ef5948bffdc171e90240e5e98eb759fb756c5fc06eba7cf12e3
 EBUILD libmicrohttpd-0.9.55.ebuild 1195 BLAKE2B e9133561165018a4c03134cebc940c4d636d789dff1dbd76a4c635bcb47a20aab909ca05ae5641bf4a1e25b2165fcd02312fab7d0c7608b4f0ce39ba0e053993 SHA512 a319e69ead4556143002662c33ac17954b6cfef74015739eadd31e2ff81c8ca36a9421201d326e8448e8efdda4de9ad6c460f9fed684993d4009bc75c522b8bb
 EBUILD libmicrohttpd-0.9.57.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
 EBUILD libmicrohttpd-0.9.58.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
-EBUILD libmicrohttpd-0.9.59.ebuild 1269 BLAKE2B 79c674a488568661ac5a19a73496b65f2bcfc2e4369904b4bf47df663f843d9cd4cdcae1a5ef04b0c1365f691bcc1eeef039486a9ab979513fb934a71b6d2161 SHA512 6f10805daae9401c6ca7c5d16b9eaeb039690dca79421652a1d41e97ca9ba4101ea8d37724e444a7d50e77b8e8783ca6a75ea4df02548638af9bc9f07df35892
+EBUILD libmicrohttpd-0.9.59.ebuild 1264 BLAKE2B 0e9f9332f4cd3750e01203fbf17bb95faa259198e759d038ec157a1e00d920b64fdfed2db39bad6518d6883831ef5e725501c6e4a1b89b1c9d6f6cca8233251a SHA512 20a5c232312809e36d79fe9a475c3d82885c4045c2b9763eb21fc1aa7a973d3bab967042a24a7ac03891b1ca23787aa06d24125d41c47b7ce944e7889d71c232
 EBUILD libmicrohttpd-0.9.60.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
+EBUILD libmicrohttpd-0.9.61.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
+EBUILD libmicrohttpd-0.9.62.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
index 80b28728089e..bc481246c49b 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.61.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.61.ebuild
new file mode 100644
index 000000000000..2c54b305f529
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.61.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Small C library to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+		dev-libs/libgcrypt:0=
+		net-libs/gnutls
+	)"
+
+# We disable tests below because they're broken,
+# but if enabled, we'll need this.
+DEPEND="${RDEPEND}
+	test?	(
+		ssl? ( net-misc/curl[ssl] )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-bauth \
+		--enable-dauth \
+		--disable-examples \
+		--enable-postprocessor \
+		--disable-thread-names \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(use_enable messages) \
+		$(use_enable ssl https) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static)
+}
+
+# tests are broken in the portage environment.
+src_test() {
+	:
+}
+
+multilib_src_install_all() {
+	default
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
new file mode 100644
index 000000000000..2c54b305f529
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Small C library to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+		dev-libs/libgcrypt:0=
+		net-libs/gnutls
+	)"
+
+# We disable tests below because they're broken,
+# but if enabled, we'll need this.
+DEPEND="${RDEPEND}
+	test?	(
+		ssl? ( net-misc/curl[ssl] )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-bauth \
+		--enable-dauth \
+		--disable-examples \
+		--enable-postprocessor \
+		--disable-thread-names \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(use_enable messages) \
+		$(use_enable ssl https) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static)
+}
+
+# tests are broken in the portage environment.
+src_test() {
+	:
+}
+
+multilib_src_install_all() {
+	default
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 420956decf8d..89efc7880ffd 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -4,6 +4,6 @@ DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579
 DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
 EBUILD libnetfilter_conntrack-1.0.4.ebuild 968 BLAKE2B c1d3943def2e1b3d8eb61006a6426fb23ca0f9062522d8f197c8af3baa366181ba11f1e3ea797d9a461898d8fbdf40036425d36897e3b570dd3932d47f40b5fd SHA512 c1eb29f822d2ed62dea906fb0040b49a9edb966372959cd98a2297dcc88b718c2eb04d6b36d79030d2e473885c299795541a9017005f9f90d6fce176360b660f
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 969 BLAKE2B 23fe2a76299843350018cdaf39d284764732f55be25f36daa5c0d922ee788bd86169ae0ecf42c5cb1557745d4917f24906eec3d16b347e9609dba5ce69324485 SHA512 6ffe1a4467ab16ad059b4398531187ae8129707986cad0365d600fb4e91ccda2f8b24c2be9b426ac6a7451b994ed0a4b773366fe997f8443c5fd84cd29afadac
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 968 BLAKE2B b4e9b7a61352bfe98370bc1279307663e22f0aa642f12a8b76a2cf662b30cb12a5daaae01f32ce6fa3cbf7f7697b49903c0022b925d1f4cfa9dfd60ab30403e3 SHA512 df358cda920583fae2ae4f6e5a02f5ef06aef910dbb37222751949ae3b28acb8cac2019b5658376ee237865a3597ea286b4fb1fe2fa7cdd9f484301c544b2931
 EBUILD libnetfilter_conntrack-1.0.7.ebuild 979 BLAKE2B f3cc5bfc79799b9e585d68e948d614c1f8c6370a38a551104979f3c111bf56c39ff7c8ed0d476b28246662c576f583f155f3a0ecfe188779c10c3024a191456d SHA512 6105474e9db8329ed22a6bc15f5ded6d7aaf548914e2df09601968028140ee890472ec63c8187984b985b543530569f491f6ee13caa50a1c023ac2d006a80741
 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 b7629d8fe9b9..0fe2fe586750 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="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 8cbe1c21d959..4bd26c63c889 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -9,5 +9,5 @@ EBUILD libnftnl-1.0.8-r1.ebuild 1364 BLAKE2B 0c8ed0d675c9bd38094fde0b057b667e40c
 EBUILD libnftnl-1.1.0.ebuild 1375 BLAKE2B 8176c16368b5af09f74326a79beecd990be14274cf1e643d4a71d87a260cb5513d828df70ccfb2dad2b936a0e5312be1700a4db0c6132ffdc677c80a1e391717 SHA512 bee525dc84832e27a6b80faeded252d4f5bc373bec65bb160cd1402210b1123e99d7df0e670104bc9e73f7b2e7a80a5cee5770908ca15aad3e026dc273e44549
 EBUILD libnftnl-1.1.1-r1.ebuild 1495 BLAKE2B 75d2b2cdfb8ad9e1c9b994338ef585b90fc8728bb2c5d5c1daa0111f9ccb8ea5ea8eca1d4f976bd111beb4bb5f18799f48fc41701ef56899c770a5658c84b8fe SHA512 521e8da06ad4b1e7af767e9b33985305a260776dcda48692433b491cd2c079492db2ce6d41ecd61dbe29635e572d5bf03d6581beadb42e0044575cf77cbe1ae9
 EBUILD libnftnl-1.1.1.ebuild 1375 BLAKE2B 896998647d4f4b38aaebab192925ebec10d7afceacfee79dfb5250b175142c8f332ee6c20af203a0b72af9becf2676d21d334d42710146e6131ecfa5edd51c65 SHA512 d2a1f4d3b03ce8d8c44048fa049c556acb74cbc8b53a9198ca687277257452cdb9a477b9ba4e952d466a9e72e8239ce5a49815380f36231dbb837346e4636a5e
-EBUILD libnftnl-1.1.2-r1.ebuild 1163 BLAKE2B 41bdd0e117b920bce5d9a5f2d0f5a43e78e80a5b2f03d0c22aeea83be379ee6b1c2f4a1bd6431262ac443a5c4119d30bab44255e2e5243f03417d9c3ec7811a4 SHA512 de42c06c8f996c2990982dd6ea982f30b19256fd43866e79958a54770b4e9173de2225e3f9ce392f95a1babe2dcead1cc84e40b9474d6044c370f0a14f4001fb
+EBUILD libnftnl-1.1.2-r1.ebuild 1162 BLAKE2B 435437f1a6ffee381bcce3f91411593bc7ac6bdb4ec241a3616b1fd557b62650466b16c7adf0b6be41e673f5dd19702006664fa374ede7bdbf9267e9801c4185 SHA512 b41d6228d42eb1eef4a139d8585fc1bb1c9111db36246687c46dca18a10b0930ba35c8d7ff23e9b9cd50e38a56fc2aa73fdd2a1e3ebf4dc8ce65aa5d12ad27a6
 MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
diff --git a/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild b/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
index e65f2a32fede..d229373b4d72 100644
--- a/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples static-libs test"
 
 RDEPEND=">=net-libs/libmnl-1.0.3"
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index cdde807422bc..91cd430b2dfd 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -15,6 +15,6 @@ EBUILD libqmi-1.16.4.ebuild 1108 BLAKE2B d2be43c1b65dc95941f1aa6c63472f7edaf6278
 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 1123 BLAKE2B 01854af07ce518f730bc18321dc3ae2f855342dd2a3d089f09be40463c7a3e59d319a8034ac06a3c4d6d215c54da245e768eb9694eae0fdbaa93f24eb781796b SHA512 99b30210a929ac673c664c9792cf646931cc7024dbd85127f5ddf844ac0c667425830f9cab28a9c18785f1ee87865a512b3bb134944cc34bf031dcca7a4d9566
+EBUILD libqmi-1.20.2.ebuild 1132 BLAKE2B f22e06f44ec5d8cbc3e5e3933d1e8e5cbe27cfae3c3624bef68469bd7f60da011a66d52b511dca67959e9068dbda8e98ec85cd6ef49a6521832694e25489b6c9 SHA512 631b04acce82f6748efcecbea05e7dc583d461dc243c7f09d11bfbc2144f9d3f187b66dbcc27137474cad7374a884ca2dd28d166f632204711c73341d950bb68
 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.20.2.ebuild b/net-libs/libqmi/libqmi-1.20.2.ebuild
index 9f03c3eb6110..4d318a2b5e6f 100644
--- a/net-libs/libqmi/libqmi-1.20.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.20.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 10efc9d700d0..54a859c8d23f 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -2,5 +2,5 @@ AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b
 DIST libsoup-2.56.1.tar.xz 1806416 BLAKE2B eb10d76a92912dcf8f450d6e8449e2aec26936ca1b706d16351ead4174f0cc107e6a2b43b96bf75c16106f8f4b24620bfb07814162390eba195b8a9f56a338fb SHA512 5ac087eeba346c27e884a2053a4f8afdb2fc6e432527f4494024a7edc4eccdf145188a3faa64e3f4bdd98af2fcb98914e494b4ed24f92cffc2ff1485dce7d693
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 EBUILD libsoup-2.56.1.ebuild 2715 BLAKE2B dafb5214b815895ed1f566c2404b3d57534713a57bc5cca21152c74ef34ffc14809b9da6f4b2caccf5b363f8ae9347e5843d7f8c87b24502e9d711f97826d7c7 SHA512 4ff03d9e87cbec65d8d11a979165832700fbc89a48e8b84dc86222ad8db8b491bf997dbdb8c1e6b4054983c11e96b7d14c4d91b7d0ed84b2a66e430aa725bbf0
-EBUILD libsoup-2.58.2.ebuild 2986 BLAKE2B 02abc879d257bc02a4b864d14001f148c7cacc7973b67710e261fa4d605a559f55304e45c2bf4e335960bf113663b7dec7503bb90254e9123349988351fbdc35 SHA512 fe4435ebfce99c48b5c006d5cd1e9bfa4f7bdd2bf64e5ea75ade402971e04cfa9fe872122a5d2bb7e9f277782844b4c4e59b5b0e88c23690c5382fa6465568ea
+EBUILD libsoup-2.58.2.ebuild 2985 BLAKE2B 0cc03c78ed35cf30cb6215e3e7414934aea7284b2337956eb7b7798e6a812241bb6bac3ebfc58cd1668a6eb41a990604acd2128a2429aadaa5235a73ba9e7cc3 SHA512 c334dbbe24cb4efda0bc9d64c68b6fa9f2d3d97cec90eea5f8f34cf3aee1f9f5206e2d65917db151c39e0ec3bc3707b62ecfcec63805b1cee240c0fc9826e9a8
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 86606ab6b6aa..02fcf7e7c38a 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 82ffaabcd5c4..6734a2e9b5a2 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,7 +1,12 @@
+AUX libsrtp-1.6.0-openssl-1.1.patch 11603 BLAKE2B 1d5addff655f04bef9cebc79690a9731408795b8935099f529199bb7b30d9901633cefac543cc644c36c0e3de0a584f2e9fa4991a55a9cfa9bf4a349c60c9212 SHA512 c53c675ea8c6cc722c2c640bcf9ecdc4c386ccb7bf0ed29beadf4f2cc24830f8419b432f2b2f7ef78ebc003e57facddf2c930f134f045c38d481b8ee213caf38
+AUX libsrtp-1.6.0-openssl-aem_gcm-key.patch 2704 BLAKE2B 686530bce1ba56f96fa6df4606e7133aa38df0f68e3636c7c599da54371383bc64dcb63baf7404b9744ec3bcf3f3548a4877edee1ab4be699f40ad37f10468af SHA512 f0b6156494c2c8f0c3dd78142203bc15ec52f3176e01dbed74cad5302b49dc3e146cd75a4fdaff30a83ea3b8498c1e147f0c820533f362af0a2b8599087ff837
+AUX libsrtp-1.6.0-openssl-aem_icm-key.patch 3870 BLAKE2B 47dd3f9def13b48cc19657bcaf8a8c4ed77e2a4f738f72119f64825865c8820adb8ea2675695d8ce1b021dc61cdd6f478ec76fc97d9c9942178e63c1d578dc80 SHA512 561ce042f2216cdee8926f3931407116294aeed170297bf325fde02cda86a43d71aab538f2b54b2b7727a02629903c9aaf36cfe84dc6a2e4cda9388047519842
+AUX libsrtp-1.6.0-openssl-hmac.patch 7673 BLAKE2B 92d4aa2699b324b81540f2e2fb360e1a4864b2626062c96265dade3581ad3af7119e0f6ebd8b1bdcd3591bcde29bffa2b516ed9ee0bdd4c578a5274805c1a7cd SHA512 c187d0249243e26d6cdae4a24b593651fb006b473d0a72b6c4c9b6ad2025893a37e33b163adbee728aa702223397b98fbc38ac2856b737dd03fd067b4dc4baf0
 AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cdddb6a959dc59d0fcaa340faf5d04ad9b6803d676d626ce6cecdee1e097defc3c69df7e1216f012276e81c22fb043e6b0e633c4 SHA512 b3c80f5d05748eeb5d93f1c5fe2cc73b3380529a8de44315291fe2a9fbf32df861dec511038f551df65c2cb2592ce337d497c06c8855ce8dd1def9a67bae40ad
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
+EBUILD libsrtp-1.6.0-r1.ebuild 2388 BLAKE2B 6698b8dd582e2224702c0cb1d7ee03d6ca923fb8a68cdb57e1260d30605415843f8284047133e1f749a5fc42862e00a689354b267e5f23b20aab6dcbe524b98f SHA512 e3cee3220a12c85fce5287b98cf2353c1eabff3c77d361002a4a5abf75cc3b809c1d87d467a9f50aa3b1d355353e2fc7cabdea14b9aeda6188839d9665b83c54
 EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770bcc7471a1727e0872f8af655b3af9034831fa5d8800afb0492bf2b6bcc61f1aa9b3b1d6b39f065dee7b2787c0 SHA512 14f95b201db1eba997d54059ac6c54d0af5d5047bab001510bfa1fe6ed7ed3b3b29428a1221fb6c0e44fd0fc96b8a481416a912e4c0c79fab3f6b56afab29712
-EBUILD libsrtp-2.2.0.ebuild 1845 BLAKE2B 7f6e602ce987f1dfeef436a5b8bf36db2be895aa537fcfc68a02bc15ae730700756673f88b72c8115c98f0362d6f252b946905fda4e01725707727cce5d45d5e SHA512 bdf35bb4bf5a071b0f9b5dde23389e0c7a0c8debbeee95e40ed55c2a7087df29e74cc14974a939c5b3c183ead42a3d0f73876d9963a9445693bb31c8767ac844
+EBUILD libsrtp-2.2.0.ebuild 1849 BLAKE2B 8da25f146b54912124fa5f31bc31431098216ba839375823cc5afa093ca1c34e5a6bbd1ba39d9b2fe5db744291cb39e70bccaa0693c5997cbe2eb18522a2c380 SHA512 a42d3e5bca155e7ea0453903c19d0ea38cca52e5d1fcc08bf031527e4500e8fc9a63b884e0d157cdbaf7ae0a4d253d30b788eb86292cead338b6c05ef56d8efd
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch
new file mode 100644
index 000000000000..5d17cb426e88
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch
@@ -0,0 +1,361 @@
+Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f20bfbd112ddd
+
+--- a/crypto/cipher/aes_gcm_ossl.c	2018-06-11 07:46:09 UTC
++++ b/crypto/cipher/aes_gcm_ossl.c
+@@ -117,6 +117,14 @@ err_status_t aes_gcm_openssl_alloc (cipher_t **c, int 
+     }
+     memset(gcm, 0x0, sizeof(aes_gcm_ctx_t));
+ 
++    gcm->ctx = EVP_CIPHER_CTX_new();
++    if (gcm->ctx == NULL) {
++        crypto_free(gcm);
++        crypto_free(*c);
++        *c = NULL;
++        return err_status_alloc_fail;
++    }
++
+     /* set pointers */
+     (*c)->state = gcm;
+ 
+@@ -140,7 +148,6 @@ err_status_t aes_gcm_openssl_alloc (cipher_t **c, int 
+ 
+     /* set key size        */
+     (*c)->key_len = key_len;
+-    EVP_CIPHER_CTX_init(&gcm->ctx);
+ 
+     return (err_status_ok);
+ }
+@@ -155,7 +162,7 @@ err_status_t aes_gcm_openssl_dealloc (cipher_t *c)
+ 
+     ctx = (aes_gcm_ctx_t*)c->state;
+     if (ctx) {
+-	EVP_CIPHER_CTX_cleanup(&ctx->ctx);
++        EVP_CIPHER_CTX_free(ctx->ctx);
+         /* decrement ref_count for the appropriate engine */
+         switch (ctx->key_size) {
+         case AES_256_KEYSIZE:
+@@ -205,7 +212,7 @@ err_status_t aes_gcm_openssl_context_init (aes_gcm_ctx
+         break;
+     }
+ 
+-    if (!EVP_CipherInit_ex(&c->ctx, evp, NULL, key, NULL, 0)) {
++    if (!EVP_CipherInit_ex(c->ctx, evp, NULL, key, NULL, 0)) {
+         return (err_status_init_fail);
+     }
+ 
+@@ -227,19 +234,19 @@ err_status_t aes_gcm_openssl_set_iv (aes_gcm_ctx_t *c,
+ 
+     debug_print(mod_aes_gcm, "setting iv: %s", v128_hex_string(iv));
+ 
+-    if (!EVP_CipherInit_ex(&c->ctx, NULL, NULL, NULL,
++    if (!EVP_CipherInit_ex(c->ctx, NULL, NULL, NULL,
+                            NULL, (c->dir == direction_encrypt ? 1 : 0))) {
+         return (err_status_init_fail);
+     }
+ 
+     /* set IV len  and the IV value, the followiong 3 calls are required */
+-    if (!EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_IVLEN, 12, 0)) {
++    if (!EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_IVLEN, 12, 0)) {
+         return (err_status_init_fail);
+     }
+-    if (!EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_IV_FIXED, -1, iv)) {
++    if (!EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_IV_FIXED, -1, iv)) {
+         return (err_status_init_fail);
+     }
+-    if (!EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_IV_GEN, 0, iv)) {
++    if (!EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_IV_GEN, 0, iv)) {
+         return (err_status_init_fail);
+     }
+ 
+@@ -263,9 +270,9 @@ err_status_t aes_gcm_openssl_set_aad (aes_gcm_ctx_t *c
+      * Set dummy tag, OpenSSL requires the Tag to be set before
+      * processing AAD
+      */
+-    EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, aad);
++    EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, aad);
+ 
+-    rv = EVP_Cipher(&c->ctx, NULL, aad, aad_len);
++    rv = EVP_Cipher(c->ctx, NULL, aad, aad_len);
+     if (rv != aad_len) {
+         return (err_status_algo_fail);
+     } else {
+@@ -291,7 +298,7 @@ err_status_t aes_gcm_openssl_encrypt (aes_gcm_ctx_t *c
+     /*
+      * Encrypt the data
+      */
+-    EVP_Cipher(&c->ctx, buf, buf, *enc_len);
++    EVP_Cipher(c->ctx, buf, buf, *enc_len);
+ 
+     return (err_status_ok);
+ }
+@@ -313,12 +320,12 @@ err_status_t aes_gcm_openssl_get_tag (aes_gcm_ctx_t *c
+     /*
+      * Calculate the tag
+      */
+-    EVP_Cipher(&c->ctx, NULL, NULL, 0);
++    EVP_Cipher(c->ctx, NULL, NULL, 0);
+ 
+     /*
+      * Retreive the tag
+      */
+-    EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_GET_TAG, c->tag_len, buf);
++    EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_GET_TAG, c->tag_len, buf);
+ 
+     /*
+      * Increase encryption length by desired tag size
+@@ -347,14 +354,14 @@ err_status_t aes_gcm_openssl_decrypt (aes_gcm_ctx_t *c
+     /*
+      * Set the tag before decrypting
+      */
+-    EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, 
++    EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len,
+ 	                buf + (*enc_len - c->tag_len));
+-    EVP_Cipher(&c->ctx, buf, buf, *enc_len - c->tag_len);
++    EVP_Cipher(c->ctx, buf, buf, *enc_len - c->tag_len);
+ 
+     /*
+      * Check the tag
+      */
+-    if (EVP_Cipher(&c->ctx, NULL, NULL, 0)) {
++    if (EVP_Cipher(c->ctx, NULL, NULL, 0)) {
+         return (err_status_auth_fail);
+     }
+ 
+--- a/crypto/cipher/aes_icm_ossl.c	2018-06-11 07:46:00 UTC
++++ b/crypto/cipher/aes_icm_ossl.c
+@@ -144,6 +144,14 @@ err_status_t aes_icm_openssl_alloc (cipher_t **c, int 
+     }
+     memset(icm, 0x0, sizeof(aes_icm_ctx_t));
+ 
++    icm->ctx = EVP_CIPHER_CTX_new();
++    if (icm->ctx == NULL) {
++        crypto_free(icm);
++        crypto_free(*c);
++        *c = NULL;
++        return err_status_alloc_fail;
++    }
++
+     /* set pointers */
+     (*c)->state = icm;
+ 
+@@ -173,7 +181,6 @@ err_status_t aes_icm_openssl_alloc (cipher_t **c, int 
+ 
+     /* set key size        */
+     (*c)->key_len = key_len;
+-    EVP_CIPHER_CTX_init(&icm->ctx);
+ 
+     return err_status_ok;
+ }
+@@ -195,7 +202,7 @@ err_status_t aes_icm_openssl_dealloc (cipher_t *c)
+      */
+     ctx = (aes_icm_ctx_t*)c->state;
+     if (ctx != NULL) {
+-        EVP_CIPHER_CTX_cleanup(&ctx->ctx);
++        EVP_CIPHER_CTX_free(ctx->ctx);
+         /* decrement ref_count for the appropriate engine */
+         switch (ctx->key_size) {
+         case AES_256_KEYSIZE:
+@@ -257,8 +264,6 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx
+     debug_print(mod_aes_icm, "key:  %s", octet_string_hex_string(key, c->key_size));
+     debug_print(mod_aes_icm, "offset: %s", v128_hex_string(&c->offset));
+ 
+-    EVP_CIPHER_CTX_init(&c->ctx);
+-
+     switch (c->key_size) {
+     case AES_256_KEYSIZE:
+         evp = EVP_aes_256_ctr();
+@@ -276,7 +281,7 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx
+         break;
+     }
+ 
+-    if (!EVP_EncryptInit_ex(&c->ctx, evp,
++    if (!EVP_EncryptInit_ex(c->ctx, evp,
+                             NULL, key, NULL)) {
+         return err_status_fail;
+     } else {
+@@ -304,7 +309,7 @@ err_status_t aes_icm_openssl_set_iv (aes_icm_ctx_t *c,
+ 
+     debug_print(mod_aes_icm, "set_counter: %s", v128_hex_string(&c->counter));
+ 
+-    if (!EVP_EncryptInit_ex(&c->ctx, NULL,
++    if (!EVP_EncryptInit_ex(c->ctx, NULL,
+                             NULL, NULL, c->counter.v8)) {
+         return err_status_fail;
+     } else {
+@@ -326,12 +331,12 @@ err_status_t aes_icm_openssl_encrypt (aes_icm_ctx_t *c
+ 
+     debug_print(mod_aes_icm, "rs0: %s", v128_hex_string(&c->counter));
+ 
+-    if (!EVP_EncryptUpdate(&c->ctx, buf, &len, buf, *enc_len)) {
++    if (!EVP_EncryptUpdate(c->ctx, buf, &len, buf, *enc_len)) {
+         return err_status_cipher_fail;
+     }
+     *enc_len = len;
+ 
+-    if (!EVP_EncryptFinal_ex(&c->ctx, buf, &len)) {
++    if (!EVP_EncryptFinal_ex(c->ctx, buf, &len)) {
+         return err_status_cipher_fail;
+     }
+     *enc_len += len;
+--- a/crypto/hash/hmac_ossl.c	2018-06-11 07:45:39 UTC
++++ b/crypto/hash/hmac_ossl.c
+@@ -65,8 +65,6 @@ err_status_t
+ hmac_alloc (auth_t **a, int key_len, int out_len)
+ {
+     extern auth_type_t hmac;
+-    uint8_t *pointer;
+-    HMAC_CTX *new_hmac_ctx;
+ 
+     debug_print(mod_hmac, "allocating auth func with key length %d", key_len);
+     debug_print(mod_hmac, "                          tag length %d", out_len);
+@@ -76,21 +74,43 @@ hmac_alloc (auth_t **a, int key_len, int out_len)
+         return err_status_bad_param;
+     }
+ 
+-    /* allocate memory for auth and HMAC_CTX structures */
+-    pointer = (uint8_t*)crypto_alloc(sizeof(HMAC_CTX) + sizeof(auth_t));
+-    if (pointer == NULL) {
++/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
++   using HMAC_CTX_new.  But this function doesn't exist in OpenSSL 1.0.x. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
++    {
++        /* allocate memory for auth and HMAC_CTX structures */
++        uint8_t* pointer;
++        HMAC_CTX *new_hmac_ctx;
++        pointer = (uint8_t*)crypto_alloc(sizeof(HMAC_CTX) + sizeof(auth_t));
++        if (pointer == NULL) {
++            return err_status_alloc_fail;
++        }
++        *a = (auth_t*)pointer;
++        (*a)->state = pointer + sizeof(auth_t);
++        new_hmac_ctx = (HMAC_CTX*)((*a)->state);
++
++        HMAC_CTX_init(new_hmac_ctx);
++    }
++
++#else
++    *a = (auth_t*)crypto_alloc(sizeof(auth_t));
++    if (*a == NULL) {
+         return err_status_alloc_fail;
+     }
+ 
++    (*a)->state = HMAC_CTX_new();
++    if ((*a)->state == NULL) {
++        crypto_free(*a);
++        *a = NULL;
++        return err_status_alloc_fail;
++    }
++#endif
++
+     /* set pointers */
+-    *a = (auth_t*)pointer;
+     (*a)->type = &hmac;
+-    (*a)->state = pointer + sizeof(auth_t);
+     (*a)->out_len = out_len;
+     (*a)->key_len = key_len;
+     (*a)->prefix_len = 0;
+-    new_hmac_ctx = (HMAC_CTX*)((*a)->state);
+-    HMAC_CTX_init(new_hmac_ctx);
+ 
+     /* increment global count of all hmac uses */
+     hmac.ref_count++;
+@@ -106,11 +126,19 @@ hmac_dealloc (auth_t *a)
+ 
+     hmac_ctx = (HMAC_CTX*)a->state;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+     HMAC_CTX_cleanup(hmac_ctx);
+ 
+     /* zeroize entire state*/
+     octet_string_set_to_zero((uint8_t*)a,
+                              sizeof(HMAC_CTX) + sizeof(auth_t));
++
++#else
++    HMAC_CTX_free(hmac_ctx);
++
++    /* zeroize entire state*/
++    octet_string_set_to_zero((uint8_t*)a, sizeof(auth_t));
++#endif
+ 
+     /* free memory */
+     crypto_free(a);
+--- a/crypto/include/aes_gcm_ossl.h	2018-06-11 07:46:09 UTC
++++ b/crypto/include/aes_gcm_ossl.h
+@@ -54,7 +54,7 @@
+ typedef struct {
+   int      key_size;
+   int      tag_len;
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX* ctx;
+   cipher_direction_t dir;
+ } aes_gcm_ctx_t;
+ 
+--- a/crypto/include/aes_icm_ossl.h	2018-06-11 07:46:00 UTC
++++ b/crypto/include/aes_icm_ossl.h
+@@ -71,7 +71,7 @@ typedef struct {
+     v128_t counter;                /* holds the counter value          */
+     v128_t offset;                 /* initial offset value             */
+     int key_size;
+-    EVP_CIPHER_CTX ctx;
++    EVP_CIPHER_CTX* ctx;
+ } aes_icm_ctx_t;
+ 
+ err_status_t aes_icm_openssl_set_iv(aes_icm_ctx_t *c, void *iv, int dir);
+--- a/crypto/include/sha1.h	2017-08-01 11:57:38 UTC
++++ b/crypto/include/sha1.h
+@@ -56,8 +56,6 @@
+ #include <openssl/evp.h>
+ #include <stdint.h>
+ 
+-typedef EVP_MD_CTX sha1_ctx_t;
+-
+ /*
+  * sha1_init(&ctx) initializes the SHA1 context ctx
+  *
+@@ -72,6 +70,12 @@ typedef EVP_MD_CTX sha1_ctx_t;
+  *
+  */
+ 
++/* OpenSSL 1.1.0 made EVP_MD_CTX an opaque structure, which must be allocated
++   using EVP_MD_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
++
++typedef EVP_MD_CTX sha1_ctx_t;
++
+ static inline void sha1_init (sha1_ctx_t *ctx)
+ {
+     EVP_MD_CTX_init(ctx);
+@@ -88,7 +92,33 @@ static inline void sha1_final (sha1_ctx_t *ctx, uint32
+     unsigned int len = 0;
+ 
+     EVP_DigestFinal(ctx, (unsigned char*)output, &len);
++    EVP_MD_CTX_cleanup(ctx);
+ }
++
++#else
++
++typedef EVP_MD_CTX* sha1_ctx_t;
++
++static inline void sha1_init (sha1_ctx_t *ctx)
++{
++    *ctx = EVP_MD_CTX_new();
++    EVP_DigestInit(*ctx, EVP_sha1());
++}
++
++static inline void sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg)
++{
++    EVP_DigestUpdate(*ctx, M, octets_in_msg);
++}
++
++static inline void sha1_final (sha1_ctx_t *ctx, uint32_t *output)
++{
++    unsigned int len = 0;
++
++    EVP_DigestFinal(*ctx, (unsigned char*)output, &len);
++    EVP_MD_CTX_free(*ctx);
++}
++#endif
++
+ #else
+ #include "datatypes.h"
+ 
diff --git a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-aem_gcm-key.patch b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-aem_gcm-key.patch
new file mode 100644
index 000000000000..c85e3750a1b5
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-aem_gcm-key.patch
@@ -0,0 +1,83 @@
+Backport of https://github.com/cisco/libsrtp/commit/1acba569915d8124b627a29dd5e3500332618eac
+
+--- a/crypto/cipher/aes_gcm_ossl.c	2018-06-10 18:51:02 UTC
++++ b/crypto/cipher/aes_gcm_ossl.c
+@@ -187,22 +187,28 @@ err_status_t aes_gcm_openssl_dealloc (cipher_t *c)
+  */
+ err_status_t aes_gcm_openssl_context_init (aes_gcm_ctx_t *c, const uint8_t *key)
+ {
++    const EVP_CIPHER *evp;
++
+     c->dir = direction_any;
+ 
+-    /* copy key to be used later when CiscoSSL crypto context is created */
+-    v128_copy_octet_string((v128_t*)&c->key, key);
++    debug_print(mod_aes_gcm, "key:  %s", octet_string_hex_string(key, c->key_size));
+ 
+-    if (c->key_size == AES_256_KEYSIZE) {
+-        debug_print(mod_aes_gcm, "Copying last 16 bytes of key: %s",
+-                    v128_hex_string((v128_t*)(key + AES_128_KEYSIZE)));
+-        v128_copy_octet_string(((v128_t*)(&c->key.v8)) + 1, 
+-		               key + AES_128_KEYSIZE);
++    switch (c->key_size) {
++    case AES_256_KEYSIZE:
++        evp = EVP_aes_256_gcm();
++        break;
++    case AES_128_KEYSIZE:
++        evp = EVP_aes_128_gcm();
++        break;
++    default:
++        return (err_status_bad_param);
++        break;
+     }
+ 
+-    debug_print(mod_aes_gcm, "key:  %s", v128_hex_string((v128_t*)&c->key));
++    if (!EVP_CipherInit_ex(&c->ctx, evp, NULL, key, NULL, 0)) {
++        return (err_status_init_fail);
++    }
+ 
+-    EVP_CIPHER_CTX_cleanup(&c->ctx);
+-
+     return (err_status_ok);
+ }
+ 
+@@ -214,8 +220,6 @@ err_status_t aes_gcm_openssl_context_init (aes_gcm_ctx
+ err_status_t aes_gcm_openssl_set_iv (aes_gcm_ctx_t *c, void *iv,
+ 	                             int direction)
+ {
+-    const EVP_CIPHER *evp;
+-
+     if (direction != direction_encrypt && direction != direction_decrypt) {
+         return (err_status_bad_param);
+     }
+@@ -223,19 +227,7 @@ err_status_t aes_gcm_openssl_set_iv (aes_gcm_ctx_t *c,
+ 
+     debug_print(mod_aes_gcm, "setting iv: %s", v128_hex_string(iv));
+ 
+-    switch (c->key_size) {
+-    case AES_256_KEYSIZE:
+-        evp = EVP_aes_256_gcm();
+-        break;
+-    case AES_128_KEYSIZE:
+-        evp = EVP_aes_128_gcm();
+-        break;
+-    default:
+-        return (err_status_bad_param);
+-        break;
+-    }
+-
+-    if (!EVP_CipherInit_ex(&c->ctx, evp, NULL, (const unsigned char*)&c->key.v8,
++    if (!EVP_CipherInit_ex(&c->ctx, NULL, NULL, NULL,
+                            NULL, (c->dir == direction_encrypt ? 1 : 0))) {
+         return (err_status_init_fail);
+     }
+--- a/crypto/include/aes_gcm_ossl.h	2017-08-01 11:57:38 UTC
++++ b/crypto/include/aes_gcm_ossl.h
+@@ -52,7 +52,6 @@
+ #include <openssl/aes.h>
+ 
+ typedef struct {
+-  v256_t   key;
+   int      key_size;
+   int      tag_len;
+   EVP_CIPHER_CTX ctx;
diff --git a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-aem_icm-key.patch b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-aem_icm-key.patch
new file mode 100644
index 000000000000..1c2cf3ff2057
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-aem_icm-key.patch
@@ -0,0 +1,113 @@
+Backport of https://github.com/cisco/libsrtp/commit/fb954450198c832c96b4191fcef3a1b9e2d15d8b
+
+--- a/crypto/cipher/aes_icm_ossl.c	2018-06-10 20:33:16 UTC
++++ b/crypto/cipher/aes_icm_ossl.c
+@@ -235,6 +235,8 @@ err_status_t aes_icm_openssl_dealloc (cipher_t *c)
+  */
+ err_status_t aes_icm_openssl_context_init (aes_icm_ctx_t *c, const uint8_t *key, int len)
+ {
++    const EVP_CIPHER *evp;
++
+     /*
+      * set counter and initial values to 'offset' value, being careful not to
+      * go past the end of the key buffer
+@@ -252,30 +254,35 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx
+     c->offset.v8[SALT_SIZE] = c->offset.v8[SALT_SIZE + 1] = 0;
+     c->counter.v8[SALT_SIZE] = c->counter.v8[SALT_SIZE + 1] = 0;
+ 
+-    /* copy key to be used later when CiscoSSL crypto context is created */
+-    v128_copy_octet_string((v128_t*)&c->key, key);
++    debug_print(mod_aes_icm, "key:  %s", octet_string_hex_string(key, c->key_size));
++    debug_print(mod_aes_icm, "offset: %s", v128_hex_string(&c->offset));
+ 
+-    /* if the key is greater than 16 bytes, copy the second
+-     * half.  Note, we treat AES-192 and AES-256 the same here
+-     * for simplicity.  The storage location receiving the
+-     * key is statically allocated to handle a full 32 byte key
+-     * regardless of the cipher in use.
+-     */
+-    if (c->key_size == AES_256_KEYSIZE
++    EVP_CIPHER_CTX_init(&c->ctx);
++
++    switch (c->key_size) {
++    case AES_256_KEYSIZE:
++        evp = EVP_aes_256_ctr();
++        break;
+ #ifndef SRTP_NO_AES192
+-        || c->key_size == AES_192_KEYSIZE
++    case AES_192_KEYSIZE:
++        evp = EVP_aes_192_ctr();
++        break;
+ #endif
+-        ) {
+-        debug_print(mod_aes_icm, "Copying last 16 bytes of key: %s",
+-                    v128_hex_string((v128_t*)(key + AES_128_KEYSIZE)));
+-        v128_copy_octet_string(((v128_t*)(&c->key.v8)) + 1, key + AES_128_KEYSIZE);
++    case AES_128_KEYSIZE:
++        evp = EVP_aes_128_ctr();
++        break;
++    default:
++        return err_status_bad_param;
++        break;
+     }
+ 
+-    debug_print(mod_aes_icm, "key:  %s", v128_hex_string((v128_t*)&c->key));
+-    debug_print(mod_aes_icm, "offset: %s", v128_hex_string(&c->offset));
++    if (!EVP_EncryptInit_ex(&c->ctx, evp,
++                            NULL, key, NULL)) {
++        return err_status_fail;
++    } else {
++        return err_status_ok;
++    }
+ 
+-    EVP_CIPHER_CTX_cleanup(&c->ctx);
+-
+     return err_status_ok;
+ }
+ 
+@@ -286,7 +293,6 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx
+  */
+ err_status_t aes_icm_openssl_set_iv (aes_icm_ctx_t *c, void *iv, int dir)
+ {
+-    const EVP_CIPHER *evp;
+     v128_t nonce;
+ 
+     /* set nonce (for alignment) */
+@@ -298,25 +304,8 @@ err_status_t aes_icm_openssl_set_iv (aes_icm_ctx_t *c,
+ 
+     debug_print(mod_aes_icm, "set_counter: %s", v128_hex_string(&c->counter));
+ 
+-    switch (c->key_size) {
+-    case AES_256_KEYSIZE:
+-        evp = EVP_aes_256_ctr();
+-        break;
+-#ifndef SRTP_NO_AES192
+-    case AES_192_KEYSIZE:
+-        evp = EVP_aes_192_ctr();
+-        break;
+-#endif
+-    case AES_128_KEYSIZE:
+-        evp = EVP_aes_128_ctr();
+-        break;
+-    default:
+-        return err_status_bad_param;
+-        break;
+-    }
+-
+-    if (!EVP_EncryptInit_ex(&c->ctx, evp,
+-                            NULL, c->key.v8, c->counter.v8)) {
++    if (!EVP_EncryptInit_ex(&c->ctx, NULL,
++                            NULL, NULL, c->counter.v8)) {
+         return err_status_fail;
+     } else {
+         return err_status_ok;
+--- a/crypto/include/aes_icm_ossl.h 2017-08-01 11:57:38 UTC
++++ b/crypto/include/aes_icm_ossl.h
+@@ -70,7 +70,6 @@
+ typedef struct {
+     v128_t counter;                /* holds the counter value          */
+     v128_t offset;                 /* initial offset value             */
+-    v256_t key;
+     int key_size;
+     EVP_CIPHER_CTX ctx;
+ } aes_icm_ctx_t;
diff --git a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-hmac.patch b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-hmac.patch
new file mode 100644
index 000000000000..c9973f214fc0
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-hmac.patch
@@ -0,0 +1,254 @@
+Backport of https://github.com/cisco/libsrtp/commit/5781341d99cd286a1f3d164e0576c2e837a444b7
+
+--- a/crypto/hash/hmac_ossl.c	2017-08-01 11:57:38 UTC
++++ b/crypto/hash/hmac_ossl.c
+@@ -46,11 +46,12 @@
+     #include <config.h>
+ #endif
+ 
+-#include "hmac.h"
++#include "auth.h"
+ #include "alloc.h"
+ #include <openssl/evp.h>
++#include <openssl/hmac.h>
+ 
+-#define HMAC_KEYLEN_MAX		20
++#define SHA1_DIGEST_SIZE		20
+ 
+ /* the debug module for authentiation */
+ 
+@@ -65,26 +66,18 @@ hmac_alloc (auth_t **a, int key_len, int out_len)
+ {
+     extern auth_type_t hmac;
+     uint8_t *pointer;
+-    hmac_ctx_t *new_hmac_ctx;
++    HMAC_CTX *new_hmac_ctx;
+ 
+     debug_print(mod_hmac, "allocating auth func with key length %d", key_len);
+     debug_print(mod_hmac, "                          tag length %d", out_len);
+ 
+-    /*
+-     * check key length - note that we don't support keys larger
+-     * than 20 bytes yet
+-     */
+-    if (key_len > HMAC_KEYLEN_MAX) {
+-        return err_status_bad_param;
+-    }
+-
+     /* check output length - should be less than 20 bytes */
+-    if (out_len > HMAC_KEYLEN_MAX) {
++    if (out_len > SHA1_DIGEST_SIZE) {
+         return err_status_bad_param;
+     }
+ 
+-    /* allocate memory for auth and hmac_ctx_t structures */
+-    pointer = (uint8_t*)crypto_alloc(sizeof(hmac_ctx_t) + sizeof(auth_t));
++    /* allocate memory for auth and HMAC_CTX structures */
++    pointer = (uint8_t*)crypto_alloc(sizeof(HMAC_CTX) + sizeof(auth_t));
+     if (pointer == NULL) {
+         return err_status_alloc_fail;
+     }
+@@ -96,8 +89,8 @@ hmac_alloc (auth_t **a, int key_len, int out_len)
+     (*a)->out_len = out_len;
+     (*a)->key_len = key_len;
+     (*a)->prefix_len = 0;
+-    new_hmac_ctx = (hmac_ctx_t*)((*a)->state);
+-    memset(new_hmac_ctx, 0, sizeof(hmac_ctx_t));
++    new_hmac_ctx = (HMAC_CTX*)((*a)->state);
++    HMAC_CTX_init(new_hmac_ctx);
+ 
+     /* increment global count of all hmac uses */
+     hmac.ref_count++;
+@@ -109,19 +102,15 @@ err_status_t
+ hmac_dealloc (auth_t *a)
+ {
+     extern auth_type_t hmac;
+-    hmac_ctx_t *hmac_ctx;
++    HMAC_CTX *hmac_ctx;
+ 
+-    hmac_ctx = (hmac_ctx_t*)a->state;
+-    if (hmac_ctx->ctx_initialized) {
+-        EVP_MD_CTX_cleanup(&hmac_ctx->ctx);
+-    }
+-    if (hmac_ctx->init_ctx_initialized) {
+-        EVP_MD_CTX_cleanup(&hmac_ctx->init_ctx);
+-    }
++    hmac_ctx = (HMAC_CTX*)a->state;
+ 
++    HMAC_CTX_cleanup(hmac_ctx);
++
+     /* zeroize entire state*/
+     octet_string_set_to_zero((uint8_t*)a,
+-                             sizeof(hmac_ctx_t) + sizeof(auth_t));
++                             sizeof(HMAC_CTX) + sizeof(auth_t));
+ 
+     /* free memory */
+     crypto_free(a);
+@@ -133,113 +122,65 @@ hmac_dealloc (auth_t *a)
+ }
+ 
+ err_status_t
+-hmac_init (hmac_ctx_t *state, const uint8_t *key, int key_len)
++hmac_init (HMAC_CTX *state, const uint8_t *key, int key_len)
+ {
+-    int i;
+-    uint8_t ipad[64];
++    if (HMAC_Init_ex(state, key, key_len, EVP_sha1(), NULL) == 0)
++        return err_status_auth_fail;
+ 
+-    /*
+-     * check key length - note that we don't support keys larger
+-     * than 20 bytes yet
+-     */
+-    if (key_len > HMAC_KEYLEN_MAX) {
+-        return err_status_bad_param;
+-    }
+-
+-    /*
+-     * set values of ipad and opad by exoring the key into the
+-     * appropriate constant values
+-     */
+-    for (i = 0; i < key_len; i++) {
+-        ipad[i] = key[i] ^ 0x36;
+-        state->opad[i] = key[i] ^ 0x5c;
+-    }
+-    /* set the rest of ipad, opad to constant values */
+-    for (; i < sizeof(ipad); i++) {
+-        ipad[i] = 0x36;
+-        ((uint8_t*)state->opad)[i] = 0x5c;
+-    }
+-
+-    debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, sizeof(ipad)));
+-
+-    /* initialize sha1 context */
+-    sha1_init(&state->init_ctx);
+-    state->init_ctx_initialized = 1;
+-
+-    /* hash ipad ^ key */
+-    sha1_update(&state->init_ctx, ipad, sizeof(ipad));
+-    return (hmac_start(state));
++    return err_status_ok;
+ }
+ 
+ err_status_t
+-hmac_start (hmac_ctx_t *state)
++hmac_start (HMAC_CTX *state)
+ {
+-    if (state->ctx_initialized) {
+-        EVP_MD_CTX_cleanup(&state->ctx);
+-    }
+-    if (!EVP_MD_CTX_copy(&state->ctx, &state->init_ctx)) {
++    if (HMAC_Init_ex(state, NULL, 0, NULL, NULL) == 0)
+         return err_status_auth_fail;
+-    } else {
+-        state->ctx_initialized = 1;
+-        return err_status_ok;
+-    }
++
++    return err_status_ok;
+ }
+ 
+ err_status_t
+-hmac_update (hmac_ctx_t *state, const uint8_t *message, int msg_octets)
++hmac_update (HMAC_CTX *state, const uint8_t *message, int msg_octets)
+ {
+     debug_print(mod_hmac, "input: %s",
+                 octet_string_hex_string(message, msg_octets));
+ 
+-    /* hash message into sha1 context */
+-    sha1_update(&state->ctx, message, msg_octets);
++    if (HMAC_Update(state, message, msg_octets) == 0)
++        return err_status_auth_fail;
+ 
+     return err_status_ok;
+ }
+ 
+ err_status_t
+-hmac_compute (hmac_ctx_t *state, const void *message,
++hmac_compute (HMAC_CTX *state, const void *message,
+               int msg_octets, int tag_len, uint8_t *result)
+ {
+-    uint32_t hash_value[5];
+-    uint32_t H[5];
++    uint8_t hash_value[SHA1_DIGEST_SIZE];
+     int i;
++    unsigned int len;
+ 
+     /* check tag length, return error if we can't provide the value expected */
+-    if (tag_len > HMAC_KEYLEN_MAX) {
++    if (tag_len > SHA1_DIGEST_SIZE) {
+         return err_status_bad_param;
+     }
+ 
+     /* hash message, copy output into H */
+-    sha1_update(&state->ctx, message, msg_octets);
+-    sha1_final(&state->ctx, H);
++    if (HMAC_Update(state, message, msg_octets) == 0)
++        return err_status_auth_fail;
+ 
+-    /*
+-     * note that we don't need to debug_print() the input, since the
+-     * function hmac_update() already did that for us
+-     */
+-    debug_print(mod_hmac, "intermediate state: %s",
+-                octet_string_hex_string((uint8_t*)H, sizeof(H)));
++    if (HMAC_Final(state, hash_value, &len) == 0)
++        return err_status_auth_fail;
+ 
+-    /* re-initialize hash context */
+-    sha1_init(&state->ctx);
++    if (len < tag_len)
++        return err_status_auth_fail;
+ 
+-    /* hash opad ^ key  */
+-    sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad));
+-
+-    /* hash the result of the inner hash */
+-    sha1_update(&state->ctx, (uint8_t*)H, sizeof(H));
+-
+-    /* the result is returned in the array hash_value[] */
+-    sha1_final(&state->ctx, hash_value);
+-
+     /* copy hash_value to *result */
+     for (i = 0; i < tag_len; i++) {
+-        result[i] = ((uint8_t*)hash_value)[i];
++        result[i] = hash_value[i];
+     }
+ 
+     debug_print(mod_hmac, "output: %s",
+-                octet_string_hex_string((uint8_t*)hash_value, tag_len));
++                octet_string_hex_string(hash_value, tag_len));
+ 
+     return err_status_ok;
+ }
+@@ -248,7 +189,7 @@ hmac_compute (hmac_ctx_t *state, const void *message,
+ /* begin test case 0 */
+ 
+ uint8_t
+-    hmac_test_case_0_key[HMAC_KEYLEN_MAX] = {
++    hmac_test_case_0_key[SHA1_DIGEST_SIZE] = {
+     0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+     0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+     0x0b, 0x0b, 0x0b, 0x0b
+@@ -260,7 +201,7 @@ uint8_t
+ };
+ 
+ uint8_t
+-    hmac_test_case_0_tag[HMAC_KEYLEN_MAX] = {
++    hmac_test_case_0_tag[SHA1_DIGEST_SIZE] = {
+     0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
+     0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,
+     0xf1, 0x46, 0xbe, 0x00
+--- a/crypto/include/hmac.h	2017-08-01 11:57:38 UTC
++++ b/crypto/include/hmac.h
+@@ -53,10 +53,6 @@ typedef struct {
+   uint8_t    opad[64];
+   sha1_ctx_t ctx;
+   sha1_ctx_t init_ctx;
+-#ifdef OPENSSL
+-  int ctx_initialized;
+-  int init_ctx_initialized;
+-#endif
+ } hmac_ctx_t;
+ 
+ err_status_t
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..9b3f9a9952bf
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/cisco/libsrtp"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
+
+RDEPEND="
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES README TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/srtp/config.h
+)
+PATCHES=(
+	"${FILESDIR}/${PN}-pcap-automagic-r0.patch"
+	"${FILESDIR}/${P}-openssl-hmac.patch"
+	"${FILESDIR}/${P}-openssl-aem_icm-key.patch"
+	"${FILESDIR}/${P}-openssl-aem_gcm-key.patch"
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+)
+
+src_prepare() {
+	default
+
+	# test/rtpw.c is using /usr/share/dict/words assuming it exists
+	# using test/rtpw.c guaratees the file exists in any case
+	sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# stdout: default error output for messages in debug
+	# kernel-linux: breaks the build
+	# gdoi: disabled by upstream and breaks the build
+	# pcap: seems to be test-only
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-stdout \
+		--disable-kernel-linux \
+		--disable-gdoi \
+		--disable-pcap \
+		$(use_enable aesicm generic-aesicm) \
+		$(use_enable console) \
+		$(use_enable debug) \
+		$(use_enable openssl) \
+		$(use_enable syslog)
+}
+
+multilib_src_compile() {
+	use static-libs && emake ${PN}.a
+	emake shared_library
+	use test && emake test
+}
+
+multilib_src_test() {
+	# work-around tests that do not like out-of-source builds
+	cp "${S}"/test/{getopt_s,rtpw}.c "${BUILD_DIR}"/test/ || die
+
+	LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest
+
+	# Makefile.in has '$(testapp): libsrtp.a'
+	if use !static-libs; then
+		rm libsrtp.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# libsrtp.pdf can also be generated with doxygen
+	# but it would be a waste of time as an up-to-date version is built
+	use doc && DOCS+=( doc/*.txt doc/${PN}.pdf )
+	einstalldocs
+}
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 3ec19b6a8a37..add8e007cda0 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 893901602d0b..fc0dbe7b96f5 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -3,6 +3,6 @@ AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e370603
 DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf8720a7619f3fc310a3d724cb7e85bcf81d31761c3fe4e3c29010b67d3fc81cf391d5c2f7e051cb8cc2400763248 SHA512 73d685bab2e88ff6b03c95cc13f1bd341bce4c527353c7e4870865d236cfbe23dfd2d198a1ec1531aed1afd700ce8e5b738ec68ca9152a4b6ae63dd6cbbf0d51
 DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d4132a589e053f43f5de64bb764d9263910837a53be594e64595483ed9516dcbf20abc5071e9a8154b8bb75f6f4c SHA512 f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
 EBUILD libssh-0.8.4.ebuild 2957 BLAKE2B dd4df344d463601b948ac65ee55b23f5586384eb43941614fac7b77c16c2c20c0feac5e3ab78c98e8566f07cf6ab6a06e1a32476183838950adf39a3be2ab6ff SHA512 3aa65824678b47784712a1b50fd8c2a78e1ee069150bfb9221896a599704d732b40541492d5a26a9b5049d271a34a958a5fde0d8338e820c3f63bfedab46a7f0
-EBUILD libssh-0.8.5.ebuild 2966 BLAKE2B 9eed97687ac93fa78c65d9f6d0c939fd91ffeec0452ff76f5efd5ee64b21eb62075f09d52f674cba7d6b3e1acbf39e53311657530ea54202da7914afd365ed94 SHA512 af0724b5943b3c11f667508c8a232c5cf2dba642d6d72b0f4e307f5d93a26545ede0ce3dc1546d675c37b91c9367e1c6f45341d2ce42e32a907781fd324715d9
+EBUILD libssh-0.8.5.ebuild 2962 BLAKE2B f888f5dbea50bc9b29053ac917b314043df8aec8389a5c73f2c2eac7d8c942fccbbba06f9f5e0d29c8c6564bf9c831d3dd11856268a1da8cd339a18beddfcc29 SHA512 b16d211e4f0a7b6bb05dd421125029fcf9f15fe99d1909ff0c740d1c4cc8082bf17f0c6f83df905f6985612509bd1a71d49e881b0932a188d0c0f8c1c2dd99fc
 EBUILD libssh-9999.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.8.5.ebuild b/net-libs/libssh/libssh-0.8.5.ebuild
index 7b660604f3aa..bfa5efa28109 100644
--- a/net-libs/libssh/libssh-0.8.5.ebuild
+++ b/net-libs/libssh/libssh-0.8.5.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	inherit eapi7-ver
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 8b7912afc4f5..c213ad26d3be 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,5 @@
 DIST libtorrent-rasterbar-1.1.10.tar.gz 3902542 BLAKE2B 3a78862ce2825c9da32ab38122db05c2816daa237559446a60702f562e971c5597210dfc2612235294cec3f60fa3de8cab3a0246887ac4779b01171a460f70f0 SHA512 414deeb9765bfb6072af5fa00ad836bfe3751622a80783ea84389e31355b342a4371f0dc195b2d27b154826e515b2e6063c8786f792afa347abba9caadaa5b2a
-DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d8980363a6b92a3378339349609d64d3b7a38a58baf6c2898a26f70e92b0de0d6a1f4b6725a576a850aacaa5764fe7d96fa0b541dfa2d7 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7
-DIST libtorrent-rasterbar-1.1.9.tar.gz 3903742 BLAKE2B a9f942e7d06e076dec98314bc44e8633731c51e8469095ebff8c9c8084305714ca40663a0d963f16188ba17fa640f273eaa1396784514bc04e4bc4cbcdc3aab2 SHA512 2dcf81fdf34b81790012a6c20dc344dccb89535359cffeb9a2725763f0a1842a00af1ae06b63e4e32054f06ceb14e32031afe479dc36897ddab28494241eb756
-EBUILD libtorrent-rasterbar-1.1.10.ebuild 2386 BLAKE2B 36723a88c2ac601e4cc474171d44130db9844403b6e15cd0a3c2a3137e8e7de6936e03bcce3c0afc2b42ce698569eff9e79feaa8092bb1fb6121a70c2ccb38c3 SHA512 4a81eedf874f80c4ea4168d909fee0a98b5110643e1decba90d323cdbd67fd87d8cca367fb2935b8d1c37ffba573fd29132371fd9a3f25367b8bbe6673fd346f
-EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2398 BLAKE2B 319dd61c379cc1e0b92f938c9364eb9af477e017fd2595ccf6bfde65a05bb8d7d27ac3ed7396233aedb24a1b02296e33fd66d42af74bc8b31f1ee97efc6c5a0d SHA512 ba767f43b744e9f1a50c7a559b91a8b45009a1b08820852c9a005d3d6a2c7f6114a6091cbfed2df34e9e7bb2c75ca10873af69bc067356913774f027b27dd2e4
-EBUILD libtorrent-rasterbar-1.1.9.ebuild 2382 BLAKE2B 66850d5bd5eaa2760aa47dab753bc50935bdde25dd22f9b725b10e9749b54f479526018d26c45fb1a3447b95aab0d13f173e3b8f998511301b61a9370b32c2c3 SHA512 9be66c60b007b3e7b077deb7bcbcd3d84b2667143d5869729cb3b0a003f8152aabdcea2330a094802a6fad58ced81df5ccee3a0267d06cbc0d9af85f219d53f3
+DIST libtorrent-rasterbar-1.1.11.tar.gz 4044314 BLAKE2B 96192ffdcb5bd1888307c874e2685314db9a99438337b0cb67ef317a2fe54b4a0e8e28fcdf34a1656a9abb69cc79f9bbda22cdedf1b8f2ba4f1b5488922c87b3 SHA512 1e0449406ea34b226033e3f54f719c5f2842043c7e54107e847050c67b1c5e9d2cb5a08fbf0e81c2c6e31eda6fe85c5ec0ff8ca47916c979894f778fc3313bb6
+EBUILD libtorrent-rasterbar-1.1.10.ebuild 2385 BLAKE2B e463383b63362472e800c89ff9bf4c06d567999c552f4c5d5dbba79293e6af996721dfd9db56a60278343dc15836bba15ddc22885cba19056f438e417e5eb0e7 SHA512 54e4a0e6e3ca32b4866541fae61eb0d6024b89af47e086d74abb9cddd692d00d40e9d4d5514201f41cbc085d789a4d613f01d724caafdc827359d411822bdc76
+EBUILD libtorrent-rasterbar-1.1.11.ebuild 2385 BLAKE2B ad385b92bab0e665924966ffd00d3a4122e96223e18c302cb3a18e6eb281dcfc1684b5bfc686de0f2f64e054d8d58b2046705afd9494bd83a54bcd8a6d04a1c9 SHA512 4c712d84550b7bdf0999ac713c87633d6d4c512f01be616939ad313894e965c0e3ff200349bd63814ad4a2a12eb74e8099c4bd158fde0afdd32ecbdc991231d7
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
index c74205693ccd..83687710f615 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
@@ -13,12 +13,12 @@ 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"
+HOMEPAGE="https://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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.11.ebuild
index dea208929568..8acf6bab9901 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.11.ebuild
@@ -13,12 +13,12 @@ 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"
+HOMEPAGE="https://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_1_1_11/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5-r1.ebuild
deleted file mode 100644
index 9764eda8cc98..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-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 yes))
-		$(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/libtrace/Manifest b/net-libs/libtrace/Manifest
index 95c99a5ce7e2..535aaa2af0dc 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,8 +2,8 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815
 AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa5204e95e7aad330c9b3afcb033e65a95c135b09b054a7741f902b2aefe31fa5b953d62a95bb41ff227b3281956e55c6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
-DIST libtrace-4.0.3.tar.gz 938865 BLAKE2B b3f7cda52f18fe2905f53af61459c238fe2630c1ffca8189ed73c010a6fd057f04beca9979fc0f515de4797f1aee383b57ddc63dc9a08a88bae5946a9949f010 SHA512 08da665ed355b48daa006119261af7dc1c1a64c193efcd736e91394753f4b3c46af074044d970242d2396389577d92137264acdbb6ab70cdc69a6e3965f742ae
 DIST libtrace-4.0.4.tar.gz 949490 BLAKE2B 63b4e3bee7502deabbb07891ffe81fbed81f6b3b6c8b78148b035565fbb4e9f8302ee8f824e35584e68c453e61b0459f5a602b471330e6e0abae747a80f65872 SHA512 255a0654f762f9185ef70969225a160c017d50e0b01d1e90c31f555c1ebf5ce6509931f0c78bbed183e670d6acecb68e23efb8009a0e236fddd3a8f032401def
-EBUILD libtrace-4.0.3.ebuild 1125 BLAKE2B 521d0d7b377d1afda49b921083b9f1c4a4dddacb55f3f921c62c81ff58720509d1eaa6def73cca5851daf9575e8dad062d0794a52f3acbcb4f64a72b3a5b1619 SHA512 3dc77a8bb40b9da727a9e8524f1249e32f25fe71ad2e9780a987c8e7223270b3fbcf6071398068894ccce638b35528077e89785acbdf912e9800d2043e1260ef
+DIST libtrace-4.0.5.tar.gz 954257 BLAKE2B 42d0940f18f836945fc50d86e1fd242e18a09c4dc07319f831457ebfd08a4ad2d4f7f1ae2a5fcd8f881011110fdf57f623a42d624ba07348f1b9de759769c641 SHA512 c9738af7a471f6c0a6a2a2595ea081beb6145b57792558dd66feef9e4601814a8f5d6be194c83ba2ce076571dfc2a86aadafaa30411d9ecc3e7b7d83fc7809ce
 EBUILD libtrace-4.0.4.ebuild 1125 BLAKE2B 521d0d7b377d1afda49b921083b9f1c4a4dddacb55f3f921c62c81ff58720509d1eaa6def73cca5851daf9575e8dad062d0794a52f3acbcb4f64a72b3a5b1619 SHA512 3dc77a8bb40b9da727a9e8524f1249e32f25fe71ad2e9780a987c8e7223270b3fbcf6071398068894ccce638b35528077e89785acbdf912e9800d2043e1260ef
+EBUILD libtrace-4.0.5.ebuild 1132 BLAKE2B a99e580d3d2c64ef7fc150ba55de23a7576030aafa5eb832c6399e44620928c65388f4ce6aa5b2d09e2e69fb3fac1b4c9896ccefceeec90ed48fc2113d83b198 SHA512 44933db0e20dfb03763bbc8a01bacad8e5459cecf606bc72f31cfb8ba06bc8220e385b4da968eceda1ac0116f1ace4e99bdd2822c418f590a1ec7d68dcf1a7f6
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-4.0.3.ebuild b/net-libs/libtrace/libtrace-4.0.5.ebuild
index 30734d72f4b6..14825e4a8334 100644
--- a/net-libs/libtrace/libtrace-4.0.3.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools eutils
 
 DESCRIPTION="A library and tools for trace processing"
@@ -54,5 +54,5 @@ src_install() {
 
 	use doc && dodoc -r docs/doxygen/html
 
-	prune_libtool_files --modules
+	find "${D}" -name "*.la" -delete || die
 }
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a4acc2a1e11a..1356e9d7c392 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,7 +1,13 @@
 DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
 DIST mbedtls-2.13.1.tar.gz 2345612 BLAKE2B 0b78a04407076016fb7f74b635cd2fc86119a9cd8571c6356715e3a680f5b16787c2b002830d103ebd4b995dda956ec874a35bf1a824489dc56f509a9485b1d3 SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b
+DIST mbedtls-2.14.1.tar.gz 2374523 BLAKE2B bab8e2a6b988627ae634aa26d6bf778ee1b923c9e2b17b2fd62c889120ab0dd5a9362ce6c0b8817c97dc1bbcda892b3a9ea7113c73240345e6e7bc4470a047aa SHA512 e8c953f4335a0cbdf4e713b646fcc1ee5302953b4279c6f21c15a6a8216d805d113354c1448c8df3617dbdfcd4e8a82157cd5630c37662d0db6b02865d4bd8e0
+DIST mbedtls-2.15.1.tar.gz 2662140 BLAKE2B 9b1f3f6e522445c187ebfe38a35bb934d72d638d1b0fa59852c7e0b1c1094302efd4328038a2e0c8427b2d08d791179d0b33ffd20e7809cd4ac9dac1b480866b SHA512 361bac49bc179c020855a59140a3e9e31ec9e89ebde9d630e9f3491cdfdf466c8dc2313276d6b257a7728784f5478bdcfd14d26e81f90d432bad2e9a94151fc2
+DIST mbedtls-2.16.0.tar.gz 2412091 BLAKE2B 7fae9fa1ffa8ae7e7958af6fbac98299135e5b7c524ad3944f0ae7b5aa7f2574253950583a77bd1b9fa175b513032110565406b5d4a85c56c65c5c2e50e87928 SHA512 15e8df96c16b0b6f7b100ca76d85dae77f8e6a6644fc41262dc28e11440b9238e837193991ba5942864ed9f58542f96967c2d1e18a5ae270571f6d364bcc33b1
 EBUILD mbedtls-2.10.0.ebuild 2418 BLAKE2B aa3b1703e9054f1dbb4ad55eaf2ed3b286a1c3bd0f8a369f6123b1abfbcb42156bb2c71885c0ffa7710b6f842071532dd07776943cefd35728040c54ab307b87 SHA512 0ccf855ca1eb9cbf54a51ddd969bcf5feec66b3619d345be6cd480c782ddb36203f2e733475a5e2cf011c24ee1960f5f6ce03cc061cc55470328724844d8a942
 EBUILD mbedtls-2.12.0.ebuild 2442 BLAKE2B c45bfa98c90f49219f6189a7f345aa64f4c5e6b4e6ea9037f323377b773d49ab3f8ad72858dbffd8a3112d85fe4938df8dfc01927bc9af36e7100d2921d84ead SHA512 a01f5cfecd3c93d95a65673659103d18415d9a72e464149bce3e20e8ccb4c3df97579571e5a8c3f6cdc550a3a6afae92af5e366db3efa8aca76813a9fdcfd20f
 EBUILD mbedtls-2.13.1.ebuild 2455 BLAKE2B cd57e8c219e29481e51c967ab0aa2c0e4f815293905114696dfa4a24ffa3a0d7c851cb8625a66d38e24a8d64b5661d26517b4521f5f451b18ff7456f8b9d0741 SHA512 0b292eecbd94c51a619310cf4ed7ebe9857c67e98815d590bc2dee84c6b8057128486f3da442f9d6bcc62a1c3bb58e584942f9177144a8444ae1fb74b80bec51
+EBUILD mbedtls-2.14.1.ebuild 2452 BLAKE2B d8d88038dde514329f7d0d45ca8abc55e4d1ae9eb19b8142b6a2915ea8c3cb9af0d6c12633fb46249391f949756cd35d0d39627b1bff7c10da805f3a9677decf SHA512 4b02c7e3e685f23c34139d56a81ef2afec9fb1369790ceb186211e8607d99d7dc88e1a9e915bdc91f98af9ba2b81380adc7f0e01eb16c12ec8c0b10ef375713c
+EBUILD mbedtls-2.15.1.ebuild 2452 BLAKE2B d8d88038dde514329f7d0d45ca8abc55e4d1ae9eb19b8142b6a2915ea8c3cb9af0d6c12633fb46249391f949756cd35d0d39627b1bff7c10da805f3a9677decf SHA512 4b02c7e3e685f23c34139d56a81ef2afec9fb1369790ceb186211e8607d99d7dc88e1a9e915bdc91f98af9ba2b81380adc7f0e01eb16c12ec8c0b10ef375713c
+EBUILD mbedtls-2.16.0.ebuild 2452 BLAKE2B ac897017e98ec772ffe853f35fa728ee4184c0134c86986cf90c447a55381a24e203e99c8ab776bc1352c2f99427996d1c664185d6e447ea200a45a466dff873 SHA512 9a21024351ef7a7cd3b149d49cb45198bba22fd402d8370eb6efd219dd41f6e547ccff090d0b7b1afac195de37479811884b2fcb4c6e4a054e35e429c45c226c
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.14.1.ebuild b/net-libs/mbedtls/mbedtls-2.14.1.ebuild
new file mode 100644
index 000000000000..12069e130eb2
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.14.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/12" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.15.1.ebuild b/net-libs/mbedtls/mbedtls-2.15.1.ebuild
new file mode 100644
index 000000000000..12069e130eb2
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.15.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/12" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.16.0.ebuild b/net-libs/mbedtls/mbedtls-2.16.0.ebuild
new file mode 100644
index 000000000000..f222e806698e
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.16.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/12" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/nacl/Manifest b/net-libs/nacl/Manifest
index 0738daada557..9c4fb7e0f1a1 100644
--- a/net-libs/nacl/Manifest
+++ b/net-libs/nacl/Manifest
@@ -1,3 +1,3 @@
 DIST nacl-20110221.tar.bz2 163415 BLAKE2B 2b9b3b009f32a23fdea4885a3c0dc34febdc675b856c42d8fcb68bf1da67f6e5c073f7e17d2f4001416dd1e3e7d889ca6561e09f7ea081cbd8fbe77aae6ec6e7 SHA512 4c031ceffe6a28dc74b46ac003d485531f78de467c802df73c8b22ca53644dabb7d2e3080b7bdd6583f0d07ad76b6d95bc0ffdce319ca2f80ee041e6fe618656
 EBUILD nacl-0_p20110221.ebuild 1904 BLAKE2B f183b0cb6e3c179252e952234f505788d5dc55e98a2a8bee94291ba065478243862ee55738a94aa65b55bbd8020ca6f592812c3ff2ee698db1698bd6f70235ad SHA512 ff11b6737ee7e071fc7a625ec5ec69a2d5156fcf87b947d471e0fd60051e8e1dfc51c21434a8a8cdc6f39d449ac8bdfaa63dca0fff961a79e3dcc6e82cc600af
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/nacl/metadata.xml b/net-libs/nacl/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-libs/nacl/metadata.xml
+++ b/net-libs/nacl/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 55c30b134114..bfc08a299cbb 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3118 BLAKE2B d967bd660eb6fc01e654b03d0d235d20e8781331f5923cd6a705edca2141b7b36d6ef767077153bb12a25c8bb62aae238ef83b6b891d30726c3afa8d5d7e9626 SHA512 e4d0f327caf610ada38693eae433f814146d4f57bdcee76c4dd01c0f5d4bd21cc927c9c341c3d3e90ef90348b199c9dd14bb1b12dda091ac92c883161d2bf015
+EBUILD neon-0.30.2.ebuild 3108 BLAKE2B 6dedf24ea99990d2df64c0dbb7bc41b28b4bdb43fbb93793c07a0169de2aebf401ba176f59d3a8d85266ad043cabccee298326df74d5d8a194fa99a22f8e58af SHA512 7b778a83a080c5525b71b6cde30604926b70ae91097ee8312bf4f6edc8178e5b98c4510af0de1b9e6af4fb506c19b212a759bc3d9448f473b9909ef7769daa60
 MISC metadata.xml 1316 BLAKE2B 8d191f415e3ec7d76acac052656386617625842ffb7ca4c0ecf6e0e5c971f142d8f644bcad394671fac98fc6f046674fe5a5f94a460a5fa4328079e1ce2515a0 SHA512 6d15131eef6b6e61c0d7289d00c8dad289c5f48ffdca65b57b1ce73afe65a705f89e710874ca9f5a199dc6b1eb818f3650b8d60a65717d3ae49f9102113ca3f4
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 895d1fbcb069..e7b2bb04dd15 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://webdav.org/neon/"
+SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index e7dc76787899..cf77f36b1045 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,4 +1,4 @@
 AUX net6-1.3.14-gnutls-3.4.patch 943 BLAKE2B 47b21caeb130001c44a44d84bc9a6fc459f3e5fbd5c6e19762e41dfe0b8ce04cde049d0f596f4c05d767f0ff0fa76ce56c4881753542bae4ec215cb4b4769a62 SHA512 8fe45b816d21d5542aedcd88cde8013815a9035c51174c6f6f5ecd90eb75380a68c4d376d2c5f45280fab38f662bc0f7a97815e8bdcb335030cd0534c30c542f
 DIST net6-1.3.14.tar.gz 483549 BLAKE2B 171251fbd24eb76cf06999d64ad818817e92abb190b9df71a75c7f68e04a5012e555767b49d99cba8dcbb060e70830bbf47d8fd046381ffbd23c036258e56a7c SHA512 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0
 EBUILD net6-1.3.14-r2.ebuild 770 BLAKE2B 8fd14b791669cc85fec583eb1b1e122e0ee63637ed2becbc3d4c4cf59c7c0fb7bb46fad54af8cce0bc1664d20d654f147587787602924f18734999ddf41ec210 SHA512 d8706ac605f8e7cbd829a5f24a9a34f7eb589116829d7496c39094372d419dc9f25c1662fbfc9a8ffc34739cb43f89ae110517f689c827c433c944a92e892768
-MISC metadata.xml 368 BLAKE2B eb26c06b5d43796abf241f2fd2ebd9f8d28029fa5b879f63e0812501caa6c2e08ccdc06ace39667fd7ea817c3b13bc6d260b3359e5ceced06563049122655217 SHA512 61aea4707c44401f441210989032bd7c76131d0f08020601ca720f926dc5070962a32abb99c7ef55bc042b3de5f3a3e782bd83f6f5204936e38ac7c66e06b3a6
+MISC metadata.xml 280 BLAKE2B fc4453c2c6dae8a8498a1d710188f672df33e721eb4c4417864a55cb8df99aa02b7a7b1fdf2df6af175c89296af9892f016e702b816b2915c425452a70f1b6e1 SHA512 8c2fc8a9ab4a6238579c31fdea68d3ce9d2189adbe26b1e60cad36231082c01683ceefc5aa975816066870f0af04f666bb0f9850938065bc805c18130eabdefd
diff --git a/net-libs/net6/metadata.xml b/net-libs/net6/metadata.xml
index ed816b3da2a1..e6b34d908066 100644
--- a/net-libs/net6/metadata.xml
+++ b/net-libs/net6/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>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     Network access framework for IPv4/IPv6 written in C++ used by obby
   </longdescription>
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 1ba4e51ec96c..e6894ae54ee1 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,10 @@
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
 DIST nghttp2-1.34.0.tar.xz 1612432 BLAKE2B b5a53d5ffdb68e509cebf50993c3b9de4e597ae9079db505db6e6df67c1eb5f4b095f18dec9f1b946f05b83f3db8ba15e5e5cd7efd4921a94350bd47533a9164 SHA512 5ddc4ab443c51ce286a656d2013421172fc37608f14c0a7ea02fa9e5a0dd155e162d5602b55f34dacc69709525a9a8110dc4c42d92607bbad1951075d094c6a0
+DIST nghttp2-1.35.0.tar.xz 1616224 BLAKE2B b594e386b9a9dcd62dd75686a9274b30d3b9be5b1f2aa4dccb6543bcece60cda931bd6e16c5122ac946159547c1aafa6a02f2f013a3b38837194d4cf9a14ba64 SHA512 4e209bb6e388ee9c3440a88eb28ecb4a69e0047b089e4d028bb911dd69518a970b5b06ed6fff06594adca53dccd42443733faad909d347dd8d8e919055356e2f
+DIST nghttp2-1.35.1.tar.xz 1614460 BLAKE2B 86e078cd0fc285f76df5096c34ee3142268772cf690ec7c9abef7cc3d873ac583a1da5e331ec46138e05b5867f56a9a4e98210395d75377ff37956307c7b049f SHA512 fcd3f79f913afbeee1c75003bb39df918e6122bbf728b3ad4192d5849d8fb96705e04f5505465d63f25a565b2f1da6abd8fabdebb6e3347500f7abd31980861d
 EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
 EBUILD nghttp2-1.34.0.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
+EBUILD nghttp2-1.35.0.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
+EBUILD nghttp2-1.35.1.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
 EBUILD nghttp2-9999.ebuild 1949 BLAKE2B 56a3fc7ee584692bbf9219aaba3a56c0aa57f7b4479d6da0a12c77ce8b999a1db1aec3cf76203536cdd42254dd8c42ef2df63ba08fade93a0dc674502012858c SHA512 fe76714b538e6f49c44c3beb212f98b17644575a9b049981c44a4537d7501cf9b3f6bbdd2351a3c286d8c1e1c9acce09843eb86660b5ecfb38785ce920db4aef
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.35.0.ebuild b/net-libs/nghttp2/nghttp2-1.35.0.ebuild
new file mode 100644
index 000000000000..990e99d6dd0c
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.35.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/nghttp2/nghttp2-1.35.1.ebuild b/net-libs/nghttp2/nghttp2-1.35.1.ebuild
new file mode 100644
index 000000000000..990e99d6dd0c
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.35.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index e41650ccfae4..85afb32ade93 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,34 +1,27 @@
 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
+AUX nodejs-11.4.0-llhttp.patch 729 BLAKE2B d52b7c2bc1e0f0ea46c1e54eb893ac74a6052bc72bfe160cdc25bd2f1e21b265cd776f1de916c6ef848f8b951bc959c5400803d75bde4e144ce245c7c6cc5b10 SHA512 e80ccaedfbdd6fa2ad1b6c4c4f7cc0bff6160d27a2443f27b66d98db2fd35806814a656bb47de5deaef7b75c94e8d97090af2b0dfb16e0183056e0dbb9f4e549
+AUX nodejs-11.4.0-stdarg_h.patch 243 BLAKE2B fef871a9900e3987559cc29ae4c60394b6474cadaf6afee9961245b0938563f736d050294587900264821b2e13a99729333eb1bc38eee9fc77cec16a48a64675 SHA512 008cb557c9d94fd3a70dcf54ea260ed5ad457f62bbc689eccb668052c7195895c3c7f115354dc76da8f1ff0c6807bda9ca7bce62c844e37036c3916cea40286b
+AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
-DIST node-v10.10.0.tar.xz 19960760 BLAKE2B dc16e2afba4be727c5169ac5cd77324e0e8d7270c96da141da21a175cfbd64a38f7b51b86264396f3866174abc9095f7c840303208f7193739a1970818d4ff3a SHA512 482518a72cb0bdd5d987a7855856eadaa4fecea933ff7791918edf3097588246782d86b27568c06764ef9f2bca62b64a4d65e4cbd0e934931a72dc5719db7446
-DIST node-v10.11.0.tar.xz 20144576 BLAKE2B 956d940554748f420589adab0f14bd6fcc6a4781cdecd537abd6eb9aa43e9cf754ef009b20d416f1ef4c9a01ef91a27a59a8c080c1c0a49a59388f75713d6286 SHA512 00a678a829de9b836e77dd0806799029b657cf000369ca653540d7e1b82c3895da43dbbfe4d3c2b3b2b1e711bf55b3835a351fad18affdd0c25dcceea8e3406c
-DIST node-v10.12.0.tar.xz 20185168 BLAKE2B 1a827ed08222900ef196921a57d64466fc558412bb27a26759553686c69d59d8e6686394a484156d254a01030077b09c9abfec87a7716aee06dbe9937a861efd SHA512 3b59bbe7b795e7a85520f6b4691806d8939d26cc2a5e5d22e6406d3d373ee7758da225bd25b6f6b71b105e3d7ef4c58220bfa5e558afd0cd873fbd7d6ba9efc4
-DIST node-v10.13.0.tar.xz 20184740 BLAKE2B 4c063889341eb2aa128096466cfdc2c91631a760ec7dea3e06b30990252cf6575b96a6d61dd1ba467c8d134b75ee51c897d4ec5c8f60b64ba51d3bc4113df63c SHA512 90431414f45c858efd6ed6259916b778e29712b57bc758f12fa7d7fafe5073c85fc379e56c86795936515f4c4f772ac308d3f6d0569c46305a7d49dc55c884c8
-DIST node-v10.9.0.tar.xz 19987812 BLAKE2B 4a5bd257cd527500b691b15d177bde53158b5e46e710ffeaa45224bae821cfaffdf59f24ad6bdc822cf468b90c1a4422a2f82d29e1d4b2dc0f838e3e0ab5b4ac SHA512 19c7366b4c9d1e255b5ac56e974ff86b9ca87c363534b467ecc3c59e170b891e86c479a2bcda6647c6df686b018caaedea84270e848b93a4f1c80ff04af12461
-DIST node-v11.0.0.tar.xz 20142548 BLAKE2B 97fc14392c449abde0c2b4ef27f020ac215747a5cca327b07ed735dd9867a01f1a64bfa19a62758111b0fbdca92b5536c15d7946bf968b5c3eab9c0b55f7dd26 SHA512 232243f37a8344775b2e0302601ec23310a8915e0913dc0cb0133df75cb7aad315ca0a6d039f8f9e6ae0d9f98aa8049532d80d470cf9ea0e309f8183be870000
-DIST node-v11.1.0.tar.xz 20207100 BLAKE2B 7ee0912f2fe99ccd2136c6719833b54af59099a2093a8698ebad7a55d4adfc26265e1637b1933e873552c9dbb50387d14c22f6e6785e9b02e866dcca9211c4fb SHA512 faea85516db2063f32ec9c6762ede0e29c8094ea4a52e030d6842df1f42b132d86515e01602510a717c42a69a2684e3758a9f08a4236dd8dd4e0171d71db3380
-DIST node-v11.2.0.tar.xz 20332812 BLAKE2B 2bb8cd409dc5328faa1404a36bff5c6bf554de397ce1d010886ee5fd7b15d148abb758d54c48e3f7db46e117f2e5cfe2cf8ff4565a551f1424725c75b40d4bf9 SHA512 6251706437c0344bd4994619b7fe09c36a15e99e707d36b3a3746b7b379a03a9a4758a4fc6fdc0214fbd107eef4ec39bd8b75d88ccab207d97cbf21852eb81b2
-DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
+DIST node-v10.14.0.tar.xz 20193912 BLAKE2B a72411c9b7bfc9e257089d26cfc7a00321d1db7836b9a292544971fbceaaeae8b178ef53735175621d42169eb6839173340b00e441e498187bf4fffc02edca71 SHA512 82900373993ae2a068ccc9217eadc700a91956893f0a9973c5003ca648e16859a5b37919ea15c06bc1bd746957db6915ad75aa3d8ddb18c1b949c5723617c0c9
+DIST node-v10.14.2.tar.xz 20214264 BLAKE2B ca962d58a5b23c0acdc242d80d5b9a5bf2b2c81b218ad177503d6152bdc58682873156f01f1c0634217486316628edaa1de4042241906912e910c7b1dfa2abf5 SHA512 35d66708ffe557b87d93328d49d46423b18a3ada6f33031a39b1fab063adf8d61d431cea4e91df853922b1cf34d337fe3adbb3f6582f37bc059c0e793dd8034a
+DIST node-v11.4.0.tar.xz 20406416 BLAKE2B 45c5f2d42aa328c5f5530be99e89e01fe70947e41c9c6b9def599d62df57fb48ce575f36da36369756e98fe3c6d4d0093c0f2f28e0c571874e711cca6d705582 SHA512 1d2fc3cb545f0262bcec674ffb47cd9391876744bcac5f1d95e59022fa1afef921f2dbb2d0ae957b8162349a085fba8ad526d71f63ebc38213e8e9b56908ed31
+DIST node-v11.5.0.tar.xz 20415048 BLAKE2B 5d156545c9fc4a93991aa3d695b9792e7e7fa1768d9ddd32f6aa600f6967a18e3f5cb8b17081a0e1bf0baeaa8f4d731e80dc115163e1f79cf080ef1a2404821d SHA512 17910b008f1d6d9ff29cad89e1683abbf02702e09ab192bd8059c2e37ef774011a2339d7100f4d691cfb3e8fd576b88e45cadc50bff394b4848c2bdd246a407a
 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.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
+DIST node-v6.15.1.tar.xz 15845836 BLAKE2B 8adedbc72bbc0899ec4782894c19ad550c9d41d4069ed640471c7d97185d413b0f9e9a29b9538df5e1b39f59a04abc4adfb2bbdcda9b8803c18a650a2779e92b SHA512 e1d927c91a949b8c681c0ab2c8cbd62d7c202d76abeb9791b1260cf64a01c8aeaa50697e1ed33658586565fa85223abcaeb9370024313a5a5e31297ed4fe310b
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd09670dd8bd736dce2c7ab2fc87c3a717cda11c2a09c325b25a72d99431cbc79c0ee7c202ece5fc41786f1f0aa68e4 SHA512 ca49a1f3aaa8b25faa62c411a96551c8977bb43a22f8f171f27d3585306f379b6a12e55e60ddca04a6f2f8c62a1b3fed9e66c02898d80bf7ca59278536e04c13
+DIST node-v8.14.1.tar.xz 18497208 BLAKE2B 4ce23e9257c224dfa646a57acfc5d86a0cd70ba5861e6ec75c6d912c6c23f50c99e8239aba364179ae9e07cd20dde67c86e76aed0ec3d1feb1606b25a55cac2c SHA512 038975261da930aa8122e9ad44f6d59c32b32dbf6f71a4da8ba74f0874455a7b8f7a9878d900829898b25adb57b81a8114b4222b0384173db19daa769ea025d0
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.10.0.ebuild 6353 BLAKE2B fdb46cd02319dff1cce1b3c19523998da5b7d6ea69058f9b9f3763f093614a84b4dab91151797ce32d529b41d227a051ba489b3c41cffdf3597816bd1a9b926b SHA512 58a08d3e3d69784c41dccb32a3a7cced78e112ae8f30d86ea0d865255292941f953bca23a22bfb8a8a66135a688fe4c87f6af87f0526dc716ce177ab0f41ec66
-EBUILD nodejs-10.11.0.ebuild 6353 BLAKE2B 844b108d90a89a4fc70e1294b3e1efc4181a3555787a3446806ed62b79685a07544184da74face287074af67d2ec8abb9b1a91f3d0370b0d48d7185d1b7015ed SHA512 606e610f800ce9792d689fc813fdc09270ced425b4e76e07e8767853c33041f69d5cfa117976cf583c2bb811cfabf9ab2f86a287ed25b8bff9af4618bcd92660
-EBUILD nodejs-10.12.0.ebuild 6414 BLAKE2B 8f684f966fbc4e4a01a11dfae5bdd8ffd67ddbf896c229cc885e08e7b6360d07e3f3bc4eeee7086bde006d1098714c7077b777fc01d67383edfa37ffefebf147 SHA512 4e5782138680633590896771b5f548952a8b2f7665d0040d00bb37779616c44e3740bc808ed5a51114bcdd7b51d70a35183a1febf78eeaf53680137ecccd84b7
-EBUILD nodejs-10.13.0.ebuild 6454 BLAKE2B 56df71ab1dd8368bc99a7d2ac7a33a350331cc712b843233506a459b8a3457f32be5907e3d61cab8a60256a234bf67713b92b5338eb9c640c93cda159eb6f1d6 SHA512 b496a2c70f32e0cece70d182d7c1b069e498c83f6ef35c1141c4787ef10f51869febf7370e042970b79a46fa48f51c5490d9352dd53e87dd875afefdf95008c6
-EBUILD nodejs-10.9.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
-EBUILD nodejs-11.0.0.ebuild 6414 BLAKE2B 61fc56531db35943990d97f4accc37f8b469ab6948de7e4759d90e0fc875148769853d1d2dc2935f5538cd7c45f3576f9d274232552821b34bbe845d3ec19c01 SHA512 2b4c09b4c2961bc4803fa673a0a03fee0e6225fd81ef552061f75de9b8d142b0f3fd1df24da61c526fc1ec81e7873cb282a535e8d6fd83fc2d7b4f6eb9a692eb
-EBUILD nodejs-11.1.0.ebuild 6414 BLAKE2B 5cf2d61e52cad51da6989f3beac179f8d9fe5f37e055ec72c4acbc8e809b9c3d11d6233586e9979b8e9c920df5b65ca615f4904a1d400931710c3fcf6bbacdba SHA512 c1b13320e0d0755a4439d76f7e5cdef77653ab22745bdf1a63eae14c0dd30b9631fb480ea5f3353cd09f9ae48494e390607250af8a3a851ac657253f3447a659
-EBUILD nodejs-11.2.0.ebuild 6414 BLAKE2B 5cf2d61e52cad51da6989f3beac179f8d9fe5f37e055ec72c4acbc8e809b9c3d11d6233586e9979b8e9c920df5b65ca615f4904a1d400931710c3fcf6bbacdba SHA512 c1b13320e0d0755a4439d76f7e5cdef77653ab22745bdf1a63eae14c0dd30b9631fb480ea5f3353cd09f9ae48494e390607250af8a3a851ac657253f3447a659
-EBUILD nodejs-4.8.7.ebuild 4424 BLAKE2B fa72291c5b44ce0ba1a592b329be2cd9afa3539bf8419be567c457ef223d4ef3db32ae612795da32345c69bb8b141c350b312989df2869fea37e5ecd5afe44bd SHA512 461f777fac4899b55829edc55961ac021cbe6569fcec87bdb842c8a8b3db117ef74b0ec1e1ff01264f74ee71153e6a771d94d9bbea8fee753c1ea53b8c26dc9e
+EBUILD nodejs-10.14.0.ebuild 6444 BLAKE2B fc4ffb4a4ecbf2279c0f773dd96808a2de6c224a4767b5d77efc75b70e14a7eda611a7a7b983e1245454a7eabb61f962711a47b127edb879e88fe4c8440f1a10 SHA512 b427d948b0f88a6245b7985903a19857d886e71cfd20456804f45e94977dc2b5590c9d3268784575ac1210272fcfa6b9ec743eac57020ca3af6c6fce75502eee
+EBUILD nodejs-10.14.2.ebuild 6444 BLAKE2B 1fdbd24f37567676ca48f8753f97cfa2e0964fce527778f9493ec49f7686fdc116ba16cec8ffe76e86f8adb847e05a34125b453dbb511cf067a5c68ab1dfe123 SHA512 0a49da523193ad40e67efd51a0e2a9bf5ce89a2fd8c38e33d68a62a21c3f8eecf245a13e3bdd0cab13825f751b945dc527d7b76a9c305d26dabfdc37c7fb7ca7
+EBUILD nodejs-11.4.0.ebuild 6528 BLAKE2B 13f4d6f9eef464d904a189611cf2b8c33ee53162385f5289585c3612bf176e63ce88d565e4d298c627bc7c123365adfc9775572f02ff244e83fd824e4f36019e SHA512 0e72cce5dc84cdae84c20c167f133c67da6ee46ca3298a01a6879e36b4a1c05eae7a5786a4c94cb6db7f735a33b6a6b964423f89dc719e9faf65ed277605def2
+EBUILD nodejs-11.5.0.ebuild 6530 BLAKE2B ffc5e467fe91bcafad4196ea7eaff03a90e3d40d8faedd768cfe1774b1ac65333f9367945e1719cf6f226f08a61b057b6ae89fd66c63c023b1548f4cc4410238 SHA512 ac69912ef0721122ae3204be673f06671cbc9845a4d750608ab2110d30ebef428498a9b37e4600655606ac48a8c70fb61234b9642a7c368d28de89f480e73bc5
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
-EBUILD nodejs-6.11.5.ebuild 6079 BLAKE2B cae909f4065caf36f168acee12b6fd5a9a2c6fc1c612ae78d8ae2470043a75fbe4be1c0c7975c9d5e3546d334b55ea6d3644320eee952eb17b852e8417db5cbf SHA512 2a78ae710fe19eefc05f47b98ed7a3fd0d0ab84430ffbfd30e3134f0dc9ca80d811f9caa47e61fc99a840b589d05f3b7393e7495b70f36b982637504abf984d5
 EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
+EBUILD nodejs-6.15.1.ebuild 6202 BLAKE2B 0f137aa8d001827da9dc883f317447731419b21fb91cc7e854a4933d75637819c1296af973931bda102eb1eff749250cc02832142c1092df00eba4056938eae6 SHA512 793df4d8b211799231b0d2c5a8038659c3e1b946864aa025909c260e97db087c4b40111a76be7353f68039e9de79240575735c1e20fbd83fd97c426dbf077e92
 EBUILD nodejs-8.12.0.ebuild 6362 BLAKE2B d2caec942c787ff4af79633f40d145d459df2e7ff7b15c7807a44086aa93dd3f21f4f0a84879ab61f9792d72c0855c3745400b6d791086184649bc22999e4f05 SHA512 b698140ab323e29eddfa4f3d579618206c4a31023ee25be2aff6ca03f321f4e9d3bde7735ac821093bdef62000e0d458e9fe4ae5cc9883b9bff9eb559135326e
-EBUILD nodejs-9.11.2.ebuild 6348 BLAKE2B 8e74887ad5e17570c3ecdb608ff21a22813b53d3049de6a608d8a71fcd562fc8f96208601c390861a4ec0c05b4d7219131da93e35e82bb96fde7fa54921c5793 SHA512 6fdd51157c30021589e7d6c2637ce02d376f3e80da578ff1bcefdb3d2473ef689d8fca02c49e1673245a158a90d19af7cf45241d8190d0b76e563c1bedee8449
-EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06
+EBUILD nodejs-8.14.1.ebuild 6463 BLAKE2B a82f9ccd7c59f64e10dbf4742c6ef46afc53074949e8097cb222f0ab04b4825fb2210c666d227dc45a8af4fa763a2edd76b44c033428b0ad8d922712091b7efb SHA512 6ca964df9c8cfe01a8183dbef762b37745a12a2f111d7e9a71d8ccfaeec9d91709d674702dab5ec84bb05293033ce412d8b8a41a8fee5ad39872439057e80230
+EBUILD nodejs-99999999.ebuild 6342 BLAKE2B a96e1f8bc847aaa0252318c1990d7e74fa141aac5f31c1f0ecc7c86c283a683b51338f1a6b76ca943fa508e9a5f3f0908932355e2f8e6aa7c9a96ead3827c9ed SHA512 ffc3e3017336e23760842d30faf36daecaba4aa0121e83db7185d827da030bf53da02bd4922bbe5aff5c90fad7be568cdf5ab0f739525c0d5e436f0ac650b7d3
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch b/net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch
new file mode 100644
index 000000000000..07ac9af6c662
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch
@@ -0,0 +1,30 @@
+--- a/node.gypi
++++ b/node.gypi
+@@ -169,11 +169,15 @@
+ 
+     [ 'node_shared_http_parser=="false"', {
+       'dependencies': [
+-        'deps/http_parser/http_parser.gyp:http_parser',
+-        'deps/llhttp/llhttp.gyp:llhttp'
++        'deps/http_parser/http_parser.gyp:http_parser'
+       ],
+     } ],
+ 
++    [ '"true"', { 'dependencies': [
++        'deps/llhttp/llhttp.gyp:llhttp'
++      ],
++    }],
++
+     [ 'node_shared_cares=="false"', {
+       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
+     }],
+--- a/src/node_metadata.cc
++++ b/src/node_metadata.cc
+@@ -2,6 +2,7 @@
+ #include "ares.h"
+ #include "nghttp2/nghttp2ver.h"
+ #include "node.h"
++#include "node_internals.h"
+ #include "util.h"
+ #include "uv.h"
+ #include "v8.h"
diff --git a/net-libs/nodejs/files/nodejs-11.4.0-stdarg_h.patch b/net-libs/nodejs/files/nodejs-11.4.0-stdarg_h.patch
new file mode 100644
index 000000000000..951c35989c69
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-11.4.0-stdarg_h.patch
@@ -0,0 +1,10 @@
+--- a/src/node.cc
++++ b/src/node.cc
+@@ -75,6 +75,7 @@
+ #include <fcntl.h>  // _O_RDWR
+ #include <limits.h>  // PATH_MAX
+ #include <signal.h>
++#include <stdarg.h> // va_start/va_end
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
new file mode 100644
index 000000000000..1b6eb9fb7fa1
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
@@ -0,0 +1,20 @@
+--- a/node.gypi
++++ b/node.gypi
+@@ -169,11 +169,15 @@
+ 
+     [ 'node_shared_http_parser=="false"', {
+       'dependencies': [
+-        'deps/http_parser/http_parser.gyp:http_parser',
+-        'deps/llhttp/llhttp.gyp:llhttp'
++        'deps/http_parser/http_parser.gyp:http_parser'
+       ],
+     } ],
+ 
++    [ '"true"', { 'dependencies': [
++        'deps/llhttp/llhttp.gyp:llhttp'
++      ],
++    }],
++
+     [ 'node_shared_cares=="false"', {
+       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
+     }],
diff --git a/net-libs/nodejs/nodejs-10.10.0.ebuild b/net-libs/nodejs/nodejs-10.10.0.ebuild
deleted file mode 100644
index 6590a0a5927c..000000000000
--- a/net-libs/nodejs/nodejs-10.10.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.23.0:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.33.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.11.0.ebuild b/net-libs/nodejs/nodejs-10.11.0.ebuild
deleted file mode 100644
index 8830ea2264cd..000000000000
--- a/net-libs/nodejs/nodejs-10.11.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.23.0:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.33.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.12.0.ebuild b/net-libs/nodejs/nodejs-10.12.0.ebuild
deleted file mode 100644
index c543c3b59b1e..000000000000
--- a/net-libs/nodejs/nodejs-10.12.0.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.23.1:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.34.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-62.1:= )
-	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-S="${WORKDIR}/node-v${PV}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.13.0.ebuild b/net-libs/nodejs/nodejs-10.14.0.ebuild
index 763d9f78f284..ea37a260ff52 100644
--- a/net-libs/nodejs/nodejs-10.13.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.14.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-62.1:= )
-	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/nodejs/nodejs-11.0.0.ebuild b/net-libs/nodejs/nodejs-10.14.2.ebuild
index e032286ea2d7..ccc31bc334c2 100644
--- a/net-libs/nodejs/nodejs-11.0.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.14.2.ebuild
@@ -24,11 +24,12 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.23.2:=
+	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-62.1:= )
-	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -92,7 +93,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
diff --git a/net-libs/nodejs/nodejs-10.9.0.ebuild b/net-libs/nodejs/nodejs-10.9.0.ebuild
deleted file mode 100644
index 34e08649c75d..000000000000
--- a/net-libs/nodejs/nodejs-10.9.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-11.2.0.ebuild b/net-libs/nodejs/nodejs-11.4.0.ebuild
index 4bbb68a8177c..0e67f6a9bcd3 100644
--- a/net-libs/nodejs/nodejs-11.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-11.4.0.ebuild
@@ -23,12 +23,13 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.23.2:=
+	>=dev-libs/libuv-1.24.0:=
+	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-63.1:= )
-	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -39,6 +40,8 @@ DEPEND="
 S="${WORKDIR}/node-v${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-11.4.0-llhttp.patch
+	"${FILESDIR}"/${PN}-11.4.0-stdarg_h.patch
 )
 
 pkg_pretend() {
@@ -92,7 +95,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
diff --git a/net-libs/nodejs/nodejs-11.1.0.ebuild b/net-libs/nodejs/nodejs-11.5.0.ebuild
index 4bbb68a8177c..cfa00efc596d 100644
--- a/net-libs/nodejs/nodejs-11.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-11.5.0.ebuild
@@ -23,12 +23,13 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.23.2:=
+	>=dev-libs/libuv-1.24.0:=
+	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-63.1:= )
-	ssl? ( =dev-libs/openssl-1.1.0*:0=[-bindist] )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -39,6 +40,8 @@ DEPEND="
 S="${WORKDIR}/node-v${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-11.4.0-stdarg_h.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 
 pkg_pretend() {
@@ -92,7 +95,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
diff --git a/net-libs/nodejs/nodejs-4.8.7.ebuild b/net-libs/nodejs/nodejs-4.8.7.ebuild
deleted file mode 100644
index ce23ef0038ee..000000000000
--- a/net-libs/nodejs/nodejs-4.8.7.ebuild
+++ /dev/null
@@ -1,143 +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 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 x86 ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
-
-RDEPEND="icu? ( >=dev-libs/icu-55:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.5.2:=
-	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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 # Verbose build
-	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/|| 'python'/|| '${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 || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || 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 myarch=""
-	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	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} \
-		--without-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="${ED}" PREFIX=/usr
-	if use npm; then
-		dodoc -r "${LIBDIR}"/node_modules/npm/html
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
-	fi
-
-	# set up a symlink structure that npm 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
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "When using node-gyp to install native modules, you can avoid"
-	einfo "having to download the full tarball by doing the following:"
-	einfo ""
-	einfo "node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-6.11.5.ebuild b/net-libs/nodejs/nodejs-6.15.1.ebuild
index 8fa13fa1dd80..822894752611 100644
--- a/net-libs/nodejs/nodejs-6.11.5.ebuild
+++ b/net-libs/nodejs/nodejs-6.15.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-RESTRICT="test"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
@@ -15,22 +14,26 @@ 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 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.9.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.16.1:=
+	>=net-libs/http-parser-2.7.0:=
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-58.2:= )
+	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
 	${PYTHON_DEPS}
-	test? ( net-misc/curl )"
-
+	test? ( net-misc/curl )
+"
 S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 PATCHES=(
 	"${FILESDIR}"/gentoo-global-npm-config.patch
 )
@@ -61,7 +64,10 @@ src_prepare() {
 
 	# 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}/|g" \
+		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
+		tools/install.py || die
 	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
 	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
 
@@ -86,12 +92,13 @@ src_prepare() {
 
 src_configure() {
 	local myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
+	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
+	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
 	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
 
 	case ${ABI} in
 		amd64) myarch="x64";;
diff --git a/net-libs/nodejs/nodejs-8.14.1.ebuild b/net-libs/nodejs/nodejs-8.14.1.ebuild
new file mode 100644
index 000000000000..69c390294cd1
--- /dev/null
+++ b/net-libs/nodejs/nodejs-8.14.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.2:=
+	>=net-dns/c-ares-1.10.1
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.33.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-60.1:= )
+	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )"
+
+S="${WORKDIR}/node-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/nodejs-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" \
+		-e 's|share/doc/node/|share/doc/'"${PF}"'/|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-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || 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_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+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
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+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-9.11.2.ebuild b/net-libs/nodejs/nodejs-9.11.2.ebuild
deleted file mode 100644
index 449755ba98b5..000000000000
--- a/net-libs/nodejs/nodejs-9.11.2.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.19.2:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.32.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-61.1:= )
-	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-S="${WORKDIR}/node-v${PV}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-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-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 1e76d8f64f67..e5f27818359a 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,12 +23,13 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.19.2:=
+	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-61.1:= )
 	npm? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -37,7 +38,8 @@ DEPEND="
 	test? ( net-misc/curl )
 "
 PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 
 pkg_pretend() {
@@ -91,7 +93,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
diff --git a/net-libs/obby/Manifest b/net-libs/obby/Manifest
index 202432a1b46b..893e752ef378 100644
--- a/net-libs/obby/Manifest
+++ b/net-libs/obby/Manifest
@@ -1,3 +1,3 @@
 DIST obby-0.4.8.tar.gz 530525 BLAKE2B 81a309763a0720139e91670e03d5107da13ab097e2443b7882c774cfcea1c1a9f8a084e7214590fadc1402c490dcabc9db36a8d9d7090955617980c0732f2b5f SHA512 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0
 EBUILD obby-0.4.8-r1.ebuild 767 BLAKE2B b90c9873c0c2552c9afcca4fb21e605114698bb559faadb9172a445b9d212a5daf4a66dc30011b9d569899086c49dad8a49a21ed38c253be5f0fbfafaa18c049 SHA512 a0ec62111bbc20b8c3bd82a63899af50000c7468fddf1e634c1f754d3ec7ef1f9cda9f95d356b0bc88d762dca11446dc1691030c492952dac511f7845f338974
-MISC metadata.xml 385 BLAKE2B 4cdf5635017733e8470ca8d213fd72056c00b9c223576428e1a289f14c757c41f7730ea85083cae4f8fd41537cf6950f93573940c361d8037f84d62fd6374b30 SHA512 51166e672fd655840ef07da2ce3d10e54aee8d823d46c0c8bd92b204c57ed995398c473aa021b884c7c3016dcedffd0ba9a49016fc02c85197dfc48c25658768
+MISC metadata.xml 297 BLAKE2B 8aef71e73b288ed76acedb890be16de99f28528b39f5e6bf2e08133479e4d9cd28d452dbd94f8c44e9cdba3455a877813b9c86d4f7ceb6f7bec1f4db11f1de47 SHA512 810966e0a53c4c53c9629904ae40a753977efcc43d468c1b356ee63e0c4b4e47eb34f0fa31cf184adb3ad5eb529727ec04efe3f808a4a56ed45b233193d7cbf0
diff --git a/net-libs/obby/metadata.xml b/net-libs/obby/metadata.xml
index bc8832395288..fbb4a0fb19a4 100644
--- a/net-libs/obby/metadata.xml
+++ b/net-libs/obby/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>Framework to synchronize changes within a text documents to other participants of a session</longdescription>
 </pkgmetadata>
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 72d71fd804fa..51792eb5dd75 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,3 +1,5 @@
 DIST rabbitmq-c-v0.8.0.zip 249220 BLAKE2B 171ae0ffc093851089f4dc11cc1e8ef25ae90cbb0cce75ffb93c04a765b7d195e5bde8bbdaa4ce0c598c7f4bb291ed204d157443ed927db373a89f8ab9e7ebc0 SHA512 e386979ce1bc05c02cda06e8582981e0df25f9b31ca950f8a921bd2b249020f751ba65a6f38b8f5ba0be1b3e89492b29b72c6cd1d5ed3d6f19440799d6419ba6
-EBUILD rabbitmq-c-0.8.0.ebuild 1111 BLAKE2B 949f7f843f362345bab652f2bc7a7eb0d261fe8f6a5fecc50107ed01b4c99afa3ad744193819c21120ec3cebd997d3772eb54240124ed3e597dd2da10ae39cc1 SHA512 81e05977f399034885ca1699634e9403d8ec140e884c732415ab9e76309122d862b62b471143026a69dd2b1c4d0e7cc90794aeb39f23ab46546af039ef2da819
+DIST rabbitmq-c-v0.9.0.zip 227245 BLAKE2B ea37e0a9734bc7a8923cab880a9e150f055bab83bb79eb793882a1d435e6e435fbf4610034235f858d0e4d20978287b9432b312c8c3eea5e588655dc2f831554 SHA512 0cac0e26b4caca3de22b468200a20c38c8ace1a824442faa0855d93922b0c3a649fc2067366f6694eca0be635187ca9a9cfe47643472f4abb3d67028768f49fb
+EBUILD rabbitmq-c-0.8.0.ebuild 1107 BLAKE2B a6b9018702b7b2969fb3f95a843aa243c7d057bd416dba9ab16fc586db8f9434995593fb6af660818008f53a02ff4db34364a4bd3fa3a37319623d7cc0274a7b SHA512 ea8089584ad9d42759c6bf901cef3e5ae5f0a9d6d2631ba86079f29b399c15898eba183e10e415a9d1d3dcc85fbb443014c6572f4695e3e114bd6a44c03523e0
+EBUILD rabbitmq-c-0.9.0.ebuild 1331 BLAKE2B 44b776bcd36dd8c8ef4498da062215dd1ae4b89461f0936e1ab93e960bf6f0465f9cb4d56ff099e4616da1a07cac49e8883dace20cf12658632404fb3ccab38d SHA512 02382404ffb6db5db3b7ee3d06a099753ac427b67e15162df1715f72741556a942ff79547ff40481517bd45231d961e523305aa5cd8954671aa5840e1c1be9ea
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
index 0a03a2d4ffab..b8a050a0a6f6 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
new file mode 100644
index 000000000000..5f1af9841fa7
--- /dev/null
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+DESCRIPTION="RabbitMQ C client"
+HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
+else
+	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/4"
+IUSE="doc libressl test +ssl static-libs tools"
+
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="ssl? (
+		libressl? ( dev-libs/libressl:= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	tools? ( dev-libs/popt )"
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen )
+	tools? ( app-text/xmlto )"
+DOCS=( AUTHORS README.md THANKS TODO )
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_API_DOCS=$(usex doc)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_TOOLS=$(usex tools)
+		-DBUILD_TOOLS_DOCS=$(usex tools)
+		-DENABLE_SSL_SUPPORT=$(usex ssl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Skip "basic" test which requires running local rabbitmq-server instance,
+	# see https://github.com/alanxz/rabbitmq-c/issues/530
+	ctest -v -E basic || die
+}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 53b219c9f790..ad7a6da208dd 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -5,7 +5,7 @@ AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.8-r1.ebuild 2128 BLAKE2B c20af1119c40d55ddd5bcd6a444a5bbfadaa1229b6cfa0bd4272fb7454b4989190b4a632d3631e7d547dd7fcbd053c1b281ca49f141caf0f8c1deac0caff4c51 SHA512 a21adfd7734a31ee6040c49102a2b3916cad605f976693e4c1e4f34ed544198bfd231ab77e6e114f86056eea93f69dcbfe76333a5611da3a3fa66ccc06e1ea92
+EBUILD serf-1.3.8-r1.ebuild 2125 BLAKE2B f8276c9af00f571b33933b2a6b2676694c8dfa7fdd1f465c3171997936468094a793ac747e419457addca1dd358983dcff2155cc72bfbb577d1c8f8b88eb85c1 SHA512 4db061cb8b0d4af9555eaef6ca6be13b2a731091974086cde09cd6f36b537047265fd56bff4cd46b1739915160a7705bca6e391045c5bc81628f3fe08b90d406
 EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
 EBUILD serf-1.3.9.ebuild 2137 BLAKE2B 89bf9822603a39f7b0d7e70dca6fac80833cf4f51bc11581210f7439e7349eabbb60831380924d02454613798d658cded8dfef694acd13ed4ae50343b9b99963 SHA512 43dc08a91fe547b4511aedf0c1f2d6d920d42935a9b1f9f2ae2950f344ba853e344d945044d2570ff67c2beb72c9e329ec47e65900d7d370164b4729f600e007
 MISC metadata.xml 339 BLAKE2B ff1bd30899bf67f73610a584e1d012632c801f3fecc39b5dc1a79025abdc151c650d26e5363bce5aace53798b20ec8931fc3532e83814b89fce767a2ecdc4e0d SHA512 b98b7e682407dd662a866336f76031793f13b0d76a7dae86b542afb515fdda1224b8141c71ff1f502294c2bcd88f3f80d18d654dcabe77088bef049bf462f18c
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index ad16ba7e0a9d..4b6c23a4a040 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/shairplay/Manifest b/net-libs/shairplay/Manifest
index 016fb02f7a55..77450aef517f 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,6 +1,7 @@
 DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b
 DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6
 EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d44b70c3b4283852643a9fa1b313538fb48f0900e254faed5ac100e480d7021dca2a776056ab30f977b9dd915314e0b32eb SHA512 3ce15525ded41e9ffd2d6ac3134a73a8bc0a8bea1d018d3e93f42c5aa35a9b983e3848806fad8089f20e9ca7fdaab1c1ba7ad7697423872b1a9f4c89be48018e
+EBUILD shairplay-0_pre20180824-r1.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
 EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
-EBUILD shairplay-9999.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
+EBUILD shairplay-9999.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
 MISC metadata.xml 806 BLAKE2B 54e0d86fcf821eb4c29502f75a44b7a5dc53747e6e594e4a8bfcc558cef8362b136b17e827a10f617b6115a29f3dda5528555e09c2c6fb1fe43b2132d1a8a177 SHA512 fe0e689e3b0cd7bf95bab72137b10b04d7006b63917142293bca72a58a90c485d3e5735f6036828de714a89180021785361aa8862fcf7405815e0bb57f476329
diff --git a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
new file mode 100644
index 000000000000..e8573a8c12b6
--- /dev/null
+++ b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/juhovh/${PN}.git"
+else
+	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
+	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Apple airplay and raop protocol server"
+HOMEPAGE="https://github.com/juhovh/shairplay"
+LICENSE="BSD LGPL-2.1 MIT
+	playfair? ( GPL-3+ )"
+
+SLOT="0"
+IUSE="+playfair static-libs"
+
+DEPEND="
+	net-dns/avahi[mdnsresponder-compat]
+	media-libs/libao
+"
+
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with playfair) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/shairplay/shairplay-9999.ebuild b/net-libs/shairplay/shairplay-9999.ebuild
index f4af8a0449c9..e8573a8c12b6 100644
--- a/net-libs/shairplay/shairplay-9999.ebuild
+++ b/net-libs/shairplay/shairplay-9999.ebuild
@@ -21,21 +21,15 @@ LICENSE="BSD LGPL-2.1 MIT
 	playfair? ( GPL-3+ )"
 
 SLOT="0"
-IUSE="alac +playfair static-libs tools"
+IUSE="+playfair static-libs"
 
 DEPEND="
-	tools? ( media-libs/libao )
+	net-dns/avahi[mdnsresponder-compat]
+	media-libs/libao
 "
 
 RDEPEND="
-	alac? (
-		media-sound/alac_decoder
-		net-libs/shairplay[tools]
-	)
-	tools? (
-		dev-libs/openssl:0=
-		net-dns/avahi[mdnsresponder-compat]
-	)
+	${DEPEND}
 "
 
 src_prepare() {
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index 3912f12dc8ef..772e046d343c 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -4,5 +4,5 @@ AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f017894741
 DIST signon-oauth2-0.21.tar.bz2 37819 BLAKE2B 5de9add1952ba94e12b776c7f4b462bfc31ce01c148d8819b6e159510c4b00f4d2fc915a62f585b1061d46efbeb92406e3c117452e4e7f5575404fea3ab20601 SHA512 b0f97353e87c08420c3132f3357522b526a7c48df807ab833e05297ebfc86e0e8f25d4d3aa94e8ebc4aa1d9bc77856d63c43e5b5e9f3e63628f7710b9a056fd0
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
 EBUILD signon-oauth2-0.21-r1.ebuild 841 BLAKE2B a6d424f9e2720dc7e1289fb9e0dd432fd8f3c0a6b2015f83fb86a29681cfc73e88892ea0d27ee262d34a420fbfd8f5fc7a2785172ea16ba0b5093611c986d50d SHA512 8fe420882ef3212253a9a0c3ab3111cdd1e0ebf0bd57fa2a7174b4ebb94478e464a909484e619c373de72fb9880f9d4de5fcded607b49dbe5894410c3f924cca
-EBUILD signon-oauth2-0.24.ebuild 945 BLAKE2B 8fe23bd251c2313faed2e5bc441f026ce096759d99fd348e7a8f90635034b7fbfb2146759aaf3d5875c5944bc3fcaac02d5f2c73ef8b2d949529e16e41e35393 SHA512 cbb548ebf497f5c679c93a063e40994c9d72cf883498f6a37578d5999bf050e3dc6ac1bf930116ab1dddb608b68e2a26155bc06855b8ad24e4e80ef1e0e8e834
+EBUILD signon-oauth2-0.24.ebuild 941 BLAKE2B eb262d648a24159348727197beb595e2e8259d4cc16ade747f114edfd1c813fb87a0369e1b55bd91212b74334581812794eae0a96c7c505f70d383244b1d90b7 SHA512 11e782d5cd9c736fd6a8278e32ec9d26bc9dd594be9d2e5c4bfd66893195809bbbfebc4a03daf0dd2996ded1430fc7ae084668f13864c1892322fb3be10ac4c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
index ea3dd0c41f71..2bde09237a76 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-libs/signon-ui/Manifest b/net-libs/signon-ui/Manifest
index 730798bbb7b7..976a4e67e4a1 100644
--- a/net-libs/signon-ui/Manifest
+++ b/net-libs/signon-ui/Manifest
@@ -1,3 +1,7 @@
+AUX signon-ui-0.15_p20171022-fix-username-field-reading.patch 4338 BLAKE2B ef44759dde1e1f393ce6a6e6a30528049ef1ce480ae9721f006dd4a37ebfc0c0a36937472fcc74731072229894c1a280c2b50e92e059d000d1de5e91435d8fc3 SHA512 2414ffaacb13224bd4edb4beec1cb6c8e576401d2a3b3677b5aaa9140eeea99077c37fcb0115c2400987722d23f822844d3f4cc901adbc85be6d4e098072d28d
+AUX signon-ui-0.15_p20171022-webengine-cachedir-path.patch 925 BLAKE2B 5ead2d7a75d2dc011d84a476f0cd1b80c72a54dbb9d06a6d151f9940bbdbcb20494a2ad388aa0590b2148cf0d5d2e455d50425d0292bbeda7e41de366172227e SHA512 e21aafb1cb79033619dc50ee41a81efe8e02be7ce71382ab532beb48d720a514bb7d4abe588c117685b4b643865c4a11eb304a8e0107104393de08afa1d162f7
 DIST signon-ui-0.15.tar.bz2 60278 BLAKE2B 9674dbfb184249a8a88fbdbe07e6e1c3d070b3e7ca42666a99ae5cdff31ceefe6a45cde533d77234194dc294722999c48ac16dcf6fe0e67a6ce7d53c711edfbc SHA512 02167d48cec3efbd1b0f39f65732742416b46e638a888a74df02bbfeb6deaefdd81549c8cee1a80ecdc8a9f9d0363a6935e8f105bec40bb798af5cc19a74bf03
+DIST signon-ui-0.15_p20171022.tar.bz2 55849 BLAKE2B 6b97b3f673fb4494c7e32dc345f6c4697acdb19305b9459fe954d88983e4666211926921dac70829435706cdd9a41f36d36241a73905b2a795873c2894ffa8d7 SHA512 d0a4ca222de00abf4000905d917799fc6f9e04a2c3f49d0d0882dc4e90fdbcde14da91f355d10f8a3feac03661febd321ea6de1df227fa5a3c404eaefa7c2d60
 EBUILD signon-ui-0.15-r1.ebuild 1015 BLAKE2B 7e3ca87104cc40d0be5869601f4e7582143ff15d587cd32bcf840dd489524fe6b38604521395e7307283eb54ad5a40a77a595ef53f5609e9aeda69a153b4cba6 SHA512 341e8d25a797d7bb92a04137c73dfcb64775184b9aeca531a1d440b862c8cbe2fb33154671c2649c663adfcafb2d9f255a29bc4163d8008be7345ec29a04d738
+EBUILD signon-ui-0.15_p20171022.ebuild 1161 BLAKE2B de493e85187efc72ed06013194e156ab4f54ded6829419724046c8f5a3d2a75a07b61b7a590ec832b5d3b88ed4f0339380cd24af2af474aaf65a7735c6527a64 SHA512 6d33b042f91dff7c1f499235eb6aede2d3eee530fb124aaff14280ff1085e3ea6a05d6819b30ff09d94b668e36f0177e38ab29e708c8cd7b77bc3f174a927a49
 MISC metadata.xml 326 BLAKE2B 896ee331ecb5fc149dbd576756e92fd439e6e5b3364e487de418428eb47502cadbb7826c433ce8bf348a7c70e5215dc073aa75a93b8a853920dd9fbacc139927 SHA512 5fae353739749bdc5a688a5819992063f045818006124b8cefbb4ef6a3452d91122931aae8286627b9121f893b97e66a44caa732edfbc2aab9301d8d039b0a7f
diff --git a/net-libs/signon-ui/files/signon-ui-0.15_p20171022-fix-username-field-reading.patch b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-fix-username-field-reading.patch
new file mode 100644
index 000000000000..accc8d92d91e
--- /dev/null
+++ b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-fix-username-field-reading.patch
@@ -0,0 +1,127 @@
+From 90890e7d27c544e3557bed2f6624614141db0fc4 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sat, 29 Sep 2018 15:34:43 +0200
+Subject: [PATCH] Reintroduce the username field reading with webkit-options.d
+
+Use WebChannel to spy on the input fields.
+Use the old UserAgent to make sure the selectors match.
+---
+ src/browser-request.cpp | 11 +++++++++++
+ src/qml/WebView.qml     | 36 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 47 insertions(+)
+
+diff --git a/src/browser-request.cpp b/src/browser-request.cpp
+index 1895d59..e58f302 100644
+--- a/src/browser-request.cpp
++++ b/src/browser-request.cpp
+@@ -31,6 +31,7 @@
+ #include <QStandardPaths>
+ #include <QTimer>
+ #include <SignOn/uisessiondata_priv.h>
++#include <QSettings>
+ 
+ using namespace SignOnUi;
+ using namespace SignOnUi::QQuick;
+@@ -43,8 +44,10 @@ class BrowserRequestPrivate: public QObject
+     Q_DECLARE_PUBLIC(BrowserRequest)
+     Q_PROPERTY(QUrl pageComponentUrl READ pageComponentUrl CONSTANT)
+     Q_PROPERTY(QUrl currentUrl READ currentUrl WRITE setCurrentUrl)
++    Q_PROPERTY(QString username MEMBER m_username)
+     Q_PROPERTY(QUrl startUrl READ startUrl CONSTANT)
+     Q_PROPERTY(QUrl finalUrl READ finalUrl CONSTANT)
++    Q_PROPERTY(QString usernameSelector READ usernameSelector CONSTANT)
+ 
+ public:
+     BrowserRequestPrivate(BrowserRequest *request);
+@@ -58,6 +61,7 @@ public:
+     QUrl startUrl() const { return m_startUrl; }
+     QUrl finalUrl() const { return m_finalUrl; }
+     QUrl responseUrl() const { return m_responseUrl; }
++    QString usernameSelector() const { return m_settings->value("UsernameField").toString(); }
+ 
+ public Q_SLOTS:
+     void cancel();
+@@ -77,6 +81,8 @@ private:
+     QUrl m_startUrl;
+     QUrl m_finalUrl;
+     QUrl m_responseUrl;
++    QString m_username;
++    QSettings *m_settings;
+     QTimer m_failTimer;
+     mutable BrowserRequest *q_ptr;
+ };
+@@ -116,6 +122,9 @@ void BrowserRequestPrivate::start()
+ 
+     m_finalUrl = params.value(SSOUI_KEY_FINALURL).toString();
+     m_startUrl = params.value(SSOUI_KEY_OPENURL).toString();
++
++    m_settings = new QSettings("signon-ui/webkit-options.d/" + m_startUrl.host(), QString(), this);
++
+     buildDialog(params);
+ 
+     QObject::connect(m_dialog, SIGNAL(finished(int)),
+@@ -231,6 +240,8 @@ void BrowserRequestPrivate::onFinished()
+     QVariantMap reply;
+     QUrl url = m_responseUrl.isEmpty() ? m_currentUrl : m_responseUrl;
+     reply[SSOUI_KEY_URLRESPONSE] = url.toString();
++    if (!m_username.isEmpty())
++        reply[SSOUI_KEY_USERNAME] = m_username;
+ 
+     m_dialog->close();
+ 
+diff --git a/src/qml/WebView.qml b/src/qml/WebView.qml
+index 33462b8..3af0239 100644
+--- a/src/qml/WebView.qml
++++ b/src/qml/WebView.qml
+@@ -1,4 +1,5 @@
+ import QtQuick 2.0
++import QtWebChannel 1.0
+ import QtWebEngine 1.1
+ 
+ WebEngineView {
+@@ -25,8 +26,43 @@ WebEngineView {
+     profile: WebEngineProfile {
+         cachePath: rootDir
+         persistentStoragePath: rootDir
++        // For compatibility with the webkit-options.d values
++        httpUserAgent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) Safari/537.21"
+     }
+ 
++    QtObject {
++        id: commProxy
++        WebChannel.id: "comm"
++        property string username: ""
++        property string selector: signonRequest.usernameSelector
++        onUsernameChanged: signonRequest.username = username
++    }
++
++    WebChannel {
++        id: chan
++        registeredObjects: [commProxy]
++    }
++    webChannel: chan
++
++    WebEngineScript {
++        id: qwebchannel
++        injectionPoint: WebEngineScript.DocumentCreation
++        sourceUrl: "qrc:/qtwebchannel/qwebchannel.js"
++        worldId: WebEngineScript.MainWorld
++    }
++
++    WebEngineScript {
++        id: commScript
++        injectionPoint: WebEngineScript.DocumentReady
++        sourceCode: "new QWebChannel(window.qt.webChannelTransport, function(channel) {" +
++                    "    var elem = document.querySelector(channel.objects.comm.selector);" +
++                    "    elem.addEventListener('keyup', function() { channel.objects.comm.username = elem.value; });" +
++                    "});"
++        worldId: WebEngineScript.MainWorld
++    }
++
++    userScripts: [qwebchannel, commScript]
++
+     ProgressBar {
+         anchors.top: parent.top
+         anchors.left: parent.left
+-- 
+2.18.0
diff --git a/net-libs/signon-ui/files/signon-ui-0.15_p20171022-webengine-cachedir-path.patch b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-webengine-cachedir-path.patch
new file mode 100644
index 000000000000..3a056484acdc
--- /dev/null
+++ b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-webengine-cachedir-path.patch
@@ -0,0 +1,25 @@
+From e155e6e70ce7a6c52837688b570e8020faac5496 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sat, 8 Sep 2018 18:58:42 +0200
+Subject: [PATCH] Fix WebEngine cache directory path
+
+Otherwise the URL is treated as a path, which results in a folder "file:" in ~.
+---
+ src/browser-request.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/browser-request.cpp b/src/browser-request.cpp
+index 146bec8..1895d59 100644
+--- a/src/browser-request.cpp
++++ b/src/browser-request.cpp
+@@ -132,7 +132,7 @@ void BrowserRequestPrivate::start()
+ 
+     m_dialog->rootContext()->setContextProperty("request", this);
+     m_dialog->rootContext()->setContextProperty("rootDir",
+-                                                QUrl::fromLocalFile(rootDir.absolutePath()));
++                                                rootDir.absolutePath());
+     m_dialog->setSource(webview);
+ }
+ 
+-- 
+2.18.0
diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
new file mode 100644
index 000000000000..0be0cf2ea2b4
--- /dev/null
+++ b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=4368bb77d9d1abc2978af514225ba4a42c29a646
+inherit qmake-utils
+
+DESCRIPTION="Online accounts signon UI"
+HOMEPAGE="https://gitlab.com/accounts-sso/signon-ui"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-qt/qttest:5 )"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/libproxy
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtwebchannel:5
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-webengine-cachedir-path.patch"
+	"${FILESDIR}/${P}-fix-username-field-reading.patch"
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e '/^SUBDIRS.*/,+1d' tests/tests.pro || die "couldn't disable tests"
+	fi
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 7cbe4fd9ce01..a597106c5b3e 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,3 +1,4 @@
 DIST signond-8.59.tar.gz 281298 BLAKE2B 29b97705b6e774f65b42a7ef9a253b08b1f4caf46141e3d761aabd9ef641dbe1301ef2fac0f46d8073e815bb97bc64bfbbf4b19d9c6644e2369f3abe538a50af SHA512 b8db03127df7b62dbf046841568c12f29c48c0b3272751600637864caa1c10b05ee9abce20fa41fb8eb7133c6bb20d18ca40803077e9e7808dba5afd108a36bb
+EBUILD signond-8.59-r1.ebuild 1577 BLAKE2B 2acb75311c77b68b8ff8926547df2721331c1727066390c1637fd52ed159d6848d167857952c5e05744a7147b447e54066e57cbf4ae0dd8cf0a2db27dd1c2af1 SHA512 c3bff5501a4168bffe329668bcf1441382077af38a713b22b88cbc7342a15a231e3bd0ec6e52fb307979009f10c33b090784a49b42b10676bd7bfde1c7027ff7
 EBUILD signond-8.59.ebuild 1554 BLAKE2B 95782649efb0ae8d4cac3da859fdecfdbc4e29efb7f87c0473cea0d38fdeaa47c4206da8674531b69dafe9175a30268fe8105d74e549f2d0f52055b53f7e3e1f SHA512 8c918b7252d1be52b9c11f27746e88ef21314dd8b1c8cf53edcaecb5bc64af03d827f6cc9a4827b4c71f66026a133952c7855db03b46d2c23e459e54bf386272
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/signond-8.59-r1.ebuild b/net-libs/signond/signond-8.59-r1.ebuild
new file mode 100644
index 000000000000..8a154b36b176
--- /dev/null
+++ b/net-libs/signond/signond-8.59-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils vcs-snapshot
+
+DESCRIPTION="Signon daemon for libaccounts-glib"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.59 -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc test"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	net-libs/libproxy
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<net-libs/libproxy-0.4.12[kde]
+"
+# <libproxy-0.4.12[kde] results in segfaults due to symbol collisions with qt4
+
+src_prepare() {
+	default
+
+	# remove unused dependency
+	sed -e "/xml \\\/d" -i src/signond/signond.pro || die
+
+	# ensure qt5 version of binary is used
+	sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
+
+	# install docs to correct location
+	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
+
+	# don't install example plugin
+	sed -e "/example/d" -i src/plugins/plugins.pro || die
+
+	# make tests optional
+	use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
+
+	# make docs optional
+	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" -i \
+		signon.pro -i lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
+}
+
+src_configure() {
+	eqmake5 LIBDIR=/usr/$(get_libdir)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 720783dbc756..d81d802a1800 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,9 +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
+DIST socket_wrapper-1.2.1.tar.gz 67955 BLAKE2B 77091f0650ef4be31e581e32651920acd532c8a0018ff2775c0b273ddabdd4251a63b9cb2536f2dbda37b324e13ecf49422241fe7cdb92c8439e4b675f88af96 SHA512 2e905591bf7ff9cf06a1b5ce2c683996a32c6d08a416aeb07e4b6049849c915040b528171275a8b101a3ea549f05c9c7b2fc9ad6096089dc471e0278a4fc610d
 EBUILD socket_wrapper-1.1.6.ebuild 701 BLAKE2B 60d422829b34f9b374d386b56f868bf19fe5a88ca963f0f6858726f04a4389f7281d1f1ca47d74fafa4200aba4f5d6a2c1ed1b04e0a8434b465202c488f4510d SHA512 f3929eaf574cb4eee26e44015436160149d000f49c385b8d543c685e6ccb650d8c3b0b18ea2a13d9ca41e45be44874c0ef80106c4eb8a4f0187daa1c7d2661f0
 EBUILD socket_wrapper-1.1.7.ebuild 708 BLAKE2B c678a8a8d3bcfac6674bced32c8f335afc6f77265877fec520bc8e9abe9d777e065d518be0e029c8eb6ea508d055f586262c68069fe95d2d6034f19c4d48dfe3 SHA512 8509ada1750d66a9b571e5905dbb2d39112554e7a14afb0992b65ef5edbc8344f4da3d8eacfb3ee11fc691d35fa8f7abf9510cb45e46b82ee36abb21a91f2bbd
-EBUILD socket_wrapper-1.1.8.ebuild 716 BLAKE2B 8463e9537cbdbad9e34433d7f0518c70c0cf58200ee26d6972d83a07c663a65dcb8f44c514be6769925fccc8101ce5b1615e1510f6ff91a28cbfd31b5b7985e4 SHA512 5cbc2731f5ed327e10149267c2fd6e2b4517dca4196d30fc99cacf85127835677e013dc88393b9811ffbcec585564fb04c84cd6622e8f0699429b65742855991
 EBUILD socket_wrapper-1.1.9.ebuild 716 BLAKE2B 8463e9537cbdbad9e34433d7f0518c70c0cf58200ee26d6972d83a07c663a65dcb8f44c514be6769925fccc8101ce5b1615e1510f6ff91a28cbfd31b5b7985e4 SHA512 5cbc2731f5ed327e10149267c2fd6e2b4517dca4196d30fc99cacf85127835677e013dc88393b9811ffbcec585564fb04c84cd6622e8f0699429b65742855991
+EBUILD socket_wrapper-1.2.1.ebuild 458 BLAKE2B 56847b4af19a587e61f6e26d7cad2f343ac80c7bc703b00b69dc9cfe74897c6311f9974d9f305364ae0b335175a351b710c128f40e14bf562da61301463d1b63 SHA512 573e8c69a0be3b37cf33c0c960d276a3cc6b48d636b4fcf0a6d819be367c7f09eebf38686f48ace6364717cf63c78625f9d4b89b110da3123ab59271f2fcd06d
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.8.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild
index 4cbcd2bedf10..10f5dbfec6e2 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.8.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,10 +15,3 @@ 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/srt/Manifest b/net-libs/srt/Manifest
index 9e555977c928..4525c59b848f 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,3 +1,8 @@
+AUX srt-1.3.1-no-rpath.patch 1199 BLAKE2B f813d6203a1c1cb55380b651202ffa577c45b16b07764b0d674fba9e8e5fa2e3ac59c36bee328f490f7a75ee1aa53201a415307c2d1484d83c59944d046195b7 SHA512 a824f88f8ca1494ee86708662fda7340cb215ef6b12ef8dbcfaef9ece0d4cc82c42c1122aef163430244869e5bc2019566d3e481d64c881bec901591a426fa65
+AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.2.2.tar.gz 634049 BLAKE2B 1f650c5d8ab470829212b9c4a1082eb1de4480c8bad4b787a63a2b9c06cb7c8c0ad3a80a06ec5b13e629ec2d18a025ff36e3dcdaa9de8359805e3ff4c1b4d963 SHA512 cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a
+DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41668f3b3db76055917cff767b6d04b1fdd97b676772fbb561f36f3d2f712e1d1165a26033f728c1bf9efdc SHA512 1f8fdfc0e1d92bc8c477651982c23afeacb65e2293a7225227927e1b6f71a01355a3311600097d77b3df638503e4856acbcb52ed270b650480f20b98c1be5ec2
 EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
+EBUILD srt-1.3.1.ebuild 1230 BLAKE2B f88af13e4cd496575db0de715f95567c74a260aaa2ac2c0d2ed06ca9b0f99880f3d0ca66fa5b5102514cfc5a0744460159ec3ca04e98dac166ac15d1e655ee41 SHA512 29358c59e3ce22048033a631d4cbc95731419298c38cd044c91999d07a44c9f42431f51fcbdff9159b4a12f2a1c2f23b06afb581c5a7a245f69d55e73f774387
+EBUILD srt-9999.ebuild 1286 BLAKE2B 5b4ce6b439f58a6af3d1d2a640556b657bad14a589451170d2e0c862bbc6017237d1029df10ed02c66832e9feec9f334e41322a93f973ec122c94441fb431e9e SHA512 599ad5fcc603ee02f518fd76cd6c560f03ba9e0dcb66cba1fb1fbee491f3ae33deabf52d3ac05b77b7909e68b2f4d9d00eb8f290a570b2cfaf4276c51f0b49f1
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/files/srt-1.3.1-no-rpath.patch b/net-libs/srt/files/srt-1.3.1-no-rpath.patch
new file mode 100644
index 000000000000..6e3650709c63
--- /dev/null
+++ b/net-libs/srt/files/srt-1.3.1-no-rpath.patch
@@ -0,0 +1,28 @@
+From a90e6ab27bc20fa34536c19828db5be44be4ef4d Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 26 Nov 2018 21:51:20 -0500
+Subject: [PATCH] Do not force rpath on Linux
+
+---
+ CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb2582c..60c4507 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -663,14 +663,6 @@ macro(srt_make_application name)
+ 	# set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 	# set (FORCE_RPATH BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+-	if (LINUX)
+-		# This is only needed on Linux, on Windows (including Cygwin) the library file will
+-		# be placed into the binrary directory anyway.
+-		# XXX not sure about Mac.
+-		# See this name used already in install(${TARGET_srt} LIBRARY DESTINATION...).
+-		set(FORCE_RPATH LINK_FLAGS -Wl,-rpath,.,-rpath,../${CMAKE_INSTALL_LIBDIR} BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE)
+-	endif()
+-
+ 	# We state that Darwin always uses CLANG compiler, which honors this flag the same way.
+ 	set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${CFLAGS_CXX_STANDARD} ${EXTRA_stransmit}" ${FORCE_RPATH})
+ 
diff --git a/net-libs/srt/files/srt-always-GNUInstallDirs.patch b/net-libs/srt/files/srt-always-GNUInstallDirs.patch
new file mode 100644
index 000000000000..94332ad44762
--- /dev/null
+++ b/net-libs/srt/files/srt-always-GNUInstallDirs.patch
@@ -0,0 +1,25 @@
+From 68190ee0db1bc7577f17c51616966f509f971b0a Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 26 Nov 2018 12:45:38 -0500
+Subject: [PATCH] Always use GNUInstallDirs
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb2582c..59a41d4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,9 +32,9 @@ set_if(SYMLINKABLE LINUX OR DARWIN OR CYGWIN)
+ # inside "bin" and "lib64" directories. At least this maintains
+ # the current status. Shall this be not desired, override values
+ # of CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR.
+-if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
++# if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ 	include(GNUInstallDirs)
+-endif()
++# endif()
+ 
+ set (SRT_VERSION 1.3.1)
+ set_version_variables(SRT_VERSION ${SRT_VERSION})
diff --git a/net-libs/srt/srt-1.3.1.ebuild b/net-libs/srt/srt-1.3.1.ebuild
new file mode 100644
index 000000000000..d326da6dca6e
--- /dev/null
+++ b/net-libs/srt/srt-1.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/Haivision/srt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc libressl gnutls"
+
+RDEPEND="
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
+	"${FILESDIR}/${P}-no-rpath.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
+	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GNUTLS=$(usex gnutls)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
new file mode 100644
index 000000000000..6ba9d8717793
--- /dev/null
+++ b/net-libs/srt/srt-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/Haivision/srt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc libressl gnutls test"
+
+RDEPEND="
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
+	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DENABLE_UNITTESTS=$(usex test)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index 274b0a66193d..11cb4bfc9729 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
-EBUILD telepathy-logger-qt-17.08.0.ebuild 712 BLAKE2B 91e523f0e8c752acaafe928ed181ad9fdb1a19b788be356c53716e552605f486c934abb32ea553aea9d645000d9e9d754ebc4f67a38bb1a9d0f439cec51eed35 SHA512 0273a7c2cc1bc6f12ac7aa2980f96781a7df6f503ffd8024b248f11c3f0b1782c1c677ce8a05c3eab6a6f9c39821e28dd04bcef07a3d7ed177e1a3333a2a782d
+EBUILD telepathy-logger-qt-17.08.0.ebuild 672 BLAKE2B d2457d4f4e158840b315aa8485a599dba1cad5d9b599bdb0021ac8cd7936ab4b2b4f24e328862860ac315362ec0ae5912406d97be1b8e8f8cffc1927b9775e18 SHA512 d63cd67e8079ee9ddb0f1e1e2b8d3a66aec7acf1228161d3a577326caf1fc300c46bb118f7876dea7a58b607b34c941fdef42b7cb3225f01bdebf8b6b38536b9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
index 16614d015bbd..d5bd5e9959d6 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit kde5 python-any-r1
 
 DESCRIPTION="Qt bindings for the Telepathy logger"
-HOMEPAGE="https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt"
+HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz"
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 2f5d5067f383..935d53480117 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -2,5 +2,5 @@ AUX telepathy-qt-0.9.6.1-qtpath.patch 935 BLAKE2B ee54f49734a52387c68c60ebd32d2a
 AUX telepathy-qt-0.9.6.1-yes-release.patch 578 BLAKE2B fd8581e60b4f526681946c7c45638c85f3a5ad0448d71dbdfd2b4a8a5f72f423ae2d8514c2459f817c9b0aff35db8c257d827e6e25f75037fd867df18fcb3e36 SHA512 c0c3e3e6b698aa5410d33653f36a1dac044054fa03830f1c78c1a1d82aa74e24ef84d4ccfc8b3ce295e655f2618aa318c863b8b49303097d5774e789efb4cc80
 AUX telepathy-qt-0.9.7-deps.patch 2017 BLAKE2B f8f0d4eb3362b1b0d4fb628dfa773bced0eebaa359340f6b95d0d37077083f90979dd557775cc5a44b74c0b78f4741b5c03b589feedff0b0d32d51f3883b6513 SHA512 202974d14ee316e713138e5ee88a5b6ec4f613af567b83ac4dc4aec8bc39dcb6cd65d1be6724189e48cccfc526ad8bd7151a7a5420a5d5f44071ccd50a0ecae1
 DIST telepathy-qt-0.9.7.tar.gz 6213405 BLAKE2B 13e2ae73bba74b4aedd55b46d0816744a4485a2a39faed610439fff40a65065a12606080012e220fc30a9d2642aba311aca6a24b540d8d22a140197911343eb8 SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877
-EBUILD telepathy-qt-0.9.7-r1.ebuild 1129 BLAKE2B ba893df8ca6ed5676a9c5944bb306ddca9e40d45f89190ce924de626a7cc82ae23595e9ee372156e75a5b0bd89cd154069bd96c175724c8d47814d47747f5de9 SHA512 2f302ed453dd1905a9b5181b5d670a333c3d9781a6493976f27467b828fc938f422ad0ddb559243a21dd939a9b79f8d4d3a48760e4dfb7d6a219ed704a87178f
+EBUILD telepathy-qt-0.9.7-r1.ebuild 1140 BLAKE2B 67f3b0e995b96e5ad6fcb7c08c789accd1db122ada0522007c0970764f7779407a0a8389cba0d92c5607ae988250c427909b501880986dca3d93aa11d8db037b SHA512 71e611dbe485b17182f220b352c20803889e4eafbca076e6bc81e44150b5b0178ddcf39567552e43ce291c9aef4f23d0019100574c0ad4f468ac2a3309cfeb4b
 MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
index 97dc81e956dd..39c1c5cd6ccd 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 cmake-utils
@@ -26,7 +26,8 @@ RDEPEND="
 		>=net-libs/telepathy-glib-0.18.0
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index b8961ce0de7f..685de829b610 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,11 +2,7 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199
 AUX initd 533 BLAKE2B 0e5b218af1b78b3613bfcd33b9c6c941ff708e55dff6383d234aea19b1677b7cc1f5f69205f4a9ae3db7a668887537d52281c7738f95506ab06088188c3b665e SHA512 46fb490c26244a894e2a33b464083c0b653f9c195af08848cd85b6f74f1677ffe66664c90e9c85e8ddbefec91d773ceec95e7043ea678f7f96c50ed0f96efb56
 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 c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735
-EBUILD tox-0.1.10.ebuild 2214 BLAKE2B 5d2003fadd0af8870610f10f0f5f1ff310de209e9efe83606ea781cba75f38033eed23edfd03b3b2f2291e48c95387949dd35600c76a850d1f6590d98ef5441f SHA512 c57222375a9135a00053ad05567658ab5c108015733e23b2aeb89e4ef93a835e3df3db9b65d3f01dddc38336d97bca366a4e1972c7d44471cf6a47c3913cebc4
-EBUILD tox-0.2.5.ebuild 2087 BLAKE2B 0518bf2d70a2390bfc92397c864f54c9612d0346dd0752a7b8c6259242518b2c57d4df3cc17b34ed7b6780d76bdb7e1f2e347fe4fe379f0975fbb079aac02ff6 SHA512 574c84ed7ccbeb7480ad7f2140d4ca1e703f44be05f60c24a7aeb5a1c843798017a9615905e7ab619bb1af7a70b179a53523a606f9e22b370a5c723664afe6f8
 EBUILD tox-0.2.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0
-EBUILD tox-9999.ebuild 1794 BLAKE2B ec371c542ac51f12bda1b26e59716a766d1e7824d3203288064c3fda280d891c2429a7b7e0c26b840981187bdb0568103bd012bcd1e676a3c3878e42a209e9cd SHA512 b3a45120acc50594bb2f66dc4dc13f638e5cda5500f666a1b68ce2e0fd53637dfd36530a2eac370da01b4bb4e86cc7a7ac7750194ee5f31de22a116256ef7756
-MISC metadata.xml 934 BLAKE2B 65fb020f4e90f8cdd707add853106090ccd4196c072ca894de568016c95b4e2e35ec778cfee5a93fcbed0b8775d47710802c3565f1497f813e5c728f50db44ed SHA512 e84aee8e455301ab196b591ebc2eddfb11bd5a06e6309d6a22383236ad0b8718f8791f1725387e3049e1ba82c02a2a8b986dd4fb5e1a5e63979443c6ad935b5d
+EBUILD tox-9999.ebuild 1803 BLAKE2B 68f3351d491a75643265226fc47e90d23e44cc66f772fe859cff87fcd6b88ced56ffead16ebef992701d023bcd97edd7be45b4075ec72b5afd37b91488b22d01 SHA512 f5dc655a65c4f5f6566008367208d71e017889136e02ad0f023b5a065e3b719c447c9918a3673ce6e9b4c8b0cffdcf7e81b0ca6f701f97b21f3ac04b340ba083
+MISC metadata.xml 875 BLAKE2B 0768a021d85945b52d6b62b91b7c374ac97824842f807f66e6dafa9a95a2701cad54b4c41cba8d567848dc5815d1b52ebd670d23699feb8dfe434b7ef0a20950 SHA512 d0cb0ec14129a7c6ddfc4743fc8ebd2e3ac21b0f01738a4a7f2f3a59a6e062097b046764fe8f6e868c6bf6a56041b750bf769c4451eb5265825fb918cde611f4
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 99359c3fc50a..4c464531d0ba 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="log-info">Log level: 3</flag>
 		<flag name="log-debug">Log level: 4</flag>
 		<flag name="log-trace">Log level: 5</flag>
-		<flag name="ntox">Enable the testing nTox client.</flag>
 		<flag name="daemon">Enable the DHT Bootstrap Daemon.</flag>
 	</use>
 	<upstream>
diff --git a/net-libs/tox/tox-0.1.10.ebuild b/net-libs/tox/tox-0.1.10.ebuild
deleted file mode 100644
index ce36d2840170..000000000000
--- a/net-libs/tox/tox-0.1.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user
-
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/c-toxcore-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+av daemon log-debug log-error log-info log-trace log-warn +no-log ntox static-libs test"
-
-REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )"
-
-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"
-
-S="${WORKDIR}/c-toxcore-${PV}"
-
-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)
-}
-
-src_install() {
-	default
-	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 ${PN}
-		enewuser ${PN} -1 -1 -1 ${PN}
-		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 reinstall net-libs/tox"
-		fi
-	fi
-}
diff --git a/net-libs/tox/tox-0.2.5.ebuild b/net-libs/tox/tox-0.2.5.ebuild
deleted file mode 100644
index 71e771406fa3..000000000000
--- a/net-libs/tox/tox-0.2.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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 6480c17e2cc6..3c267ef0e1e2 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	av? ( media-libs/libvpx:=
 		media-libs/opus )
 	daemon? ( dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom]"
+	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index cf1ecbce695f..8b2239d7cbd1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
+DIST webkitgtk-2.22.4.tar.xz 16752132 BLAKE2B a60f1c6168ba1ef19c931030017a58a640f0ff4a8d5bf97b278fff50f86374d5e10e06d95837e90c5a653a4c226095321ae86fdd64e61d846821979343b7350b SHA512 a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f
 EBUILD webkit-gtk-2.22.2.ebuild 8125 BLAKE2B 0997d124840b3a57d57b685c98b87ff38f6999c632faeb81297713e48f0f5bde97a876b2ba68effab319111c979b474fed5e7c1204926005b6216770bcccca95 SHA512 b05263a65622920e6d16df475bc413314ea80d7afcf3c7beaba0ce7ff257fc364582729d915cdbb9cfbfd110a10d68efb61912e998115b6a96abd2cc6886e5b0
+EBUILD webkit-gtk-2.22.4.ebuild 8352 BLAKE2B 26bf2060a808a3ff02f427774a57eafa36482d3f1131b787f0c9b6cf96d24f5554edc80e20428fd822456f640352150f824e48f4b3a996f8977cc797a2c209fa SHA512 948e181817faa73c0e2677897d8868933fa53255701d77444588a90c45f4f5e35a2a7d89198ac0f452b3105126a1067b7d791d9235742f6ab61f29b010de19b4
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
new file mode 100644
index 000000000000..3b79a2603968
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+# Review on bumps if fixed upstream and adjust accordingly:
+# non-GL builds are broken - https://bugs.webkit.org/show_bug.cgi?id=191997
+# GstreamerGL gets built even with GL disabled (thus requiring opengl or gles2 with gstreamer) - https://bugs.webkit.org/show_bug.cgi?id=191998
+REQUIRED_USE="
+	^^ ( opengl gles2 )
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 2f203dae8bd5..c3f01604ad03 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -10,5 +10,5 @@ DIST xrootd-4.5.0.tar.gz 2172752 BLAKE2B 0e1251f9b064e5bf5e0bf9df0575a9605c4437e
 DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
 EBUILD xrootd-4.4.0.ebuild 2000 BLAKE2B 8734736459d1058c63f0719d304bf832854b2d4e880bee58de1626c7b0d81913793bbaf910991df25a6aadcc08d6e99dcb214849bd908139b9cf47e92f39e135 SHA512 1330f545925b50a3be116ef6ecb9fe28bdf1afa3da77527c9903d7a9dc403824905cb9c18febe581bc37589e80b8a14066a02e6f895f04c54b0e138d761442dd
 EBUILD xrootd-4.5.0.ebuild 2602 BLAKE2B ffaedff2f1b50f2fc3950f771f80365f3dd239704d37ee93de4cd8eb60e066c8a542615b85f7ce1b9775ccb48d41d6223fcfe56ee750623e3daba2c430465e25 SHA512 594dfc5e60edfc965b8ed82ddda1f112b96d9ec5dab5adcf911d45ba4ed276cbb37a31532c0f3d1b1d251abe440557df8b7338628f0bd2a5c62c778e48c68892
-EBUILD xrootd-4.8.3.ebuild 2598 BLAKE2B a871ab01d2e84b74948090ab93c88015e99e77fd29cfb9c686adf376953ca4b329b8345434755446478a9cf085e72c15dff07cbbb8353a61ceb199b615fb0c54 SHA512 d7fe4f320806598da1fa487b56cca952efdc092a38958e9c902880ac8dfd4d347c04538aa7d6e4b7c4541af2939ea49adaed648af8af71389c1e0fb23c3f66d6
+EBUILD xrootd-4.8.3.ebuild 2593 BLAKE2B e0aef6a1c55d34fc4175e4f57acf99083f208ea0283b49c988de16d58176c8e63b5bbdf8378361be34313b5a3734d6d362c64d02b723cd56b903bf655f72b0de SHA512 75526b8954ceba00889d4649b01f0995c758998bdc4b11af5d11f826bbd7319e112b368997ee144aee8299a74d5ee38ac3732621faed9b75ecb4cd6afe518a9b
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild
index e43d7d367bd6..86a04bc9126d 100644
--- a/net-libs/xrootd/xrootd-4.8.3.ebuild
+++ b/net-libs/xrootd/xrootd-4.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline rbd ssl test"
 
 CDEPEND="
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 11174983fe7b..65aee93cdf9b 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -12,6 +12,7 @@ DIST zeromq-4.2.1.tar.gz 1243428 BLAKE2B 2112f127d5e9624861adad455e77c21b17db091
 DIST zeromq-4.2.2.tar.gz 1236437 BLAKE2B 7104f8ad28cc00f1ba6d6cb5dbb9aa466971c73a513e206eee77db293f4e4845106910d539363dc0c21de7e83885056453a530c941c38e19c5ec1fa836e1bca0 SHA512 d78813a61ce3311a1f8c230f7da0f5aedc97ef4b792afb6d398c5710da239348c0c7a67bdfeb38a7ab0282af498f1ed173649aff4add1bc35f0ef1b66f965443
 DIST zeromq-4.2.3.tar.gz 1326780 BLAKE2B f76ff6461e5a180221b1fff471e795a457fe4f26ec1ca725438aff4e240be7da80e42b2aea49845b5712e1d63590f64bc681f9a793bcf4d32fe0ee08bcab482c SHA512 8ac588a7a4db9d65586dd7b501999edac151e1d03056c1014d7ded6cd4bcf5bb4f81252b47d89d60c3ad7d527685218992bf5853b4656c0702e0f64c2d77712b
 DIST zeromq-4.2.5.tar.gz 1409447 BLAKE2B 9309cff20192c4e0d9e34992cc3168c219ae63e8258362483d15f3315436324454603739393d2fa2628fb4cf7a94954c1643de07c3a28e86933fcd53aa2e0fac SHA512 4556cb50d05a6d133015a0ba804d6d951a47479a33fa29561eaeecb93d48b7bb6477365d0986c38b779f500cadaf08522c4a7aa13f5510303bd923f794d37036
+DIST zeromq-4.3.0.tar.gz 1487771 BLAKE2B 3783eb2505c2e42fc2c03cd9a280b0e2a70758d4046bd0c5b0f43a5a0630655ff06665c30fdfe222fb077ff966a9d5e0c762f65370804dee2eb25fa8215d5e2b SHA512 593239f66c4157e596874832378c9405d79c915a5895503bdbc87304df0ab49311b96f92ba6492396b4bf25d2007689099730995f7c335a51fbf42a9aafb02e4
 EBUILD zeromq-2.2.0.ebuild 1290 BLAKE2B 41766c48411cb623c574f20b72d9190877c0f4a53708c132863986059b620f0175a46fa3ed840dcc38298419642f186124289db64bbc9c092dfd896788c26eb7 SHA512 83c7f2b4f30aa15b44c2761c879762cb8cef3e19ba84f9bc95ab6e8f7bb0e3d01c0fbf91688be12ac662c231929793544d7769f2dafcec718f2e22764b76b9a0
 EBUILD zeromq-3.2.3.ebuild 1520 BLAKE2B 81d008fa3fab31485ee72e5669479f7a730b14c2f20af29dd51e9bda168ee4dba9057a43214addec88f6b6c5960899898351b234f352464854a63a79b0d0fbe7 SHA512 1bb6da7c444a4377fe716d6a0702d12b2e23128418cd38820d2093da7bf0b14d9a3d7e85b17e283ec49bdedf5f5214d6723b23869d431c8fff82b816d3499fc4
 EBUILD zeromq-3.2.5.ebuild 1469 BLAKE2B 0c63cffa55d6ce54d430dfd3f4997f1426a80aec72e5778cdb3ba833c383d2c5d487824bda6ab413c7750de790755f266d3c69b79f8cdf6ae982fde417fb95d9 SHA512 85a0a5c8184dcafaa29d93e59568fb569ef015fc2f1cd7c26bd5c66f0333050c04505587e6922691641d43b679c34eac13dd7ced4cd2955a5c2e926ad559bfbc
@@ -24,4 +25,5 @@ EBUILD zeromq-4.2.2-r2.ebuild 1552 BLAKE2B d1191b9f59fa5aafd1a0520d5a342db4241c9
 EBUILD zeromq-4.2.2.ebuild 1217 BLAKE2B 9de51f8af0843322ca7aead2aca32e7b6b862b0299e62ab2678d2893740ccc964db6e1be93554469af84f9f97502b9bdfb36f61c4075d32d2fa2c5f571b5b350 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c
 EBUILD zeromq-4.2.3.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
 EBUILD zeromq-4.2.5.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
+EBUILD zeromq-4.3.0.ebuild 1430 BLAKE2B e239c8fadbccfd4d5082d000b42abeecc634a50ebbf59283da0710b2ab14b2f1585b7b79405d8fa796a17a74c6ade7918a49c5d1da372624f97e2c1bb952dd62 SHA512 e11c18a78347646c7fabd462318e04c0ec223514215f5fb80eef74f46f80c33497f0edbb1ca51af798bbb6575bb6a0466d313c40853789252b46257e72c976e0
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.0.ebuild b/net-libs/zeromq/zeromq-4.3.0.ebuild
new file mode 100644
index 000000000000..8c81542fae61
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+
+RDEPEND="
+	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+	sodium? ( dev-libs/libsodium:= )
+	pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+	!elibc_Darwin? ( sys-apps/util-linux )
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	pgm? ( virtual/pkgconfig )"
+
+PATCHES=()
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable drafts)
+		$(use_enable static-libs static)
+		$(use_enable unwind libunwind)
+		$(use_with sodium libsodium)
+		$(use_with pgm)
+		$(use_with doc docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Restricting to one job because multiple tests are using the same port.
+	# Upstream knows the problem and says it doesn't support parallel test
+	# execution, see ${S}/INSTALL.
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-libs
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)