gentoo resync : 18.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
commit: 536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree: 697733f5cb713908dcf378e13fd15a798a906a91 /net-libs
parent: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
59 files changed, 1119 insertions, 189 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 53960ecd51af..68abb3897729 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 3751f0c07522..2c455ac70584 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -1,7 +1,7 @@
 AUX davix-0.6.7-uio.patch 316 BLAKE2B 71bf63feb080a4c34f8b672516d8237149bee9d360c7b0d289ac6b226e65427651a688679ec42cc2bf30304a53211d33b06fdccdda228e90b40e21ed7da48cea SHA512 0874cc8c04118e97c176e901bfeaafa13d3a76ec8589b045845133f3f8633e7b75a007ba10990ac4ee1bfe344294d27265510f64171cecd9110fd0b41d71ada2
 AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7eb2c7eded0771f251459bc391e4b8a22ad1ad685918525ff0ef89bd319e562a221530ce70807f2161efdef65d SHA512 683257bf61dca6394e5ab0b375e35ea3e28c85f0e01a308a514f91f1da18aca4c63f57e45db7b3862fd7d9e0f80e7129e518798241bfec1ddefd87affc1bad4e
 DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce
-DIST davix-0.6.8.tar 3461829 BLAKE2B 96e23b3d099262b577a078aad9c6ac3adb6a0ab5dd410573a1886a886f828e46af2d6df9904236ae9f1aff5c75e7bec93c81e02bd173d67a13e9f9bfce3225c1 SHA512 7c0e2a427b2a9ad807d104e8ada732a6e806818e0b7b53caf965ce6238637e4c6f5c67e56e7ef89a23004531c62bc1ba6cb7ce1dd0d1aefdc46bdd7b8c48c9c4
-EBUILD davix-0.6.7.ebuild 1484 BLAKE2B cacdc4cf848fa97be6fc46f6cbfd651f4a0fb3e9b8b9a5c7f4290b9ec813781eda2ccce8da5513d290f8c2b527f9949271e0c009d3093660a97cb395ce58970c SHA512 cee6b67866faaae5330db9f60a17e71298a00cbb80b3e2efb674bb935a63f14f094f8e61c48f3df2d0f7b1b491d684474166a231e8abeee436d30076d5292579
-EBUILD davix-0.6.8.ebuild 1408 BLAKE2B eec0c2a2fd8a95d2d71035cd1a9170ed7d038760a8c4262a1185e40ccf43f817822b5e844bcaf3f00da77e34f60c7e5c8f83c14c09da7d2bc08865e66eef1a02 SHA512 46ccc73973ac813dababa673da10442f223be28beeb16a9305f9103c616062ef9a7707d282d08cf810027cd757a70b846c92859f16931cae20b9b3ce813800f8
+DIST davix-0.7.1.tar 4336124 BLAKE2B 5db4f8f03fef38feedb0f0a9dfce763ff53ba9b1aa19d09f0af979e111d9f52226222e7b00e48aa3589070e9bf857e000f297d1a162aac83fe877ce3cd2984e1 SHA512 a4408960c4e16011de5e6cea1470d7fa487fd0b9c462082d8fb800bcaa812cab10a92643c9eeb66dda506d177903917176e6310c2a10042a848a52b858f4eb4e
+EBUILD davix-0.6.7.ebuild 1479 BLAKE2B b443682bf8396040d259a69f39a5b6d3c04e8bd96f315aff99e84cad4a8afa571b2d3aaca24310b7f632739e43db129c595ed6ac1c404ccf98d05cb178887ecf SHA512 7032a772e90ed906f446f6e9ce1104545c6bf38c433914936759864402526197cb9aa6dfa0d586984fa7b19865aa96cf9c8b801a85a48171885a4bd566c135f1
+EBUILD davix-0.7.1.ebuild 1597 BLAKE2B b6e322e6c78ff1044750f95f6b767b320752a782824ffa3cd0a28b8f69e463ecb0d80f29af11f8d958144267d670a5f6fb95f26cf3f41e23f4fe3dd8349abd0d SHA512 b04f578b4096f521bab40cef92ff2a28ba3433d0abcfd6f583faecb156ea04f6311811f2ff605a29c353f4d0d46dd13ea5ee8872196406f9d30686d94278dd6b
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild
index 4ca799254b21..f442b5b75b91 100644
--- a/net-libs/davix/davix-0.6.7.ebuild
+++ b/net-libs/davix/davix-0.6.7.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="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 kernel_linux test tools"
 
 CDEPEND="
diff --git a/net-libs/davix/davix-0.6.8.ebuild b/net-libs/davix/davix-0.7.1.ebuild
index 943d50f9fb95..b6b1dbf9c82f 100644
--- a/net-libs/davix/davix-0.6.8.ebuild
+++ b/net-libs/davix/davix-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,16 @@ RDEPEND="${CDEPEND}"
 
 REQUIRED_USE="test? ( tools )"
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	for x in doc test; do
+		if ! use $x; then
+			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
+		fi
+	done
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
@@ -44,7 +54,6 @@ src_configure() {
 		-DSTATIC_LIBRARY=OFF
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
 		-DBUILD_TESTING=$(usex test)
-		-DUNIT_TESTS=$(usex test)
 	)
 	cmake-utils_src_configure
 }
@@ -62,4 +71,8 @@ src_install() {
 	if ! use tools; then
 		rm -rf "${ED}/usr/share/man/man1"
 	fi
+
+	if use test; then
+		rm -rf "${ED}/usr/bin/davix-unit-tests"
+	fi
 }
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 97e48aa50969..dddb397c4a1b 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -19,13 +19,15 @@ DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb798280942
 DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385
 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 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 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282
-EBUILD grpc-1.12.1-r1.ebuild 4259 BLAKE2B ca43c1322b2b3b372de13bfb27e671c21cc6754eb161a8bf81756001c71d8af9885739950732064bf925a402a4d1b754d78f84b737dffe956dac86a946c2468b SHA512 21febff464b1551c011da6fa9db30a3ba63b9b62b7e6eef425890e4814ab7de11e8537d81fc525ebe2841cb91e3e31feba199634ee49c5b6073456bd365e12de
-EBUILD grpc-1.13.0-r1.ebuild 4368 BLAKE2B 349d192044bd3faef859aaeb4b6d5dcf466c5f29daf477563d0a0c2709e57b60548b4f96f2509b5234b166cb2ef58c6dc7b802a1990b0a2d2eaa230641872941 SHA512 147de0ba938be55d3b0592a547cb535c07ae8c4daba5381f6d02e1b3228d4116334e5e31119482c5da9b01df523edecdbe6715f127e180b937ba961404f6222a
-EBUILD grpc-1.13.1.ebuild 4381 BLAKE2B 49dd3565bb52ae69ff98e90bc74a241082835bd48e280b048f92be0947184b3870a242761c7adca42679cd0549254a9cf8b79ca6d99af8aa1d403b1ed88fb3b0 SHA512 a428bc0e88112227b9526d0bb431b9f0eb4fef2cfd8dcfae1c9df6cb6b3949423533dc08d37202e9822889139a6f41256b6530a8d95bd3f88b3102d1a22254ed
-EBUILD grpc-1.14.2.ebuild 4484 BLAKE2B c0f9955324ad0eb424d222c087dc44a02db8ef2e247fcd8f38001b43abbd22768fb67ada639621656b40d2ac3d9a4661bb1fa4bc7da96d757502b4aa7ec9c79b SHA512 93d275734afa05b8cf6f89e6da44702ee5dffdec8da4c9cdbeae3d73cfd1e2c154c656bb3d0dc87201f07b2edcf64e9d4a0ae4d990f0fe40cdf17e84eada62d4
-EBUILD grpc-1.15.0.ebuild 4479 BLAKE2B b5df046963596a10c1f5abb586342082cdc0e580b5ae9c0a954268f9d778f11c33ec8665cfc25649083a3436cef3c4f971ae41fb909f129f1b237addb7868e17 SHA512 d3a9f8577b02f682f6fda677fc3471ea10bf2a9f2eefe13f7cd7e9848389a9f58cd2562b00ba38ac82ee176ec3418f4a469ffcd12995b53df513ca7b69c09fba
-EBUILD grpc-1.16.0.ebuild 2335 BLAKE2B 9e582ec97af56e8ca5fb9edceeb05100d49567402622c4cc3c53e0d01bee8a5f5bd4a9035a0ade265ca6724db8f23163dce4e8fb6911b42b08b83d13abc07b1b SHA512 71c377f53a6b734f636f86e0e0a8fb7657e95ab1fb5100ce1ea0ea5b4f745c5fcc94af3797cbb2b0aa18d825b4791e429dad8732bd14c0c276a53cf0d54c4f6a
+EBUILD grpc-1.12.0.ebuild 1530 BLAKE2B d2abeea3fa12c68427d1ac0769715e85bc73393b0b08ae57a42cb5ef88d4126fb0993e7f3b4efc77667ba63239793cd436da8e8fb9d006d569b6f2ba3338f5af SHA512 4758b67f830e8c2d40add0d6f8fb2aae9b5856c8e0ca02a78f1ae0b7fbc974a5a0f066da252f1e10111fcf99299b12881632386bde9c511b7f54d2b961612811
+EBUILD grpc-1.12.1-r1.ebuild 4257 BLAKE2B e88648e02078ed041a513893673699dbc6f69ef2f6a1c1d5be4f794576ffbb386c081ddbf2a184db082561b3a2b6b5f6c11d38aa470c166657aa4b601c9de8ee SHA512 dad67ee4714ff90844524a28a989b2bff3a1501c25bf2b2ac272430beb2749aaf0f901824f833e754004e319a55cfa066159a291b5d9d9493dfa7d0b9975e19e
+EBUILD grpc-1.13.0-r1.ebuild 4366 BLAKE2B 7c2638c2c350bc552ccb75da9b4ea08f520a548ca2cf7f4211d69b81ff9889e09622e726ab98ad0125943dee058bfe26415d85ef43f4fd8b26eceeb12fd283f4 SHA512 be7df5c35761c12472856bb244cd4f5838d1e0e176e2db53ba867c2a1d64ec8f6019b0f9e4c5394b9efd5c556f299587ababa34333d1c5675d34a830274feced
+EBUILD grpc-1.13.1.ebuild 4379 BLAKE2B f3bd95162997f25317d26beb9b37d73b126c25f0b004cc687e05bc40635a43545ed4d7c11a657028a0e0b6b89b9d066b6f297373cf9445f071beb813ca76b2fa SHA512 33a782024f2e2299cb07647f9baf9188d7b7f53d8875ad86ce59224e74e10761dc58e1bc1e2f6da1fc35a2d8a1fee0581686a3be8d6c757b3e58104c3598d9df
+EBUILD grpc-1.14.2.ebuild 4482 BLAKE2B 527731a7613488f4fd344d8d3dc4d072dc86105ff8f8c98598b9ea91a4e488010180f150b61e8ec5bb253be3b6660ab7da8f3c16e099279c17b44900ef67eb25 SHA512 9add91a48299c56be331aa6a20e456a364b27cb4d79c21b0f3fe89ae8c72bab26ea96584cbcaf6a0aac31d5991ce3f51e243800312d15375687103a234187ad2
+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
 MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/grpc-1.12.0.ebuild b/net-libs/grpc/grpc-1.12.0.ebuild
index a232297d5cfc..ddf193e17a04 100644
--- a/net-libs/grpc/grpc-1.12.0.ebuild
+++ b/net-libs/grpc/grpc-1.12.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit python-r1 toolchain-funcs multilib flag-o-matic
 
 DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="http://www.grpc.io"
+HOMEPAGE="https://www.grpc.io"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/net-libs/grpc/grpc-1.12.1-r1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild
index 6c9403c76269..e5ea7b0998a7 100644
--- a/net-libs/grpc/grpc-1.12.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.12.1-r1.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 @@ inherit distutils-r1 flag-o-matic toolchain-funcs
 PROTOBUF_VERSION="3.5.2"
 
 DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="http://www.grpc.io"
+HOMEPAGE="https://www.grpc.io"
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
diff --git a/net-libs/grpc/grpc-1.13.0-r1.ebuild b/net-libs/grpc/grpc-1.13.0-r1.ebuild
index b3f51b4ee149..d04a6152ea2a 100644
--- a/net-libs/grpc/grpc-1.13.0-r1.ebuild
+++ b/net-libs/grpc/grpc-1.13.0-r1.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
@@ -14,7 +14,7 @@ inherit distutils-r1 flag-o-matic toolchain-funcs
 PROTOBUF_VERSION="3.5.2"
 
 DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="http://www.grpc.io"
+HOMEPAGE="https://www.grpc.io"
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
diff --git a/net-libs/grpc/grpc-1.13.1.ebuild b/net-libs/grpc/grpc-1.13.1.ebuild
index 620789c5cc90..c754e09e6eba 100644
--- a/net-libs/grpc/grpc-1.13.1.ebuild
+++ b/net-libs/grpc/grpc-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ inherit distutils-r1 flag-o-matic toolchain-funcs
 PROTOBUF_VERSION="3.5.2"
 
 DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="http://www.grpc.io"
+HOMEPAGE="https://www.grpc.io"
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
diff --git a/net-libs/grpc/grpc-1.14.2.ebuild b/net-libs/grpc/grpc-1.14.2.ebuild
index f7ac68eea649..8c453555b084 100644
--- a/net-libs/grpc/grpc-1.14.2.ebuild
+++ b/net-libs/grpc/grpc-1.14.2.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
@@ -14,7 +14,7 @@ inherit distutils-r1 flag-o-matic toolchain-funcs
 PROTOBUF_VERSION="3.5.2"
 
 DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="http://www.grpc.io"
+HOMEPAGE="https://www.grpc.io"
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
index 7c59fdc30768..9aa1447c2c75 100644
--- a/net-libs/grpc/grpc-1.15.0.ebuild
+++ b/net-libs/grpc/grpc-1.15.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
@@ -14,7 +14,7 @@ inherit distutils-r1 flag-o-matic toolchain-funcs
 PROTOBUF_VERSION="3.6.1"
 
 DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="http://www.grpc.io"
+HOMEPAGE="https://www.grpc.io"
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
diff --git a/net-libs/grpc/grpc-1.16.0.ebuild b/net-libs/grpc/grpc-1.16.0.ebuild
index b3fac81f326d..4cfb0e21799c 100644
--- a/net-libs/grpc/grpc-1.16.0.ebuild
+++ b/net-libs/grpc/grpc-1.16.0.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic toolchain-funcs
 MY_PV="${PV//_pre/-pre}"
 
 DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="http://www.grpc.io"
+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"
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
new file mode 100644
index 000000000000..4cfb0e21799c
--- /dev/null
+++ b/net-libs/grpc/grpc-1.16.1.ebuild
@@ -0,0 +1,102 @@
+# 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
+"
+
+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.15.0-fix-cpp-so-version.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@$(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/gsoap/Manifest b/net-libs/gsoap/Manifest
index 9f83965e4723..6f00acf2e7dd 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -5,6 +5,8 @@ AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af
 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
-EBUILD gsoap-2.8.70.ebuild 1875 BLAKE2B f3d471fc3467e7c88c470b48f1d242bf7483a133d6b668e1cfe39e36e54eaa508e678881943ad1b7aa7845dda3b3f667e863b5a34e517f1c562769337ecdd364 SHA512 024549d143921d38866924105ed0d93b8445d2ceef717506575d26b7070697bce57e18df8b24e8aab20257f35f4c328ccaef4bcd286a7ec665cd6fdc4914ac34
+EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
+EBUILD gsoap-2.8.71.ebuild 1876 BLAKE2B fd95d1228e01e40e6be151a59f47bfef79550d690c8640736ca0f3eabff8f2eda1f924254aec7420c792cf92dc215ed79813ad83bbf9a24c380a71db9c1571eb SHA512 8694c4a63556b64077464ec09819711aa1f44eca00de3f9d049876866c229c57e38eba72842e737b6820ff6ba83902e9a8f1d0339266ed7a60043961c479c60d
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.70.ebuild b/net-libs/gsoap/gsoap-2.8.70.ebuild
index f09037b2e0fd..7423a510e48c 100644
--- a/net-libs/gsoap/gsoap-2.8.70.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.70.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
 LICENSE="GPL-2 gSOAP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
 
 RDEPEND="
diff --git a/net-libs/gsoap/gsoap-2.8.71.ebuild b/net-libs/gsoap/gsoap-2.8.71.ebuild
new file mode 100644
index 000000000000..4f3a99893774
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.71.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 libressl gnutls +ssl"
+
+RDEPEND="
+	sys-libs/zlib
+	gnutls? ( net-libs/gnutls )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=(
+	# Fix Pre-ISO headers
+	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+	# enable shared libs https://bugs.gentoo.org/583398
+	"${FILESDIR}/${PN}-2.8.70-shared_libs.patch"
+
+	# Fix --enable-xlocale configure switch
+	#"${FILESDIR}/${PN}-2.8.70-xlocale_h.patch"
+
+	# Fix parallel make
+	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# Don't include xlocale.h as it got removed in >=glibc-2.26
+		--disable-xlocale
+		$(use_enable debug)
+		$(use_enable examples samples)
+		$(usex gnutls --enable-gnutls '')
+		$(usex ipv6 --enable-ipv6 '')
+		$(usex ssl '' --disable-ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# yes, we also install the license-file since
+	# it contains info about how to apply the licenses
+	dodoc *.txt
+
+	docinto html
+	dodoc changelog.md
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	if use examples; then
+		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
+		docinto html
+		dodoc -r gsoap/doc/*
+	fi
+}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 2d7b26fe1f95..4aaf2818aefb 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -9,6 +9,6 @@ DIST http-parser-2.8.0.tar.gz 50575 BLAKE2B 0ea1973b452b62915ad2a92be95e09281c1a
 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 1005 BLAKE2B eb920cd19be9b1222df2dd689a0bc428d0537ac4a94e96742927fcbe6a6a5bf58af935d89359721b2bb8851f5309262664c43d87fc27a68cc333736774bf280e SHA512 600d57522c7823422783a9c164c66bad54200adac19d62d66dc415ad17a2f5b9caa2353dab4f87f952700f41ff14c8845ae993fb3b0caf5f52ee850dded8ff01
+EBUILD http-parser-2.8.1.ebuild 1004 BLAKE2B 55aee0eaf8b64cbe81131fe94fdda20d6774655f460a0a5a3d4b38e0dd6b71219dc8a4f579c7188a08f8afeea7c6e0d780c421eb66b3bfcf1e4e4ad75d34e3c6 SHA512 9ed1a395feecfd25ad17455429dea4cc93880dff36834e07c565ecad359bf96cbb3c6be7e1c51483f40f552ba517d47a7b6aa22cdf5cfd4197c923974d5dc305
 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/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.8.1.ebuild
index 1431e169b4a5..2057dd48dc95 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 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index 803eb0a57e7f..488e83c142c8 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,4 +1,3 @@
 DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libdom-0.3.3.ebuild 1154 BLAKE2B 97f611afccded19c7292e00a39187662116fac41740a7ce5d8afdfb2b92b33e7d412f5ad7eed97d15b83e0e3b46889cdf566017d8bf724c24479a6f4ee064ad4 SHA512 2719a5b91644a7ff0628cfbeb3a9c63e627db62e19a717f308e8b704f04179b8481fe973e2e7168b92113d44f2494717c96493622f9ef7f02a67ca4d4cb20313
+EBUILD libdom-0.3.3-r1.ebuild 1185 BLAKE2B c6de672965f301871fa75fc13f0d00b0d9194a1c31fa6598eadbc2f1bcc218fe96fd583a234d42f09208226e1440ce1e3bf91fd79f4c3d8a1d6bc4b271347a2b SHA512 c89a58ad9f4077eaa68b506934793afce125c41cea3b3fa71bbd0acac6da5ac8f1aaf28de806867061a5ccdf1a9c7eb69062f6bcec7acfd3a4d37fabc57b4c79
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/net-libs/libdom/libdom-0.3.3-r1.ebuild b/net-libs/libdom/libdom-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..12f44fe06415
--- /dev/null
+++ b/net-libs/libdom/libdom-0.3.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="implementation of the W3C DOM, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE="expat test xml"
+
+RDEPEND="
+	>=dev-libs/libparserutils-0.2.1-r1
+	>=dev-libs/libwapcaplet-0.3.0
+	>=net-libs/libhubbub-0.3.1-r1
+	xml? (
+		expat? ( >=dev-libs/expat-2.1.0-r3 )
+		!expat? ( >=dev-libs/libxml2-2.9.1-r4 )
+	)"
+DEPEND="${RDEPEND}
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig
+	test? (
+		dev-perl/XML-XPath
+		dev-perl/libxml-perl
+		dev-perl/Switch
+	)"
+
+REQUIRED_USE="test? ( xml )"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
+		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
+		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \
+		$@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/net-libs/libdom/libdom-0.3.3.ebuild b/net-libs/libdom/libdom-0.3.3.ebuild
deleted file mode 100644
index d245b9d4989f..000000000000
--- a/net-libs/libdom/libdom-0.3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NETSURF_BUILDSYSTEM=buildsystem-1.7
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="expat test xml"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.3.0[static-libs?,${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	xml? (
-		expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
-		!expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-perl/XML-XPath
-		dev-perl/libxml-perl
-		dev-perl/Switch )"
-
-REQUIRED_USE="test? ( xml )"
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
-		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
-	)
-}
diff --git a/net-libs/libgcal/Manifest b/net-libs/libgcal/Manifest
deleted file mode 100644
index d671a30a1a15..000000000000
--- a/net-libs/libgcal/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgcal-0.9.6.tar.bz2 555942 BLAKE2B 5293e6b38823f9cc263d9fab59478ecf241cb52fc04f193a03a89c4b01818ab77a319c3e13aa3fb5cdaf9694e65a0a55f6c2a95d01e849619aefa085f63a9239 SHA512 be2e0592a19531fa202017e529dad765a1bd6f9205ffdaba33bfd32231ad5eafb0237081fda8c5bbbe605e07204fc7895e2168b72718dde6cc660c97c08bbf26
-EBUILD libgcal-0.9.6-r1.ebuild 963 BLAKE2B dc5cd00c4bb16e106145f176847627563fcecb42159c235906a8a450dfeeb5e866c4bd8f6f56e9dd1fb213337d9da5a0d10082b01fe5b4fa9c9162d425f6ec61 SHA512 1c4f2d2638e08a548fcb42f7ee25a98017f3c4e30c073292f3ab1a15d1fe1da0bf6f8858b03690a7bed6d5267d3ce53cb73de5e0bd346e47f734e3496785006b
-MISC metadata.xml 244 BLAKE2B fd4db13441b55607ee12996170c47ad681580962530637524401f0eaf1b5f55d2086011c13639dd8604473d1a9e147e9a89ada767bfdadcfa2de7bf5bf6f4368 SHA512 8620ac8d738f462d1a75a76cfcca8794e75ecb77c63a053ad4dd5e2a0ddd8e6a2d7973d45d3cec7d08c9013b170b7661392d221d79c9be22efb3ab9620f4c623
diff --git a/net-libs/libgcal/libgcal-0.9.6-r1.ebuild b/net-libs/libgcal/libgcal-0.9.6-r1.ebuild
deleted file mode 100644
index 0069e5558340..000000000000
--- a/net-libs/libgcal/libgcal-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C/C++ interface to the Google Data API"
-HOMEPAGE="https://code.google.com/p/libgcal/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-# Some tests fail
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	>=net-misc/curl-7.18.2
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-"
-
-DOCS=( README )
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_TESTS=OFF
-		$(cmake-utils_use debug CURL_DEBUG)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile docs
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}/docs/doxygen/html/" )
-	cmake-utils_src_install
-}
-
-src_test() {
-	mycmakeargs+=(-DENABLE_TESTS=ON)
-	cmake-utils_src_configure
-	cmake-utils_src_make test
-}
diff --git a/net-libs/libgcal/metadata.xml b/net-libs/libgcal/metadata.xml
deleted file mode 100644
index 855b8c7d6567..000000000000
--- a/net-libs/libgcal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">libgcal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index 6192736303f0..4f99cb9a70a0 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,5 +1,6 @@
 AUX libgssglue-0.3-protos.patch 415 BLAKE2B 1c9a1592070eeeb3189ab7a64381f85c79fc8676b1efd744da70768767741ba1e3978c8dde7762c9c22e4de98c0d1e523d5bfd28efb7e5f97e5404e37dbdd183 SHA512 0993ce5908d1388490c195cd7da7950d019ac2937e4aa374dad515b12c9775ebbc578f2635b508b333fd8f961b4f8816db7c5e4891ace07f042c7ea6588c0307
-AUX libgssglue-0.4-implicit-declarations.patch 470 BLAKE2B 0f9be2702191324d57b41325db7cae1bb0585f68d960d1f68b3dfaea95f145a9ad928a1ef16be9a259563a662c08184bf2965cd8b55c8968772f96a80c935e7a SHA512 3bfe59382a33538c0930d41443899a08178a74e5045d0faac2bda0ce2c5556fcf77cd930a26c26b8d8e8af6b3682fb65e6bdeff2b990d8b810f5ef917c4c8ada
+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 906 BLAKE2B bed33d64dc1db5aa931103d74038dfc0bbff7ea3117aa2d5985560b81f2d7ab4d2696fe4142f8f725d9d5b55ad4e4e2da5c69c677aa17dbb525fb8e4a0b46ed7 SHA512 c2cae4858324415973ff7d8b8ac80821087559a1c597d0b3163340778eaa067962eaa5dcbe8720be2deabf7a5ed394d99b56b885eca51b7baf0a0d316f2339e5
 EBUILD libgssglue-0.4.ebuild 846 BLAKE2B 677236531187898c9d41dc876edcbed31d1a313aa06efb48338c3725c4c638f532a845bb9f5eb41142952c12379f11991981fa92e9b6fd080dbdf707d769a3df SHA512 d9140d4acb46c2b0fdc7e2ce8e071c65bfb428007e07d2d627ef6ca3148c373a97bbd7f96de01465802684353f2ebb439e03927cf2d38a1190a136c06192c729
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
index 6a98569128d0..4a6d8a41a7e7 100644
--- a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
+++ b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
@@ -1,8 +1,8 @@
 * g_initialize.c:275:5: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration]
 * g_initialize.c:275:5: warning: implicit declaration of function 'geteuid' [-Wimplicit-function-declaration]
 
---- src/g_initialize.c
-+++ src/g_initialize.c
+--- a/src/g_initialize.c
++++ b/src/g_initialize.c
 @@ -29,6 +29,9 @@
  #include "mglueP.h"
  #include <stdlib.h>
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
new file mode 100644
index 000000000000..fd4c0748d5d6
--- /dev/null
+++ b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3-protos.patch
+	"${FILESDIR}"/${PN}-0.4-implicit-declarations.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s,/lib/,/$(get_libdir)/," doc/gssapi_mech.conf #646126
+}
+
+src_configure() {
+	# No need to install static libraries, as it uses libdl
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /etc
+	doins doc/gssapi_mech.conf
+}
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 15a42c9b5b89..765275ff8645 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,7 +1,6 @@
 DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526
 DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD libhubbub-0.3.3.ebuild 786 BLAKE2B b995a7361dc41af100c17b781ac3f9daf3d5fc47d22905153167165b256765747a8199bdfe6041ac3147f51beb047f6c1010177d60ac0197fa82daae28126b62 SHA512 80f415406e399aa5045f5f946590a07e2f94c173e5bf34e1326d17658e0f89a775c1a689934ad93dec404e8f00195155cd747696b611482f90475f97adfedff7
-EBUILD libhubbub-0.3.5.ebuild 840 BLAKE2B 6de72af9228928530253017d73e57d840f9cce3c319743fa504dc81e1c342903d70a227910bd571d7778465f6c3832e68ea52eea9a0bf68f47b38f101d35026f SHA512 6a587b178d8e0a17c426a3375a1266b988e06b2249a33c8c9444348b77cbcba1901355e5e84604e1d614a21b9484e6e0a394830cd7278768f41431b4de737461
+EBUILD libhubbub-0.3.5-r1.ebuild 1071 BLAKE2B 76f4f027a5df87c391c97d61f2cc883f578668dfa01156097b8b8b53266c0e2a28fe1771d2dfc58c082ccd1934f80ceda0a1b50656c20e5555b3d5bbaacc1151 SHA512 ad7fbf1d635b16152224c7ce41e4b9b3e2589ad66e6439a24f9e1e294e4d2433a1b19d23418f66f6371e378932375d2c656744eb9ac90c0eb286af27a063a23d
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/net-libs/libhubbub/libhubbub-0.3.5.ebuild b/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
index 8277a2ae87cc..d0a20d7641ec 100644
--- a/net-libs/libhubbub/libhubbub-0.3.5.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
@@ -1,33 +1,52 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-NETSURF_BUILDSYSTEM=buildsystem-1.7
-inherit netsurf
+inherit toolchain-funcs
 
 DESCRIPTION="HTML5 compliant parsing library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
 IUSE="doc test"
 
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
+	>=dev-libs/libparserutils-0.2.1-r1
 	!net-libs/hubbub"
 DEPEND="${RDEPEND}
+	dev-util/netsurf-buildsystem
 	virtual/pkgconfig
-	test? ( dev-lang/perl
-		>=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
+	test? (
+		dev-lang/perl
+		>=dev-libs/json-c-0.10-r1
+	)"
 
 DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
 
 src_prepare() {
-	# working around broken netsurf eclass
 	default
 	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
 		-i test/tree2.c || die
+}
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
 
-	multilib_copy_sources
+src_install() {
+	_emake DESTDIR="${ED}" install
 }
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 5509ff46a8a2..9a89a6a62205 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 797 BLAKE2B 576536bec5766361261d5f587a5312de737993f4f13a96d069bf84d2617bee1aa97f692eff2c9f37a46fc0ac98785242331494b5eb1d61a44c35af2039ce9ef0 SHA512 15c691bbc9d508a32967e5ad187e8ba776fb91acdf6bdc2c2b1e17a565d6de0469a64f47d040c684609d014419e5165fdec067e993d845af338bbe275a5d1a89
+EBUILD libmbim-1.16.2.ebuild 792 BLAKE2B c598d3d327f5e3d0bf49e3d6360fee16ad02ca4513548c0d2e0d458044945a3d99c768b5c6425aae724b5e8e60e29ee8f14072e920637f6211d0b7e10c75ec63 SHA512 8d884d2d64ed94132542b159f48cf3649c7178e59e1c7a66ea5c2e2516bc203808f12760bf097f830d96d47a37183e6ef9f97d9ba9c29260fcc3b6f66aef06c8
 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 30d61f25ae34..1b578f7e23a1 100644
--- a/net-libs/libmbim/libmbim-1.16.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.16.2.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://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 a0243d18ba91..9bcc7fc79027 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -3,9 +3,11 @@ DIST libmicrohttpd-0.9.55.tar.gz 1308328 BLAKE2B 5189bcaf2f29fdff9fdd3d7dfddd1b5
 DIST libmicrohttpd-0.9.57.tar.gz 1332713 BLAKE2B 52e46726b220229ae722b4b94478bcd657e5edf1a836fa412b3365d8a2ca651887e62badd095f42f4fe41ad92f07e4147c812aef1c03dd6fba72a4acc6b1581a SHA512 996a59b1bc950320f21df095d3e24e1e6a6e4204095eb84e7dc5e5ed296b1dbe553459b227ba6cc93f60721f1975f778ece8c7c1c10e9168d030fba46675eed3
 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
 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 1274 BLAKE2B 65f8ab0f584264519f327a207bbd12fa87ecc567c5ab1ef7a6d6bc870d1d39832798c8e6e3ffc918e688a6810b85dae25cdb83b6682280bece835bee25db3bbd SHA512 2c1396b596478469f72cb7dd853e5f7af1dc6ea074cc3d5592eb87188558a924e7a7be2764e5d9eba7ce7f7778abbbf628c419393fe5330e9157c10ae8a36ef1
+EBUILD libmicrohttpd-0.9.59.ebuild 1269 BLAKE2B 79c674a488568661ac5a19a73496b65f2bcfc2e4369904b4bf47df663f843d9cd4cdcae1a5ef04b0c1365f691bcc1eeef039486a9ab979513fb934a71b6d2161 SHA512 6f10805daae9401c6ca7c5d16b9eaeb039690dca79421652a1d41e97ca9ba4101ea8d37724e444a7d50e77b8e8783ca6a75ea4df02548638af9bc9f07df35892
+EBUILD libmicrohttpd-0.9.60.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 61e4dc5d490b..80b28728089e 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://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.60.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.60.ebuild
new file mode 100644
index 000000000000..2c54b305f529
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.60.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/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index ac579bd264bf..8cbe1c21d959 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -4,8 +4,10 @@ AUX libnftnl-1.1.1-big-endian-3.patch 1179 BLAKE2B 8ca66b878b2ddbe73aa361b3886e0
 DIST libnftnl-1.0.8.tar.bz2 400496 BLAKE2B d2563f707ceb40b8cd7c4b4fdede64943fabcc8a639eb61c844f7b941786a49b1c029e375977759717e5cb8f8dc2019ddcbf48223347f868713d1a077d51d8a8 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9
 DIST libnftnl-1.1.0.tar.bz2 370642 BLAKE2B 3dbc0116027e863a656c55c0d65449bf3905378e84c907f0d94582c608a793952fbb83f90565304af05978b08675a6edf13ee997fd5ce0d4374a2143746691c1 SHA512 3216afbd62f5dbd78b26c2ab3acb467bca5d6a7f5fd5bb15356b9d80ffca64f9afa1d8f374701e00f1ae9e5ec282fd55c970502121330c1446032e70bb593d23
 DIST libnftnl-1.1.1.tar.bz2 372562 BLAKE2B 9dee45bb485399c4677f636c8aa065a7e4e80102f17beb4aa066278a6ef753e7c1aaf02c6a853edc70f018ebef5e8389a05ca384116ec06761f0a29e278f4e54 SHA512 87f092e2b6576121538c8ac7ce92d8c918723e36dd02e2fcfcb7dcaf2ae705bbcd62c79c9076574ef73f461f7df5d10e72bcaeda29e4a7e60ea1401d998424a6
+DIST libnftnl-1.1.2.tar.bz2 366014 BLAKE2B c9170b9a948b949e443fcbbc0b795095a8e51b0cb77e5ba23853fe8c3005baa476afd5d7fa4d7bfcb733b912f0ecb868d22aa2b4c88dbf68e7b56e1a5b23c1db SHA512 808e0efd2ff32a65cca1e6113cc29aece1335364b94ad87438d19b0887d0bd34de11942fa411e4105ef153f2cce862ded17ebc441c413b839ac506471e530569
 EBUILD libnftnl-1.0.8-r1.ebuild 1364 BLAKE2B 0c8ed0d675c9bd38094fde0b057b667e40cad6033f70c035c8e11d1e951fe68fac729bcde0a963d16d2acb58ada4343c35185193730a5a0ed4f0ee0045107c8c SHA512 c630c448ee80de01b0e98337314f2ac695c3a653914491db4aeb4ba1d99f9a43d532d9ff19b3ec92b619ab889a97d6788828333d90dd6bf81bbb2f2bf1cc54e7
 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
 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
new file mode 100644
index 000000000000..e65f2a32fede
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info toolchain-funcs
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+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"
+IUSE="examples static-libs test"
+
+RDEPEND=">=net-libs/libmnl-1.0.3"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index dae878e1fa85..dc66926a689b 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -2,5 +2,5 @@ DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
 EBUILD libnsl-0-r1.ebuild 567 BLAKE2B f177900284d5ca68d483b67f1f371f4f329206a930c8cd49c531d59795fff4268af2ffa68e2627880f8f5f71fdcb9df53e3416c1d8b60f4da75257bfba802de9 SHA512 a05cf1e7c8f24c96ead7a7483500c699a77fb01edd779f6d4c897ae4196c851725a55a87d48d01badc52b35537d45888d58114b31917b672440537faa834cecb
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 897 BLAKE2B 64f3b140a9e9acc57de15b3f03f4764b161ab43f87d3c44a86bad17b08c2e21b3f2d4f89f1de5f04ef74d0b56b1d84fd99578e3e0d97e744cbeb3756185eccb9 SHA512 2d04d2b14bb18403d5f4a8cb8cecaef2f76b17eb5bc7a77b95ab78fdc22cfa13e7d483b11bdbfc202470e51beae7ad5b2d6168118479897c0a2703e3571845f6
+EBUILD libnsl-1.2.0.ebuild 905 BLAKE2B 6ce927cd9f3886ecd76c2b2b29fae097612f1f329e4138acca6481d9e470e5856b6a957b5297175ffba56eac386e57833936d680b568cb9bb47f9a0d9069c186 SHA512 d6ea15b97741debf499a4b4b1c7e4e5003a0f6c476a88af6992e3904d3d411d0b72ec1285f2ad2d8fff5a78a5b8b608c984316b218c8f29b8f4b87d0781647b8
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 9ae659fcd87b..05a4b49a7a41 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.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"
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE=""
 
 DEPEND="
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	>=net-libs/libtirpc-1.0.2-r1[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	!<sys-libs/glibc-2.26
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index a735fbf07551..b287fd8dcaa6 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -1,4 +1,6 @@
 AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae34d5cb3507916b49edbf487ce007db7b20d2da58404161a5a6ba063cec86d9507c074a232ea58688f5de2deb6147815b9b5501cd9b SHA512 c7ac48e30ededc7079a08504ae78f421b843100dec2c8658d75ff7a3101660087de962d73ac73bf1023286b0a89c1d1b3187ba36336d1caf051b03d445571dd6
+AUX liboauth-1.0.3-openssl-1.1.patch 4483 BLAKE2B 4d2628448a1341cc41a676d5002c7f0f17af384fafde77687bc83235d90f4b6b853bbc9a4262fd4acaa0b04cb67d586bca308bb9c66fafbe7de1734fb39a4c1b SHA512 90ae75bbaf7296826f813df852263901ad8632579b5e5dd1e8b1edc4719d3f749ffc30e6348ffc2ddd5239de544c934382f52c4d62e90b3e655fd9630b5b4880
 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa
+EBUILD liboauth-1.0.3-r1.ebuild 1536 BLAKE2B 279535ccfca6db6850f83e1df8cea9810454c6f944ef3ab20a58258a7bd96e63f1cd5682c43e02a5baf3036f72e68ae0ddd5cbe6ac882c1d213ad4ae5ce47eca SHA512 c03ca8bc392c5ecf96fcaff187d9f8788beca1d3da46a67bea8049621e27b03f7d860bed7755decd68b77b5f51873424c1526c4b509d3f412c422153f248803d
 EBUILD liboauth-1.0.3.ebuild 1445 BLAKE2B af869f162f31ae9b2b487da42a476709f4726c3fa4724ce427b36a153ecf2daf0cb8f2e98448f50243a40f9810899a94b33b41ee27269dc118470e1d03b3c00d SHA512 a70d801add90aade10a12b5dd24446a1dbc36a9dfa28fbd3c90f3a7054b6a0a0c34830cda96565984b4b444295f557334b5fe149c99cf1e87b37a5af4b1b254f
 MISC metadata.xml 879 BLAKE2B 499e638089270b30e1fc4a15008592e036c05032719e05ef06cc4c897be1bebe3d4873caacec09f6c54f65240da2582fee0776aa7e0b89508e98c4a3a668f870 SHA512 05625ec768286997f291d95e40e024c692bb8dd3be2d2eea1c3d7c90b452b9a98988a2ca43a5c6134a0e084e0a4ae40af4a00e809092edbcf3a0630781657a07
diff --git a/net-libs/liboauth/files/liboauth-1.0.3-openssl-1.1.patch b/net-libs/liboauth/files/liboauth-1.0.3-openssl-1.1.patch
new file mode 100644
index 000000000000..f39747fd12f1
--- /dev/null
+++ b/net-libs/liboauth/files/liboauth-1.0.3-openssl-1.1.patch
@@ -0,0 +1,143 @@
+From bf51f1f17bdfcdbf09b7edad9995ccbf17c41109 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 15 Nov 2018 12:11:11 +0100
+Subject: [PATCH] Fixed build with openssl-1.1
+
+https://github.com/x42/liboauth/issues/9
+---
+ src/hash.c | 60 +++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 39 insertions(+), 21 deletions(-)
+
+diff --git a/src/hash.c b/src/hash.c
+index 17ff5c8..551991f 100644
+--- a/src/hash.c
++++ b/src/hash.c
+@@ -362,6 +362,11 @@ looser:
+ #include "oauth.h" // base64 encode fn's.
+ #include <openssl/hmac.h>
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++#define EVP_MD_CTX_new EVP_MD_CTX_create
++#define EVP_MD_CTX_free EVP_MD_CTX_destroy
++#endif
++
+ char *oauth_sign_hmac_sha1 (const char *m, const char *k) {
+   return(oauth_sign_hmac_sha1_raw (m, strlen(m), k, strlen(k)));
+ }
+@@ -386,7 +391,7 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) {
+   unsigned char *sig = NULL;
+   unsigned char *passphrase = NULL;
+   unsigned int len=0;
+-  EVP_MD_CTX md_ctx;
++  EVP_MD_CTX *md_ctx;
+ 
+   EVP_PKEY *pkey;
+   BIO *in;
+@@ -399,24 +404,31 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) {
+     return xstrdup("liboauth/OpenSSL: can not read private key");
+   }
+ 
++  md_ctx = EVP_MD_CTX_new();
++  if (md_ctx == NULL) {
++	return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX");
++  }
++
+   len = EVP_PKEY_size(pkey);
+   sig = (unsigned char*)xmalloc((len+1)*sizeof(char));
+ 
+-  EVP_SignInit(&md_ctx, EVP_sha1());
+-  EVP_SignUpdate(&md_ctx, m, strlen(m));
+-  if (EVP_SignFinal (&md_ctx, sig, &len, pkey)) {
++  EVP_SignInit(md_ctx, EVP_sha1());
++  EVP_SignUpdate(md_ctx, m, strlen(m));
++  if (EVP_SignFinal (md_ctx, sig, &len, pkey)) {
+     char *tmp;
+     sig[len] = '\0';
+     tmp = oauth_encode_base64(len,sig);
+     OPENSSL_free(sig);
+     EVP_PKEY_free(pkey);
++    EVP_MD_CTX_free(md_ctx);
+     return tmp;
+   }
++  EVP_MD_CTX_free(md_ctx);
+   return xstrdup("liboauth/OpenSSL: rsa-sha1 signing failed");
+ }
+ 
+ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) {
+-  EVP_MD_CTX md_ctx;
++  EVP_MD_CTX *md_ctx;
+   EVP_PKEY *pkey;
+   BIO *in;
+   X509 *cert = NULL;
+@@ -440,10 +452,10 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) {
+   b64d= (unsigned char*) xmalloc(sizeof(char)*strlen(s));
+   slen = oauth_decode_base64(b64d, s);
+ 
+-  EVP_VerifyInit(&md_ctx, EVP_sha1());
+-  EVP_VerifyUpdate(&md_ctx, m, strlen(m));
+-  err = EVP_VerifyFinal(&md_ctx, b64d, slen, pkey);
+-  EVP_MD_CTX_cleanup(&md_ctx);
++  EVP_VerifyInit(md_ctx, EVP_sha1());
++  EVP_VerifyUpdate(md_ctx, m, strlen(m));
++  err = EVP_VerifyFinal(md_ctx, b64d, slen, pkey);
++  EVP_MD_CTX_cleanup(md_ctx);
+   EVP_PKEY_free(pkey);
+   xfree(b64d);
+   return (err);
+@@ -455,35 +467,41 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) {
+  */
+ char *oauth_body_hash_file(char *filename) {
+   unsigned char fb[BUFSIZ];
+-  EVP_MD_CTX ctx;
++  EVP_MD_CTX *ctx;
+   size_t len=0;
+   unsigned char *md;
+   FILE *F= fopen(filename, "r");
+   if (!F) return NULL;
+ 
+-  EVP_MD_CTX_init(&ctx);
+-  EVP_DigestInit(&ctx,EVP_sha1());
++  ctx = EVP_MD_CTX_new();
++  if (ctx == NULL) {
++	return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX");
++  }
++  EVP_DigestInit(ctx,EVP_sha1());
+   while (!feof(F) && (len=fread(fb,sizeof(char),BUFSIZ, F))>0) {
+-    EVP_DigestUpdate(&ctx, fb, len);
++    EVP_DigestUpdate(ctx, fb, len);
+   }
+   fclose(F);
+   len=0;
+   md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char));
+-  EVP_DigestFinal(&ctx, md,(unsigned int*) &len);
+-  EVP_MD_CTX_cleanup(&ctx);
++  EVP_DigestFinal(ctx, md,(unsigned int*) &len);
++  EVP_MD_CTX_cleanup(ctx);
+   return oauth_body_hash_encode(len, md);
+ }
+ 
+ char *oauth_body_hash_data(size_t length, const char *data) {
+-  EVP_MD_CTX ctx;
++  EVP_MD_CTX *ctx;
+   size_t len=0;
+   unsigned char *md;
+   md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char));
+-  EVP_MD_CTX_init(&ctx);
+-  EVP_DigestInit(&ctx,EVP_sha1());
+-  EVP_DigestUpdate(&ctx, data, length);
+-  EVP_DigestFinal(&ctx, md,(unsigned int*) &len);
+-  EVP_MD_CTX_cleanup(&ctx);
++  ctx = EVP_MD_CTX_new();
++  if (ctx == NULL) {
++	return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX");
++  }
++  EVP_DigestInit(ctx,EVP_sha1());
++  EVP_DigestUpdate(ctx, data, length);
++  EVP_DigestFinal(ctx, md,(unsigned int*) &len);
++  EVP_MD_CTX_free(ctx);
+   return oauth_body_hash_encode(len, md);
+ }
+ 
+-- 
+2.19.1
+
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..96cf577256ea
--- /dev/null
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C library implementing the OAuth secure authentication protocol"
+HOMEPAGE="http://liboauth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="bindist curl doc libressl +nss"
+
+REQUIRED_USE="bindist? ( nss )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-doxygen-out-of-tree.patch
+	"${FILESDIR}"/${PN}-1.0.3-openssl-1.1.patch
+)
+
+CDEPEND="
+	curl? ( net-misc/curl )
+	nss? ( dev-libs/nss
+		curl? ( || (
+			net-misc/curl[ssl,curl_ssl_nss]
+			net-misc/curl[-ssl]
+		) )
+	)
+	!nss? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+		curl? ( || (
+			net-misc/curl[ssl,curl_ssl_openssl]
+			net-misc/curl[-ssl]
+		) )
+	)
+"
+
+RDEPEND="${CDEPEND}"
+
+DEPEND="
+	${CDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		media-fonts/freefont
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable !curl curl)
+		$(use_enable curl libcurl)
+		$(use_enable nss)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		# make sure fonts are found
+		export DOTFONTPATH="${EPREFIX}"/usr/share/fonts/freefont-ttf
+		emake dox
+	fi
+}
+
+DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README )
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 0adb0649c1ee..cdde807422bc 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 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
+EBUILD libqmi-1.20.2.ebuild 1123 BLAKE2B 01854af07ce518f730bc18321dc3ae2f855342dd2a3d089f09be40463c7a3e59d319a8034ac06a3c4d6d215c54da245e768eb9694eae0fdbaa93f24eb781796b SHA512 99b30210a929ac673c664c9792cf646931cc7024dbd85127f5ddf844ac0c667425830f9cab28a9c18785f1ee87865a512b3bb134944cc34bf031dcca7a4d9566
 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 3c9b3648c603..9f03c3eb6110 100644
--- a/net-libs/libqmi/libqmi-1.20.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ 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 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 4abafb409fc6..e41650ccfae4 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -8,6 +8,7 @@ DIST node-v10.13.0.tar.xz 20184740 BLAKE2B 4c063889341eb2aa128096466cfdc2c91631a
 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-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
@@ -22,11 +23,12 @@ EBUILD nodejs-10.13.0.ebuild 6454 BLAKE2B 56df71ab1dd8368bc99a7d2ac7a33a350331cc
 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-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 6157 BLAKE2B 78f63916625998dce844d3bef4f45f4796e183a0ab0f728fc40076416224f4ae734042d608859dec8ef328552b74f8b1300275f8b5ac160da51aae6ff7520293 SHA512 4af3159ac838924e4ecd003bee90fc49becbf3a1b6b40c211dfe8867d8d7f54f0c03cd0ec269327aecb8b9aa490edc6631d7991b82cb511b5e394142d5060b39
-EBUILD nodejs-8.12.0.ebuild 6366 BLAKE2B 590769fb2ede5b40fb988057f55dcccf8b2cbd309948df364dfaf96ee6089544469b140265dadba511ee6779fe70a4c7c6d319680f88447f56855b92f039f239 SHA512 d5eca1c4ff0401077e80a14cc057d60e09f8ef98ef0700cf3138a8b28867ab929b5ca6bd6c6681bab69a77d4ee68c4ae4add21d52904f22d633c331283252aa2
+EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
+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
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-11.2.0.ebuild b/net-libs/nodejs/nodejs-11.2.0.ebuild
new file mode 100644
index 000000000000..4bbb68a8177c
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.2.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.23.2:=
+	>=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] )
+"
+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-6.14.4.ebuild b/net-libs/nodejs/nodejs-6.14.4.ebuild
index af4a773604ea..82d1e57e4378 100644
--- a/net-libs/nodejs/nodejs-6.14.4.ebuild
+++ b/net-libs/nodejs/nodejs-6.14.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=6
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/net-libs/nodejs/nodejs-8.12.0.ebuild b/net-libs/nodejs/nodejs-8.12.0.ebuild
index 9e1b9751f456..ff4d5a46bf53 100644
--- a/net-libs/nodejs/nodejs-8.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-8.12.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
@@ -15,7 +15,7 @@ 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"
+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}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index bf5f239fb524..53b219c9f790 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 2131 BLAKE2B 39fdb4921083fc3d58e8b0104354bb912940fe4efaa61abf03dee18f9ed9d68ce923ad2f0c936259ab51499ec2d61880bcdbda08203ace585e28754c44d04f1f SHA512 3ccf27be31998557a14dfca50a64e974efb4cee2a7c999e9a70328ac216a84327b09f38704de5b6f095369f9529ccb98cfae5746b569ca5074e48aa2b65e178d
+EBUILD serf-1.3.8-r1.ebuild 2128 BLAKE2B c20af1119c40d55ddd5bcd6a444a5bbfadaa1229b6cfa0bd4272fb7454b4989190b4a632d3631e7d547dd7fcbd053c1b281ca49f141caf0f8c1deac0caff4c51 SHA512 a21adfd7734a31ee6040c49102a2b3916cad605f976693e4c1e4f34ed544198bfd231ab77e6e114f86056eea93f69dcbfe76333a5611da3a3fa66ccc06e1ea92
 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 7d6405b86653..ad16ba7e0a9d 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 5fd6f8bc4f09..016fb02f7a55 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,4 +1,6 @@
 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-9999.ebuild 962 BLAKE2B 02d8567f2ecb09398ceefda38ac58bb09fa756effdc0904d12bdbb5003e3a13b05a29b8bc0bac4d96d2c7f9986465522caed6b65986bdc285df168ecc05b1683 SHA512 e03e7ada6986d16e1d890074926a79998323be00fa51713887617ac9ef0299f98866a4f7eb076d9485c7d0eaa7781692fb2c59b97a8e7b4b38f6c39b3ed9be3f
-MISC metadata.xml 686 BLAKE2B f0577825c70fcf0af9e304fa694d7d5ffe7ec8d2f681c74e1ee569d36b300ce195d1a4398faece1a69e66b42ebf7bf6372cadcfdcb97877295a79896a75bb2ba SHA512 4bb4d66a8f01c1b433402bc13f86f49a26db2ee02eaecd8ebbc8498f9f17350f36d6f57b0e7dd53f3977a9f20c30184c1b2f61f57c99b733f52895fb181b9d53
+EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
+EBUILD shairplay-9999.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
+MISC metadata.xml 806 BLAKE2B 54e0d86fcf821eb4c29502f75a44b7a5dc53747e6e594e4a8bfcc558cef8362b136b17e827a10f617b6115a29f3dda5528555e09c2c6fb1fe43b2132d1a8a177 SHA512 fe0e689e3b0cd7bf95bab72137b10b04d7006b63917142293bca72a58a90c485d3e5735f6036828de714a89180021785361aa8862fcf7405815e0bb57f476329
diff --git a/net-libs/shairplay/metadata.xml b/net-libs/shairplay/metadata.xml
index 96259cc68f99..4c3bf6e9c763 100644
--- a/net-libs/shairplay/metadata.xml
+++ b/net-libs/shairplay/metadata.xml
@@ -4,6 +4,7 @@
     <longdescription>Apple airplay and raop protocol server</longdescription>
     <use>
         <flag name='alac'>Add support for Apple Lossless Audio Codec files</flag>
+        <flag name='playfair'>Add support for handling fairplay handshake (used in for example screen mirroring)</flag>
         <flag name='tools'>Build and install a binary shairplay in /usr/bin</flag>
     </use>
     <maintainer type="person">
diff --git a/net-libs/shairplay/shairplay-0_pre20180824.ebuild b/net-libs/shairplay/shairplay-0_pre20180824.ebuild
new file mode 100644
index 000000000000..f4af8a0449c9
--- /dev/null
+++ b/net-libs/shairplay/shairplay-0_pre20180824.ebuild
@@ -0,0 +1,55 @@
+# 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="alac +playfair static-libs tools"
+
+DEPEND="
+	tools? ( media-libs/libao )
+"
+
+RDEPEND="
+	alac? (
+		media-sound/alac_decoder
+		net-libs/shairplay[tools]
+	)
+	tools? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+
+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 76a24ddd83bc..f4af8a0449c9 100644
--- a/net-libs/shairplay/shairplay-9999.ebuild
+++ b/net-libs/shairplay/shairplay-9999.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools vcs-snapshot
+inherit autotools
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/juhovh/${PN}.git"
 else
-	EGIT_COMMIT="498bc5bcdd305e04721f94a04b9f26a7da72673f"
+	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"
+LICENSE="BSD LGPL-2.1 MIT
+	playfair? ( GPL-3+ )"
 
 SLOT="0"
-IUSE="alac static-libs tools"
+IUSE="alac +playfair static-libs tools"
 
 DEPEND="
 	tools? ( media-libs/libao )
@@ -43,6 +45,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_with playfair) \
 		$(use_enable static-libs static)
 }
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index eeaca919dce9..c5c8364988f7 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -6,8 +6,11 @@ AUX wvstreams-4.6.1-gcc47.patch 1308 BLAKE2B 4c49bb694eb50452f3d158ef9e8c8097861
 AUX wvstreams-4.6.1-glibc212.patch 497 BLAKE2B d4ba5b6e687b7746f4be510721ee5fc7fda4d5f8c7c7e9b14479e0301de6329925b8a876ec3e98007d7edcc3646685c1e18b45d4b91ed891a69df4950ccb4415 SHA512 467ef4faad88b4ba150a05f95147bbd2ba8d297bbb5e32a1c85e482b62786e1ec82f6ae8a8f62426c01239ec9e9da899f38fcd7a7d4737dd9a8c9d6de0bdedb1
 AUX wvstreams-4.6.1-openssl-1.0.0.patch 399 BLAKE2B c290744f06cd7781ce64fa43e0d7a076b80fa3130425e2ad19768f6cf3f88bcd007b6ab5d3fc2fef24396cb064c76917a577f25f9329cecbc3c41f1500f4008a SHA512 98d8c8b529e9ce6c8219f70dbec8f9270d14952e88e3f0f0cf16e58cfed2cad8a2bd4039d2006290f9567beaeb5ec77ef500fb5bc812b7a3bac6a1bf4e2888aa
 AUX wvstreams-4.6.1-parallel-make.patch 1882 BLAKE2B 03c40c90d63c72065ad29dcb7436a37e5d5037595c285671a5c7c1b76a74723e63ac7eba024326e7452b4c9af507b2925609faed0496c384c04980044dea28b6 SHA512 d7fffbd7940495f2e34d3317b8f0066f6caa98e213df00bf31e3f42fa6821c9fd017e3052f7ff98303a8d8bb61d9b24a14b87ddd18199038e083e42cf253c17e
+AUX wvstreams-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a570194a93d64142ce6e96f81c141cdb4ae33c6e785fe863278347e2b7903df13a5390305a18568fca9880c2ac45534458671ec SHA512 a8b90e1bbda676ba4303c7a31fc896955c3a0aea0ba4d8a69514210a4baa1cc4228de43b648788cfca2e6b607040daaa520568c7d15b258d04b803bba6375637
+AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
 DIST wvstreams-4.6.1.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
 EBUILD wvstreams-4.6.1-r3.ebuild 2404 BLAKE2B fb696df3dbda56527f29646f03d3f4cfd7507b9af6d08b50771fff15770c35e96bdb19e61b3651abd72f63beb17096216a85b10fd01ef7306ca082406e8e6c68 SHA512 f4a95c3d74d79315e297a78c99ab2fca17b953c2b2b0f62934ed1de78b3ef98aba423057033eee1936717ff32f469b404875944f81b8e6f723f8cd701990ace9
-EBUILD wvstreams-4.6.1-r4.ebuild 2039 BLAKE2B 48a3607f36ed7344a527c963bd44407e4aff67ae944e79b5f80a6d89bbdffb4458f9223a401d8d282e3956cd6392628764719d9e46ff99582156d7c79585dd96 SHA512 2a24763688a9d28d488ab6baced03d253af9a3a3d15c3d657b14fba32bb230614c8051b7da39b61a895ebbd5bd0eff5e2e68d3c45c7f2c42e5ac27cf2a5d78a1
-EBUILD wvstreams-4.6.1-r5.ebuild 2113 BLAKE2B 3d247490da681010632b09b4839e1dc6beac0e8a6e7d4dfdbc98e1055e6e7fe201ee1663c55d356a98b82795f19115590cd427a530df05214c026c7660fa6a86 SHA512 2fe82454c1c34ac4d70e98b439e31beb3e8d9d6696e8ba0de6068f38e68288291f05bf0dce5f204b2374e746cf166f81300ad8d03d6d185eca5ac1d2ef191aaa
+EBUILD wvstreams-4.6.1-r4.ebuild 2038 BLAKE2B dc58084533c0dd159f6cece9f3e71a0fd986ea9ea79b5042f597f323f34787f2084b1f823cfa014f820c65317b3d27ffa0da7cf138caac68a4c229282d2e5d82 SHA512 b2a9ead8d0b3bb82b8b7dc2f08c51994ba43abae7cda7177ee700d1410652f46f07a8464dacefa8356fb2a97b9d23de005f070fc94b82a14ace273d3061101f2
+EBUILD wvstreams-4.6.1-r5.ebuild 2112 BLAKE2B a48edb2558858a642096d3d5ca9026556d96983d509a4c5cf1d13fee70780354c5b268583c720aaf76f41d3cef73d406fb76b44fd798f9cd075305f527fcb352 SHA512 343a767d872bb15a883444b531461860f57b367478065b6bf190d2db1dffe7576d2e9e63a76a7ff1b66cc7e44c764692e0fe731a895bf937602ef9dc38866d20
+EBUILD wvstreams-99999.ebuild 1907 BLAKE2B ae0a110b682b12e3bdb9a896e8d20defbfd4ef32f53ed58729d91ced4fecaade6f36bfc6282143aa4307ea5a1ac3e27ec5fa4546ed24fe57f2e583a0926e5259 SHA512 8a8a507e142f5731b0bb1608399ad988fba56cb3060b8e55351a963e1fe1d94aa432e04740ea9f5560c9f317892d03f72c8d2d58194dc5bef0d99bcec6f046d5
 MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch b/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch
new file mode 100644
index 000000000000..0bf2bc4a7b02
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch
@@ -0,0 +1,10 @@
+--- a/config.ac
++++ b/config.ac
+@@ -444,7 +444,6 @@
+ if test "$with_openssl" != "no"; then
+     if test "$with_openssl" != ""; then
+         WV_APPEND(CPPFLAGS, [-I$with_openssl/include])
+-        WV_APPEND(LDFLAGS, [-L$with_openssl])
+     fi
+     AC_CHECK_HEADERS(openssl/ssl.h,, [with_openssl=no],
+                      [#define OPENSSL_NO_KRB5])
diff --git a/net-libs/wvstreams/files/wvstreams-99999-soname.patch b/net-libs/wvstreams/files/wvstreams-99999-soname.patch
new file mode 100644
index 000000000000..9dd0d8ab8260
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-99999-soname.patch
@@ -0,0 +1,11 @@
+--- a/default.so.do
++++ b/default.so.do
+@@ -47,7 +47,7 @@
+     redo-ifchange "$OUT/$2.a"
+     ln -s $2.a "$sofile"
+ else
+-    $CXX -o "$sofile" -shared \
++    $CXX -o "$sofile" -shared -Wl,-soname,$sofile \
+         $zdefs \
+         $LDFLAGS \
+         $obj $libdep $libs
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
index df4b00f5a857..52d22d3b1ee3 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r4.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
@@ -62,7 +62,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_with dbus) \
 		$(use_with pam) \
-		--cache-file=${T}/config.cache \
+		--cache-file="${T}"/config.cache \
 		--disable-optimization \
 		--localstatedir=/var \
 		--with-openssl \
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
index 8d33d4bb7186..e9caeed7582e 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r5.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
@@ -63,7 +63,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_with dbus) \
 		$(use_with pam) \
-		--cache-file=${T}/config.cache \
+		--cache-file="${T}"/config.cache \
 		--disable-optimization \
 		--localstatedir=/var \
 		--with-openssl \
diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
new file mode 100644
index 000000000000..8665f2087f92
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-99999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+AT_NOELIBTOOLIZE=yes
+inherit autotools flag-o-matic git-r3 multiprocessing toolchain-funcs out-of-source
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="https://github.com/apenwarr/wvstreams"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2"
+SLOT="0/5.0"
+KEYWORDS=""
+IUSE="+dbus debug doc pam static-libs +zlib"
+
+RDEPEND="
+	<dev-libs/openssl-1.1:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	dbus? ( >=sys-apps/dbus-1.4.20 )
+	pam? ( virtual/pam )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/redo
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999-openssl-ldflags.patch
+	"${FILESDIR}"/${PN}-99999-soname.patch
+)
+
+src_prepare() {
+	sed -i -e 's|-pre||g' config.ac || die
+
+	default
+
+	ln -s config.ac configure.ac || die
+	eautoreconf
+}
+
+my_src_configure() {
+	append-flags -fno-strict-aliasing
+	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
+
+	tc-export AR CC CXX
+
+	econf \
+		$(use_enable debug) \
+		$(use_with dbus) \
+		$(use_with pam) \
+		$(use_with zlib) \
+		--cache-file="${BUILD_DIR}"/config.cache \
+		--disable-optimization \
+		--localstatedir=/var \
+		--without-qt \
+		--without-valgrind
+}
+
+my_src_compile() {
+	redo -j$(makeopts_jobs) || die
+
+	if use doc; then
+		doxygen "${S}"/Doxyfile || die
+	fi
+}
+
+my_src_test() {
+	redo -j$(makeopts_jobs) test || die
+}
+
+my_src_install() {
+	DESTDIR="${D}" redo -j$(makeopts_jobs) install || die
+
+	local lib
+	for lib in $(find "${BUILD_DIR}" -name '*.so' -type l | grep -v libwvstatic); do
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins "${BUILD_DIR}"/pkgconfig/$(basename ${lib/.so}).pc
+	done
+
+	if use doc; then
+		#the list of files is too big for dohtml -r Docs/doxy-html/*
+		docinto html
+		dodoc -r Docs/doxy-html/*
+	fi
+
+	if ! use static-libs; then
+		find "${D}/usr/$(get_libdir)" -name '*.a' -delete || die
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
commit	536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree	697733f5cb713908dcf378e13fd15a798a906a91 /net-libs
parent	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)