gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /net-libs
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
88 files changed, 2137 insertions, 745 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6c5be02035df..888a8a5fb043 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index b21fc2b4df9f..c058d717f1d2 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,3 +1,5 @@
 DIST dleyna-connector-dbus-0.2.0.tar.gz 324464 BLAKE2B f97452490787180f51054c32894ce876b5cc500f39dfc11c8c63052c9eed53ce9bb049e1b725a729e1598b162baecc39d19660616c78823d9f7edf90b4955e30 SHA512 0a1fc71fe299b295e86e47f2e356c89abc77f710e84bebe0f26fdb2ccbba5e693d5c8fc73133d46d902ba700f4369ade988f571ae7475f3325d5d5cce382f1d2
+DIST dleyna-connector-dbus-0.3.0.tar.gz 17306 BLAKE2B b019066f31d6e050b130164e9b3a9dd8e29317db1f93e85c257e1f6f6af7c3310d2fb685d99f12d6eaa00ba983e6e1e88b6d6ae2bf533b117bde16b6d36bde32 SHA512 f1edba6a835575daadb0cc544e0ce5e89bde278d2fbb6802211d3e064e478a3dcb88a2b6d6cbc6b2794a63daf64d33f50795ec67bcd8f00281dbcabcbdbc0468
 EBUILD dleyna-connector-dbus-0.2.0.ebuild 555 BLAKE2B 4d35e80fbd1409d9c636f4941a61337a12a5814c7a9042b01a9949ae580959ab919c990bb913a0c365c76864339cc51aa6c5556ac3f1099070832da4c94cb262 SHA512 55edda4d376d71c7998e38d4ded73383755c7ca35f527d58dd75e10cb19d00221a72e36a77d37570e14466a7adff93d3469752bf28f1b2a8f1285e59f40e66c2
+EBUILD dleyna-connector-dbus-0.3.0.ebuild 639 BLAKE2B f2ea636111735e778446961f6ccf68f333e122bdd93db8bcd59430fb5c86c094cad862bd775cbfb167bf0a23a4f536ecd852b614d6d868343fa3852c901bf1d4 SHA512 5fa2dd05cbf5727d7c8864b3fae468390460817ebea7a632a48af3a6366ca97189bd1a1cd9143374bfa932a85e811b65b3ba37b42f046368e85d3d331370db50
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
new file mode 100644
index 000000000000..a43e8f618081
--- /dev/null
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="utility library for higher level dLeyna libraries"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/dleyna-core-0.2.1:1.0
+	>=sys-apps/dbus-1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest
index 4edf7efa455d..5a96e3eabf56 100644
--- a/net-libs/dleyna-core/Manifest
+++ b/net-libs/dleyna-core/Manifest
@@ -1,3 +1,6 @@
+AUX 0.6.0-gupnp-1.2.patch 2499 BLAKE2B 70528c690f684bc14ee39c256fa315407628f9aa7303cfc5489bc6868cb774df440ede747f59e4a1f37fb322db0403132eff62f258855548b819a733c6c4db21 SHA512 b0bb51867e07068abdde71ba68d5a8a56fde832976496a8f93035b012f5c65417b7bd875566408d401803534943e80a9ac48275b4f025a59f39ecaea0393faf2
 DIST dleyna-core-0.5.0.tar.gz 337307 BLAKE2B fc2b342d1cfd3b132f10bea55b386f7fc0fb31cb541272c5cc002c985b2830c9ac425c497feeb62ebc2bdad76d91f9123408dbd00b24080d1a3b1902e8743727 SHA512 8611ae61482dcb0ca55513ed4ce7cae9372f88d710033e5abbaeb3c06533a7b2ac143757776bf9ced0dd3f0149ee9f2e42e90fac3ecbbeb42f38d13aeae7849f
-EBUILD dleyna-core-0.5.0.ebuild 531 BLAKE2B a4d984f3e90a1acf84144c310483dbc2a2af89b0c07005ef2cf2e4cfa2fb970f9479c5ab2655779643ef72ed553b3aff8f6b518349f599ecb4569af037537a1e SHA512 f13ad1176efc8ca66a28c77d781d4a20bf52378257f676b0ec91a38191efce21a19685202dc1590c2c8f4fb72ba27a3d94a66de573644e51a99797960d2c22e5
+DIST dleyna-core-0.6.0.tar.gz 30821 BLAKE2B f97ef825ef28efd58877487074c0146f8c8425b000537a2281ab44465829030ba9b837f95ad16b56044837a3e571a0ce54a8126ddafc2dda551dbf1d8b11a79e SHA512 cda3f3ee2bea860b06447ab79d8ca62a29c8d26215774c44adb05e57316b95acd4df6ee4ecdd731574b6da5b3aef1c08977a649288004a62a88af38a83157b57
+EBUILD dleyna-core-0.5.0.ebuild 535 BLAKE2B 3d2379127ad4b6d79b666822f1761c2da5689c41a9d2de43ad89c9c98ee45b98735c2386692623f8a7bd312c9e25897d0ad68eadd5c6edb7c6ae310106d3c991 SHA512 06077ab0daed7261b0fc4a33101b1b9eec748cbede503c78194aa914b98de47dcd69d43f728ce1448280f692e3f42980e77418abaa0a14124cce24c35b651ee3
+EBUILD dleyna-core-0.6.0.ebuild 670 BLAKE2B 7eea5157042c64aedd7349c3f5b30432f65b4857e5ba3d05d2aca09c6d0ededcbd1d1e7b144d967e3b081ca0fabb11ced61fb728e77b7523bbc3c411225c4386 SHA512 a436bfcead55112a25a5c3852029222dc0ff43c279c8a4e4d559e644a0b08b6a099a3a69da9565367a0e3789602f1a85d8305c1ac071a3b34f093f05d5fc8744
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
index e8969cb21f79..5679380a109b 100644
--- a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
-	>=net-libs/gupnp-0.20.5
+	>=net-libs/gupnp-0.20.5:0/4
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
new file mode 100644
index 000000000000..d60cf90fb902
--- /dev/null
+++ b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="utility library for higher level dLeyna libraries"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_3.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0/4"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/gupnp-1.2.0:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gupnp-1.2.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch b/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch
new file mode 100644
index 000000000000..71eef9f37b37
--- /dev/null
+++ b/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch
@@ -0,0 +1,73 @@
+From 41b2e56f67b6fc9c8c256b86957d281644b9b846 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Sat, 16 Mar 2019 05:39:38 +0100
+Subject: [PATCH] Port to gupnp-1.2
+
+The latest version of gupnp breaks backwards compatibility. Fortunately,
+there are not many calls to gupnp functions in core, so we just needed
+to bump the dependencies.
+
+There is one deprecated gupnp_service_proxy_cancel_action call but
+I am not sure how to change it without breaking Dleyna API.
+Let's leave it for now.
+---
+ configure.ac                  | 2 +-
+ dleyna-core-1.0.pc.in         | 2 +-
+ libdleyna/core/main-loop.c    | 4 ----
+ libdleyna/core/service-task.c | 1 +
+ 4 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a96c84..9f769e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ PKG_PROG_PKG_CONFIG(0.16)
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
+ PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
+ PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.28])
+-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
++PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([stdlib.h string.h syslog.h])
+diff --git a/dleyna-core-1.0.pc.in b/dleyna-core-1.0.pc.in
+index 966a8e1..52b718e 100644
+--- a/dleyna-core-1.0.pc.in
++++ b/dleyna-core-1.0.pc.in
+@@ -8,5 +8,5 @@ Name: @PACKAGE@
+ Description: UPnP & DLNA core library
+ Libs: -L${libdir} -ldleyna-core-1.0
+ Cflags: -I${includedir}/dleyna-1.0
+-Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0
++Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.2
+ Version: @VERSION@
+diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c
+index 3642a5b..9716b06 100644
+--- a/libdleyna/core/main-loop.c
++++ b/libdleyna/core/main-loop.c
+@@ -128,10 +128,6 @@ int dleyna_main_loop_start(const char *server,
+ {
+ 	int retval = 1;
+ 
+-#if !GLIB_CHECK_VERSION(2, 35, 0)
+-	g_type_init();
+-#endif
+-
+ 	dleyna_log_init(server, control_point->get_version());
+ 
+ 	if (!prv_context_init(server, control_point))
+diff --git a/libdleyna/core/service-task.c b/libdleyna/core/service-task.c
+index e0ca2df..fb113c3 100644
+--- a/libdleyna/core/service-task.c
++++ b/libdleyna/core/service-task.c
+@@ -103,6 +103,7 @@ void dleyna_service_task_cancel_cb(dleyna_task_atom_t *atom, gpointer user_data)
+ 
+ 	if (task->p_action) {
+ 		if (task->proxy)
++			// TODO: switch to GCancellable
+ 			gupnp_service_proxy_cancel_action(task->proxy,
+ 							  task->p_action);
+ 		task->p_action = NULL;
+-- 
+2.20.1
+
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index 8453d3ed493b..f11b55d0df06 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1,3 +1,6 @@
+AUX 0.6.0-gupnp-1.2.patch 27528 BLAKE2B c9c872faac1fb257aad958d167627b38557455cd2fd1e284f2b234cb7f73026bcfbdf79843c78a5611b6c4d4d79380304dd64e8f4fe07f6f9e370cc8d82d029a SHA512 5eb8148a1416f6420167097b51eca77be432cfaa7f2d86a1d9255cbb41b99dda0338a01e433974b9bbbfa68e2ec6ca16a4c79523b2e184e1ffaf0f65dbc52fc1
 DIST dleyna-renderer-0.5.0.tar.gz 378208 BLAKE2B 4a1b9e28310c2dd13baa9dccc1f35b2190b6af852da5a3a7ee77766affd7c52312e68b34a881652f3dbf6f71f0e25a69988ed2ff6ce897dc4f74c60793e06359 SHA512 28802057d6e0b7da24fd8abb11748faeb78ea6ef15ce85d83907497ff252c86cec1072a919e64bab6df0a375e0092c1281569802515fb87d9dc083098f1d4820
-EBUILD dleyna-renderer-0.5.0.ebuild 774 BLAKE2B e788dc6d7c611a2d8bc8e8f3ffabdf457813a18d57c01dbf9fa7f387f6d0833ffcd27c34e85ad8014a8bd70bf341113e91cc16af4f1308f0b7a8408646f48dfc SHA512 027a8cc430e1b4eb28f9ffdb8b1f0285d4d1a8dfd5a6fd2b797a8b626b91ace6ecd8cec8996c698da154c4cb284168a6add843ed6d539c0d777d7fd2b82bcd87
+DIST dleyna-renderer-0.6.0.tar.gz 65566 BLAKE2B cfd2b5a08b2e5c6e15006e722c4878281bf7f4b6d8a9bd317ec5b27fc1568a2ca891af2ac2fc3c230f65e9920bd524b4fbaf43631192b079b2aea051783d2b8a SHA512 f4cb6c658bfaf620962eb6b84ab6b41be1bb8455ac1ff358db7fcf3db7f5c4e2130bb7b0e5201005c738e892aabf25b3cf2a3e1cc1f4a9ef9d834789b87c0183
+EBUILD dleyna-renderer-0.5.0.ebuild 782 BLAKE2B 7f81aacd9026c61e430e155020ffcec8073db3a1c499ed76e552701ec38358da81e4b2daebbf7e1ca21754f8ec2e23ba47114b3c4421f6f22ac1ed79b4f9c10c SHA512 ecd401208c765811d463ad81c886518f1a1339660e83f5495b1de343d53650de18e0f0eb9d9c9c30af8cdd41b45cd36d3162f62c16d792277c3f370a1ee3a6d1
+EBUILD dleyna-renderer-0.6.0.ebuild 876 BLAKE2B d68b6f44b7bc2c899f37bae971357bcf02809f7a56eb8475404bab3ec7b8b14a22a0d1aed267a4be7ecb3b8ccb001ccacdf6a4f1d5f5f3418f77a7f004235e45 SHA512 4701cdb56bb0cf119025d56eb34d6bb5dada81bf55b0a54697aa05a9842d87b434219d007f586ac1858f42f1165ea69b549469de1ce004e99670de6faae56495
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
index a62e8c4fd927..c6d747523d8e 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
@@ -18,8 +18,8 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.28:2
 	>=media-libs/gupnp-dlna-0.9.4:2.0
 	>=net-libs/dleyna-core-0.5
-	>=net-libs/gssdp-0.13.2
-	>=net-libs/gupnp-0.20.5
+	>=net-libs/gssdp-0.13.2:0/3
+	>=net-libs/gupnp-0.20.5:0/4
 	>=net-libs/gupnp-av-0.11.5
 	>=net-libs/libsoup-2.28.2:2.4
 "
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
new file mode 100644
index 000000000000..d8d20888cdb8
--- /dev/null
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="library implementing services that allow clients to discover and manipulate DLNA renderers"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=net-libs/dleyna-core-0.6.0
+	>=net-libs/gssdp-1.2.0:0=
+	>=net-libs/gupnp-1.2.0:0=
+	>=net-libs/gupnp-av-0.11.5
+	>=net-libs/libsoup-2.28.2:2.4
+"
+RDEPEND="${DEPEND}
+	net-libs/dleyna-connector-dbus
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gupnp-1.2.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch b/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch
new file mode 100644
index 000000000000..2fddca199444
--- /dev/null
+++ b/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch
@@ -0,0 +1,944 @@
+https://github.com/intel/dleyna-renderer/pull/167
+
+From 594015eac2757f629a32d043c9a9b10ff6c5f95f Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Mon, 5 Nov 2018 22:07:09 +0100
+Subject: [PATCH 1/4] Use english for logging
+
+---
+ libdleyna/renderer/device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
+index 7acef89..032d394 100644
+--- a/libdleyna/renderer/device.c
++++ b/libdleyna/renderer/device.c
+@@ -1201,7 +1201,7 @@ static void prv_add_actions(dlr_device_t *device,
+ 				continue;
+ 			}
+ 
+-			DLEYNA_LOG_DEBUG("DLNA version ≥ 1.50 pour %s",
++			DLEYNA_LOG_DEBUG("DLNA version ≥ 1.50 for %s",
+ 					 device->path);
+ 			timeseek_missing = TRUE;
+ 			g_free(dlna_device_class);
+
+From a588dd11e4c6d2ff6a7c1789fad913ab9c2519b5 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Sat, 21 Sep 2019 20:36:04 +0200
+Subject: [PATCH 2/4] Do service introspection on device creation
+
+Fixes #104
+Fixes #164
+---
+ libdleyna/renderer/Makefile.am   |   2 +
+ libdleyna/renderer/device.c      | 411 ++++++++++++++++---------------
+ libdleyna/renderer/gasync-task.c | 135 ++++++++++
+ libdleyna/renderer/gasync-task.h |  57 +++++
+ libdleyna/renderer/manager.c     |   1 -
+ libdleyna/renderer/upnp.c        |  14 +-
+ 6 files changed, 419 insertions(+), 201 deletions(-)
+ create mode 100644 libdleyna/renderer/gasync-task.c
+ create mode 100644 libdleyna/renderer/gasync-task.h
+
+diff --git a/libdleyna/renderer/Makefile.am b/libdleyna/renderer/Makefile.am
+index ca601c7..ce4dc41 100644
+--- a/libdleyna/renderer/Makefile.am
++++ b/libdleyna/renderer/Makefile.am
+@@ -22,6 +22,7 @@ libdleyna_renderer_1_0_la_LDFLAGS =	-version-info $(DLEYNA_RENDERER_VERSION) \
+ libdleyna_renderer_1_0_la_SOURCES =	$(libdleyna_rendererinc_HEADERS) \
+ 					async.c				 \
+ 					device.c	 		 \
++					gasync-task.c			 \
+ 					host-service.c			 \
+ 					manager.c			 \
+ 					server.c			 \
+@@ -53,6 +54,7 @@ sysconf_DATA = dleyna-renderer-service.conf
+ EXTRA_DIST = 	$(sysconf_DATA)			\
+ 		async.h				\
+ 		device.h			\
++		gasync-task.h			 \
+ 		host-service.h			\
+ 		prop-defs.h			\
+ 		manager.h			\
+diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
+index 032d394..73b3dd3 100644
+--- a/libdleyna/renderer/device.c
++++ b/libdleyna/renderer/device.c
+@@ -26,15 +26,16 @@
+ 
+ #include <libsoup/soup.h>
+ #include <libgupnp/gupnp-control-point.h>
++#include <libgupnp/gupnp-service-proxy.h>
+ #include <libgupnp-av/gupnp-av.h>
+ 
+ #include <libdleyna/core/core.h>
+ #include <libdleyna/core/error.h>
+ #include <libdleyna/core/log.h>
+-#include <libdleyna/core/service-task.h>
+ 
+ #include "async.h"
+ #include "device.h"
++#include "gasync-task.h"
+ #include "prop-defs.h"
+ #include "server.h"
+ 
+@@ -675,21 +676,30 @@ static void prv_process_protocol_info(dlr_device_t *device,
+ 	DLEYNA_LOG_DEBUG("Exit");
+ }
+ 
+-static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
+-				     GUPnPServiceProxyAction *action,
++static void prv_get_protocol_info_cb(GObject *target,
++                                     GAsyncResult *res,
+ 				     gpointer user_data)
+ {
+ 	gchar *result = NULL;
+ 	gboolean end;
+ 	GError *error = NULL;
+ 	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
++	GUPnPServiceProxyAction *action;
+ 
+ 	DLEYNA_LOG_DEBUG("Enter");
+ 
+ 	priv_t->dev->construct_step++;
+ 
+-	end = gupnp_service_proxy_end_action(proxy, action, &error, "Sink",
+-					     G_TYPE_STRING, &result, NULL);
++	action = gupnp_service_proxy_call_action_finish(GUPNP_SERVICE_PROXY(target), res, &error);
++
++	if (action == NULL || (error != NULL)) {
++		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
++				   ((error != NULL) ? error->message
++						    : "Invalid result"));
++		goto on_error;
++	}
++
++	end = gupnp_service_proxy_action_get_result (action, &error, "Sink", G_TYPE_STRING, &result, NULL);
+ 	if (!end || (result == NULL)) {
+ 		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
+ 				   ((error != NULL) ? error->message
+@@ -701,6 +711,10 @@ static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
+ 
+ on_error:
+ 
++	if (action) {
++		gupnp_service_proxy_action_unref(action);
++	}
++
+ 	if (error)
+ 		g_error_free(error);
+ 
+@@ -709,53 +723,193 @@ static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
+ 	DLEYNA_LOG_DEBUG("Exit");
+ }
+ 
+-static GUPnPServiceProxyAction *prv_get_protocol_info(
+-						dleyna_service_task_t *task,
+-						GUPnPServiceProxy *proxy,
+-						gboolean *failed)
++static void prv_introspection_wrap_cb (GUPnPServiceInfo *info,
++				  GUPnPServiceIntrospection *introspection,
++				  const GError *error,
++				  gpointer user_data)
++{
++	if (error != NULL) {
++		g_task_return_error (G_TASK (user_data),
++				g_error_copy (error));
++	} else {
++		g_task_return_pointer (G_TASK (user_data),
++				introspection,
++				g_object_unref);
++	}
++
++	g_object_unref (G_OBJECT (user_data));
++}
++
++void prv_introspect_async (GUPnPServiceInfo    *info,
++			   GCancellable        *cancellable,
++			   GAsyncReadyCallback  callback,
++			   gpointer             user_data)
++{
++	GTask *task = g_task_new (info, cancellable, callback, user_data);
++
++	gupnp_service_info_get_introspection_async_full (info,
++			prv_introspection_wrap_cb,
++			cancellable,
++			task);
++}
++
++static GUPnPServiceIntrospection *prv_introspect_finish
++		(GUPnPServiceInfo   *info,
++		 GAsyncResult       *res,
++		 GError            **error)
++{
++	g_return_val_if_fail (g_task_is_valid (res, info), NULL);
++
++	return g_task_propagate_pointer (G_TASK (res), error);
++}
++
++static gint compare_speeds(gconstpointer a, gconstpointer b);
++
++static void prv_introspect_av_cb (GObject *target,
++				  GAsyncResult *res,
++				  gpointer user_data)
++{
++	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
++	GError *error = NULL;
++	GUPnPServiceIntrospection *introspection;
++	const GUPnPServiceStateVariableInfo *svi;
++	GList *allowed_values;
++	GVariant *speeds = NULL;
++	const GUPnPServiceActionInfo *sai;
++
++	DLEYNA_LOG_DEBUG("Enter");
++
++	priv_t->dev->construct_step++;
++
++	introspection = prv_introspect_finish (GUPNP_SERVICE_INFO (target), res, &error);
++
++	if (introspection == NULL || (error != NULL)) {
++		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
++				   ((error != NULL) ? error->message
++						    : "Invalid result"));
++		goto on_error;
++	}
++
++	svi = gupnp_service_introspection_get_state_variable(
++							introspection,
++							"TransportPlaySpeed");
++
++	if (svi && svi->allowed_values) {
++		allowed_values = svi->allowed_values;
++
++		allowed_values = g_list_sort(allowed_values, compare_speeds);
++
++		prv_get_rates_values(allowed_values, &speeds,
++				     &priv_t->dev->transport_play_speeds,
++				     &priv_t->dev->min_rate,
++				     &priv_t->dev->max_rate);
++
++		priv_t->dev->mpris_transport_play_speeds = g_variant_ref_sink(speeds);
++	}
++
++	sai = gupnp_service_introspection_get_action(
++						introspection,
++						"X_DLNA_GetBytePositionInfo");
++
++	priv_t->dev->can_get_byte_position = (sai != NULL);
++
++on_error:
++	g_clear_object(&introspection);
++
++	g_clear_error(&error);
++
++	DLEYNA_LOG_DEBUG("Exit");
++}
++
++static void prv_introspect_rc_cb (GObject *target,
++				  GAsyncResult *res,
++				  gpointer user_data)
++{
++	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
++	GError *error = NULL;
++	GUPnPServiceIntrospection *introspection;
++	const GUPnPServiceStateVariableInfo *svi;
++
++	DLEYNA_LOG_DEBUG("Enter");
++
++	priv_t->dev->construct_step++;
++
++	introspection = prv_introspect_finish (GUPNP_SERVICE_INFO (target), res, &error);
++
++	if (introspection == NULL || (error != NULL)) {
++		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
++				   ((error != NULL) ? error->message
++						    : "Invalid result"));
++		goto on_error;
++	}
++
++	svi = gupnp_service_introspection_get_state_variable(introspection,
++							     "Volume");
++	if (svi != NULL)
++		priv_t->dev->max_volume = g_value_get_uint(&svi->maximum);
++
++on_error:
++	g_clear_object(&introspection);
++
++	g_clear_error(&error);
++
++	DLEYNA_LOG_DEBUG("Exit");
++}
++
++static gboolean prv_get_protocol_info(
++				dleyna_gasync_task_t *task,
++                        GObject *target)
+ {
+-	*failed = FALSE;
++    GUPnPServiceProxyAction *action;
+ 
+-	return gupnp_service_proxy_begin_action(
+-					proxy, "GetProtocolInfo",
+-					dleyna_service_task_begin_action_cb,
+-					task, NULL);
++    action = gupnp_service_proxy_action_new("GetProtocolInfo", NULL);
++
++    gupnp_service_proxy_call_action_async(GUPNP_SERVICE_PROXY (target), action,
++            dleyna_gasync_task_get_cancellable (task),
++            dleyna_gasync_task_ready_cb,
++            task);
++
++    return FALSE;
++}
++
++static gboolean prv_introspect(dleyna_gasync_task_t *task, GObject *target)
++{
++	prv_introspect_async (GUPNP_SERVICE_INFO (target),
++			      dleyna_gasync_task_get_cancellable (task),
++			      dleyna_gasync_task_ready_cb,
++			      task);
++
++	return FALSE;
+ }
+ 
+-static GUPnPServiceProxyAction *prv_subscribe(dleyna_service_task_t *task,
+-					      GUPnPServiceProxy *proxy,
+-					      gboolean *failed)
++static gboolean prv_subscribe(dleyna_gasync_task_t *task, GObject *target)
+ {
+ 	dlr_device_t *device;
+ 
+ 	DLEYNA_LOG_DEBUG("Enter");
+ 
+-	device = (dlr_device_t *)dleyna_service_task_get_user_data(task);
++	device = (dlr_device_t *)dleyna_gasync_task_get_user_data(task);
+ 
+ 	device->construct_step++;
+ 	prv_device_subscribe_context(device);
+ 
+-	*failed = FALSE;
+-
+ 	DLEYNA_LOG_DEBUG("Exit");
+ 
+-	return NULL;
++	return FALSE;
+ }
+ 
+-static GUPnPServiceProxyAction *prv_declare(dleyna_service_task_t *task,
+-					    GUPnPServiceProxy *proxy,
+-					    gboolean *failed)
++static gboolean prv_declare(dleyna_gasync_task_t *task,
++					    GObject *target)
+ {
+ 	unsigned int i;
+ 	dlr_device_t *device;
+ 	prv_new_device_ct_t *priv_t;
+ 	const dleyna_connector_dispatch_cb_t *table;
++    gboolean result = FALSE;
+ 
+ 	DLEYNA_LOG_DEBUG("Enter");
+ 
+-	*failed = FALSE;
+-
+-	priv_t = (prv_new_device_ct_t *)dleyna_service_task_get_user_data(task);
++	priv_t = (prv_new_device_ct_t *)dleyna_gasync_task_get_user_data(task);
+ 	device = priv_t->dev;
+ 	device->construct_step++;
+ 
+@@ -770,16 +924,16 @@ static GUPnPServiceProxyAction *prv_declare(dleyna_service_task_t *task,
+ 				table + i);
+ 
+ 		if (!device->ids[i]) {
+-			*failed = TRUE;
++			result = TRUE;
+ 			goto on_error;
+ 		}
+ 	}
+ 
+ on_error:
+ 
+-DLEYNA_LOG_DEBUG("Exit");
++	DLEYNA_LOG_DEBUG("Exit");
+ 
+-	return NULL;
++	return result;
+ }
+ 
+ static void prv_free_rc_event(gpointer user_data)
+@@ -800,6 +954,9 @@ void dlr_device_construct(
+ {
+ 	prv_new_device_ct_t *priv_t;
+ 	GUPnPServiceProxy *s_proxy;
++	GUPnPServiceProxy *av_proxy;
++	GUPnPServiceProxy *rc_proxy;
++	GCancellable *cancellable;
+ 
+ 	DLEYNA_LOG_DEBUG("Current step: %d", dev->construct_step);
+ 
+@@ -809,19 +966,42 @@ void dlr_device_construct(
+ 	priv_t->dispatch_table = dispatch_table;
+ 
+ 	s_proxy = context->service_proxies.cm_proxy;
++	cancellable = g_cancellable_new ();
+ 
+ 	if (dev->construct_step < 1)
+-		dleyna_service_task_add(queue_id, prv_get_protocol_info,
+-					s_proxy, prv_get_protocol_info_cb,
+-					NULL, priv_t);
++		dleyna_gasync_task_add(queue_id,
++				       prv_get_protocol_info,
++				       G_OBJECT(s_proxy),
++				       prv_get_protocol_info_cb,
++				       cancellable,
++				       NULL, priv_t);
++
++	av_proxy = context->service_proxies.av_proxy;
++	if (dev->construct_step < 2)
++		dleyna_gasync_task_add(queue_id,
++				       prv_introspect,
++				       G_OBJECT(av_proxy),
++				       prv_introspect_av_cb,
++				       cancellable,
++				       NULL, priv_t);
++
++	rc_proxy = context->service_proxies.rc_proxy;
++	if (dev->construct_step < 3)
++		dleyna_gasync_task_add(queue_id,
++				       prv_introspect,
++				       G_OBJECT(rc_proxy),
++				       prv_introspect_rc_cb,
++				       cancellable,
++				       NULL, priv_t);
++
+ 
+ 	/* The following task should always be completed */
+-	dleyna_service_task_add(queue_id, prv_subscribe, s_proxy,
+-				NULL, NULL, dev);
++	dleyna_gasync_task_add(queue_id, prv_subscribe, G_OBJECT(s_proxy),
++				NULL, NULL, NULL, dev);
+ 
+-	if (dev->construct_step < 3)
+-		dleyna_service_task_add(queue_id, prv_declare, s_proxy,
+-					NULL, g_free, priv_t);
++	if (dev->construct_step < 5)
++		dleyna_gasync_task_add(queue_id, prv_declare, G_OBJECT(s_proxy),
++					NULL, NULL, g_free, priv_t);
+ 
+ 	dleyna_task_queue_start(queue_id);
+ 
+@@ -2121,133 +2301,6 @@ static void prv_get_rates_values(GList *allowed_tp_speeds,
+ 	return;
+ }
+ 
+-static gboolean prv_get_av_service_states_values(GUPnPServiceProxy *av_proxy,
+-						 GVariant **mpris_tp_speeds,
+-						 GPtrArray **upnp_tp_speeds,
+-						 double *min_rate,
+-						 double *max_rate,
+-						 gboolean *can_get_byte_pos)
+-{
+-	const GUPnPServiceStateVariableInfo *svi;
+-	const GUPnPServiceActionInfo *sai;
+-	GUPnPServiceIntrospection *introspection;
+-	GError *error = NULL;
+-	GVariant *speeds = NULL;
+-	GList *allowed_values;
+-	gpointer weak_ref = NULL;
+-	gboolean  device_alive = TRUE;
+-
+-	/* TODO: this weak_ref hack is needed as
+-	   gupnp_service_info_get_introspection iterates the main loop.
+-	   This can result in our device getting deleted before this
+-	   function returns.  Ultimately, this code needs to be re-written
+-	   to use gupnp_service_info_get_introspection_async but this cannot
+-	   really be done until GUPnP provides a way to cancel this function. */
+-
+-	weak_ref = av_proxy;
+-	g_object_add_weak_pointer(G_OBJECT(av_proxy), &weak_ref);
+-
+-	introspection = gupnp_service_info_get_introspection(
+-		GUPNP_SERVICE_INFO(av_proxy),
+-		&error);
+-
+-	if (!weak_ref) {
+-		DLEYNA_LOG_WARNING("Lost device during introspection call");
+-		device_alive = FALSE;
+-		goto exit;
+-	}
+-
+-	g_object_remove_weak_pointer(G_OBJECT(av_proxy), &weak_ref);
+-
+-	if (error != NULL) {
+-		DLEYNA_LOG_DEBUG(
+-			"failed to fetch AV service introspection file");
+-
+-		g_error_free(error);
+-
+-		goto exit;
+-	}
+-
+-	svi = gupnp_service_introspection_get_state_variable(
+-							introspection,
+-							"TransportPlaySpeed");
+-
+-	if (svi && svi->allowed_values) {
+-		allowed_values = svi->allowed_values;
+-
+-		allowed_values = g_list_sort(allowed_values, compare_speeds);
+-
+-		prv_get_rates_values(allowed_values, &speeds, upnp_tp_speeds,
+-				     min_rate, max_rate);
+-
+-		*mpris_tp_speeds = g_variant_ref_sink(speeds);
+-	}
+-
+-	sai = gupnp_service_introspection_get_action(
+-						introspection,
+-						"X_DLNA_GetBytePositionInfo");
+-
+-	*can_get_byte_pos = (sai != NULL);
+-
+-	g_object_unref(introspection);
+-
+-exit:
+-
+-	return device_alive;
+-}
+-
+-static gboolean prv_get_rc_service_states_values(GUPnPServiceProxy *rc_proxy,
+-						 guint *max_volume)
+-{
+-	const GUPnPServiceStateVariableInfo *svi;
+-	GUPnPServiceIntrospection *introspection;
+-	GError *error = NULL;
+-	gpointer weak_ref = NULL;
+-	gboolean device_alive = TRUE;
+-
+-	/* TODO: this weak_ref hack is needed as
+-	   gupnp_service_info_get_introspection iterates the main loop.
+-	   This can result in our device getting deleted before this
+-	   function returns.  Ultimately, this code needs to be re-written
+-	   to use gupnp_service_info_get_introspection_async but this cannot
+-	   really be done until GUPnP provides a way to cancel this function. */
+-
+-	weak_ref = rc_proxy;
+-	g_object_add_weak_pointer(G_OBJECT(rc_proxy), &weak_ref);
+-
+-	introspection = gupnp_service_info_get_introspection(
+-		GUPNP_SERVICE_INFO(rc_proxy),
+-		&error);
+-
+-	if (!weak_ref) {
+-		DLEYNA_LOG_WARNING("Lost device during introspection call");
+-		device_alive = FALSE;
+-		goto exit;
+-	}
+-
+-	g_object_remove_weak_pointer(G_OBJECT(rc_proxy), &weak_ref);
+-
+-	if (error != NULL) {
+-		DLEYNA_LOG_DEBUG(
+-			"failed to fetch RC service introspection file");
+-
+-		g_error_free(error);
+-
+-		goto exit;
+-	}
+-
+-	svi = gupnp_service_introspection_get_state_variable(introspection,
+-							     "Volume");
+-	if (svi != NULL)
+-		*max_volume = g_value_get_uint(&svi->maximum);
+-
+-	g_object_unref(introspection);
+-
+-exit:
+-
+-	return device_alive;
+-}
+-
+ static void prv_update_device_props(GUPnPDeviceInfo *proxy, GHashTable *props)
+ {
+ 	GVariant *val;
+@@ -2378,34 +2431,6 @@ static gboolean prv_props_update(dlr_device_t *device, dlr_task_t *task)
+ 
+ 	service_proxies = &context->service_proxies;
+ 
+-	/* TODO: We should not retrieve these values here.  They should be
+-	   retrieved during device construction. */
+-
+-	if (service_proxies->av_proxy)
+-		if (!prv_get_av_service_states_values(
+-			    service_proxies->av_proxy,
+-			    &device->mpris_transport_play_speeds,
+-			    &device->transport_play_speeds,
+-			    &device->min_rate,
+-			    &device->max_rate,
+-			    &device->can_get_byte_position)) {
+-			DLEYNA_LOG_DEBUG("Lost Device AV");
+-
+-			device_alive = FALSE;
+-			goto on_lost_device;
+-		}
+-
+-	/* TODO: We should not retrieve these values here.  They should be
+-	   retrieved during device construction. */
+-
+-	if (service_proxies->rc_proxy)
+-		if (!prv_get_rc_service_states_values(service_proxies->rc_proxy,
+-						      &device->max_volume)) {
+-			DLEYNA_LOG_DEBUG("Lost Device RC");
+-			device_alive = FALSE;
+-			goto on_lost_device;
+-		}
+-
+ 	changed_props_vb = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+ 
+ 	prv_add_player_speed_props(device->props.player_props,
+diff --git a/libdleyna/renderer/gasync-task.c b/libdleyna/renderer/gasync-task.c
+new file mode 100644
+index 0000000..47a0ad5
+--- /dev/null
++++ b/libdleyna/renderer/gasync-task.c
+@@ -0,0 +1,135 @@
++/*
++ * dLeyna
++ *
++ * Copyright (c) 2019 Jens Georg <mail@jensge.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions of the GNU Lesser General Public License,
++ * version 2.1, as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ */
++
++#include "gasync-task.h"
++#include <libdleyna/core/task-processor.h>
++
++struct dleyna_gasync_task_t_ {
++	dleyna_task_atom_t base;
++	dleyna_gasync_task_action action;
++	GObject *target;
++	GAsyncReadyCallback callback;
++	GCancellable *cancellable;
++	GDestroyNotify free_func;
++	gpointer cb_user_data;
++};
++
++const char *dleyna_gasync_task_create_source(void)
++{
++	static unsigned int cpt = 1;
++	static char source[27];
++
++	g_snprintf(source, 27, "gasync-source-%d", cpt);
++	cpt++;
++
++	return source;
++}
++
++void dleyna_gasync_task_add(const dleyna_task_queue_key_t *queue_id,
++		dleyna_gasync_task_action action,
++		GObject *target,
++		GAsyncReadyCallback callback,
++		GCancellable *cancellable,
++		GDestroyNotify free_func,
++		gpointer cb_user_data)
++{
++	dleyna_gasync_task_t *task;
++
++	task = g_new0(dleyna_gasync_task_t, 1);
++
++	task->action = action;
++	task->callback = callback;
++	task->cancellable = cancellable;
++	task->free_func = free_func;
++	task->cb_user_data = cb_user_data;
++	task->target = target;
++
++	if (target != NULL) {
++		g_object_add_weak_pointer (target, (gpointer *)(&task->target));
++	}
++
++	dleyna_task_queue_add_task(queue_id, &task->base);
++}
++
++void dleyna_gasync_task_ready_cb(GObject *source, GAsyncResult *res, gpointer user_data)
++{
++	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)user_data;
++
++	task->callback(source, res, task->cb_user_data);
++
++	dleyna_task_queue_task_completed(task->base.queue_id);
++}
++
++void dleyna_gasync_task_process_cb(dleyna_task_atom_t *atom,
++		gpointer user_data)
++{
++	gboolean failed = FALSE;
++
++	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
++
++	failed = task->action(task, task->target);
++
++	if (failed) {
++		dleyna_task_processor_cancel_queue(task->base.queue_id);
++		dleyna_task_queue_task_completed(task->base.queue_id);
++	}
++
++	if (task->callback == NULL) {
++		dleyna_task_queue_task_completed(task->base.queue_id);
++	}
++}
++
++void dleyna_gasync_task_cancel_cb(dleyna_task_atom_t *atom,
++		gpointer user_data)
++{
++	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
++
++	if (task->cancellable) {
++		g_cancellable_cancel (task->cancellable);
++		task->cancellable = NULL;
++
++		dleyna_task_queue_task_completed(task->base.queue_id);
++	}
++}
++
++void dleyna_gasync_task_delete_cb(dleyna_task_atom_t *atom,
++		gpointer user_data)
++{
++	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
++
++	if (task->free_func != NULL)
++		task->free_func(task->cb_user_data);
++
++	if (task->target != NULL) {
++		g_object_remove_weak_pointer(task->target, (gpointer *)&task->target);
++	}
++
++	g_free(task);
++}
++
++gpointer dleyna_gasync_task_get_user_data(dleyna_gasync_task_t *task)
++{
++	return task->cb_user_data;
++}
++
++GCancellable *dleyna_gasync_task_get_cancellable(dleyna_gasync_task_t *task)
++{
++	return task->cancellable;
++}
+diff --git a/libdleyna/renderer/gasync-task.h b/libdleyna/renderer/gasync-task.h
+new file mode 100644
+index 0000000..629e48c
+--- /dev/null
++++ b/libdleyna/renderer/gasync-task.h
+@@ -0,0 +1,57 @@
++/*
++ * dLeyna
++ *
++ * Copyright (c) 2019 Jens Georg <mail@jensge.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions of the GNU Lesser General Public License,
++ * version 2.1, as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ */
++
++#pragma once
++
++#include <libdleyna/core/task-atom.h>
++
++#include <glib.h>
++#include <gio/gio.h>
++
++typedef struct dleyna_gasync_task_t_ dleyna_gasync_task_t;
++
++typedef gboolean (*dleyna_gasync_task_action)
++	(dleyna_gasync_task_t *task,
++	 GObject *target);
++
++const char *dleyna_gasync_task_create_source(void);
++
++void dleyna_gasync_task_add(const dleyna_task_queue_key_t *queue_id,
++		dleyna_gasync_task_action action,
++		GObject *target,
++		GAsyncReadyCallback callback,
++		GCancellable *cancellable,
++		GDestroyNotify free_func,
++		gpointer cb_user_data);
++
++void dleyna_gasync_task_ready_cb(GObject *source, GAsyncResult *res, gpointer user_data);
++
++void dleyna_gasync_task_process_cb(dleyna_task_atom_t *atom,
++		gpointer user_data);
++
++void dleyna_gasync_task_cancel_cb(dleyna_task_atom_t *atom,
++		gpointer user_data);
++
++void dleyna_gasync_task_delete_cb(dleyna_task_atom_t *atom,
++		gpointer user_data);
++
++gpointer dleyna_gasync_task_get_user_data(dleyna_gasync_task_t *task);
++
++GCancellable *dleyna_gasync_task_get_cancellable(dleyna_gasync_task_t *task);
+diff --git a/libdleyna/renderer/manager.c b/libdleyna/renderer/manager.c
+index 74052f5..bea9935 100644
+--- a/libdleyna/renderer/manager.c
++++ b/libdleyna/renderer/manager.c
+@@ -25,7 +25,6 @@
+ 
+ #include <libdleyna/core/error.h>
+ #include <libdleyna/core/log.h>
+-#include <libdleyna/core/service-task.h>
+ #include <libdleyna/core/white-list.h>
+ 
+ #include "async.h"
+diff --git a/libdleyna/renderer/upnp.c b/libdleyna/renderer/upnp.c
+index 17cbda7..0e9d483 100644
+--- a/libdleyna/renderer/upnp.c
++++ b/libdleyna/renderer/upnp.c
+@@ -28,10 +28,10 @@
+ 
+ #include <libdleyna/core/error.h>
+ #include <libdleyna/core/log.h>
+-#include <libdleyna/core/service-task.h>
+ 
+ #include "async.h"
+ #include "device.h"
++#include "gasync-task.h"
+ #include "host-service.h"
+ #include "prop-defs.h"
+ #include "upnp.h"
+@@ -116,12 +116,12 @@ static const dleyna_task_queue_key_t *prv_create_device_queue(
+ 
+ 	queue_id = dleyna_task_processor_add_queue(
+ 			dlr_renderer_service_get_task_processor(),
+-			dleyna_service_task_create_source(),
++			dleyna_gasync_task_create_source(),
+ 			DLR_RENDERER_SINK,
+ 			DLEYNA_TASK_QUEUE_FLAG_AUTO_REMOVE,
+-			dleyna_service_task_process_cb,
+-			dleyna_service_task_cancel_cb,
+-			dleyna_service_task_delete_cb);
++			dleyna_gasync_task_process_cb,
++			dleyna_gasync_task_cancel_cb,
++			dleyna_gasync_task_delete_cb);
+ 	dleyna_task_queue_set_finally(queue_id, prv_device_chain_end);
+ 	dleyna_task_queue_set_user_data(queue_id, *priv_t);
+ 
+@@ -243,8 +243,8 @@ static void prv_server_unavailable_cb(GUPnPControlPoint *cp,
+ 
+ 	udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy);
+ 
+-	ip_address = gupnp_context_get_host_ip(
+-		gupnp_control_point_get_context(cp));
++	ip_address = gssdp_client_get_host_ip(
++		GSSDP_CLIENT(gupnp_control_point_get_context(cp)));
+ 
+ 	if (!udn || !ip_address)
+ 		goto on_error;
+
+From 79593067cf40ed58a3bd95311c7fa108feafcb46 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Sat, 21 Sep 2019 20:37:33 +0200
+Subject: [PATCH 3/4] Move to GUPnP 1.2
+
+Fixes #166
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 271ee92..364659d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,8 +38,8 @@ LT_LANG([C])
+ PKG_PROG_PKG_CONFIG(0.16)
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
+ PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
+-PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2])
+-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
++PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 1.2.0])
++PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0])
+ PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5])
+ PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4])
+ PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2])
+
+From 66e755a89cdcd7f10a535131a340c3f3ab371194 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Mon, 23 Sep 2019 00:08:38 +0200
+Subject: [PATCH 4/4] Protect introspection calls against missing proxies
+
+---
+ libdleyna/renderer/device.c | 38 +++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 14 deletions(-)
+
+diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
+index 73b3dd3..525a23d 100644
+--- a/libdleyna/renderer/device.c
++++ b/libdleyna/renderer/device.c
+@@ -977,22 +977,32 @@ void dlr_device_construct(
+ 				       NULL, priv_t);
+ 
+ 	av_proxy = context->service_proxies.av_proxy;
+-	if (dev->construct_step < 2)
+-		dleyna_gasync_task_add(queue_id,
+-				       prv_introspect,
+-				       G_OBJECT(av_proxy),
+-				       prv_introspect_av_cb,
+-				       cancellable,
+-				       NULL, priv_t);
++	if (dev->construct_step < 2) {
++		if (av_proxy == NULL) {
++			dev->construct_step++;
++		} else {
++			dleyna_gasync_task_add(queue_id,
++					       prv_introspect,
++					       G_OBJECT(av_proxy),
++					       prv_introspect_av_cb,
++					       cancellable,
++					       NULL, priv_t);
++		}
++	}
+ 
+ 	rc_proxy = context->service_proxies.rc_proxy;
+-	if (dev->construct_step < 3)
+-		dleyna_gasync_task_add(queue_id,
+-				       prv_introspect,
+-				       G_OBJECT(rc_proxy),
+-				       prv_introspect_rc_cb,
+-				       cancellable,
+-				       NULL, priv_t);
++	if (dev->construct_step < 3) {
++		if (rc_proxy == NULL) {
++			dev->construct_step++;
++		} else {
++			dleyna_gasync_task_add(queue_id,
++					       prv_introspect,
++					       G_OBJECT(rc_proxy),
++					       prv_introspect_rc_cb,
++					       cancellable,
++					       NULL, priv_t);
++		}
++	}
+ 
+ 
+ 	/* The following task should always be completed */
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index b8bf93baf78f..2477b1296f63 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,7 @@
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
+DIST glib-networking-2.62.3.tar.xz 183996 BLAKE2B 3841a355fe485f30970ab571fbe7ae73c8351cdcdad5021809fcac4663bca31b309a0921d07b2551c428ac154da2290e377da0299e66b2b099dfb556f387d18b SHA512 6bcf7584a4d97745e980598eb9182ba2e416471455d9c3debc4cbaea07250e395f6d7001af544ce0114a26d726e71e9b420d9756508cda09499016e89f4a6da1
 EBUILD glib-networking-2.60.3.ebuild 1770 BLAKE2B c0db1da80fb63c85a5509060519a324cfded0b6197a82cfeff9a092728dc52361dd08fff810c590c0972330e66a562679ebd4c72190dc25a646d673d6cf07323 SHA512 768bbeb31d1efa08aa29d71e4c9238d7ca47eab2af0887843e0505dcdf6bdb865319d9138453774fb0308341ed12c2b87f21f10e02a2a3f88844a83ebfb982df
 EBUILD glib-networking-2.60.4.ebuild 1772 BLAKE2B d4d5464d05565614309ef4d7e8b32b3aae6c9652ba93e461cdecc8a90ed29ce3e9d0b772c90acc1df642207c32dd20253c7b0a1c4366b41e40441d79b60d1d28 SHA512 56936435a5db3308e7251a28523611b17125dc1eb3432f7c5f86676cd99019a56023ae1655af533243b251cba79ccce3a4cc40d8b00a47468aa1939836239ede
+EBUILD glib-networking-2.62.3.ebuild 1780 BLAKE2B 0af9ed42a6c3a15b7db75ba6f8dcbeacf2ebd006daeefe43f70253a430a2f61bdb3c3764cef834de6c088f5e3d25fcac226483a04a6955fc22e14f20fceddbe2 SHA512 2d56008f5b05f5af0a4195027ef38538a0cf7f8b6f4d30e769397e86e35d02723dd56cfeb2bcd183b18fdc0ffd1a73704154d4a4869b96271ffd0fd5b2ffd883
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.62.3.ebuild b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
new file mode 100644
index 000000000000..8862fff92c3c
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 7dae621b57b7..b260265ca33d 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -13,4 +13,4 @@ EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
 EBUILD grpc-1.26.0-r1.ebuild 2685 BLAKE2B d2b51dc050788e587b9e0b631db41f0706cc1f0366b44bf5492fa6131fa8bac0866340cb60a6f83c7356e99a9faacc7174c49681a24bd8b3f0f38ac10c11c8c9 SHA512 95bde11e513f1ffe08969c8a50e8354ce41423fd08f7f659ba2024defe2311caa0878a7aebc1d421b77e1ae1ff48ed0e41b3df7aa42518765e20b5f31275d618
-MISC metadata.xml 737 BLAKE2B de7262f1cccfe21d55f3ae0f744e067d54912995520b46b9fd3107abfed3c057082f91854f4bc4c399606a31200f0f2da468218b1d677de1aca1155532395d60 SHA512 dbc3dc0370c809f0ea1ad5f88dcef44b0ca5a2bbde47606acf85ec6149892f19990608da9b5fd4417e77a5b565a34fc481a9c7b27b00e11a5c0015ef04800a7c
+MISC metadata.xml 630 BLAKE2B 1798e243492198d1a5df8cd8928ce592e243bdac8d68cf7089af016b0c7579d8e89ca90f81cda221a33d60f224d51e93b4cdb1464f8ed64cfefd3e1dccc695ef SHA512 f7c2aa3e76f18e30872d2ee9154290509b7d946d388bbf767505dfdb87dce9716b19cdbf53f2fc72dfcb79cc809b843b2660b6828682aa9f887cfba8c623fd93
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 6267f34d90d8..708220c8696a 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -8,9 +8,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		A high performance, open-source universal RPC framework
-	</longdescription>
 	<use>
 		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 5f9109847974..148554e0c7a8 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,3 +1,5 @@
 DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
+DIST gssdp-1.2.2.tar.xz 61444 BLAKE2B 917936ba61ef6074939a11792ddb4f3baf0bd88475df7e49fd6e598dc2530610f04661a4b5efcb2a024e0d37011bfab32bcffd644d2a3be2eb1325c9020b73bf SHA512 3d962ac5a633492979d49c722bbbbeec88385fdbd063d3b68f6b82edbc62c9e78c556d48a904460dd04328bf7a79668dcf3ee33bf61a271ac926e01e2e645f68
 EBUILD gssdp-1.0.3.ebuild 1417 BLAKE2B 81ede79120c65986eacc364c409c8fd001badf4f70f1d5f52fa5b2af7623c252d107c6c33fe31522bdb53c8d50c6abffd7a29942f96099d6e8b67d467aff64b5 SHA512 512021422a7bbf9c4744211ab6f33352175dee773df90a41c07b38cbe0a00aab830c7e02da024346eefed22d6d9513250df120e2f73d4eb8e5f127a8ab81ab3b
+EBUILD gssdp-1.2.2.ebuild 1481 BLAKE2B e811e5597edbc1f4fc80e228e06cbe597d63f0bae0d63064a18597035e37b9d9fb46894f8ba4b5e796c903ac28327edba1171896d3c181ec210268cbbebf1096 SHA512 6210dd03acdff231e83ddbb8595b265b9d338f136238106e9eda5a4be10fb6dfd226f76faff4493523b0e1ccb290a5ca98445bb0b100d0086806705165aa69d3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.2.2.ebuild b/net-libs/gssdp/gssdp-1.2.2.ebuild
new file mode 100644
index 000000000000..1b098110d25b
--- /dev/null
+++ b/net-libs/gssdp/gssdp-1.2.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson multilib-minimal vala xdg
+
+DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2+"
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection gtk vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
+	gtk? ( >=x11-libs/gtk+-3.12:3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? (
+		$(vala_depend)
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		-Dsniffer=$(multilib_native_usex gtk true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 3a8f640dcdcd..16cd2eb16576 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,3 +1,5 @@
+AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
-EBUILD gupnp-igd-0.2.5.ebuild 1187 BLAKE2B 80a178361fc4acd434db8882d692b2c57b760c44eb698cb24baa61f37839f103a2ad07f647a4c0785a53d466de80ddb74042a65018462a9d24662f84fecfbef6 SHA512 590e3794848b09b25885925d9a6c5df23c601b3c2e9a25c1c41cfbf160a96c6a0ebfc4967bc6194bf47bfa26b2e5592f394a9deeba051432bedc3953fc088390
+EBUILD gupnp-igd-0.2.5-r10.ebuild 1461 BLAKE2B 779d595be3346606cb33e81747bbcfbb1b814a5541a3f3bad2a9adb84fe6eb614498e4d1bee0baf0f2dcc6652f53ed59bdd0cbd17f5bac5116ce583ca83bb645 SHA512 6e47772cc91d76bcc18e20b3b4c3bf9a8791ed28d01b883df39e5a1a6d06c772a80059a106abaa44d1c1ccdf7e1716fc34e93aa351f2dcda7afaf2f7f2e5079a
+EBUILD gupnp-igd-0.2.5.ebuild 1195 BLAKE2B da2b4bd36ddac42b51ec0aa59cf07038e71f59819262abb21191c93c66d90978de7d21650df65a146aa15d7de4ffedc1eddee7c6047b1ad5ada50d89d32255da SHA512 e34a657520c195b9b50d9586b4f79196074d139045418a0d88a90b38d4bd87cffb809ce6d299541a7bf7c3ca4e376c247e33e0364de06756adf5850c73b4c1bc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000000000000..c70bf6fea489
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac                    | 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in             | 2 +-
+ libgupnp-igd/Makefile.am        | 2 +-
+ tests/gtest/gupnp-simple-igd.c  | 6 ++++--
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+ 
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0)
+ 
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
++++ b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+ 
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
++++ b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
++++ b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+ 
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
++++ b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
+   GUPnPDeviceInfo *subdev1;
+   GUPnPDeviceInfo *subdev2;
+   const gchar *xml_path = ".";
++  GError *error = NULL;
+ 
+   g_signal_connect (igd, "context-available",
+         G_CALLBACK (ignore_non_localhost), NULL);
+ 
+   if (mainctx)
+     g_main_context_push_thread_default (mainctx);
+-  context = gupnp_context_new (NULL, "lo", 0, NULL);
++  context = gupnp_context_new ("lo", 0, NULL);
+   g_assert (context);
+ 
+   if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
+   gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml");
+   */
+ 
+-  dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path);
++  dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error);
+   g_assert (dev);
++  g_assert (error == NULL);
+ 
+   subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+       "urn:schemas-upnp-org:device:WANDevice:1");
+-- 
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000000000000..a413d8fcbaec
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.2:0=[${MULTILIB_USEDEP}]
+	>=net-libs/gupnp-1.2:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10 )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# The only existing test is broken
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gupnp-1.2.patch # needs eautoreconf, https://gitlab.gnome.org/GNOME/gupnp-igd/merge_requests/1
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# python is old-style bindings; use introspection and pygobject instead
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-gtk-doc \
+		--disable-python \
+		$(multilib_native_use_enable introspection)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
index 2620984d393c..68eefd20d9ac 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
@@ -15,8 +15,8 @@ IUSE="+introspection"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-0.14.7[${MULTILIB_USEDEP}]
-	>=net-libs/gupnp-0.20.10[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-0.14.7:0/3[${MULTILIB_USEDEP}]
+	>=net-libs/gupnp-0.20.10:0/4[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10 )
 "
 DEPEND="${RDEPEND}
diff --git a/net-libs/gupnp-ui/Manifest b/net-libs/gupnp-ui/Manifest
index 3f103da701d3..580038b60a0c 100644
--- a/net-libs/gupnp-ui/Manifest
+++ b/net-libs/gupnp-ui/Manifest
@@ -1,4 +1,4 @@
 AUX gupnp-ui-0.1.1-underlinking.patch 755 BLAKE2B 02bd4724610799c4339e9a7f347b580437b8a1f9fcc368832f942c989d0d5fa00f118517a50ac932e421b186075cf3f55ab9dca4f6bfbef2668448c260c0e018 SHA512 1dba9b59bbbfff77886573fa53dc03207a72a7f483e5c67274dd8a7ec8846a2dd2d01bb95044ed96f96c568d87b2105016d6d429180116b4a3a290a1f9bf0d39
 DIST gupnp-ui-0.1.1.tar.gz 362414 BLAKE2B 2453520ea36f4d69df3af26241f9f2a0584e55225394a8e76d7a13cfd0d0b42cfb3203f1afba157cc2dd651cd63744fb5f4393e3790becbd3293764c3d37d14b SHA512 eae64352e96e6cc54411b5f9276a4386b60bc4af21246d3387024b8d5b7243ef988a98739adecc068f7d26fd85887b7500c4e9d89993aa68e5fe746ddc93dcab
-EBUILD gupnp-ui-0.1.1.ebuild 709 BLAKE2B 371be5d3335f8939fc4b5508b0cb321b5147a8285c25730cda2649abe6480a6798293e384d1151360264dc3f27d0307ece19cbda5cbde62931456c9585f8248d SHA512 40ae1b264a0ec31e10d00340fc9db38fccdc6c080d56007781736571952c388dd068d83eec78df132cd1d2533f4b8e12ade2565739f3739105f5fc9cf8692170
+EBUILD gupnp-ui-0.1.1.ebuild 692 BLAKE2B a792994da604a23aad4d511ab000b28915c5269a3c93c83aa8dd333d28ad86d594febb7d45eef7f97ac5b2a8d1787d845ac489dceb6a2bca42897ca892590272 SHA512 8e2e8723faaddf788ab6a698024edbaf6c9e193718edb40af15112adc95f75450f0e075973b91419630508ab8d2786958baee28c3434bcbebcbd2970988de0a5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
index 1469081e3807..01c06fadfd32 100644
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
+++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
-	net-libs/gupnp"
+	net-libs/gssdp:0/3
+	net-libs/gupnp:0/4"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
@@ -28,9 +29,7 @@ PATCHES=(
 )
 
 src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-gtk-doc
+	econf --disable-gtk-doc
 }
 
 src_install() {
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 15dc6ab93e2e..da965411e449 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,6 @@
+AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d2836b9b968c4cc34500e6a11a5b04b432c5e8dac1addff6cea85feeab5bf3fe2027b3d87fe2e861a4b9aec2e3e349b SHA512 e232ee5bdb2ae1fcd9b44c63942d1bef9d610e90135ec4fa3224716ca632d513f099638eea58fa67f39d7d80a507db1f7788af5712749417d2c576c8868521ab
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
-EBUILD gupnp-1.0.4.ebuild 1941 BLAKE2B 6f24da0f5b67dad486e73fbe9638e769e17d6a781e98a1d1ce4064edca226a5eaf3b39d08efc0544c51fe6cda09cc5b35bef07d747abce5a8eb47390f420cf0a SHA512 54731be431b0ac10c4c06b4d247b83762537b638fcfde811be13fbac87be681e4311e8f7fd3c9a48839fca1c01c8c824bebef7d1186184198551a573b84bd2ad
+DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588 SHA512 08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
+EBUILD gupnp-1.0.4.ebuild 1963 BLAKE2B 0839c63f1431786e5d256690dbedc58f35e90e65f57f890ab502ce81dcfc54b4eac23133ffee1de727ca5a254f40377dc42887b67e735f786da646097554a0dc SHA512 8bb01a528b8a89602068765bfff9eb377833e7e2ebb39d93a4e78fcb6f29ced1e05f3f73b16de02f95d39bc61b6aa9b03ff937692cecbbc5936219f91bf8e0b5
+EBUILD gupnp-1.2.2.ebuild 2413 BLAKE2B b34cfc02dafb7294fed57fc3229667c4226aad7ccc17b9db161ca2c8957d1b6026360c795c128892521d7ceaced1e5176cc83f2df98bb60f57fc6a71e521aea2 SHA512 c385bf2dafe03ce757bd3d356de4667f2e222b3940b8e0737919748207b2f758b8aaceb26807cff7e8dd17df9de0a88336540d838ccbfdfc86c698cc6e96d955
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/files/1.2.2-build-manpage.patch b/net-libs/gupnp/files/1.2.2-build-manpage.patch
new file mode 100644
index 000000000000..ce03a171b88d
--- /dev/null
+++ b/net-libs/gupnp/files/1.2.2-build-manpage.patch
@@ -0,0 +1,55 @@
+From 23f54c2a1e8718e836224d68dafded091604a677 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 20 Feb 2020 12:15:33 +0200
+Subject: [PATCH] build: Always build gupnp-binding-tool manpage
+
+manpage generation shouldn't be dependent on gtk_doc option
+---
+ doc/meson.build | 2 ++
+ meson.build     | 5 +----
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index 478650b..b71b657 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -4,6 +4,7 @@ version_xml = configure_file(input: 'version.xml.in',
+                output: 'version.xml', configuration:
+                entities)
+ 
++if get_option('gtk_doc')
+ gnome.gtkdoc('gupnp',
+              main_xml : 'gupnp-docs.xml',
+              src_dir : [join_paths(meson.source_root(), 'libgupnp'),
+@@ -26,6 +27,7 @@ gnome.gtkdoc('gupnp',
+                  'gupnp-types-private.h'
+              ],
+              install : true)
++endif
+ 
+ xsltproc = find_program('xsltproc', required: false)
+ if xsltproc.found()
+diff --git a/meson.build b/meson.build
+index e0dce33..eb3c82d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -31,15 +31,12 @@ dependencies = [
+ subdir('libgupnp')
+ subdir('tests')
+ subdir('tools')
++subdir('doc')
+ 
+ if get_option('vapi') and get_option('introspection')
+     subdir('vala')
+ endif
+ 
+-if get_option('gtk_doc')
+-    subdir('doc')
+-endif
+-
+ if get_option('examples')
+     subdir('examples')
+ endif
+-- 
+2.20.1
+
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
index 24795058c988..a9bc2db8bed5 100644
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.4.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 # prefix: uuid dependency can be adapted to non-linux platforms
 RDEPEND="${PYTHON_DEPS}
-	>=net-libs/gssdp-0.14.15:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-0.14.15:0/3[introspection?,${MULTILIB_USEDEP}]
 	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
@@ -35,6 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	!net-libs/gupnp-vala
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild b/net-libs/gupnp/gupnp-1.2.2.ebuild
new file mode 100644
index 000000000000..3e6efc11b133
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.1.3:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.2 )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.1.3:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-manpage.patch # https://gitlab.gnome.org/GNOME/gupnp/merge_requests/5
+)
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=system
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	local emesonargs=(
+		-Dcontext_manager=${backend}
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index 360992003862..12f5bc1543f1 100644
--- a/net-libs/libasyncns/Manifest
+++ b/net-libs/libasyncns/Manifest
@@ -1,5 +1,5 @@
 AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6dad6dc302fa80957464c91eb8907ef75bd3f5fb32d7b985545a1aafccf2cd228688c16ab731ddd9c5315083f8f4d117a9a6d4ee731f SHA512 ed338a91575f9e642c3da9764348fb7d4e5b2d0da4ef9a849a4cb176df96776100e59b419bbc9206395252d8317c20c5cfe1b68e008825fde1192e24dc9f8ce0
 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0
 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7
-EBUILD libasyncns-0.8-r4.ebuild 1332 BLAKE2B 619b66a2d4cb81f32a273db71ad0f86acb3a571918ccb0ce2e5d6dcee90be23f23ed42b06c7c293c09df5b6febacd458ef6795b5672096d890b7356c5a4bf859 SHA512 6b167d27707c8ce6d090aabf818eaa248c6c501fe2aff3cec5c0b79a3377c577458fdf751cbc512ee7e48f9dddf8998d6f1b145dd5b3b7cecca63a403cfd6dfa
+EBUILD libasyncns-0.8-r4.ebuild 1234 BLAKE2B 50b620440b29f37d06320814f7b84fb351b790c54110963e6aa895aecd186646a39e7832c06a709d4530b97eaed833e7e3c5a0a23981bead4765242daec1b05e SHA512 2a12fb2bbc5b8909dc5a207dde2af019e824c2d8e414401175dae4dc0cb87cb4636fbab3a19cd1cd38a22a436fba2d02c739f6ef9d057a08ca3ba1cab066f0f1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index 105505eb5abf..954f4a89c02c 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -33,8 +33,6 @@ multilib_src_configure() {
 
 	ECONF_SOURCE=${S} \
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--disable-lynx \
 		--disable-static
 }
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 236e3b5fcb2c..6e93ecbd8c16 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,6 +1,6 @@
 DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
-EBUILD libbtbb-2018.08.1.ebuild 3637 BLAKE2B 6a71d9abb11b79757b958d9da338af298271d46fee540e6f2e793f211580d942aa8edccda5d1cab78b184800d7a89daca3b010602fa66a220d2e0ae58f419417 SHA512 fa80765d544761e8a9c0d972cbc899f747fc9d9a179b298c49dad0dc9aee3a66492ae345d538814cbaeae6bdd8f8f9490da82427e3f692f84b503e939d586a42
-EBUILD libbtbb-2018.12.1.ebuild 3637 BLAKE2B 6a71d9abb11b79757b958d9da338af298271d46fee540e6f2e793f211580d942aa8edccda5d1cab78b184800d7a89daca3b010602fa66a220d2e0ae58f419417 SHA512 fa80765d544761e8a9c0d972cbc899f747fc9d9a179b298c49dad0dc9aee3a66492ae345d538814cbaeae6bdd8f8f9490da82427e3f692f84b503e939d586a42
-EBUILD libbtbb-9999.ebuild 3637 BLAKE2B 6a71d9abb11b79757b958d9da338af298271d46fee540e6f2e793f211580d942aa8edccda5d1cab78b184800d7a89daca3b010602fa66a220d2e0ae58f419417 SHA512 fa80765d544761e8a9c0d972cbc899f747fc9d9a179b298c49dad0dc9aee3a66492ae345d538814cbaeae6bdd8f8f9490da82427e3f692f84b503e939d586a42
+EBUILD libbtbb-2018.08.1.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
+EBUILD libbtbb-2018.12.1.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
+EBUILD libbtbb-9999.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
 MISC metadata.xml 568 BLAKE2B 508af89d4b95fa71c32b5a610e1630938dc8bf7b83a98b5af981de1a3a70ec0775d694ba5e5514f83e9abdbcb229500080fc31225de40bb65ad347cb273f44a5 SHA512 a4425e207724117d83fcd21f2ed5f9bd52a945597c19ee253c1c55b1e62f0f3d14d71c546cf2e2d6c7ad7b48b0e88ef3d46fc2a172f86cb00c710ed87946430e
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
index 0fa2d6551dd8..ee2dca3e96ce 100644
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ which_plugins() {
 	fi
 }
 
-src_prepare(){
+src_prepare() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_prepare
@@ -97,7 +97,7 @@ src_configure() {
 	fi
 }
 
-src_compile(){
+src_compile() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_compile
@@ -116,7 +116,7 @@ src_compile(){
 	fi
 }
 
-src_test(){
+src_test() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_test
@@ -135,7 +135,7 @@ src_test(){
 	fi
 }
 
-src_install(){
+src_install() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_install
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index 0fa2d6551dd8..ee2dca3e96ce 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ which_plugins() {
 	fi
 }
 
-src_prepare(){
+src_prepare() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_prepare
@@ -97,7 +97,7 @@ src_configure() {
 	fi
 }
 
-src_compile(){
+src_compile() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_compile
@@ -116,7 +116,7 @@ src_compile(){
 	fi
 }
 
-src_test(){
+src_test() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_test
@@ -135,7 +135,7 @@ src_test(){
 	fi
 }
 
-src_install(){
+src_install() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_install
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 0fa2d6551dd8..ee2dca3e96ce 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ which_plugins() {
 	fi
 }
 
-src_prepare(){
+src_prepare() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_prepare
@@ -97,7 +97,7 @@ src_configure() {
 	fi
 }
 
-src_compile(){
+src_compile() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_compile
@@ -116,7 +116,7 @@ src_compile(){
 	fi
 }
 
-src_test(){
+src_test() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_test
@@ -135,7 +135,7 @@ src_test(){
 	fi
 }
 
-src_install(){
+src_install() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	cmake-utils_src_install
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index b2dbdc78572b..b55a76589611 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,4 +1,4 @@
 AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
-EBUILD libesmtp-1.0.6-r3.ebuild 1082 BLAKE2B 74a5d233e8b852715f119a9adb7401d1ac5127dbbe4a7a9ab92200a179c69ad293c946c3e450e2ef3c61d06126f2054e1f9e9e6891d518d35bd804988cb16257 SHA512 891072d155381af25de1bf398598db15522aa637b4dbdd041a73f1dd81892e9b1beb2150959df70cf94734c59ec1f28fbc24bd98b25c96692c01ae713f3a09a3
+EBUILD libesmtp-1.0.6-r3.ebuild 1048 BLAKE2B 9f15770cd5871b734a81e64d1416683856318c5e0576357256e1dd13edc68efcdc6c0c34f5ac74032fe0f54e61a5e0cc358a897ea3eb6c90eaf73c11c502ea4e SHA512 282cfbdd621f2e265b4d958d8036065ddeb8c951cedd26d163dee5dc518c3d071656080214793418c2a62a4a81debec06ae0279502e941e9b5d0839bf83f4c04
 MISC metadata.xml 245 BLAKE2B 8d60530acac96088463f7357d79430c34c12384bcda5df24a93a92789a40fb34014c14fb73ea1e80f7e96f5afb8e70a4600a651b46322af25c404bea3c75e004 SHA512 8f811f556e1fb3b6c4955a0815435a2b54897133a5a545d05fc3c47a6f8ad2448fcce4644e2f7f3d5b6835fdbfccba521a49a8c11629a89ab53770d6bc620c25
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
index 6d17cfa57b38..5e07c50b09ca 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
@@ -31,7 +31,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		--enable-all \
 		$(use_enable ntlm) \
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index 77946260f656..8abe0d18611f 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,4 +1,4 @@
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
-EBUILD libhackrf-2018.01.1.ebuild 1023 BLAKE2B deb0d52f8c263d439ca72b1351aca7b7413fc14c8c13cb934d52cd113c4b7c2a3b9ad47a61700f1a8ab9fe216bc790df1255449db23ac7ba19f830868270b905 SHA512 b160bc4cd6034f4f423d271f2c07ca851e41471e4ddec39692ea8705f3b527d5047a28af58f521160e9d336ca63318cebf80a4da3d202097376ff763d75e36a2
-EBUILD libhackrf-9999.ebuild 1023 BLAKE2B 71fbd223d93a52da2aa85660529a5ef82a65c9150482a58ae648bf3ba6a30750f9a95f87e5bd41aa7871b79a5cc22b3723bc7d35b8e5121f2b4c50580eec4fab SHA512 294a3c13016822a75531d8bde30e9bb1f3832494d0f944f77975dd817be573e332f709f4aa8f20599424396c6e2ba32f122a50822fc344e669d9b5014006ff59
+EBUILD libhackrf-2018.01.1.ebuild 1021 BLAKE2B 54aab9b60ef3bd2f5690f3f36601ff8f5f5acf95f1b005e53b107833ffa6de82c42a5d686d234ae3f2685fc718d182119dc173346c7e12d2286ff4161c96fcf7 SHA512 29e7712df24ce91f481e3eb54d575f3f682d7ed654657bae571890013ffca4a5945171437b99fe9d3d39c4e5ed43bbeef56292159023aa16b1da7049eedbce45
+EBUILD libhackrf-9999.ebuild 1021 BLAKE2B 54aab9b60ef3bd2f5690f3f36601ff8f5f5acf95f1b005e53b107833ffa6de82c42a5d686d234ae3f2685fc718d182119dc173346c7e12d2286ff4161c96fcf7 SHA512 29e7712df24ce91f481e3eb54d575f3f682d7ed654657bae571890013ffca4a5945171437b99fe9d3d39c4e5ed43bbeef56292159023aa16b1da7049eedbce45
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild b/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
index 672fac64ed5f..8acce1696f84 100644
--- a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ IUSE="+udev"
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
-src_configure(){
+src_configure() {
 	mycmakeargs=(
 		-DENABLE_INSTALL_UDEV_RULES="$(usex udev)"
 	)
diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild
index 1034297b69fd..8acce1696f84 100644
--- a/net-libs/libhackrf/libhackrf-9999.ebuild
+++ b/net-libs/libhackrf/libhackrf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ IUSE="+udev"
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
-src_configure(){
+src_configure() {
 	mycmakeargs=(
 		-DENABLE_INSTALL_UDEV_RULES="$(usex udev)"
 	)
diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index 3da21b7a6dea..f869dc5cf249 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,5 +1,5 @@
 AUX libmicrodns-0.0.9-null-addr-fix.patch 945 BLAKE2B 40b777b9d0d1a781d1ee3ff82a2370d0ca414c687d665b0df1aa9750e9bde79c027e661c9ead963edb366858c46f6118139903f77d8d4ef99df99b8c28d28268 SHA512 83ef122e8192f34608965e9d6a479ce73abf98c28028f5749e0c53cc677225fae25f501573b671425754b14fb1b871a29caff6e116ed19700cae464b4b7b4236
 DIST libmicrodns-0.0.9.tar.gz 57333 BLAKE2B a9e1d099d4588863dee3c2735a2e3f9cd46212729c342e06cccad1a8e997e85964e7f917ce97f50c0cccd21c1662ef9baf7392333ea666ff65b0577f57bab692 SHA512 6f7dbf1a324fed847131745498895ab0773dfc3c7bb96a05bf0fd3df0c0ce19d7f607789f7a5350d34e91e7ba323ee57196eb37ce351f83a9faa82c5fc8d89a8
-EBUILD libmicrodns-0.0.9.ebuild 622 BLAKE2B 4b006b9b3c74c19701dfbfa4376d28c91c36466c454f29f3eda5c553f49e8b777461c85521ef2286ecfd42d2e92b8727dfd53aed5a75f32b1e1c4ebbe06c2949 SHA512 8ead0148b3436a8cc0876c7e3d4819f96dcce0c37f6c39f6cc08467d21a97064c5eb9492ac6ec5839090258e02a79f6897aca916420a1f323fcfb43988d17643
-EBUILD libmicrodns-9999.ebuild 547 BLAKE2B 9e2f1b42a8bfdf1ff226c6ab31c69d4925b7257d1f8f63f3442b42bb3001acdd3c34d96f6f8078f426db8c7a687842524910efacbc2486f6da28619a847414bf SHA512 fcb52e9ec7308571d795fd4449e4ec05ee4ff46dc6b9a7d3f3c4509d5481c16d1240cce3fbe739cebc2a8f67bad3890dfa4b657047e3bc30f1aab9468fb14c9f
+EBUILD libmicrodns-0.0.9.ebuild 623 BLAKE2B e2ccbc10fbb88ce50c749c541ed0f2121f155574b7d6f271c4da066b68456383974aeb8afe29c3647fde4e0739e201cb18ce3d5591aca776102d8ef298f03136 SHA512 d8544763e8ac77dc829bab6b04f4b6b886ef4922c4f2c4fe16d0f10a494a02be6cb8f7cf0a977fe6971eebfd2e82277fad167daf580f24612f9cee37db5a6e6c
+EBUILD libmicrodns-9999.ebuild 545 BLAKE2B 26f441ee0028c5fc9ae16a9cef601496ff7eb9cad3a378b7e788cf2ba0197a910220e5d72d48634212e723e9666a85d0b80f3430b0f67e25dc2c47df91371de8 SHA512 062f506c098f15387d0f8d5c3ed6a0745844fc8898abca136041385bcf413d4fc8add432e4ca4f1ebaf9756a7a5980564e39bf03414f8d1be9fbd95a5369fc09
 MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c
diff --git a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
index 63b0829aeeb0..c19ecde564f8 100644
--- a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-0.0.9-null-addr-fix.patch" )
 
-src_prepare(){
+src_prepare() {
 	default
 	eautoreconf
 }
diff --git a/net-libs/libmicrodns/libmicrodns-9999.ebuild b/net-libs/libmicrodns/libmicrodns-9999.ebuild
index b6c7ba5a1eb3..fbd51b90d87f 100644
--- a/net-libs/libmicrodns/libmicrodns-9999.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_prepare(){
+src_prepare() {
 	default
 	eautoreconf
 }
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 53b1e56ab360..58f67f30eeac 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,5 +1,5 @@
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.27.ebuild 1344 BLAKE2B c97db9c85907be32032eb0ece20fba11948115d249c73824b62a09492750f90d486fbeebbe0f8735a1186e2e2c0799e0722bd6127d3ebbcf1be2b20c7a9a94ef SHA512 48eb6561a97acab4253651c446a89263abf5d91d8085c3a1b8e4c1e05411cd2f8daa60e1b5937d5213e32ec02ed35c4ad0de6bebc9efbf8c2064e8672af2125a
+EBUILD libnfsidmap-0.27.ebuild 1312 BLAKE2B f86e1217680a3191084255cf0a110e3083542881146148db2dae14eee52cec5e5da9a87b45a8663df2a50f684eed553c8434b8fd72b2cebe64e12ea3eb63c094 SHA512 7dbe331914d41becf1c2a05b1e90b9e98233e4daf3078531155cd5f0c880a42dbf202b3f666b0f40d9fd8ae6b96bd588b846b497a89f5de1f75c09c1afa1d71d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
index 8f25d649878f..6e45de21adec 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -38,7 +38,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--disable-dependency-tracking
 		$(use_enable static-libs static)
 		$(use_enable ldap)
 	)
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index e20da84ccb71..e0aab9bb7f0a 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,6 +1,6 @@
 DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055f8f590b6814b2d40f1daaf381ec9d9710e0bbb894489d251788a135550848714e8b015bf237cf41d72feabf0 SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
 EBUILD libnsl-0-r1.ebuild 565 BLAKE2B 85155d509cb198333da9ca33f6e595f5705b2d04613288da4b2692c527089a4070486811a49d3da1bb012e94598eab58d774e2b66f71df84661c19749b7f3062 SHA512 5b29ac839d03d1016e9e741ca1a792863522a821b1fcfd95a84ab742af01ef64ae549e339c9af480e2e3fdee8d9c9aca12fb839d67f3a690cc958365587f5654
-EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 913 BLAKE2B fdbd936df82a1c5e8856278460f6207bf79380a62a6317d8039909db7f3de5aabc463a135969a880070953c93ab56a18613f52cc80eccdf818f9e04aa91dd9a0 SHA512 69fac3cb3eb637b12c9b31eadbfe0ec464502a34aab8da1a3e04254def5b186c667ab6c2d872dfcdf728cffb6c6ec1c74c649dd1c3f553029631308131b628f7
+EBUILD libnsl-1.1.0-r3.ebuild 890 BLAKE2B 4f4a8e17f3019f88b4502ceba4fd331fcf37637a82558914d3aeb458479beb659020e3a6d54c05b1037072c589797884e2f078fedc7f034992e361f05bf87780 SHA512 b0c13fccc712948bc7a413d6fc7818841c4a979e0b5305d2c3b6a89be77d870f5e987b7792d61bec9d3b0e591d6812c5b9e34a16d3c05fa68900db57493acc9b
+EBUILD libnsl-1.2.0.ebuild 914 BLAKE2B e38ac90dec5e176c0d4768237865994abc448d50da656db669b8310c24c4c4da63f30cac8ee63a76b85d9b25c6dcf0c79c124f51b204bffb758b390a89c81b99 SHA512 8857f457f4a226e0fe8b67f9665b292c19ed9d1630c40eab376d2b456ddae8af034f8edbaa9a3b29024dd4b7f6ee7e838dd91619857ab18b94e6f88faab2b036
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.1.0-r3.ebuild b/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
index a6b602365fd5..cb8d1099aade 100644
--- a/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
+++ b/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${PN}-${P}
 
-src_prepare(){
+src_prepare() {
 	default
 	eautoreconf
 }
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 6b6c7e201661..013966713b92 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	!<sys-libs/glibc-2.26
 "
 
-src_prepare(){
+src_prepare() {
 	default
 	eautoreconf
 }
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 33c2025dc1da..3276391014e8 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,7 +4,7 @@ AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
 EBUILD libpcap-1.9.1-r2.ebuild 1891 BLAKE2B 17126e5f18ea988e73e2bd47643bbb419f783cfe0e6d59cd1f45b1ffc0a4a83abe24ddb2d5d0a9332c1a35a8531708271dec8b43a30efa5f2ba99ae9529f2eda SHA512 e7207fd3b6727973d6c3fa766fc140e3117cb5ee936abad08ee36b9557f1d8e8a43be677e47cc1cbd8a5c9b344f17d29725232418e7bbb1795c9f61bb6aab0fe
-EBUILD libpcap-1.9.1-r3.ebuild 1891 BLAKE2B 73ecb606bb002f7fc47e79982d6017d6884fa08cbcb9ea9ab794a111627081e8203bfe679fdc111fbbcef56d49be7e94f44326d367f0241cc8faccbfa492a7e4 SHA512 88f9a0d18dd55f037068b26b5ce51ba5747dd3d1096bc32807cee6125e25c640f66174fef02dd3c543d1ba7d16c0e24df0c09babe00c09a7a7228733940dddff
+EBUILD libpcap-1.9.1-r3.ebuild 1898 BLAKE2B d8a758fb7dcbc7f04703df59fdf3c8577291bacec6bcdb6d3b8b25156e16cb17ae35c997cd9b0e487767936b0706bb50b23dd631c373137db8e5625432c79b85 SHA512 1905e2884101fef1ead5c4c5dc830a2455db6b8b627c3985f0fcac84011e4dfaffa1b11fed6252b62fc3aa998452a14033304ef69a9262c41266571d383b8976
 EBUILD libpcap-1.9.1.ebuild 1763 BLAKE2B 139c2018a2f15097971d814b0a85eff10fc24d9381472fbb0e1481bcefb789376dd74be86bc220e1461bb8351e86c66cf570e815c08e4997ec1da852fcfbacd1 SHA512 a24b353553930a591fb0aa78e08b161132a6fbab1e1c0b1b5038cf4c5762c8b22b157183000360826660addc40e6afc969be15ee254f78e736b4f8ee8cba1ccd
 EBUILD libpcap-9999.ebuild 1689 BLAKE2B fe3e9048f399aa9fccd6d70bc15522e103b59277a69bda73c72d106b9a5451d793d9bf4ebbefdf13071d3488ae0b715432f15958bda5f167b8da1587e7257766 SHA512 6e2c1bff6a7519578a17035b17460935bee69b3521141e2848a524b4af3d9e3dd02cc3afbf4f16096b5e9bbbb53f4d5cc6209a61713958af8d35e15d3e6d7e75
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index c3c84c594222..14e727c59d67 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 7cfb5385b858..79adcca5bc17 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -11,5 +11,5 @@ AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f
 DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
 EBUILD libproxy-0.4.13-r2.ebuild 3163 BLAKE2B b8592b68c9c8d37d033e4e9621f273c6cf15e2dc69e07f163b6d4033467d60bd5beb72611a13b5be73f98bde2435856874b8ec02f9390613c1c1fd91ace951bd SHA512 a65106522326e5a947af1ea74a5a0cb4a43ff4ebaf2e1571e2bf60a3208f45b94e4633a788091450b5e8f8e27f440ef57e415f5759e31bb22c9ac966153f1fd2
-EBUILD libproxy-0.4.15-r1.ebuild 2742 BLAKE2B 9003e479144af87af66dadd27f85f9725eff3039f7bd549e240509bcd5153be695bf53f14f011a036ba4b465f367ea10f3f1c4501ecf6f3c2f6a0e76d25653e3 SHA512 1df55a2ab9368c149fa0d59baf92110fd76c1319b66b1e37003af0a2879d6149f002691bbd02d02a535bde50f9c60e787f8f19099a695b39514e7ddfe763e7c8
+EBUILD libproxy-0.4.15-r1.ebuild 2734 BLAKE2B 3c1f5e714da543a37febce031ad834583b0c7d6a6a84fa51ed180f22043411e05df17f5b51f5480a2818fddd54c8aed84625b90e2ad58283c86d588b331b72f1 SHA512 5cd5532f7e8e3881a93b129741fef5fb70085170cf91f90fa5b44e3917f42d4f7ad69fd63beb56f7781e83e9ee028f5c56baa53c9c844bbf2c35c8fbd6f7da32
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
index 4dcab470c238..16852065bae6 100644
--- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 3ab4a9b505dc..daabb2211069 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,6 +1,6 @@
 AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c886328c5f0e167a68f38d68a170809a63b63439ca99b0e23e6f3b548cb99a518651e93236072de300001c453a5de6f23059709 SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.4.8-r1.ebuild 976 BLAKE2B 377a2cca07c750615abc62d6cb055bdb770ae11459b3e13d647307aaf5c428e458969f36d1fc54f75575c8b1e2751051522fc2a2d40419233b001f0fa0f105e7 SHA512 9f428e1e437d663ff7d088f6f0c75392723420d15fed87919196538cc46b88012521abb0ce4d56bf6ff2290640e67594fd52fa8b502686792a10f782245040d6
-EBUILD libsmi-0.5.0.ebuild 895 BLAKE2B 25db5e01a85dc7a173ecf25b6b8941a4f8e384663b94a94404b29c9e75e86d8b66f10ae766651afedb3510ce5276d0957f527ce9aedc1dd11aaa37a9be8ff62e SHA512 7fb0034be8b055a56d33700636b97ae573a03b759fe47d7d00fce45c66437ee26aa605e22829da3ac33d5b9073e457183ac51e1a79b9b9c7b37b53df47c751af
+EBUILD libsmi-0.4.8-r1.ebuild 975 BLAKE2B b81e905477922e039e8d4ceb5450dfc55937cf21c8c649c05cc34c70f962e5d24a18d573d642e612a28aaac77d2071a5a1cf3f22ab1d39fbbd1c1c7680788c79 SHA512 8890bbb0515f642044fba84552002e1fb21b9e0e1dd2db68f4e3aef343e5ef689f368031e2b2d2c9f7e531a238b6262bca2df9d9edbb334cc165b4285c2ba36a
+EBUILD libsmi-0.5.0.ebuild 894 BLAKE2B 1f09b27197a313f6077e0535a0045e31586c551513653a5ee6763f0ceb1b70db681beeeff0cbc1cdbdaf55e2b8753a3018fb76226d9697c56590e1ff8d9cfeb4 SHA512 6b07eaf5a12a15d8c1ef103b54b2aaaae1ac21946983ba1378fc65da9b27d5b04339dfa043305da39263c1977f1d29881c6bd7a2f06c14c27d09b612089e7221
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 296c6901989b..3d9ba6c15aa6 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -29,7 +29,7 @@ src_test() {
 	LC_ALL=C emake -j1 check
 }
 
-src_install () {
+src_install() {
 	default
 	dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
 		doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
index 8f175e85fca4..aa462e64eeed 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -24,7 +24,7 @@ src_test() {
 	LC_ALL=C emake -j1 check
 }
 
-src_install () {
+src_install() {
 	default
 	dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
 		doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 212134502a12..9c961ccb2184 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -4,5 +4,5 @@ DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f87
 DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.1.4.ebuild 1555 BLAKE2B cae3dfc27f62a0e0fe0f2033ae95bd17e74d7c0b5ad160d71e5e793bf10a74f1dc1c5b4f0a4fffeb814e7f3503d32e67f886f02a02a47212341db41f3ead7ca2 SHA512 e97fd09ab0f1fd7ba552667e1dd18bf7b1f9c5b9deb3107d277851a2351b46e71adbace4e1d7a27528b9bb2754dcbbe5d7e345a24ca5c8a6b480f88519cf403f
-EBUILD libtirpc-1.2.5.ebuild 1596 BLAKE2B f560316f374438565bd7dbe35bc569a9882e5a71d9597de0a78f017977f1a3a0c84e6685b785a46325270d0cac7cd93ee8cafb2bfa769d8c3073a13d0125206e SHA512 cf97c65ce6b8cfe8c08db3e8ae85f68e4881f4d2e4b39ef64a6637ddce7a662268229f7cc9e93ba601a080927738ae31f13bb46e997e23194516f44084ecd451
+EBUILD libtirpc-1.2.5.ebuild 1588 BLAKE2B 64456d2406af2a72c682f4c2a95a2f846b6d104350cc1176307fe605a271317010fe3606c8a7be1753e70fdb1ac29f121409d471847f6fdba461324242ef766f SHA512 fb082eec0a392c21718dc7c348b719e94b0c0e462c3d0684a67a78f9e1f557b0894937c17eb6c03961311d5d764f1015ea9d43a438803f1bd3a206874daa1dc0
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
index 9970a7e62550..c2680357f980 100644
--- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index b4809272be7a..c026b9da37c1 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -5,8 +5,8 @@ DIST libupnp-1.12.0.tar.gz 786378 BLAKE2B b1b264c8b254cab79c423fd3efa0911b86aa5c
 DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
-EBUILD libupnp-1.12.0-r1.ebuild 1105 BLAKE2B 7ff1969d91afe7c563868e9f579d00158ddd2450e41141353f8089bccdba076fb53bc8e4922807c7e2b837b73eee5bfc9ee0f36836895d749f732736134d0016 SHA512 95f7349ee6684740aaf81f6b3059608529c1d8025eeafdf794b5d9e6352c8017b016db00747ff1e97ae022dcf6a2911b68c79b365ae118aa7b0e0e2dfd7dd3dc
-EBUILD libupnp-1.6.21.ebuild 1045 BLAKE2B 98977900885f753da887d897a6a20fc735d10e380ecd0909881b6932a62bbe6655ee8ddea781b08a51aa37effef9f026826a8ce192446dd8a7608ef82b2d759d SHA512 aead6599e9a26154d9938c14ed5e1d9baec69e5c41da3041c553c5f99826e01754a57bb18ed2be6f9ff39c5e7cc4daa55892d431da6dbdd8631f760750fea3c8
-EBUILD libupnp-1.6.25.ebuild 1046 BLAKE2B ab99e06d6b1dcd066c3c05a816d8e68e88c6020c23c646476bc20ca95222378bb4b38694600e1db02f89976cb3c4fdbf968a10ecf0f35af0a3a26634f6391411 SHA512 008cd094419c4c5ee54cbab25309bbab4470c7ebaea6f9b28943fdf7def8669062825e93d12bd00bde5695a8fb139fff6f35a9a7983245cc66d6109ac670f2fd
-EBUILD libupnp-1.8.6-r1.ebuild 1068 BLAKE2B 5bb37ad95b7ec93b0e0343930a1f2e2920153ebc09ff6af01a044c6d89166168cdd4646c9093e33b6d6cf51bee6cb2f9889295cb2924c680d4841e89dbc7503a SHA512 3ca3753268cca0b861151104a386aab20e7c08966949652307695937e88f4b852be1e689c00cba03e5cceee51c7cdf028a28b2d86e4d5e1a11bb34eca00b8cb5
+EBUILD libupnp-1.12.0-r1.ebuild 1104 BLAKE2B 78850df80497a50647b20e641163ac676634102411e7fa70c44b402a07269fb203df6a65a55db25d2748014717a6c92e7060042f8f25749dd19eac8330ab7298 SHA512 5a1dafbb73502c5f635e1af71885aa3f7accaaef0ea289e2064db1534edd345e7847c0be9f4a613254ff57aab26ba3e616a32da7072462d098e76f3a24b80a3b
+EBUILD libupnp-1.6.21.ebuild 1044 BLAKE2B c83d4cf4eb687836b5f77b61aa7544f1fc1efb7b0ee751874801b0ec5ce0d521c7fca9f994d921e50d6d521017e0cce5dd90c39efc7facbed09b913bab2992f0 SHA512 c00b0d9075ef638590f7bd88a7fca1ddaeea7b551be515fd8795ef31075ae420fd07452c51712b0a4af7b1141d019a646ced3e67fb9badbebed6e35b0d215b4d
+EBUILD libupnp-1.6.25.ebuild 1045 BLAKE2B fec4de0cd91eb2621093f2e781c69a156a80c31cb84d625f2ff11cb9ae0ec7ae3f50d21e9a43d617c2ea9d89839feea1cc7b14559fbe87039f1d646793d3a144 SHA512 ed91708822c127df4d44ae12c48e7865cfee01baed2065ef86be50e3dce31c4a1ae83de0477f743a63c112139943a018b16a66f8c48d49765e78b2dc85a5ee18
+EBUILD libupnp-1.8.6-r1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/libupnp-1.12.0-r1.ebuild b/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
index 80d0a88ebddd..0d8bc53c381b 100644
--- a/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
@@ -41,7 +41,7 @@ src_configure() {
 		$(use_enable samples)
 }
 
-src_install () {
+src_install() {
 	default
 
 	use static-libs || prune_libtool_files
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index ce56ce6acf92..c461be28e518 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -40,7 +40,7 @@ src_configure() {
 		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
 }
 
-src_install () {
+src_install() {
 	default
 	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
 	use static-libs || prune_libtool_files
diff --git a/net-libs/libupnp/libupnp-1.6.25.ebuild b/net-libs/libupnp/libupnp-1.6.25.ebuild
index d2311ecc28e5..ae692f9f658f 100644
--- a/net-libs/libupnp/libupnp-1.6.25.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.25.ebuild
@@ -40,7 +40,7 @@ src_configure() {
 		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
 }
 
-src_install () {
+src_install() {
 	default
 	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
 	use static-libs || prune_libtool_files
diff --git a/net-libs/libupnp/libupnp-1.8.6-r1.ebuild b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
index f0a666030d10..e370f8a87874 100644
--- a/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
@@ -40,7 +40,7 @@ src_configure() {
 		$(use_enable samples)
 }
 
-src_install () {
+src_install() {
 	default
 
 	use static-libs || prune_libtool_files
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index a818645217b6..301f97da555d 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -3,5 +3,5 @@ DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a
 DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
 EBUILD miniupnpc-2.1.20190625.ebuild 1323 BLAKE2B f8bc0853f7a47ae30c45cfa3377bfc38792a4fb171fd5aa1f8be2ef83eda84f8f244cf50a5f525ffac8daedfd036339f6daf1a5c44bd6941f0523dd09f6baaea SHA512 cf130e53ad502521880104721b5b092cab3a5841ad838a3eb1efab62bc1a1daf0c3e3e3099cea31f918ee57921b6cd21774f4867824fdf54d18d550f141964da
 EBUILD miniupnpc-2.1.20190824.ebuild 1324 BLAKE2B 57d051770224dbf2c954120ef139970f5bc9029ddeb89cbf2916742ea842ee4d25ac766c32d3612dbc5ac23fb6b855c05b2bdea693fb5c0c30407f1e1febc623 SHA512 51a5402b90a479404796d020406189393c38024120998b705e9cc40096a7951ab632ba2a0d47b534f20d53418c8e2afa7164fc3cf3df2b22f9eb0df523ef6ab9
-EBUILD miniupnpc-2.1.20191224.ebuild 1331 BLAKE2B 8b40a40d870e40bc639bdb07c6638ef07b684fda50e9a00219ef10d3025b6f781b9a79c8a1206d6ec30cb6452ecf7fb3de7894b7dc2351b17a47041c22d54d54 SHA512 0193dd788a68cba11d40875815ef1f712464528fd1623df78bf8b590aca0ed8052b3a51a05301f1599e21aa0e0dfd05ccad12fe4c490a4255bc97c8586e0c042
+EBUILD miniupnpc-2.1.20191224.ebuild 1324 BLAKE2B b0a33f4869a3ff34ed93ff7899ce8597dbb87859e34aac204e33c00f267e9a7d45900f893dde85b19f579be1f667ac42ff45dbcb99e398e8e44ac53de05cd2a8 SHA512 c7492d8d2c915b57c65f7ba268c2f04aae7b0643f56200c9bc875d283ee61f3a9b388b167922846b070e22c0bf5073ed568668fe198d1170e5d663822e3e02fa
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
index 9891f15b065b..929f97181800 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 88483e6ee80d..723cf3ec074d 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3446 BLAKE2B b8f90b4c5d73bacd7764d68521b304eadddd702a5898e091b20689d07a46cc58ef963b81e77bcdc7c4a4f11cf036f9785fbcb4b26463f042b6bb5d980c6a7c68 SHA512 296128d8442bcbbbbb8eff763996831a5a3b40219f60fd997242234ea7f8c2c30d2d1fef718b6a249e1b15f3e96c915bd1ca2445d59eea173e7dc5c807f01f5f
+EBUILD neon-0.30.2.ebuild 3400 BLAKE2B 9a0ea4b958d6d7d4b6d0c097944d69305f14f15fa28a8c89e74580f02da0720a39f28b32b050ae4d6fc73c2de3b3cc9f84daa1aafd7fa7db0519f1cc60544b1c SHA512 703186cdaca00d71b498016bd3ebb152a8a3d5a581237289968ca41db06ac358912e8d45370b9e3d2a9d77550fd58911ed5573897e97adc09c36b1f2dc82d695
 MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 3f180c142abb..f1b704559897 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -85,7 +85,6 @@ multilib_src_configure() {
 	fi
 
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-shared \
 		$(use_with kerberos gssapi) \
 		$(use_with libproxy) \
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 180817ee4c75..8a7e2bed79df 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,19 +1,22 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
+AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed1603283d86cea879b5bb67c60686b45ee26237970a13466d2f5392ee463660b318e53061701f916c4f2f2cc15756f21444 SHA512 c738c9ab15b0ce9b2356827a63d2d35eb1ddf9441b4fc7e9e3e07ed30bf7a6eec680cb3901ab8de6ca9a9377e6a04a520b6a88a08ff5cb2673ed50ae737e066d
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v10.18.0.tar.xz 21913328 BLAKE2B 84b0b5157671dcc3e96bb2cfd11e085251fd2942c03b27491f712f5603797bab7503d8f7c0eb45ca8e348b20a0555c1767d4d1964fff474c8590a47eb01523a5 SHA512 8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c
 DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee
 DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b
-DIST node-v12.15.0.tar.xz 23271600 BLAKE2B 20e31e2ecb6352f6fa9e2c60fc505046034434e287e827edd5e0b091c4d5e124b681ba178e1669db26ab3d1b588e3b0894595e9cd1fa46d560f7100d8ab7e1c1 SHA512 40cc5fc252e8939856886cd57cad50df11eedc37de8e50b1b2d49a2e7439d1f4bbba8de90efc030a659919106eca72facf8b31280323fc4803bed9a175ffbbfa
 DIST node-v12.16.0.tar.xz 23487084 BLAKE2B 067668ca5af6c35082c3075b4baca256ce656ccf0ac68782a4885bbd2e0ef13108bd72b8b9831ef32f075e4be99fc52b1ce35920cd0db6f10a562a84912cdbd0 SHA512 e0aa45498ffd670052853bae1edfda1a34b291c48232f8a0a58ac329215fb3d0250211ec6dc06fa50fc654e7080028eaf3cc00a3722971a5969054c4cf277f4e
+DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
 DIST node-v13.8.0.tar.xz 32745596 BLAKE2B 14bf82e8cecde1a4125c7c00c4c9e613c1dbc5bb0241b20f4d30cb8d172612d5a8c362ac786ae516baf9553d5a9c3053414b269fb040cebb664f09096a57985c SHA512 b50d79f029bc04caf193f137b7b3d03f1e1ec9252712015cab2efdeef92bc3176cf7eb36e835cda6221950792e516f9c1894cd2c480e082106e07a11aa1d0761
+DIST node-v13.9.0.tar.xz 32778780 BLAKE2B fb5a0ff82cc1fd255bcc96b50232d6a9e2e3cdab9f5080c6d112b0a5b2dbb952a70d648ccda1b242a7c9e5742683bd320924047bccd1402978d8bbcfa8d1bb68 SHA512 f52184b694bf0dc7755c1c0f05eac400d7e9971e66165a43c7784dfeb935e63de176d3ee937fb09ccb1fc9ac78aec30b6b17e8a477f1b3f10291b1b6d595207c
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 EBUILD nodejs-10.18.0.ebuild 6282 BLAKE2B 672b04c2a80abf23317a1e94c29c66f462167d805fc86afb0a29aaae49afe50f7a7c6e6141ca2449fc935a42fb671925e7a0aa9910a37b2ce61b7938b266bfac SHA512 feacefcf26854f4ece1abcb5070dbaf7c6a33be097e6dc45ee599b575c884b96415c1158f207e7dff948738a96b09ee096f1a100dacadcbc16db3f28165241f2
-EBUILD nodejs-10.19.0.ebuild 6286 BLAKE2B 7010946700adc852961e2fa65f4c162c13cdee3ca004d00970bf242e0fb35d88c5bc26cf67bbd7268ee32e8f56c4d11b28cc02a17694979ebeb5453bac26fc50 SHA512 631be80dbe591af5b1e944fb6153fd8e61b6b5d5f95f747911fb38ddfe4535642b1481d9fe71cd82868a4f1bcf8026d93355e57eeb50d1f8226d767e8c3f09fe
+EBUILD nodejs-10.19.0.ebuild 6361 BLAKE2B 33e4a0e7936b81216945e5bce90f8d85858489800f140ce5203b79e217515be71e0c89b4cb7d64119fc416eb0aba5f516a70a197ed8e14acb76b5c470d3b4a11 SHA512 9420657f220cd01ad9efa2926a1d081d3ce35580fd15d3f7e37bf0a5d1e77039b97e51db107a3eb63d4b494bd1e62067e91fec962f525133211f4731fc07860c
 EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B def68b17c74f2dca48588c0e45bd7c52f33ed8fbc04dd65189a044333e6188f64a286e563b7e2d6c9736f3f8e37252a96883c07d8e860bd0e41e82c97f464b3c SHA512 4fb47c678f94f82a4fde66b944cd56a17bcb6fe32d112a852b28739ec43d529aab0b2e8fb9e21a011709f7e42d62f140d900cfee8c39e7b7a3d08b9004a1434d
-EBUILD nodejs-12.15.0.ebuild 6128 BLAKE2B 1cbf19e274763ba559f928dc11cfef16d168ea411169ae21fb24210f9e73e2a69c3f91ee146cc7d3353510d9585901f70f42b45943a3e970c6d381ea9bbf4a0c SHA512 9747d9d52d2769a25b70a4bb4ca1c1eaa8f56c61cb1e7ca4e0840328779b2fa787c6e99ea6261a6691190c61e7213d07e19ed6ca0f42789f9bb61c13dfe529c4
 EBUILD nodejs-12.16.0.ebuild 6128 BLAKE2B 327de2b84bccd5ab4096554e7bf395db5d876a06a0d96b790e66b889fe775d942bcd87ec6253c3a3dfabe844249038d02785f0df6cd6f44cef2ef35c1681a43b SHA512 204d876ef7ef3f8a5b8573d3b2731651a72edc3e8e525ddb9603e9c3089d86e8fcf0c2edc701473aef488f412c2dc735f21d5549df96aa06c71f578e8ef01f2e
-EBUILD nodejs-13.8.0.ebuild 6149 BLAKE2B 25d34fb3d0dced02f4e23bf15b6d552674885c950ffdf7dac1d02c8e514091fc33f168dddca2bec60d9ce0eca03f80cf28ee103f5f582a1d3194b76470f4b703 SHA512 b46b1015f152139ef4b4c0b491b5c55c4a14190d962ea767f73506751599dcdb39ae25693c61e42e514aa9358e2afd24074b3733be57907d85a450829011982d
+EBUILD nodejs-12.16.1.ebuild 6203 BLAKE2B 6812d02a4be07368513881c86ada628038ed9f8a500c31d2402e68f98a10565ce9357fa223b6cc2be7d52fca3e79faed8e9ed78a62ac0e70f9b0860d9d50b528 SHA512 e11a467840822bc9cb6045f8af166088998a45b7834bda6f444fac64aaf44168fc2012138768ddc4f502098df2023143140834381d381fb64fac6c423573cdc1
+EBUILD nodejs-13.8.0.ebuild 6149 BLAKE2B 9add0c1858c32bf245bd3d687b98af5d11aab6fa09cb8627a4352bc91244c498e19ee137f0e6c5b1a8f16423cd447bdffb59bf19ec047ed29973c837d06a8295 SHA512 cb79f90013b8bcc42e78aeb85038f3f438452ef886b5a3fd1722ecf9d241fa9c94453e1f9e6c8a82ac324615fd9a4d935e8e36d2d6b24fed2d4edb62488937d5
+EBUILD nodejs-13.9.0.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
-EBUILD nodejs-99999999.ebuild 6065 BLAKE2B 543a45a1bcf4e451f6b38c4dc47489f22996cb57fc08cc74b5cd877298c81aac660a34ba09c21ecf4836cbc4ba5b797924799f8dcddf3567302a8731a6a35098 SHA512 697f79bbf7a055c123407a806b2732fa9b31d09cabc5dcb426600b794ad957db7008942befab8f5ef7384cd7b57a4a638a90e9a204f1fd8e2895ec5ff256278c
-MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4
+EBUILD nodejs-99999999.ebuild 6140 BLAKE2B 94dbffe5d736060ca34f8dba48792340e4c80880aa993e01b8b4e5efa5a126596f3a982947f0eba1fd98a3fef5bf73837d67904a64d9449ffea517ebeb1a361a SHA512 7e7318a663fa3e3e37bd75cdc3e75356ec986e352254bf964f70cc8bdea3d7ea381b4c2456044b1eed335aeb3966f527bfdf24aef2fd2d633e6118544c8c08a3
+MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
new file mode 100644
index 000000000000..c29825df3cf6
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
@@ -0,0 +1,111 @@
+    Bug: 694100
+    Add actions for pax marking mkcodecache, node_mksnapshot and mksnapshot
+    to disable mprotect for pax enable kernel.
+    Reported-by: Attila Tóth <atoth@atoth.sote.hu>
+    Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
+    Signed-off-by: Magnus Granberg <zorry@gentoo.org>
+    
+--- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
++++ b/node.gyp	2019-11-12 20:58:43.957881862 +0100
+@@ -233,7 +233,9 @@
+       'deps/acorn-plugins/acorn-static-class-features/index.js',
+     ],
+     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
++    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
+     'conditions': [
+       [ 'node_shared=="true"', {
+         'node_target_type%': 'shared_library',
+@@ -436,10 +438,24 @@
+           ],
+           'actions': [
+             {
++              'action_name': 'run_pax_mkcodecache',
++              'inputs': [
++                '<(mkcodecache_exec)',
++              ],
++              'outputs': [
++                '<(mkcodecache_u_exec)',
++              ],
++              'action': [
++                'bash',
++                '-c',
++                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
++              ],
++            },
++            {
+               'action_name': 'run_mkcodecache',
+               'process_outputs_as_sources': 1,
+               'inputs': [
+-                '<(mkcodecache_exec)',
++                '<(mkcodecache_u_exec)',
+               ],
+               'outputs': [
+                 '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
+@@ -461,10 +477,24 @@
+           ],
+           'actions': [
+             {
++              'action_name': 'run_pax_mksnapshot',
++              'inputs': [
++                '<(node_mksnapshot_exec)',
++              ],
++              'outputs': [
++                '<(node_mksnapshot_u_exec)',
++              ],
++              'action': [
++                'bash',
++                '-c',
++                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
++              ],
++            },
++            {
+               'action_name': 'node_mksnapshot',
+               'process_outputs_as_sources': 1,
+               'inputs': [
+-                '<(node_mksnapshot_exec)',
++                '<(node_mksnapshot_u_exec)',
+               ],
+               'outputs': [
+                 '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+--- a/tools/v8_gypfiles/v8.gyp	2019-12-03 16:10:36.000000000 +0100
++++ b/tools/v8_gypfiles/v8.gyp	2019-12-17 18:37:33.695839254 +0100
+@@ -9,6 +9,7 @@
+     'v8_vector_stores%': 0,
+     'v8_embed_script%': "",
+     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'v8_os_page_size%': 0,
+     'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
+     'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
+@@ -427,6 +425,20 @@
+       },
+       'actions': [
+         {
++          'action_name': 'run_pax_mksnapshot',
++          'inputs': [
++            '<(mksnapshot_exec)',
++          ],
++          'outputs': [
++            '<(mksnapshot_u_exec)',
++          ],
++          'action': [
++            'bash',
++            '-c',
++            'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.sh m <(mksnapshot_u_exec)',
++          ],
++        },
++        {
+           'action_name': 'run_mksnapshot',
+           'message': 'generating: >@(_outputs)',
+           'variables': {
+@@ -442,7 +454,7 @@
+             ],
+           },
+           'inputs': [
+-            '<(mksnapshot_exec)',
++            '<(mksnapshot_u_exec)',
+           ],
+           'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
+           'process_outputs_as_sources': 1,
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 3f344f0d8eda..3e9bb1da9c02 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="npm">Enable NPM package manager</flag>
 		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
+		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild
index 31d605f6adb2..1aedca2b28c8 100644
--- a/net-libs/nodejs/nodejs-10.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.19.0.ebuild
@@ -13,10 +13,11 @@ 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"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
+	system-ssl? ( ssl )
 "
 
 RDEPEND="
@@ -26,7 +27,7 @@ RDEPEND="
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -99,7 +100,11 @@ src_configure() {
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl )
+	else
+		myconf+=( --without-ssl )
+	fi
 
 	local myarch=""
 	case ${ABI} in
diff --git a/net-libs/nodejs/nodejs-12.15.0.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild
index 5d35c32b4303..d0e7e0c5b4cf 100644
--- a/net-libs/nodejs/nodejs-12.15.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.16.1.ebuild
@@ -15,20 +15,21 @@ SRC_URI="
 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"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
+	system-ssl? ( ssl )
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.33.1:=
+	>=dev-libs/libuv-1.34.0:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.9.3:=
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -106,7 +107,11 @@ src_configure() {
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
 
 	local myarch=""
 	case ${ABI} in
diff --git a/net-libs/nodejs/nodejs-13.8.0.ebuild b/net-libs/nodejs/nodejs-13.8.0.ebuild
index 4912e94e0c68..157d3993d84d 100644
--- a/net-libs/nodejs/nodejs-13.8.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.8.0.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	default
 }
diff --git a/net-libs/nodejs/nodejs-13.9.0.ebuild b/net-libs/nodejs/nodejs-13.9.0.ebuild
new file mode 100644
index 000000000000..00513e8978c4
--- /dev/null
+++ b/net-libs/nodejs/nodejs-13.9.0.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+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 pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.34.2:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# 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 node.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
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --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+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	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" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	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
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 00962bc7bcbf..7a8dc689fddd 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -13,11 +13,12 @@ EGIT_REPO_URI="https://github.com/nodejs/node"
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
+	system-ssl? ( ssl )
 "
 
 RDEPEND="
@@ -26,7 +27,7 @@ RDEPEND="
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -101,7 +102,11 @@ src_configure() {
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
 
 	local myarch=""
 	case ${ABI} in
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 3878da59a02d..8ae98e14ab82 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -178,8 +178,8 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-EBUILD quiche-0.1.0-r1.ebuild 3992 BLAKE2B 92aa43655db785e1ba45028eb8e56f7bdbd93566731cd3579ee03b92e5974f61a306d5a6796404c2234dff0fe935ff4f3ee05e2eeeb8a1efe4fcddfcaf9effd0 SHA512 fc34bf7f5dd90e4c09cdff848fe4c5b34f32a8e338e2fe38054cb688b05f572cb2ba933065ccf13eb40d8b45f4a9027bb59848a521e7b493b82026d05e70804a
-EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3776 BLAKE2B 78ea083d45b9426a5920160e1faafa0cc0057c7dd1e6f6af5a166be875419eb11b7f2fd5a7884823a42a6c0c7e62863301d71bc40074782ac31de8e9678f5e11 SHA512 b918a7ad17decc581f18944007827b88fb524ddb5848f0cd6dbfc9c74334cc276578ddf29cd504c6108429d27e49c12f45558bf5d169ec66528a92df7ed31bca
-EBUILD quiche-0.2.0.ebuild 4043 BLAKE2B cda6c553d2d371850e5dd6e5cabd7404e9cea7de39568482391b240bb3f1bcf643a6223400627e96434b8be8341f5ecfa07eb25f26d3090b8800adb54926f35d SHA512 63adf493f46663254cf678ce901b40f4b2e0fe290718b247a4055c3a5e819f765db9a5af48448bb9d6428f89c60d0acda912f0743214eb0cc3bb00de344db441
-EBUILD quiche-9999.ebuild 4043 BLAKE2B cda6c553d2d371850e5dd6e5cabd7404e9cea7de39568482391b240bb3f1bcf643a6223400627e96434b8be8341f5ecfa07eb25f26d3090b8800adb54926f35d SHA512 63adf493f46663254cf678ce901b40f4b2e0fe290718b247a4055c3a5e819f765db9a5af48448bb9d6428f89c60d0acda912f0743214eb0cc3bb00de344db441
+EBUILD quiche-0.1.0-r1.ebuild 3996 BLAKE2B 8ecef4042ef3c4a64b53766d8f5ea42cedb516bdb90392874a48e4269c3c7fd827b24976f4610d310317175d1805f5cd6434a7b4e6b2c6119c07459969926e5b SHA512 07a99f0d6787777907d4482efca69eaf85b0ae4abefae4a41d69a5fee7f262fa5cfe9fb9f37fdeae4a4d3b9cc7763c995093dea60cc667f7995659456f55053d
+EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3779 BLAKE2B b8afe84ecfb336e4ebb13d9299ffac0b9deb4f0001d97c9ce0b0cda6dcc13343945a26819f2cf7b72510eecc3758402b775e94301fecede64cd6b07ba8868cf1 SHA512 a3ccf728e8a4795f64f6735df4a1d00c801b0021ab1b080de2ba2cc778db010f046eff9fe2a9afad187d04d5bc406431493206da0763906ad40064636f4f43e5
+EBUILD quiche-0.2.0.ebuild 4047 BLAKE2B b54703dd4bbeed70f436167eec0a09a8f4f21a22c2ce01ea9f0e0454a16ce46bd1fab238ed1ebce9e75e336d64964fe1ba6b9598a878b708d42ad84297961cbf SHA512 fcf9df5c6b6db64824b467201377b969da8fcfe474a75f11306d08d8d70111a3af2d7b93e72a95a24fe885d9bc8533db541d3723017c93dce4a74173bcd65cc1
+EBUILD quiche-9999.ebuild 4047 BLAKE2B b54703dd4bbeed70f436167eec0a09a8f4f21a22c2ce01ea9f0e0454a16ce46bd1fab238ed1ebce9e75e336d64964fe1ba6b9598a878b708d42ad84297961cbf SHA512 fcf9df5c6b6db64824b467201377b969da8fcfe474a75f11306d08d8d70111a3af2d7b93e72a95a24fe885d9bc8533db541d3723017c93dce4a74173bcd65cc1
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
index 0e62832baa52..2d3ee90704c6 100644
--- a/net-libs/quiche/quiche-0.1.0-r1.ebuild
+++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
@@ -171,13 +171,13 @@ src_unpack() {
 	fi
 }
 
-src_prepare(){
+src_prepare() {
 	default
 	cmake-utils_src_prepare
 	multilib_copy_sources
 }
 
-multilib_src_configure(){
+multilib_src_configure() {
 	append-flags "-fPIC"
 	local mycmakeargs=(
 		-DOPENSSL_NO_ASM=ON
@@ -186,12 +186,12 @@ multilib_src_configure(){
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
 }
 
-multilib_src_test(){
+multilib_src_test() {
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
 }
 
diff --git a/net-libs/quiche/quiche-0.1.0_alpha4_p20190912.ebuild b/net-libs/quiche/quiche-0.1.0_alpha4_p20190912.ebuild
index d72cf7b21125..ccfee7706aa4 100644
--- a/net-libs/quiche/quiche-0.1.0_alpha4_p20190912.ebuild
+++ b/net-libs/quiche/quiche-0.1.0_alpha4_p20190912.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -171,16 +171,16 @@ src_unpack() {
 	fi
 }
 
-src_prepare(){
+src_prepare() {
 	default
 	multilib_copy_sources
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	cargo_src_compile --features pkg-config-meta
 }
 
-multilib_src_test(){
+multilib_src_test() {
 	cargo_src_test
 }
 
diff --git a/net-libs/quiche/quiche-0.2.0.ebuild b/net-libs/quiche/quiche-0.2.0.ebuild
index f288474ca16b..c739b541cea7 100644
--- a/net-libs/quiche/quiche-0.2.0.ebuild
+++ b/net-libs/quiche/quiche-0.2.0.ebuild
@@ -173,13 +173,13 @@ src_unpack() {
 	fi
 }
 
-src_prepare(){
+src_prepare() {
 	default
 	cmake-utils_src_prepare
 	multilib_copy_sources
 }
 
-multilib_src_configure(){
+multilib_src_configure() {
 	append-flags "-fPIC"
 	local mycmakeargs=(
 		-DOPENSSL_NO_ASM=ON
@@ -188,12 +188,12 @@ multilib_src_configure(){
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
 }
 
-multilib_src_test(){
+multilib_src_test() {
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
 }
 
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index f288474ca16b..c739b541cea7 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -173,13 +173,13 @@ src_unpack() {
 	fi
 }
 
-src_prepare(){
+src_prepare() {
 	default
 	cmake-utils_src_prepare
 	multilib_copy_sources
 }
 
-multilib_src_configure(){
+multilib_src_configure() {
 	append-flags "-fPIC"
 	local mycmakeargs=(
 		-DOPENSSL_NO_ASM=ON
@@ -188,12 +188,12 @@ multilib_src_configure(){
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
 }
 
-multilib_src_test(){
+multilib_src_test() {
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
 }
 
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index e1a0f1528e02..c31a842c9f28 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,6 +1,8 @@
 AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
+DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
 EBUILD rpcsvc-proto-0.ebuild 479 BLAKE2B f4fde5d8542ff78e737013e93e0366ea44a27ef2fab96a0bb4c4dc43d66061968b1b2406364343c827b8afdc650e704fc62fba15660aaf097842e7b29ba7f1e3 SHA512 51fe0f823b36b5c3f73c915068c3f05948f4588990633de1e9030ea0876328d17bc71931e00850e0495f69c2898ee049de8d77ecb741426623cb207389e629c6
-EBUILD rpcsvc-proto-1.4-r1.ebuild 794 BLAKE2B 76898ed27af7f84612a28ebcb734e70e6d451ff0b2de91977dd75f9dc92d88354733dca74c0c772770b7aac7c3ae7896f0b2426382d92fcab38e808623fd73b0 SHA512 f20e689450fe147d70a72363ee42e862e288b8f6a42ed57e4c58dde2f74bc0f63643b192383b2662fac0129ab446024660c5948d9b1507a5ea441edbae6e2a89
-EBUILD rpcsvc-proto-1.4.ebuild 637 BLAKE2B 76be0dfa0408a0fee4cb0e3230143bb6acebaa1f1e53428cdd37152165cc48772dc9d4e6804e6d2879d0ead8e260e9f9ae8516c271008173922994523da78808 SHA512 af89f28eb8dde8d485ed454345a728ff1d864490fc6e494deca9cfae93dfb04f8fcc57122078fda0ed9212df378d5b13e29171293da5846462c767f08f73dd12
+EBUILD rpcsvc-proto-1.4-r1.ebuild 796 BLAKE2B 306c366e831e2aa2bd1fd7f900a708da745f20c48d12d851d9014e71b88718851645ad603ff3c3e7be1824048f1e428d95470fe87ee74d898ff80877deef7822 SHA512 3b84f4ebb089b47ba42bcf61b9eeccf2f92ed178b3ba76cdfc236c6560530b09bdc17da350e7a5852eb6338a7176e12c5f4177bff189037efdad1813761c6354
+EBUILD rpcsvc-proto-1.4.1.ebuild 752 BLAKE2B 45d27d27781b13e987436371a1fa98420f7f442efd1d6ad9aec3f32683a64a4473c01859e61f06d8e6d7f6521bb5e0ec3b9e45694e7d4c8c50e0832adb7597dd SHA512 04193d62fd8e9754297f3fb96b06c955a4ea7aea0ba481c2a03b8158bb500e08188b0e647f52fedad22afe54e8af0e21e878ff25e676fada1757f4def777a2e5
+EBUILD rpcsvc-proto-1.4.ebuild 639 BLAKE2B d889bb101dfac5514d5eebab13f64269ce63c3c1e5e5b27d05d8891c83df5eabbb965f21537defcca7ea8ec9bf70186b2858f09e49c0ffaaaad694e1f2bff931 SHA512 151e6127ed6229042e9f324aa3a75aeda3c39bfd9c3674ba15cd647ee59ae2e5c26e847fb11b4899f33b7a0e92fb7c885c83500cf439c5442803c2ee777af325
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
index a1f53b70ec37..00f529920fdb 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
@@ -23,12 +23,12 @@ RDEPEND="
 
 PATCHES=("${FILESDIR}"/${P}-external-libintl.patch)
 
-src_prepare(){
+src_prepare() {
 	default
 	eautoreconf
 }
 
-src_install(){
+src_install() {
 	default
 
 	# provided by sys-fs/quota[rpc]
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
new file mode 100644
index 000000000000..4b863b0cd4d2
--- /dev/null
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+ BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+# sys-devel/gettext is only for libintl detection macros.
+DEPEND="sys-devel/gettext"
+RDEPEND="
+	!<sys-libs/glibc-2.26
+	virtual/libintl
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
+}
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
index bb7a81c87e43..30777161fd70 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
@@ -16,12 +16,12 @@ IUSE=""
 
 RDEPEND="!<sys-libs/glibc-2.26"
 
-src_prepare(){
+src_prepare() {
 	default
 	eautoreconf
 }
 
-src_install(){
+src_install() {
 	default
 
 	# provided by sys-fs/quota[rpc]
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index d6bf071c68e9..a7a748811a7e 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,7 +1,9 @@
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
+DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
 EBUILD srt-1.3.2.ebuild 1248 BLAKE2B 76ec8b0e6b7e690ac936156f966400f3f581cdef2c9b1d2babc23d794f5861cab8d46364b2727a3b8020149dcb4d410fb0d76757e03117b94edec2a98a607ec9 SHA512 99e1c067191a0ee86ae749018174b0205c9093b1d77962fab0fdf162df26c9a06136956b72938daf49b3f1a9421244f727df7d558f73f7661f18ca9a70a58a71
 EBUILD srt-1.4.0.ebuild 1254 BLAKE2B 377d38e6480cd261ea5106b8a735f343850ca52b525ce685bff11a0a1d15462b534f0c12c7aeff804cad91ac3d8ddb4c26c8a08847c9d443638cf06cc145f3b9 SHA512 8cf2d9f7162b27435b6474b57196624c4dc948abfbc4fb06bdc9ad644f8c87b1180783bf464db93018134ab08f86402caaa6ef407c0961ca64c22ec015eb1801
+EBUILD srt-1.4.1.ebuild 1254 BLAKE2B 6597b3e6ab38d5b8a0108b71a7a0ad95966a09119eb4be270f6bf7473a21f79f968f7515f9557f3652cd0ecbcd6f9c4e39fd0c008ad2072e223b8e7818426536 SHA512 cb585df5671adb3414c7344830ae9d1dc7bd85912a9f075a37b2b764a8a677d379524d187018902d20047995be583315fc6d4817a0ac095da218365d90834301
 EBUILD srt-9999.ebuild 1348 BLAKE2B 211466b0989c4a1ba51cd329746bb80410bcc922a30c800333e7dcb34762bf0752ae16847949d6d6b7acc49364b333070becb4e8bdcf205d7d5761f1d2d80f5c SHA512 99b05466a3a7e6809c1a79c07486ba2dafad524cec4e01617f026f2c9f463f079ed2557822477dbb33cb9541e075e892045a1aff7b0ec24148b8f0eef41c8448
-MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
+MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/metadata.xml b/net-libs/srt/metadata.xml
index b865368cdf49..eb897f1728c1 100644
--- a/net-libs/srt/metadata.xml
+++ b/net-libs/srt/metadata.xml
@@ -5,6 +5,10 @@
 		<email>lu_zero@gentoo.org</email>
 		<name>Luca Barbato</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>leio@gentoo.org</email>
+		<name>Mart Raudsepp</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Haivision/srt</remote-id>
 	</upstream>
diff --git a/net-libs/srt/srt-1.4.1.ebuild b/net-libs/srt/srt-1.4.1.ebuild
new file mode 100644
index 000000000000..715e4cbdfed9
--- /dev/null
+++ b/net-libs/srt/srt-1.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/Haivision/srt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="gnutls libressl"
+
+DEPEND="
+	gnutls? (
+		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+	)
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
+	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GNUTLS=$(usex gnutls)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 79f7d93962f7..caa3e052b11c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,14 +1,10 @@
 AUX 2.26.2-fix-arm-non-unified-build.patch 982 BLAKE2B b2f4ab56030fffdf2504f213f2713117537095b66c6862377051687a4a798e0540dca95774275b5a7c1ac0fdd5a2927e07a6af8b7a992b8710d2edb05be272e2 SHA512 95ab575a4de13036b11691a4d9cb1b4338b118e5983352d66c4ad639104cce564c4a946349347ac461515bd5bef7359f8193a84d7b02f2d1345cba7969fcfcf6
 AUX 2.26.3-fix-gtk-doc.patch 1302 BLAKE2B 4a0b71a93dc137b5540df0aebc31186b510dfe68dd7b354f763f9a7a93e5df0ed24b12970d801a145eb9b36cde7711029c93c174146c91622a8264380cac08a8 SHA512 f3dbbff5ce65918bf3e889d3139bd7e7b3b7d17adf5f0c22b135abbbd0c8d7ebdf5bb8b126ec9ad2b345c4163da7e862ffe36e521b09eb4024330dbe67b0d7a4
-AUX 2.26.3-fix-noGL-wayland-build.patch 1920 BLAKE2B b064c31932ae3f7d0bee63d46da6c8df8ab442be722cf32f562a201c0acef7a25ca1b3201e6b38e79ffde1c6a007789b788cb88a0ddbb321854a3771ec1a60df SHA512 785b8118954cedb7949f35d12987f24010ff7094079d70c5c19228c7560b3423cafeb757ba62130b647b16803a3a8b4725756d22bf9be023ff905ee4625d0d26
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
-DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0 SHA512 9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
 EBUILD webkit-gtk-2.24.4.ebuild 8450 BLAKE2B aa5c958a3b3961bb8e32ad0571dc18e69ebca19b22ed009e3398ee97ef137e19e1f997e743723491bf7c37a32f1cba69e21fbddb61d193f42b35a0ba48bae16e SHA512 6294d57daa1d3bc6ad1ee775c2bcadd299d6ce9498a77b84b1492704accc5442a2022e1dd52fa715b0668f6ab15e09fad6d5628a2d4ec1eee5cd2720f2e6e723
-EBUILD webkit-gtk-2.26.3-r1.ebuild 8807 BLAKE2B 4e9d8c8f9c12fe0e330d464c7b994cc7478787f046c56c698bd0972312179a7ea7dae9fd4f5a7a62d4f63f8987b9d7e314a926fa933bfd65efb6f1a7361b1448 SHA512 45c96ab14a908208f6b03213d8966043658a202f67b21f1a82d8f62c2195720728559b27831f4b9219a51a109ba3dd5b27dfed8793f68de3485b707642164e86
-EBUILD webkit-gtk-2.26.3.ebuild 8805 BLAKE2B 2affad3cc9fd2df14b5403fdddad7c68c476675be1f967b54f4118490148f4277f76b2485f760e634da8bf87a01ee324d952dfca3d65065049b84ad97faef9b4 SHA512 29c2251a33e36f14f6d8490d94e8f2f72d55576daf684fec5c6606eeaddccdbd227f9fe56971805d541ec3a9b1e8a29ac3fbe7c0d565bf20f90a9dfd26422b96
 EBUILD webkit-gtk-2.26.4-r1.ebuild 8751 BLAKE2B 12ea689a54a4edc3f2058cebc709702bd64e1b41d00bbae9ea9aff3453562c74ec9d5d94569aa5f1a4e34e4fdd55c354a95375e95f1447b54185ab5e2f0b0df0 SHA512 f53e17611ece19ddbf8f488bd80fcfff238c4eb8a725ea87534188b54c459d2839ca838efff9124559517ccbcb5699f81b3c1e8c40250e9f171e8255ce079f53
 EBUILD webkit-gtk-2.26.4.ebuild 8749 BLAKE2B 65b5c544b6713fc151dc7bd4b8419eaf59be2b6ab3291a6d5463352ff530c9c77da7afd23c63bb9dde48a77751e9af230f3eefeddceb38c5e2349c397b5d6971 SHA512 e3bb0dab5af99db0774d382a7d8c620c8de583b959e4c7c0c5c67339bdc4a11a966fcab3ea583525e7fcf331f62570d2e0fd7330cace6010a09acb6d572c820f
 MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
deleted file mode 100644
index 4549f1712e6c..000000000000
--- a/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 874dceeafc08edc979093509dff3ee6a8b25c432 Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Thu, 19 Sep 2019 02:34:49 +0000
-Subject: [PATCH] [GTK] Compilation errors when GL is disabled
- https://bugs.webkit.org/show_bug.cgi?id=200223
-
-Fix following compilation error when building with ENABLE_OPENGL=OFF
-../../Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:123:51: error: use of undeclared identifier 'WaylandCompositor'
-parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
-                                          ^
-Patch by Yury Semikhatsky <yurys@chromium.org> on 2019-09-18
-Reviewed by Philippe Normand.
-
-* UIProcess/glib/WebProcessPoolGLib.cpp:
-(WebKit::WebProcessPool::platformInitializeWebProcess): only make a call when using EGL, this matches
-guards in WaylandCompositor.h. The condition was changed in r245807.
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250077 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-index 37ece2f4576..a380a25fa4b 100644
---- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-@@ -119,7 +119,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
-             parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
-             parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
-         }
--#else
-+#elif USE(EGL)
-         parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
- #endif
-     }
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
deleted file mode 100644
index 859e268912a3..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
-	eapply "${FILESDIR}"/${PV}-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	eapply "${FILESDIR}"/${PV}-fix-noGL-wayland-build.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
deleted file mode 100644
index 799da223a868..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
-
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
-	eapply "${FILESDIR}"/${PV}-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	eapply "${FILESDIR}"/${PV}-fix-noGL-wayland-build.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /net-libs
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)