gentoo resync : 16.02.1018

32 files changed, 502 insertions, 218 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 654238579a83..b3f27e6d710f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
index 329ed1d92870..434b2f40e0f5 100644
--- a/net-libs/ccrtp/Manifest
+++ b/net-libs/ccrtp/Manifest
@@ -1,5 +1,5 @@
 DIST ccrtp-2.0.9.tar.gz 751786 BLAKE2B afa105375a95cffc649704915e0532b20af2188186a6f7d9459285996dfcf583fd2cc1be8e4dc917d4a1acf4022d13db95c617710a2a13a9da9b7badab257fba SHA512 2e63a049ead5bd8a2f3c65d3badb6d6b2a20e185698f62ea9f7e559e8d0aac6151e7a314317d63ea33282c891d75af32571da3471254600abea462097c47dfe3
 DIST ccrtp-2.1.2.tar.gz 764869 BLAKE2B 8fc3aa22e715078dae64407da8b8c2dc6740994dad7bf7dab6369b1708e6261619107dd7484b1ec801b7a8bbb30d3387d8fab9c3503adf09209b2b8aeb6df56d SHA512 a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9
 EBUILD ccrtp-2.0.9.ebuild 1094 BLAKE2B db56a4a22024aa65cc8cc80c92156d29df1057ce4a9d2b0a83bd77815a2d92314140cea73653a76e03af8b4cc1fb9699cbd00fd304ef785a30c85e59810adc12 SHA512 b7e86d6d707151f4bda0cb5fd22cae8a1fdade7cd6d4e7fbd821fade8d4cbe446b1da2fb4bc878bd4837eb03b1ad1998ca2cc08c5f124b4d995270845aa4038e
-EBUILD ccrtp-2.1.2.ebuild 667 BLAKE2B 5ac5b4ffdb0a8138b0c6a608b44cbb4e6f61c219cb2c4e41d1384dd1b61b85807c90e861492ef4f2e3ad684596d743aa6876ce81734ebaab7a11f36722871bac SHA512 262ed129e83a9e757196078a98a0f4b91f255498744d4619a7cf25893b5404c2b38f4967548ac3edfa947d97d1e8fcebdaf6e8ef2b8f3f61afd47ff22ce052a1
+EBUILD ccrtp-2.1.2.ebuild 665 BLAKE2B a6a192169ddf20c649bcf388c246a6c9437a8b9d6a05c1b0f981c6c118a2430a4fed90bc08c772c61ba9b1a8a03ae9d7ead41a3081e87c7c8479bc6d99e6a256 SHA512 bdf29138f4f548c55181392ea3b88df27c704028853491093b8c5cb0c1245b12bc21561291ff076dfba8a8582d314c0f4e7fa8398f517166da11893400ac4be1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/ccrtp/ccrtp-2.1.2.ebuild b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
index 0ed701175c1c..3a37c3fa5214 100644
--- a/net-libs/ccrtp/ccrtp-2.1.2.ebuild
+++ b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="GNU ccRTP - Implementation of the IETF real-time transport protocol
 HOMEPAGE="https://www.gnu.org/software/ccrtp/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2"
 IUSE="doc"
 SLOT="0/2"
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 1a3c5831d2c0..27838d05b714 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,5 +1,5 @@
 DIST cvm-0.76.tar.gz 91957 BLAKE2B 4b1ff780fa0842f2dba7afafe98479b76b95c3dc71ea3fe0321c92039697fde1fa69a99ee78450cadae6b23941344c48f4d4c845f9c3fcc8a69a5f8f208fbee6 SHA512 f3634be766e1381a95c09514547679f458e92b5f4de468b5d3b4e5f7e8f1eb8d1aa7eb5e2b15a374cbf51cc5f6e6269e7f5e7d9daf8d2adfaed37d2e11f472fa
 DIST cvm-0.96.tar.gz 127999 BLAKE2B bf6a0f26538f4f10dafe9d021e6f3ef22ee57230f64cf50cba95be3cb5ddf54a0479d033936d26ee9526745ead61fc6af7bfd1fdc3da10a6915108b2d873772c SHA512 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d
 EBUILD cvm-0.76.ebuild 1451 BLAKE2B a869b351583def10291ee6f19ac8602fab654dcac0dfa9e09cc7003afe795a97a7d64243a1d331eb78a27781c6e57532f39298704b57a0a719bf8714760f2761 SHA512 e0cdea110fa6acff28b95bb9eede58dd63dc4dfd9c6c22aa9ae2c2ede0b8d926d5f4adf458be62054358aad5f9329ea9b64441ca0dada3b60d825ae4fd956eb2
-EBUILD cvm-0.96.ebuild 2986 BLAKE2B 49803d2d8b654ed62b5f06c792c0c2a0804641a5cfd4638743ebb52ee6cd610111951a1dcfe5840319ea39bb74d7d7cd451060a40dd2c5885d345593b3123baa SHA512 f01eb0a15617e1394c0f9de3094f9f625206a10c52d123116090252fa4ee2075147246c93e04455a784c9eb71147a0c8655eda4a5b784cc3bcd647dcfbeb496d
+EBUILD cvm-0.96-r1.ebuild 2952 BLAKE2B 12224e99a5bf7ae32b85fd2ac30bb961e882130e909f10f0854ae4b973fc3a9357a008b200ff68aad5cc5c3b00e2896325fc2438c1038941a4ad3de32986db78 SHA512 9fa0300955f8bacc4f68ca8fe4b9a047fea132d7f5842c4b3892bed5706e21f968617e25be24b0a1ac9acf38c37d35115427797006a6f912d4338609a6f63ccf
 MISC metadata.xml 296 BLAKE2B bdd092a7e715a03179775af2fcaf170ac7ad4d640812b29d347484bbb986e09b429365201112a409b97b8d40615e561958da79e1acfdbb783ec3e6db30d41109 SHA512 75d265987a3c3e83685a00d760965bc8e4e796429017c05642de2fcda4e37891dd06386df57dfe2d0e2b294916316389a1d72dc09e9feebdf5db3abe2626e34b
diff --git a/net-libs/cvm/cvm-0.96.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild
index 1317cf1ef901..c31bc931cc8e 100644
--- a/net-libs/cvm/cvm-0.96.ebuild
+++ b/net-libs/cvm/cvm-0.96-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Credential Validation Modules by Bruce Guenter"
 HOMEPAGE="http://untroubled.org/cvm/"
@@ -17,16 +17,16 @@ IUSE="mysql postgres test vpopmail"
 RDEPEND="dev-db/cdb"
 DEPEND="${RDEPEND}
 		>=dev-libs/bglibs-1.041
-		mysql? ( virtual/mysql )
+		mysql? ( dev-db/mysql-connector-c:0= )
 		postgres? ( dev-db/postgresql[server] )
 		vpopmail? ( net-mail/vpopmail )
-		test? ( app-editors/vim )"
-# some of the testcases use ex/vi/xxd
+		test? ( app-editors/vim dev-db/cdb )"
+# some of the testcases use ex/vi/xxd and cdbmake
 
 MAKEOPTS="${MAKEOPTS} -j1" #310843
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	# disable this test, as it breaks under Portage
 	# and there is no easy fix
 	sed -i.orig \
@@ -47,35 +47,39 @@ src_unpack() {
 		|| die "Failed to fix vpopmail compiling parts of Makefile"
 }
 
-src_compile() {
+src_configure() {
 	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/lib/bglibs" > conf-bglibs
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
 	echo "/usr/include" > conf-include
-	echo "/usr/lib" > conf-lib
+	echo "/usr/$(get_libdir)" > conf-lib
 	echo "/usr/bin" > conf-bin
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
-	emake || die
+}
+
+src_compile() {
+	emake
 
 	if use mysql; then
 		einfo "Building MySQL support"
-		emake mysql || die "making mysql support failed"
+		emake mysql
 	fi
 
 	if use postgres; then
 		einfo "Building Postgresql support"
-		emake pgsql || die "making postgres support failed"
+		emake pgsql
 	fi
 
 	if use vpopmail; then
 		einfo "Building vpopmail support"
-		emake cvm-vchkpw || die "making vpopmail support failed"
+		emake cvm-vchkpw
 	fi
 }
 
 src_install() {
 	# Upstreams installer is incredibly broken
-	dolib .libs/*.a .libs/*.so.*
+	dolib.a .libs/*.a
+	dolib.so .libs/*.so.*
 	for i in a so ; do
 		dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
 	done
@@ -97,7 +101,8 @@ src_install() {
 	dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
 	dodoc README{,.vchkpw,.vmailmgr}
 	dodoc TODO VERSION ChangeLog*
-	dohtml *.html
+	docinto html
+	dodoc *.html
 }
 
 src_test() {
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 67dc127537ce..6597c8324348 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,7 +1,5 @@
 DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d
 DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df
-DIST enet-1.3.7.tar.gz 522150 BLAKE2B 8a2efee0aec375dc4f9e3594c81ce7d6b8ba846ac75ed9e9e03175db39c6b1bce6ad62782d4bb5a0fc0dfdf4574d6e8c52b45cf2a84d72aaca16fc40787fb111 SHA512 b715347d94d8c5361033002e366f2cd7b8dd263faf7e84bd3d120de770f85025749fed4325c08f12d27875a112fb534a0464f8776bea6c3df2f048b57e5623f0
 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
+EBUILD enet-1.3.13.ebuild 530 BLAKE2B 53af170e6952a7e6f1c89bb1be04b203e16e4b22d31c23a82fa5bc6a1a24f78d3434de9ee6cce91b146c6b96cf3e8ca11fefd914ad3b3057bd7093136e93864f SHA512 2677184040fbdf4367c8a3ad471f1c89c566467e49b5de434558bbde555e071ee80cc1191211a4ef78c61ae1a19753bc522d4bc42b41032458a6e380cd44c296
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
index f69c8392ee09..fca54e453524 100644
--- a/net-libs/enet/enet-1.3.13.ebuild
+++ b/net-libs/enet/enet-1.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.3/7"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="!${CATEGORY}/${PN}:0"
diff --git a/net-libs/enet/enet-1.3.7.ebuild b/net-libs/enet/enet-1.3.7.ebuild
deleted file mode 100644
index 262a049a6b4b..000000000000
--- a/net-libs/enet/enet-1.3.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base
-
-DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
-HOMEPAGE="http://enet.bespin.org/"
-SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.3/2.2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="!${CATEGORY}/${PN}:0"
-
-DOCS=( "ChangeLog" "README" )
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	base_src_install
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + || die
-	fi
-}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index c2048ec6559e..a9b0cd5fc16a 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -4,5 +4,5 @@ DIST glib-networking-2.54.1.tar.xz 441232 BLAKE2B 4697ac5fe248d12839d2a3c1340e2e
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 EBUILD glib-networking-2.50.0.ebuild 2298 BLAKE2B 0426bb0f2248be977e20c1f3f95df7283e56c08969f4f2ffe6b20dfa34b91bbe3d37200574f9e708803a4f8eeae450ce4a3ef2ec7028ac0ba76791225c755292 SHA512 9e84588bde50d6b13f36ffc0e0e906639eb38bcd4c0282fe531a42adffaca7a199b678f59878f443058a4b9489cd31eccab7a153f421d61f350433eaa58b7993
 EBUILD glib-networking-2.54.1.ebuild 2339 BLAKE2B 2d80998dbfd0e21a05a4beb5e2afde8bdb1ac91c4c2f173d92cca248e70e45cdee7757e77494c0d70bc79961003fc108dbfd1b3810e253255731d928dcce1cb7 SHA512 426b115c6b91429be6cd428645bd9810c0e9a655a88ce0f913c4861bf174e960d16b1cf5d3b378d1469fdc4a18516ac36b007e26c3d6886bb7fe2f6eb3eedc41
-EBUILD glib-networking-2.58.0.ebuild 1961 BLAKE2B 3fac1f4ee1dcb32c2e76c5a8a6a0aeb3edcabecb23a182753e70181d07968396697d58dd7eb3eddc7eba82c0f1dac37fb7d3ae7c8d27bb0d04cfb1da70a5c46d SHA512 de25a7c243c893a2dcc7f8eea3424c9e2a8951f27877c126f0d67c2862a7cce1ec279bbaad62e99cb076d9829af2271b01dc25cb5198e64d5c2288e37cc023a5
+EBUILD glib-networking-2.58.0.ebuild 1960 BLAKE2B 1896b53c5897d7f092b283098f7420f501815aaf1d12ac1dfae5e40d52f9c935951841652faa0e0f4c42be35ad6d904172d84458a909474e9bf01da719b58283 SHA512 b8b4e94af319b7434f0e35415cdc892509adb341ca6db390b873fee20ea2f024a723bdc2bf364f6e5ce1c2739ddcaaf65df0760f835f96c8672b4a78ebc76473
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
index ebfaaa633e5d..bfdc90f80243 100644
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~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"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 3cfc8baac313..af0fa0345011 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -2,9 +2,7 @@ AUX 3.24.5-glib-2.58-compat.patch 13110 BLAKE2B ee88709637098119bfb3329ab8c1d8ff
 AUX 3.28.0-glib-2.58-compat.patch 13027 BLAKE2B 5608538740ca2ab693429dca9a22b9aee010c8f91b6e4819fa980d0be6d02ff735e4571749e8c95d6274bffc9f5b81348b6af76ed2602dd6e86776558ef81576 SHA512 119f6f7d5362c3f4783aecce07d0dda2ba3accbadfe1aff6ee1a69b930454a516b65020ae29e2be01021f5ec63a7fa6640be9a169372965c26339f306442feb0
 AUX glib-2.58-compat2.patch 1361 BLAKE2B 85c6243812c58a759c710a3e3238d0383067381da0a39462006670702b57b89d3ca5915219747279500d89d205a94fd92d58c1ebee0514674d5d21c9d6b4dfe4 SHA512 3fc4180ee317338e1ac8def03c9a0779f0823431ee7de63fa2e15ff46b5d003ff1e7ebca6701a472814d7fe9289bc58a53f560f7c547b6c1b9b1585e0c8f7bbf
 DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4
-DIST gnome-online-accounts-3.28.0.tar.xz 1531200 BLAKE2B 104429ab97647c2b006c4f95f803d8be8f2d2a91b06f2b145b126b1ab34253c8870ed9f8a3b5be307cae3fc55a4894cb1e9479c680d1c14a558d525d962bcf01 SHA512 b5f83544aca0cd24dbc778a492e0da4ca82eb6acaab375daaf7aa1482acfd31c1ba82c1afc127a8890a63e883ac8a1f277da906819573d672d2d3da7f582c02b
-DIST gnome-online-accounts-3.28.1.tar.xz 1539480 BLAKE2B f4d842025c9c55de70f4d613c6193cdbd387e20f167c61cc52b36c0080da6b9e9a45fc4f8452cfd0a573395ddfd513b984910f3c5d802ef2979041db7a2a8203 SHA512 66cfc8a0e193bf4eaf49fecb15e166b2c565c3c164b8de1d191fc7c966d6cfdb19d662dd0bd0b6b80e3b6a7680796aa6d54700b9002b4cae4fe919bb681a8f06
+DIST gnome-online-accounts-3.28.2.tar.xz 1539640 BLAKE2B ff0e5b5a82617c2f8b53ff51dd6651465e8c9da14a1d484e29c97b17d612fdc535d35855c197da2c826f38e4500b117efbfc929e56318feb58fcc38fdb645a1f SHA512 6fac52c939598817bb3ca44b2e3281c98e3c74d8de5aed30e5ac61187392116393d09a0f900d9e45b0e723a90475dca7edc576a9d567a3fb716b0801e36350ca
 EBUILD gnome-online-accounts-3.24.5.ebuild 2564 BLAKE2B 3079163a311a3cb7284649ddacf36d303263ec2b7fde638724be5f27f69c3c85b6533ed2a2898f4ab85c2a60762d58c7e69fcfef61d9f428f9653b4c974997b1 SHA512 ef3cebd5b5c97524941f40289daf0e6aaef07ae0821ae5be05806fb95f77ff82e2a72033cf541d4badd4b1b8dbbc12d701f2ae93ab6cc76f5f241c11baaf5087
-EBUILD gnome-online-accounts-3.28.0.ebuild 2553 BLAKE2B b9cc26dbf86975f4a7188196c6cd0b4923285ee0c214cb56624d5291c2bc8349a5b1f62afc5eef6842af9a5203ab2a8b4ad7d5ffcfdbc4e1956e1b1cd80a41cf SHA512 9f8ff4145a958dfecd96f4e07ea9cea2b0a47dfb362f97359f330786180a7e852b17f32bed0ada41b4728983611302774cb323c7a19a598dd185de0d8e15917a
-EBUILD gnome-online-accounts-3.28.1.ebuild 2554 BLAKE2B 9e8ac9b06d7fb93d5b8e776006f085011668c67bfed1ef52b8f868a87024e0836dee827009f4a9c9d26af42700943ec00e358194e5e31578ffee0f8edd425c57 SHA512 750d3170ebdcb35630a226e9aa094a6d50026f0c734417270faf69a182efe8d4e0e1c42a30576a0955827953df6d4329a68cce75d7a80f30fd4846f27de3b20e
+EBUILD gnome-online-accounts-3.28.2.ebuild 2554 BLAKE2B 9e8ac9b06d7fb93d5b8e776006f085011668c67bfed1ef52b8f868a87024e0836dee827009f4a9c9d26af42700943ec00e358194e5e31578ffee0f8edd425c57 SHA512 750d3170ebdcb35630a226e9aa094a6d50026f0c734417270faf69a182efe8d4e0e1c42a30576a0955827953df6d4329a68cce75d7a80f30fd4846f27de3b20e
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.0.ebuild
deleted file mode 100644
index ab348f42c0fb..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.52: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.12.0: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
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-glib-2.58-compat.patch
-	"${FILESDIR}"/glib-2.58-compat2.patch
-)
-
-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 - now default disabled upstream - revisit soon
-	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-todoist \
-		--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.28.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.2.ebuild
index 7631b7086b50..7631b7086b50 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.28.2.ebuild
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index ab1845da1d09..c372a7d59c24 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -3,9 +3,9 @@ AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6
 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.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.77.zip 32495225 BLAKE2B 96d1d629eddfa470b53412f15fdb1ffdcc53bcda257ef4ed9c93b3da56cb1627fb98bed81108eb8344e6dbefa2b93c7cf9d9372186590c9a9668044eac9217e8 SHA512 3c03bd32ed9e6368f8483ff7979d2a75361f60f475a4b99b6d3a7d371719c254671d49177c70dd1538075a5e96b3e398d1d301e4fa66cb5979441b6bd6c60fd8
 DIST gsoap_2.8.78.zip 32507212 BLAKE2B 8e173cb447dd918fa83673ad9a8ef26ca78dfba0cb8ae2fc81bae23f7a0548d52dddfc0e4f02719833aa302a02ac8d069bc1356b424097802ab0299f0453a58c SHA512 c115044d2662c2dd355c4756a974a0013b7213dd28c536aba179e53c19466279bfa34ce16b4426db5aa7a24d94c18e0ed7e7cdf05e799bf89f7b54031aa0874e
+DIST gsoap_2.8.79.zip 32686007 BLAKE2B 393a48b951cacc48bd6b58b0520b2d52984d0442e376a87404915117d90c2cabbf58e633ff113851b860d7b66febaec5804e65ae6cc2f86d854e1616ff1bdfc7 SHA512 9164d3f7bf60aa6d6a0e3c99334fac749ed595efce6612345d0df2ff867bfe8d2df75af9e54a4f084846e580647e09969c79fa67f9807a92b2555ff9141d2c19
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.77.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 EBUILD gsoap-2.8.78.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+EBUILD gsoap-2.8.79.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.77.ebuild b/net-libs/gsoap/gsoap-2.8.79.ebuild
index a36f6c5466c9..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.77.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.79.ebuild
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index 2e23fb9bcd80..0fffbe162211 100644
--- a/net-libs/libasyncns/Manifest
+++ b/net-libs/libasyncns/Manifest
@@ -2,5 +2,5 @@ AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6da
 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0
 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7
 EBUILD libasyncns-0.8-r3.ebuild 1359 BLAKE2B 58816386aa8c19b7d6ea042c3e8f5bde7ab94262b666828a60b799c5f20cde6b177262bcde52b44d0a256b2e1b5175beb7b0975bce4afd63191304bf5142497d SHA512 4f391029eee067d8f0b97064ba636544d0b5d38e1346d8a273305940caa0e727f58644fce68d1092b988bffe56cd3d69779bcd62d9f686f076af7a5a1957a64e
-EBUILD libasyncns-0.8-r4.ebuild 1496 BLAKE2B 8b98b935ed53b0b253859d7249f22772206e9f647f4065d974d3a2bbe88e22e2dcde725c1a9f1c362297eb279c1b107f566541bf2ae5d315c781f3840ef139ad SHA512 482faf372b26c26f323adb2ff2cd0c104b72a7a7559587eff4d072db2916f643b3094b5930f49dd83ab89586cfdc79a17818c4699484e6daed2794d36bcd9cc9
+EBUILD libasyncns-0.8-r4.ebuild 1383 BLAKE2B 94aef724b5feccc2c8c544a7cc8a287e2a1e4129548b6c70200c66fbc5a0807b6a33881039f128f3747f17fc63671581f912a8625e81baee1fc143f1266dd931 SHA512 598a765260c8d255c370acd3b7df0dc43b54c304f02b6af1145c138b4c0a2a6070c876461ca1c5499ab8a904a1d1baa0ff3146c6f8a2ba1f54c9a3cbc40b8129
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index 73535f3dd2b4..4d10bdbdf781 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib eutils flag-o-matic libtool multilib multilib-minimal
+EAPI=7
+inherit autotools flag-o-matic multilib-minimal
 
 DESCRIPTION="C library for executing name service queries asynchronously"
 HOMEPAGE="http://0pointer.de/lennart/projects/libasyncns/"
@@ -19,10 +19,11 @@ RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
+	default
 	# fix libdir in pkgconfig file
-	epatch "${FILESDIR}/${P}-libdir.patch"
+	eapply "${FILESDIR}/${P}-libdir.patch"
 	# fix configure check for res_query
-	epatch "${FILESDIR}/${P}-configure-res_query.patch"
+	eapply "${FILESDIR}/${P}-configure-res_query.patch"
 	eautoreconf
 }
 
@@ -34,13 +35,12 @@ multilib_src_configure() {
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-dependency-tracking \
 		--disable-lynx \
 		--disable-static
 }
 
 multilib_src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if multilib_is_native_abi && use doc; then
 		doxygen doxygen/doxygen.conf || die "doxygen failed"
@@ -48,7 +48,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use doc; then
 		docinto apidocs
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index a9436c2f7d9f..b791960d334b 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,6 +1,5 @@
 AUX libgssglue-0.3-protos.patch 415 BLAKE2B 1c9a1592070eeeb3189ab7a64381f85c79fc8676b1efd744da70768767741ba1e3978c8dde7762c9c22e4de98c0d1e523d5bfd28efb7e5f97e5404e37dbdd183 SHA512 0993ce5908d1388490c195cd7da7950d019ac2937e4aa374dad515b12c9775ebbc578f2635b508b333fd8f961b4f8816db7c5e4891ace07f042c7ea6588c0307
 AUX libgssglue-0.4-implicit-declarations.patch 474 BLAKE2B 578c3306d1dc40165d20485dabac62f1a0d211e0ad3e0d54f79f7330c3ec7c26b0271345124b459eb576571735c9e3ec79687c1fce433fba5501a2b9ff59fcf9 SHA512 1a76bb2b53baa8277e117d8161cf186c569ae1d2e8f368a17378b33fb623e0be8b76ef6c36d413054d5501f344093be7691ea6e042b6367619de6079cd116c07
 DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
-EBUILD libgssglue-0.4-r1.ebuild 899 BLAKE2B fec75783cad991bd953ef2e49af0fcddff6289c803fb4c05367b3d8e1256cddd3074f0fdfceeca32b8d083ea708fa7f485217843fa0658bd00f53211cdaa80e7 SHA512 1ce86309dd2c27feac45dce085a14a03291427e7668d94ed8b86e74498ea63a02e6a96af70745f6f73d0381dd1c57c2c5c27e6ffb5af4834f6ddcc7767bb28a2
-EBUILD libgssglue-0.4.ebuild 846 BLAKE2B 677236531187898c9d41dc876edcbed31d1a313aa06efb48338c3725c4c638f532a845bb9f5eb41142952c12379f11991981fa92e9b6fd080dbdf707d769a3df SHA512 d9140d4acb46c2b0fdc7e2ce8e071c65bfb428007e07d2d627ef6ca3148c373a97bbd7f96de01465802684353f2ebb439e03927cf2d38a1190a136c06192c729
+EBUILD libgssglue-0.4-r1.ebuild 895 BLAKE2B 1513c78dabb7c1435e69feed494f1fc55657ff8b64db9ef6181946f16bb929e1778a9e763e2adca0b8fc0bb8011cb4fc490f56f7e3118aeae1a9744babce57a9 SHA512 dd10b3fcf99559ef6c858dfac75a39d8945c8fccce217fa22924160f049de0aca780a8be957ed41bf39448617573040319d76e25f407bf8d0c63fea001182e72
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
index 4e3c5bb0c2b1..452961467a84 100644
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="!app-crypt/libgssapi"
diff --git a/net-libs/libgssglue/libgssglue-0.4.ebuild b/net-libs/libgssglue/libgssglue-0.4.ebuild
deleted file mode 100644
index 675f34544c74..000000000000
--- a/net-libs/libgssglue/libgssglue-0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="exports a gssapi interface which calls other random gssapi libraries"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="!app-crypt/libgssapi"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.3-protos.patch \
-		"${FILESDIR}"/${PN}-0.4-implicit-declarations.patch
-}
-
-src_configure() {
-	# No need to install static libraries, as it uses libdl
-	econf --disable-static
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	insinto /etc
-	doins doc/gssapi_mech.conf
-}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 4f7b21bbaf73..cdda7bf6bb83 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -2,8 +2,10 @@ DIST libmicrohttpd-0.9.59.tar.gz 1396234 BLAKE2B 9cb2d52dd39bdc6c54267751e21a224
 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
+DIST libmicrohttpd-0.9.63.tar.gz 1840005 BLAKE2B 0fdbc97901a3c5fd9567e70c58e3ef93517a2b7defd88313329fd2e9c8f610e41524291e877ba6633339a29df4f17a735416904651163c272eb2334fa5012f11 SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17
 EBUILD libmicrohttpd-0.9.59.ebuild 1263 BLAKE2B 2ed2aa3c175c488d14b03e19651678166ba24b0d898ec901100622cc6841600a4ab8a056dafe90aa74dc3d2dcc1357a8d1664930f6cda26634c483eb71f43238 SHA512 91694bcc81e890f44600139f54bb1c1ab0fe05f70810ed826522bb338a0dea714b2ce2e0a2f76a41d7ed2d95846e84695dcb0df9309ca3a87eb5ce15776bb3af
 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
+EBUILD libmicrohttpd-0.9.62.ebuild 1268 BLAKE2B 71e9ca04a0c8337ef9f6199db49f55385ee10051beeefdfcfdffc647125aae2608cd25b911a4b0929bd6d7cdf4b7998a08c4dc6282e2915e96151d47b449f6b2 SHA512 575d4f09101692662dab599cb36f7b3b774ba8a6d76937dbe701613b07d526fec6eed5e18d951a246631ab28f14b0b7f2e3cdb897726cdde509344d6eca4329a
+EBUILD libmicrohttpd-0.9.63.ebuild 1271 BLAKE2B e3a9159dffa50ac50f8d8b98cde0ffd9f7b3cfac38b0becf105c68456e4649881007bd39cea9a954bb0db04e10f04c34ef69a054942cae0e8f147160e56a06be SHA512 578600917b0295118471ece4416459fee6fa62352144fd913ecfe2d6d701b067b1ff5f511a1a75c58a0722d83340403840b5272cc50d2dd2dca346d341317501
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
index 2c54b305f529..c6f7f74b68ef 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,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.63.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
new file mode 100644
index 000000000000..7b1be999f8eb
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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/libnice/Manifest b/net-libs/libnice/Manifest
index b9de7ce5a11e..252e75171611 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,4 +1,7 @@
 AUX libnice-0.1.13-gstreamer.patch 1195 BLAKE2B 26ef177454864e7757768cdfb51f8a4dcc450c9dc14c12b53f89950c90f48e4a6fe5774ef5fa456445e144037f332ae8d0fbeba6e92dac85f002c51638afe97d SHA512 fdbeded042b13c33c703a6b5032b7110eb1ce84ec3614e62f6482688a00eece723b4668a1925fcfab645bf61e7fcaf0d4d444525953dae397d8edb9a842c498b
+AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb9f5e5ec005339aac12ef5de7d0a2fd32efa146c9fbc5c542fc870e406d250c6c80a21e8c262092012a1db7049e0fd19 SHA512 745db3ad3c7a3fa855587ba4848549578e327a7741c2e3c6731c2a15852d9385f17c92ae98a3ddd0485f371eea070c527a63a20ba86424bf37ca2f690cc0f409
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
+DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD libnice-0.1.13.ebuild 1566 BLAKE2B 4b5dcc470188b8fba4435ed7be47dacda438d59821ecc69f5f6875572d91b3bc6a4039febb7d2c241674122b6db0aecd1dfcf2c15a226bb144850d7b403fefb4 SHA512 85220da97849a1202ff57fc6864011bc5d6c7e2ebccdc7ca98a852af08defd5616dd55bea86cd101c60dda24444258d51374124ff2ce52c50f47a6dd7c0b0137
+EBUILD libnice-0.1.15.ebuild 1765 BLAKE2B 5ad8e59f209314340d6cc7eb80f1939ce463efa6c88eba9468c9be6ba1d02df0708c004580840b96b6d69559d7d6a2f138aab74ce5b1e5c174a6fa1c767fc132 SHA512 86feb279be7980da3306e01f98ba6e1959f9d59b14c31dcc4031f4a4d3c6abe531f6f9f6556ab82f1d968d2dc656940a60c6964ea3405c428104b49bad593b7e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/files/libnice-0.1.15-libressl.patch b/net-libs/libnice/files/libnice-0.1.15-libressl.patch
new file mode 100644
index 000000000000..6c38069bceb8
--- /dev/null
+++ b/net-libs/libnice/files/libnice-0.1.15-libressl.patch
@@ -0,0 +1,57 @@
+From 926afef019ca9f297cebbe13479159ac5c087f00 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan.strogin@gmail.com>
+Date: Fri, 15 Feb 2019 20:45:34 +0200
+Subject: [PATCH] stun: Fix LibreSSL support
+
+Closes #71
+---
+ stun/stunhmac.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/stun/stunhmac.c b/stun/stunhmac.c
+index c7d1432..c9d183f 100644
+--- a/stun/stunhmac.c
++++ b/stun/stunhmac.c
+@@ -75,7 +75,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
+   assert (ret == 1);
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+   HMAC_CTX stackctx;
+   HMAC_CTX *ctx = &stackctx;
+   HMAC_CTX_init (ctx);
+@@ -101,7 +102,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
+ 
+   TRY (HMAC_Final (ctx, sha, NULL));
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+   HMAC_CTX_cleanup (ctx);
+ #else
+   HMAC_CTX_free (ctx);
+@@ -172,7 +174,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
+ #ifdef HAVE_OPENSSL
+   EVP_MD_CTX *ctx;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+   ctx = EVP_MD_CTX_create ();
+ #else
+   ctx = EVP_MD_CTX_new ();
+@@ -186,7 +189,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
+   EVP_DigestUpdate (ctx, password_trimmed, password_len);
+   EVP_DigestFinal_ex (ctx, md5, NULL);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+   EVP_MD_CTX_destroy (ctx);
+ #else
+   EVP_MD_CTX_free (ctx);
+-- 
+2.20.1
+
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
new file mode 100644
index 000000000000..e66ba68fd511
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal xdg
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="https://nice.freedesktop.org/wiki/"
+SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+gnutls +introspection libressl +upnp"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] )
+	!gnutls? (
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+	upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${P}-libressl.patch" ) # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/50
+
+multilib_src_configure() {
+	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-compile-warnings=yes \
+		--disable-static \
+		--disable-static-plugins \
+		--without-gstreamer \
+		--without-gstreamer-0.10 \
+		--with-crypto-library=$(usex gnutls gnutls openssl) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable upnp gupnp)
+
+	if multilib_is_native_abi; then
+		ln -s {"${S}"/,}docs/reference/libnice/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	emake -j1 check
+}
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index b8fae8f9ab2a..a5825e7dc547 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,3 +1,3 @@
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
-EBUILD libotr-4.1.1.ebuild 578 BLAKE2B 8352a8fd979ba0e862a39107cc0f5d065434b2ed51e95026d1efbb94f0090ee41bb5f6101b25ea06ec03db0e7aa3248fc84616d974a63060195191fb3ce2e58f SHA512 befdb4bd9061f2011b073481c63cc697bfc59b5feba4644e623abff010d30829cbb914010c864c610f4b82d25591837af4d4158af58d3427525afe84e4c1d03a
+EBUILD libotr-4.1.1.ebuild 581 BLAKE2B f0eea2a432704d2c88d0fdc5d75b5109987b4b677e78eb44b99c1909121e72cc458fe7495f6415f5e15ba46792c665cba50891023a94f0b40783fd127b8abe62 SHA512 f828c8194f38c538f3c6f07370adc113bc01965496f2c03b1fc6ae1a71a63ea4e3d3bda4aab284e48e04c5600e387980b549ce3ac388f7e7ab5ee4a4fd81585e
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index f533f0de1dea..8306659f8c77 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgcrypt-1.2:0
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index b230f9e1edb6..feaaca640738 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,3 +1,5 @@
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
+DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 EBUILD miniupnpc-2.0.20180503.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
+EBUILD miniupnpc-2.1.20190210.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
new file mode 100644
index 000000000000..b170db612f20
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 9d308b927c4e..9e269a045c78 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -5,6 +5,7 @@ AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.15.0.tar.xz 20217588 BLAKE2B ef7f626bd3b13b11a1cbf21f5c6a2ce08567dddc2fb525c5f10e02f81750a648245c2eb88535d8aac1b055a13d12f9ead72d55c4ccf68062940da09d582344c3 SHA512 6c10ae4070cd8b89d4d31ee2137453fa582cef85c6f002c78d5029ceedddf5caeee8e28a4e75dfc632c3af3c8e2acec403ab17a927ba51fa31175d58b45cbf49
 DIST node-v10.15.1.tar.xz 20231024 BLAKE2B 82fec4cf3902cc3b8eba595c969e18ffd2fb468e58eec026308aef2c3dde3c9b96c96997b2710e224c77c373ac72e5cc8dd4e68d937914e014d3f457c7d6afa4 SHA512 823a4703b388275aa86e7ede5c626a918764d6e83bdd9a0cb249ec1f960f3a3020306078d8a4113311303e4c3380d4090c928041ef64189a3cdf67153c7cac95
+DIST node-v11.10.0.tar.xz 22073588 BLAKE2B d2a58655c7a9a5b5f78abeaeee80747df83408c1ef325aca06b5636fda5a7cde7eb787f70960abfa1bfa9397a3a45d266d72e91359bb9035103e3ebbe88813a8 SHA512 f6701f235b2f95c4c1ba240d0540646cb6268ba795b385126abe915095e8620c90047c192215f8460e903711b0851680faa19d7ea39213d5396f4d56f728500d
 DIST node-v11.7.0.tar.xz 21218124 BLAKE2B a7e69dc8d6ee2f42ea78ec9c4d623b56bfbc2e130fc6b7d33038ce79f03d7b92e78545fa26bb2dbd58c1c25677f0b224077822264fd9cec49e71f18517098563 SHA512 eec2d5e67d94314f1a09f3a1c3407d6b12e9decbdff99d41eb487c4ddc1929fc5661be0b6fbb180961ecb6094311630b19faa0af031d82ff8de7ae213ee35ab7
 DIST node-v11.8.0.tar.xz 21253080 BLAKE2B 808df024b7dba628f03b7c6c2fe8c486bb036f02f80aa2184de0a8393afad17dcd19d98fd63f1ffc5f9c1dc4fb078f32d15217322d1608510f291eef456df35f SHA512 7c33984014c2b95bde59affee88bc77caa2788dbdd7db87150acd58c56304932bf4b030994c91fc655f0f32202b8d1ed370c3d19d09569af50ffce91414d62ac
 DIST node-v11.9.0.tar.xz 21703796 BLAKE2B 9097a93b749b7a3dee38507ae37ece985872391f86f75a7aefb7820c361e98e708e4629fe2c5c8d76de9e9fac8c9b8d8811b490b63ce31ba57777abf47cc2fe3 SHA512 beb20a9042c990ae8978b5794db21d3461ed41b985ad6a5f163ea9563ed3277953926f83a81f49d7b7ae040bad95d7777ff758a03dd299a0de1014e008767da2
@@ -16,6 +17,7 @@ DIST node-v8.15.0.tar.xz 18499412 BLAKE2B bba68517358cea14e9ba7c0c14b3f30caa00e3
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.15.0.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
 EBUILD nodejs-10.15.1.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
+EBUILD nodejs-11.10.0.ebuild 6531 BLAKE2B aae74f0eca235209b18c94ce80322e6566b4cb7f8ca2c197a4f5028db34735fa8c54643e4ac63734b714aae6097d147a7a4a937f7a49b25996f2a49d1b366b50 SHA512 c1238fb06883369eb2a6c4553920a60a4d9bcacf63c89ca226b35d9a872b3a75ac2996cccef87c17321d169f3242efa2819a39fe2efbc0dfc5d79cd1f35553d0
 EBUILD nodejs-11.7.0.ebuild 6531 BLAKE2B 5d5288b5d2787c299542605b32788187eab4107bddd80dd807e7fc46be19fabef4e59a2218be074849c13c09a1dde9e1a81e254789cb31ca3efefd3c88961646 SHA512 d8045148cfe83f9d76688d99840bfab4c32cc3b4ea3260c83f46c41bc2698715d52d0f99b564a141a1b61729da72aa12ba48507a38d29eeef9d0902ca5dca8ed
 EBUILD nodejs-11.8.0.ebuild 6531 BLAKE2B a63270b2483868d8d1952b316a9c62d85901d810e56de37671e1657fd6a26b44e67082ad1e55caf488f9eb45e21b6d3c8851b0075ba7196df921b4868169af2c SHA512 d5bad17d438452d89f52146d5630d1ee8dfb08442c86a48e4f718f700d37cc63163142463a342942344c4f63ae30caaae8f66c5d36e96aa4597b13fd553ca9cd
 EBUILD nodejs-11.9.0.ebuild 6531 BLAKE2B 4976062182cd5b05b455f5c82ab6630ef996b87978405a7d11434404b11a199541444f1a83babf66115bd5b5d2c33786cb70ccc0d57917243d122d526cd99a53 SHA512 551ed05471504b1112c1f1e4b37d2151f4025148f0d27de9717f5f92aefa650f192b9a9e097ea90119148c04be8321f1ba7c75c0120c6f8d9db759cd55531d36
diff --git a/net-libs/nodejs/nodejs-11.10.0.ebuild b/net-libs/nodejs/nodejs-11.10.0.ebuild
new file mode 100644
index 000000000000..c4b2df6f8bdc
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.10.0.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2019 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.26.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.34.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-63.1:= )
+	ssl? ( =dev-libs/openssl-1.1.1*:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-11.4.0-stdarg_h.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# 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-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_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 "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}