gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /net-libs
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
116 files changed, 1871 insertions, 1403 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a11bd68a9f85..b063647c0a71 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/balde-markdown/Manifest b/net-libs/balde-markdown/Manifest
deleted file mode 100644
index 205f6dcae275..000000000000
--- a/net-libs/balde-markdown/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST balde-markdown-0.1.tar.bz2 260429 BLAKE2B 4306a02e363a271c77d9ab3f08261ab9410d6ac8c258bc74dec3b1cabd8728927d12bd0d0b2941f5dbd90256e11ef8e30b5c952c2d7711bf6ae2896068822862 SHA512 ba0a952d1f8480f6173a8af6eb662741ac04db4e39d65158afac97606c2faaaff973dce384b2bc1d42aabbdd345cd451fc5624f1c6d2f941f2630b2e76a01d10
-EBUILD balde-markdown-0.1.ebuild 850 BLAKE2B b1ca913c2dbf14d2e6555b5c6bd3f6b753d4d818ba15d74b54ea73097f6f8d66386d86c1bb275194ee4f4c93360108f3ef9bf63acac815238197f302346e2b27 SHA512 dffc4d3ed2003805bbcb1f53e761ec246e8d6900bb40162c402681f14e3a07caff671e7b3669df87efd166d6208cfa9e8a8ef3bfaefe0303095d0c76646c6548
-MISC metadata.xml 432 BLAKE2B c6dc02584514b1ead0b3a13892f4e6c929feb94c493639196d85f6a35379760f637f19e1907b6db72454e663324aa95eee1b4c396031db16663a3fb3d96c7824 SHA512 a70288d86a91ed7dbb558abb31c3c7ac8fe4f69712166497167586f870b39bb9daed6a00ce053e42b8bc17243e036ab04cf7c0c7533f00a5e4160dc031d129b7
diff --git a/net-libs/balde-markdown/balde-markdown-0.1.ebuild b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
deleted file mode 100644
index 810fde09dce0..000000000000
--- a/net-libs/balde-markdown/balde-markdown-0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/balde/${PN}.git"
-	inherit git-r3 autotools
-fi
-
-DESCRIPTION="A balde extension that adds Markdown support"
-HOMEPAGE="https://github.com/balde/balde-markdown"
-
-SRC_URI="https://github.com/balde/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.34
-	>=net-libs/balde-0.1
-	app-text/discount"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	[[ ${PV} = *9999* ]] && eautoreconf
-	default
-}
-
-src_configure() {
-	econf \
-		--without-valgrind \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/balde-markdown/metadata.xml b/net-libs/balde-markdown/metadata.xml
deleted file mode 100644
index 0571121e40f6..000000000000
--- a/net-libs/balde-markdown/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer status="active">
-			<email>rafaelmartins@gentoo.org</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<bugs-to>mailto:balde-dev@googlegroups.com</bugs-to>
-		<remote-id type="github">balde/balde-markdown</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/balde/Manifest b/net-libs/balde/Manifest
deleted file mode 100644
index 7114eb757508..000000000000
--- a/net-libs/balde/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST balde-0.1.1.tar.bz2 360412 BLAKE2B 88f25e7c409c61f45d5fca0664d3602fd206caade28977d7d38d5626fdbc423c76cc8dda2c5829ea2b6b2f79dd9897b3a890b9a5a862d6defad4e11808edab54 SHA512 fafb9e9344ecb1caf6a4451b99adb3505fb728015e2bcce3d81162f679a70267e49a0dc194c6c977a7a155f9b5ae3318fdfcb63fb0223e43943c0fc5e8503acd
-EBUILD balde-0.1.1.ebuild 1026 BLAKE2B e885f62fc31c33fce4df62d548d391499317014c838414993557e6dc7788a43e8588ebcbea9dafe5eae7ef9395e23b28d26dd2acfb39a5c5e41382450093423d SHA512 0a00a0aadedab2fed6942d707b1c85582f4b1dcc6997a22a757954846b3bcc07a941860fe6a32816e3c0376e0fca7c4d761edb8b0de41ac7a70b75aa0fd2972d
-MISC metadata.xml 423 BLAKE2B 58ae34c1a4bcd34e0dda591a8c52cca79121ebd7908b37a0f9dff70ff0e91296d26bec14f430bc1efd529938bc943c0841672a1e6844796bf94b3227a37e5bd2 SHA512 c48ac58f4d1586234d87a719e7af4cb43c00844cef8f867b9d7ee58072a3326fa603f91a074506478466c00bef72eb157db69c9508ddb161ae4c657d3d87add3
diff --git a/net-libs/balde/balde-0.1.1.ebuild b/net-libs/balde/balde-0.1.1.ebuild
deleted file mode 100644
index d9d20aa89a46..000000000000
--- a/net-libs/balde/balde-0.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3 autotools
-fi
-
-DESCRIPTION="A microframework for C based on GLib and bad intentions"
-HOMEPAGE="https://balde.rgm.io/"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.34
-	dev-libs/fcgi
-	x11-misc/shared-mime-info"
-
-if [[ ${PV} = *9999* ]]; then
-	RDEPEND="${RDEPEND}
-		dev-util/peg"
-fi
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	[[ ${PV} = *9999* ]] && eautoreconf
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_with doc doxygen) \
-		--disable-examples \
-		--without-valgrind
-}
-
-src_compile() {
-	default
-	use doc && emake doxygen
-}
-
-src_install() {
-	default
-	use doc && dohtml -r doc/build/html/.
-}
diff --git a/net-libs/balde/metadata.xml b/net-libs/balde/metadata.xml
deleted file mode 100644
index dc226aff2d43..000000000000
--- a/net-libs/balde/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer status="active">
-			<email>rafaelmartins@gentoo.org</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<bugs-to>mailto:balde-dev@googlegroups.com</bugs-to>
-		<remote-id type="github">balde/balde</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 9337c6a0b323..7f5af186a14b 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -3,5 +3,5 @@ DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b
 DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
 DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f
 EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
-EBUILD canlock-3.2.2.ebuild 1099 BLAKE2B ca6099a7fbc1943119dd46d2501034d3bee1d845b55d9fe0ff10f9e8cbe0e56b0e7e088cb7138475dc9f6c9441e79590bad03939f341809a1095a8930b69c4c9 SHA512 72c93778a6f2f90c5fc857ef65eb7c8ec20d0642c1bbe1833608f4ed19a05762a25d582f2069a2b3e67273b369b55acc9096b10c7a059ef3b724e809fc0777d7
+EBUILD canlock-3.2.2.ebuild 1095 BLAKE2B 443bf0268fe3e64dc00ef605d2b0e79655fed89a51b8f3620606271f77b541195b69c8b3013356bcad09263af0fd39083df6f10d8355af00146ddc8f24be7694 SHA512 1507129d5a94ff1269e417e9cd4e7b83443b12cbfbdb14e9047be6d530e6341eea96b9603c6c34abf3e900deee5a0d11234ae27188a1a2b37db558eee3dc36c6
 MISC metadata.xml 431 BLAKE2B cd7cbf3191ed305dd69b9cb360da7f45d7e5e7656080328c8c152c0b1761e390d2657265bc83093758e3f6628a6a1570080d42b9e432e4b2a900a354448194fb SHA512 e6317ceb5e1fba639fa9c095e726267cfcda9284c0b075a66eca95991bc01a54e7d2891b238e00924127988be5280a6467ddb64fb386e959966d43b5a05f0542
diff --git a/net-libs/canlock/canlock-3.2.2.ebuild b/net-libs/canlock/canlock-3.2.2.ebuild
index b073927e1e72..9b4ffa7b73de 100644
--- a/net-libs/canlock/canlock-3.2.2.ebuild
+++ b/net-libs/canlock/canlock-3.2.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="BSD MIT"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+legacy"
 
 BDEPEND="sys-devel/flex
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 4a3e91368209..e59c14288467 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -2,5 +2,5 @@ AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
 DIST czmq-4.2.1.tar.gz 1617066 BLAKE2B 5b635ccd7e85f05cd4f81f1ddaef80f7478feccfb916b1a7317f539354d0a4dabb7bf14a9dbee4dae3f6fbfcaf402c51ee9ba9810d952fc837c03c14304d4dab SHA512 776c524ffeba3dbe2534351f91623a6f9db31268aa2e794e29b7eca99c9fd0a726de0f7fba4376a5b3d7321b1033314e86644efaa5a9c7226fc1f06805f7aa9f
 EBUILD czmq-4.2.0.ebuild 1167 BLAKE2B 6aeb3a671a4ec525a361ba558848cbe65bab7bc9e831f04a3eb3b2c4470207460f15385e304e2293ad260967ac5ef9fe39a2e943315ef3783fb17d82bfa4f4d8 SHA512 a31dd593f9d2537e71e16320eefcd6785f9338395cb51a30de30b3d9ffdfa41f143174934d0ec794f67f2b06d35ceb10151846dadecd2fdce8dc8a314bf4a99f
-EBUILD czmq-4.2.1.ebuild 1241 BLAKE2B 1c12101965f679c95c09b020c20d8a23076e76a685fea160c210b71a44bf3257aa97b5e9917db768f1739f2158e574b1626e230be08d0dd0d8e3d1028e245e05 SHA512 5692e9a199e75224436e632bb8c0ecbea0bd22a59c8112e3b0e36e86e3e74afcb589f6419ee9e7c53b6d669762250ad9a0bbebf621faf412505234cfd31dc6ad
+EBUILD czmq-4.2.1.ebuild 1237 BLAKE2B ecf891d5551b1b3ed34bee8a70e3068c1f57407b56b5083a24945305df8b49f06a481734159655393a2e0a7c51154eb2e7c8c935261d3bf7ed1872d60fef7587 SHA512 5460a8a6174d2a8ae9573488201aa8822bc73be4acd506df2eb9b4d744f272f4727a6b3789da2117a21f6081f664da41c5d798c45da926918a8b6afd47c957dd
 MISC metadata.xml 786 BLAKE2B 0b02a6b39b849b994c1c1e053b8156795804fcbfaefaaaa74895215f9f3394c131888a561798abafbf3a16f46bfbf00f1609ebeac3c1e5b63b1d25d6616eec09 SHA512 1dc7f022ee9fe463b647a750e13442254b6b9dbc144068401fd76ece667a1c570bca99e0558fb29738c6de68365d87584b7c4aa922e69c1ce47c903116c0fe10
diff --git a/net-libs/czmq/czmq-4.2.1.ebuild b/net-libs/czmq/czmq-4.2.1.ebuild
index 4811dcd20d22..64690fe52ffc 100644
--- a/net-libs/czmq/czmq-4.2.1.ebuild
+++ b/net-libs/czmq/czmq-4.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa x86"
 IUSE="curl drafts http-client http-server lz4 nss static-libs systemd +uuid"
 
 BDEPEND="app-text/asciidoc
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index ee8ebfedce91..e403fceec03a 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1,3 +1,5 @@
 DIST dleyna-renderer-0.7.0.tar.gz 65982 BLAKE2B dc9acf5d3c39cfc8d7b84890b3fda2f4f4856276c1fb900f114a8f07f0459906d99ebe5f941d8953f5b3c635b6eaa5319300510037891aaf2079f88fd92618ec SHA512 6b1b222971780841c5080b769888a42beadaf7cd576f0d07741585e208876179d3cdde123cbd5a2e4129d2b9e0ba18a7edf7626dd8a0cb1d4a45b91340c3e9fe
+DIST dleyna-renderer-0.7.2.tar.gz 66365 BLAKE2B 6e033f4d93f14e855aeeabfa1d31fdf4db499b1a2773c55c2631cef1c5bad850e162926554203585e490ac24d9e23eb33028052b26dc4585540eff1ee93d334c SHA512 a36ee90c30c8dece0e7c65855d6b01f92840bd26380e3553a4b0df910b3f593eb9b4cb932ad084b30c36396e819cd6841c080fe49d7032052d3ce40498e978cb
 EBUILD dleyna-renderer-0.7.0.ebuild 708 BLAKE2B 139b3fa71e2a6ca04a2c4e55a1101cafb5e60da142b205a9c23e7aebae3577e74f498aa249c335209486d65e81208be7ec399d2f14e150e0adc2693995a0fbd2 SHA512 4a7fab3e512c0abfe48142bf8ce4d9b0dc5aecfd18769f9c5356e54c7a2cca0bfb50509c16d6ebfbb407564697ab66b6535d8b00afbfd36e0fddcaa591d480ce
+EBUILD dleyna-renderer-0.7.2.ebuild 709 BLAKE2B 4d61d6288e40f52c884a09aa91b95b9325faa97110f3b4d70e86d4bbbde4b50e564ce65f6ef7b17b2661925894077852bc16e59bfe84d7ecc4a035196c7ac39f SHA512 676b9650a49ebb996ebb8bab105b128dee6dd285256004fef2e9e7c3ade100947dcdd0c7cb7e0347cab0149fc4303084f748fad2452681ab96a596e8d1097576
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
new file mode 100644
index 000000000000..39bb50f0deb6
--- /dev/null
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="A library to discover and manipulate DLNA renderers"
+HOMEPAGE="https://github.com/phako/dleyna-renderer"
+SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/gssdp-1.2.0:0=
+	>=net-libs/gupnp-1.2.0:0=
+	>=net-libs/gupnp-av-0.12.9
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=net-libs/libsoup-2.42.0:2.4
+	>=net-libs/dleyna-core-0.7.0:1.0=
+"
+RDEPEND="${DEPEND}
+	net-libs/dleyna-connector-dbus
+"
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index d507bbc91fc3..b8cf5f8bf4b7 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -2,7 +2,9 @@ AUX glib-networking-2.70.0-time_t-32-bit.patch 1837 BLAKE2B dbe1ae6dc1e3ba4f0033
 DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
 DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d
 DIST glib-networking-2.70.0.tar.xz 259808 BLAKE2B ebd423e9f93fc362cb6cece503de8f579c5c6de460e50f073107017ec0dc35cdd2f38fb780651dc7b68dd833500052c83bfba08e6c4b69c9aca1955f9aa7c7c2 SHA512 c9f8126e3466470ad8e1d588d56b843a4fa4738619a795e6772d95282c54a8356a916a3b0a0b6994606d8a6841ecb0637230f14575ed95ea68bff8f3f81aea71
+DIST glib-networking-2.70.1.tar.xz 261312 BLAKE2B bd0fb33e1ad359b36f78c8003ceb15290a9403d978400573ec7caabc44851f83f080d651085b85f7a5836a39c12c499222d8f9ad5bde51e5b24f6344332be1f7 SHA512 a06b4df4481f95193f9ed4be6d39bbe9ecaf4de8e11a48750f7110d4cfa71aa56b7ec5b36af70b7128150447f1a39ce3aeadf71e2ac516f61708f1212f8f855d
 EBUILD glib-networking-2.68.1.ebuild 1983 BLAKE2B 57f0697fa0db6c58187cb1dd748c31bd039a8999b7b1abdf330c2405e80bf203cbccc86fde0bd69fcf76499d69265ae2c079c6c43dc238ba5cfaef4014a7b375 SHA512 b1a5877223e456e2518c86d9c14128588a1ce169c30d7b5870b6d9ccb93d5f1f3dd2d06bbb5ee07421c1cfcfda07a22fcdfafc974e85afa4b001b190062e9680
 EBUILD glib-networking-2.68.2.ebuild 1983 BLAKE2B 21b2aa19571376085bcb9138188a4b743b62f81bd164b800a79d0f13f80925c2471e53a70b0c29430c7e17c5f19ba27c2be1faf383f70f5e20cd1b0131258c65 SHA512 6326da990fb32f4d480bafad98c30255da69bceca9b30c44f958a90c189e4c9cfe144c0482160ebd13d3142c3d96bd3d47f75cfc76a88ca422592bf592a6cc22
 EBUILD glib-networking-2.70.0.ebuild 2043 BLAKE2B 3c953ae769632b8548c127589adcc65e076c2fe02991a9350eb808fc7f211b1a2da68dd3d6c0aedb8a7f208d0a0c22ad9ef074935960f624cb3b280dd7ff4d72 SHA512 eb8c01bbea519f28e3f9556c932bdca981a2d7618225f069809b8a3378f196b49a28ccce4efe05dd26fb59ca8c348227216d0f5da4ed72dfd191a184730e7f12
+EBUILD glib-networking-2.70.1.ebuild 1990 BLAKE2B ea40834d7f4c62b5b574614f09d13172c98d7b1583d43d31cf18dfd090c62cfb4de3b98b8f9d1c141c2bb4737be4b3d35d7484b518bfb5064092618878ae45c6 SHA512 07c97ce0f54b012fc3865685f55572209a4641dad84072a5044e8a76747a26f136494a106b0b8780508fccb7e1ea2092c912d494de763b907c37d6d792a91c61
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.70.1.ebuild b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
new file mode 100644
index 000000000000..860454cb0242
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls[pkcs11] )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	xdg_src_prepare
+
+	if ! use test ; then
+		# Don't build tests unconditionally
+		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
+		# It may become a real runtime dependency in future
+		# Please check!
+		# bug #777462
+		sed -i "/^subdir('tls\/tests')/d" meson.build || die
+	fi
+}
+
+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_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/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 8f2007ba7f2f..ed27ec136a6b 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-online-accounts-3.40.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c
 DIST gnome-online-accounts-3.40.1.tar.xz 861220 BLAKE2B 668af9cca8524e25b4f65f41983c527e0cac167317c28f6c451c9c9a6cea18a5774c42acd1cf80cfc707ed62524d1381039fd4f16e3e506d4789372a3db85f4f SHA512 ee7835efe6e1afd6a13f823e17eb93e4a3c55e90764f93a766270ef64f07ed18eff2fce325d8248783d7c6f1c0a7a7fe7512ebb7a8bc0a3e3b33b9037a75b088
-EBUILD gnome-online-accounts-3.40.0.ebuild 1987 BLAKE2B 36a1b6e308d49be3265b5a455382f39b456cdb61fae02c446c5e11bc5cb827aa3cc5b528b033816453a32d4349bcfeaaabd054eb5d020d6172206ac7fb57a61f SHA512 48cc7f55915f515c2ce3ca4f0542115bb04e18afdfddea4c00b75936010e1c67d3dea4c304a5a6faa1ca184cb5f20d6132c0fe62f9f0bfdd13845bdae0d204e1
-EBUILD gnome-online-accounts-3.40.1.ebuild 1990 BLAKE2B f2004471d4e3833dd66cc76fb773dd920f21a337377974a36383255997721498d1b0947e44646c5cf41bc4bb8ef94daebe782dbcbebff7981c8c296783dbef1d SHA512 60d1f29ac679100fb7d542bc56772743b548145317e9f1849ae74e8af8415bdd0a85cfc12aeeb1bf44a91f77072da04c9893609c3d17177ac98b9cc181a3ca2f
+EBUILD gnome-online-accounts-3.40.0.ebuild 2121 BLAKE2B 57476176b80434f237305a369d100d0fdc541321e273f9c38f6c30fad15faed17fb841ccf8feb2b63a9d040a8855c8d7778b5ad039cf2d4abd0edfd398f69e82 SHA512 1b3ddd0d712c6aedfe8a7f747aff1068c98952724624a3c06290d0544429dc6ec12a410094b21fbb529569697ec1d6fbba461c4c597074965ea1c2abe5e5ef63
+EBUILD gnome-online-accounts-3.40.1.ebuild 2124 BLAKE2B db5bcb09565828f88ea2c106366e0c4c3a986dc0663a0b2b7fcf9e1d5b1745a4e14d51db1666995c5393f8c14162aecb94ffef0ef028218cc6cf5472dc23d2d9 SHA512 92f278bb6b94aa18297dd57c791028e692ef42d99bed52a8851d1e1b4c1cd04dbb9de94e41803884a4aeded54041c2b42fa9fffe924ef1f5378e602cb2df5ce8
 MISC metadata.xml 380 BLAKE2B 0c3c7edbcff0344c8e7929bf525916d8a6c8bec9628c7c20d9c98e81102525e2651e422e10edf53be338bd2a74b6d42396d9f8c0d1b8bfa2576a319236a07987 SHA512 eb224bd0e6ffb92203f9df3c56449dff3aeebd8623bd451810ac99a57cb84b277e5ba53354d36cede6678be209da55cc30386b903e71dbd90bd91623c2d005f1
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
index 90a80a4489ec..ed7cb68c8a1c 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
@@ -59,7 +59,10 @@ src_prepare() {
 
 src_configure() {
 	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	gnome2_src_configure \
+
+	# CONFIG_SHELL for bashisms in bug #829494, patch submitted upstream.
+	# Can be removed in future.
+	CONFIG_SHELL="${BROOT}/bin/bash" gnome2_src_configure \
 		--disable-static \
 		--enable-backend \
 		--enable-documentation \
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
index f012afee23f2..fe36f7b72807 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
@@ -59,7 +59,10 @@ src_prepare() {
 
 src_configure() {
 	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	gnome2_src_configure \
+
+	# CONFIG_SHELL for bashisms in bug #829494, patch submitted upstream.
+	# Can be removed in future.
+	CONFIG_SHELL="${BROOT}/bin/bash" gnome2_src_configure \
 		--disable-static \
 		--enable-backend \
 		--enable-documentation \
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index fab4b6fdccce..00e96b3c166d 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,9 +1,9 @@
-DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
 DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902
 DIST grpc-1.41.1.tar.gz 8346512 BLAKE2B fbb453f7ab398ac843b19922b7e3f71121bc9ba44b3e0c558796dc519dbbc5d34e31d1059bfa7552fefdd7c05d5a8b03645f5c5257e73126ba14a73bec0b1fb1 SHA512 17d4c0867a51e33c029bcce86371f8e1d4680ba78fe4f02fb63b8614e9c5f7f6078c22b7c56c63c6ff461429a70d2ec87cb3c0d30c897a88321fe7f26de6e052
-EBUILD grpc-1.37.1-r2.ebuild 2717 BLAKE2B 4b806690625388aa29ce60f40ba918ebacd2e384db9021913dc5e1c61575bc8c5a2382ffd38bc02af8e004a5f4ddd7daa70ba72636d1f0b04bab8f8588f8204e SHA512 e9d838e67b7c8554fc53d74f97b15c431364107b2f50b9459687bd1bb90fa6e3f68a9358fe347011809597da3c5cd39ff195719881e3af8265e9d5da83705b14
+DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad886071a76d527730108da155d290612f1e54cec15d69f55713f37f377e6bff844b16b5deef64c7d8bb31195652 SHA512 e0471aa355d311a40c9d29d7101bf8e22b89ac675d4914c38e617d3213b61107487ef20ca80d7cff8093b548f4a976526298e1f32959ae6ce3c088d45ecc9781
 EBUILD grpc-1.38.1.ebuild 2731 BLAKE2B ca17d04e0ad895020cf096eb98dfe01e53c312e8afd0ae868ecb10012cfa1c06749dd0031489996f0d5e7367e4a2e579d713199a31372062cd4bfe62712e118c SHA512 23e9cd3479cf10dd80ae704eda03d9004143bffedc3458904840fd36801d0aa33be1027b2447da02f2f93ee1dbf11112aa7a43aaf5c71eff9632ef0bda862f4c
 EBUILD grpc-1.41.0.ebuild 2731 BLAKE2B bef8c072cc2ba43ead5fb71e4be67d25a5c67cacff38c2cdf095b4a7b8b8b140c4ef08d5afb6b6f5cc5357cf704f99ee55489e1b6bc393127b31afaf97133f8f SHA512 1e776f2f77bca939bd266b7b09dc17f3be1f1a94dfee7840883e8cc6549162b9a78e87c17fd77557cf1ca290c6bcdb9304f2a38aea489784a421a6165fbc4c70
-EBUILD grpc-1.41.1.ebuild 2731 BLAKE2B bef8c072cc2ba43ead5fb71e4be67d25a5c67cacff38c2cdf095b4a7b8b8b140c4ef08d5afb6b6f5cc5357cf704f99ee55489e1b6bc393127b31afaf97133f8f SHA512 1e776f2f77bca939bd266b7b09dc17f3be1f1a94dfee7840883e8cc6549162b9a78e87c17fd77557cf1ca290c6bcdb9304f2a38aea489784a421a6165fbc4c70
+EBUILD grpc-1.41.1.ebuild 2729 BLAKE2B 37976ad98ac36165558f1bb4c834a9da8f74ca8c5720a983eed0945c1f1dc70e05b3471dc01c64a6fe1977801399ffc5eada1ee730e287f4b5ef8f1c86f1b95e SHA512 4f8e248f9b1105d92eb4b3d16e7b09c66e8e60e8b49e607cb593c2c91a64b6fd52e56c1c95fe62ba688ebe9b1d09cf4f4d75e30c5f92167af1055ac8a6e4ec4d
+EBUILD grpc-1.43.0.ebuild 2682 BLAKE2B 820f5ecc501a6c20db9e05b78699a136ca75c0408789670dca441ba7471b33c7c71cd6c125ff5c1a8515fd66087919595c3c2ec6a7f47f2c4dc8bf96a9046bf4 SHA512 83329a812c62f456363b41628ca99d908980cb339374de235806c064559c82652cbc94618104b9df410b33e26bcd2954694d3f8ce21be9d0f8ab7ccd527e4f28
 MISC metadata.xml 460 BLAKE2B 5cd969a5813d9d872d63cad0ebe0e02381cc8e97d0eb16ae9821f24de78c69f3670dfd6698388b17165d6a3c2029d213dd1f0e88ecda42215b0b3dfc64758657 SHA512 32148c45e964de16405ed7820c2066d5332f85047b3606f0189e9a306825b291478672dd108b0e1869086103e2f9a3a283b7a30379a883c79709cdf0fba18c4d
diff --git a/net-libs/grpc/grpc-1.41.1.ebuild b/net-libs/grpc/grpc-1.41.1.ebuild
index e9f7052206f3..94fa8a8a5f63 100644
--- a/net-libs/grpc/grpc-1.41.1.ebuild
+++ b/net-libs/grpc/grpc-1.41.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/19.141"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
diff --git a/net-libs/grpc/grpc-1.37.1-r2.ebuild b/net-libs/grpc/grpc-1.43.0.ebuild
index 468f9b7a6ac4..157b09370a9d 100644
--- a/net-libs/grpc/grpc-1.37.1-r2.ebuild
+++ b/net-libs/grpc/grpc-1.43.0.ebuild
@@ -13,16 +13,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
-SLOT="0/15.137"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+SLOT="0/21.143"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
 RDEPEND="
-	=dev-cpp/abseil-cpp-20200923*:=[cxx17(+)]
-	>=dev-libs/re2-0.2021.04.01:=
+	=dev-cpp/abseil-cpp-20211102.0*:=
+	>=dev-libs/re2-0.2021.11.01:=
 	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
-	>=dev-libs/protobuf-3.15.2:=
+	>=dev-libs/protobuf-3.18.1:=
+	dev-libs/xxhash
 	>=net-dns/c-ares-1.15.0:=
 	sys-libs/zlib:=
 "
@@ -77,7 +78,6 @@ src_configure() {
 		-DgRPC_ZLIB_PROVIDER=package
 		-DgRPC_BUILD_TESTS=$(usex test)
 		-DCMAKE_CXX_STANDARD=17
-		$(usex test '-DgRPC_GFLAGS_PROVIDER=package' '')
 		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
 	)
 	cmake_src_configure
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 89bb7e6650f6..091a8169f7ee 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,7 +1,9 @@
 DIST gssdp-1.2.3.tar.xz 62032 BLAKE2B 761a9e0df8289a595d882497bdda6d180f19328d0e97076446286e34e7735d1b1d07fc0299618955f7d92732d11d533a59cf4012f5167c4610c9856583f06770 SHA512 abce2473995a996b0adc74ced77cb2158cc997ed70edb0c25fbddd85fe9e6afc6bf7f996bbba7a6ed5268dfbe9207ae12f2e6989efe2e8e10cc25293df347e82
 DIST gssdp-1.3.0.tar.xz 1202916 BLAKE2B af771b4163c8671d1496cedabe5845eed0b12a8dd23aa226c61ca19ad1d83bca7d504ea36f9e8b09b5079373261043c121a8ac09a909f4430be0d5a5eaa995f1 SHA512 6004ee73898e5effb98dd78af116bf4b92735712f0237c57302ebbda82d77c1cfe182e0e6ef7a8c6defd7a66ac76531d0bff740d2a41cfba8ed365b88a539c85
 DIST gssdp-1.3.1.tar.xz 1141580 BLAKE2B 3d43c1cf9bb9e418ac831b09579e6940540e0ab2124d1f75989648e39b03aec612898340511b2c965573973531adbe8f489d33447a85aac761dcbe8906325abb SHA512 b253c5bd38956a02fe1f4cd77d7c868a573c1a7e25115137ae0753c7dfdebc38cd7a3c3fee1520c1c091c60283d556f646b5c715e56f013b2fe209c63a994b56
+DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8
 EBUILD gssdp-1.2.3.ebuild 1245 BLAKE2B aea2f4019c721dffd34ba8075eb6a7468ea39537a89961cad9bc62bec14df3f9d433d29ab943c5932d5b8d6b33ad2467463aa5248d2700e0cd32821690a8311d SHA512 e265e54e13963bb27eedc65aa74d3733d6754417b48a94874eb2181db9e43238b02a98197638dd4589058117fe0fdbef6a05f52bf687c6955f0cb7e1c6dbd230
 EBUILD gssdp-1.3.0.ebuild 1512 BLAKE2B a2e895b117d895f3dd497ecf95a53a57939f4cfb6076d8e346346105fa12e16622c611a0fa3079a5f70b9802f4c965af683e742cfb2235049db9ff18131e0360 SHA512 cff03653eed4c1b2dde7d5244af720b716b2541a94572710dec7bce1934aa787c20a08efb4b383395a6058c20a243d24adc7cf1408a3d9a92365e213bd8423df
 EBUILD gssdp-1.3.1.ebuild 1519 BLAKE2B 72101953f3b4f4131e9d187c5cf1eaa77d2e7b02f6b4d2167214559ca4b2053b858fe8b94d600dc2ab9e3bf2cac8050fddee73e3d76aa3b5d5ed1f3493183647 SHA512 b351580132dce51e00188fc51639319be73f0adadcf6b1d9b6b4867fec05d18acca5c94d107c059c905aa1e406c477742a70fbfab3ef75723508d3b465dd425a
+EBUILD gssdp-1.4.0.1.ebuild 1519 BLAKE2B 72101953f3b4f4131e9d187c5cf1eaa77d2e7b02f6b4d2167214559ca4b2053b858fe8b94d600dc2ab9e3bf2cac8050fddee73e3d76aa3b5d5ed1f3493183647 SHA512 b351580132dce51e00188fc51639319be73f0adadcf6b1d9b6b4867fec05d18acca5c94d107c059c905aa1e406c477742a70fbfab3ef75723508d3b465dd425a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gssdp/gssdp-1.4.0.1.ebuild b/net-libs/gssdp/gssdp-1.4.0.1.ebuild
new file mode 100644
index 000000000000..c76385775f89
--- /dev/null
+++ b/net-libs/gssdp/gssdp-1.4.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson-multilib vala xdg
+
+DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
+
+LICENSE="LGPL-2+"
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~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? ( gui-libs/gtk:4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	virtual/pkgconfig
+	vala? (
+		$(vala_depend)
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool gtk sniffer)
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	if use gtk-doc ; then
+		mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die
+		rmdir "${ED}"/usr/share/doc/gssdp-1.2
+	fi
+}
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 8c7369f2f4d6..7b3d66955418 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -2,5 +2,7 @@ AUX gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch 1692 BLAKE2B 6a
 AUX gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 755 BLAKE2B 95934ecb04553fd3153a2d0b81e52a487f922b888868d395a423e28f2d94c1012f9cda4025d79e855e371161a191c6c7b9c6dd6fc8acd603f91286ef9492dac3 SHA512 060ba2f9a95ae6fa790b6481acc3d23b93220b733b1e2966e80c33a7a802dbdf84a55023da381efd037b23cb1ca698251fc6b3779debfe7bf21b9e5ce5c54d76
 AUX gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch 1052 BLAKE2B 8ba4a7c553bf2af5a4cb6fde0daaa990db67f6fc105d64b03c555f2a091063249dddf657d03907f4d63220dd26d42d10e9be01e766459399b1a7ce4b824e62ea SHA512 d288723785d143bd306b0ff85d25658709f22a75d5a294b43b3e45ef8a84f40bbd00017b84da776453097a218f642d337c2308ca965b0cde0a1a3e97f3b6bae3
 DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb
+DIST gtk-vnc-1.3.0.tar.xz 220488 BLAKE2B ea5070cc396fe4ef52fe980b766658f1a4f82eb7dec52856ab79836363c8fdb48827d52c0df7edb2c943f5087fcfd87898aa43457f7cbf5a544a4c7063f84f3d SHA512 ff25c19a1cbd4588990f1f3a2448fd2e0b694b933ca1a7be9565188db78055efe13f90ad1243bf8237d6a29d38987d7b3e77344e50d09191207b09200b01f5df
 EBUILD gtk-vnc-1.2.0.ebuild 1726 BLAKE2B df068d3bea9685e002579f981cda026260b159948cf127f8152b10c0f102acb43d7a065b79a3d08cd1922bd661f4bb69a0c35450923f5896bbfc92d6ef9ac96b SHA512 20a13ba3044552513299c611bb35b732aca2cced2ce218e9b56947f9386c14acf990119844e09bb09172dd84b889c6665f3361ff5807f25f7dc0f9a4fa9780cb
+EBUILD gtk-vnc-1.3.0.ebuild 1491 BLAKE2B 2f5e095076d18fdf729308c3219f387879c5cd7c430dcd78427de4f6dd22a244daa5df2c5b05fd5d3f51e81c649bae44852e307bea526265e87c5288d2bb4742 SHA512 6e264102a629b95ea9f117b6ff3e7193223d3688550e066e817c1441fe03ecf4715a11e8e45f667be3f00c921410190a3379d9ab0fb80af2e418a92033e5d966
 MISC metadata.xml 398 BLAKE2B f3f6610cc4d7266437aaffb6278d79222d751634d79e275dc34547f95eaa826fc47a991b03cff5d7c9350314f876da54bb1322f6dd6e890e266a9e16b892b30c SHA512 953c1714f9dfaaf81e8dc27efa2758f5b0707dfe8594ef6fffa6da80aee0bfbd0c6d2c830d3459d4ba6bf36206ee55f4af5ee23f9f0845d1d1ee231cb8b8a352
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
new file mode 100644
index 000000000000..c29bc1decb07
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org vala meson python-any-r1 xdg
+
+DESCRIPTION="VNC viewer widget for GTK"
+HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection pulseaudio sasl +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gdk-pixbuf-2.36.0:2
+	>=dev-libs/libgcrypt-1.8.0:0=
+	>=net-libs/gnutls-3.6.0:0=
+	>=sys-libs/zlib-1.2.11
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.27 )
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	>=x11-libs/cairo-1.15.0
+	>=x11-libs/libX11-1.6.5
+	pulseaudio? ( >=media-sound/pulseaudio-11.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
+"
+# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
+# perl for pod2man
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature introspection)
+		$(meson_feature pulseaudio)
+		$(meson_feature sasl)
+		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
+		$(meson_feature vala with-vala)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index b6f327e23e6e..d51646a184a7 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,7 +1,9 @@
 DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7
 DIST gupnp-av-0.13.0.tar.xz 91584 BLAKE2B 96f4a452f199d48c72cf65a7fa0ef6eb59488862f87a7bf7d1eaaa79289e89bab43718c4a4e94f1d6a71ddf65071c1c1b3aa49c180ba068928b1740bb7a3c8d1 SHA512 8ff5dcacaa5893290c263ba8be2613da6853e074e2afcbc3e111dbff8c9b9d7edbd3772341bc370a1db06b4ba815fd6071158f61a832e2e8f2a51d66d5d8f230
 DIST gupnp-av-0.13.1.tar.xz 93040 BLAKE2B 31901d8e15afdb789aa71cdc114e3472870526dd221ed18d503f43a9590235e5f2af896d87ac2747f8d9dac8b7f27f8b055bd0d5d18838add87162ae9c6289df SHA512 e99485d5d232227f57156cafdfb8a30dab135a0d88eb7d041e475d45e1ab4329d25c50f5528a4ba33e0ceb792fd1de3ec2b8ead597d5720fd0827bce42dcd312
+DIST gupnp-av-0.14.0.tar.xz 93128 BLAKE2B d66ba820aabf82be37a8c19a64adbacc863b495cb6a68849ee236cbe6956cc94fc992a3d4f351d165efaa8257ece2f3173dd845d2a9313bc9ff1a97a178d9632 SHA512 b357b5413d3e01e4ecaf9dbdf5f5f15555506aed662154d03c6232f0c82c4a49543deddf34350a204d467c1a33fed04e406500fd51d6e412d32ac909e974e041
 EBUILD gupnp-av-0.12.11.ebuild 881 BLAKE2B 626f2d855f4b980946a971217c1b5af6896abf4dc4144eaa82f25c411892c49169a762b91589c3a37ebe8944b6d8e0040aea6367ed15d3d55d1505e46ff9b126 SHA512 ce696ef103ec85ffe33384ce66d191c4d3d543463b232739db6079302b95988bb7ff2298a063248291ec284210049f57fa7a89c29f060f94a07d1b3478c1d654
 EBUILD gupnp-av-0.13.0.ebuild 984 BLAKE2B 971c2197e5eea9e4d0bf0cd307f1926f18fee4f071274f88f99fe166347b02d5c132e7a6aa98936e7b6e8bfff51571223860982a2746e584df75e21389051577 SHA512 ac0935987ec127610ded324bfb14bde63ea2933fa21e65dd378e7837887c225fb355c8105aed673154f62ecc0ac147a66846c5a7beb8d2390e5da613b830d890
 EBUILD gupnp-av-0.13.1.ebuild 991 BLAKE2B 1c46b77563345a05be2e14d4e4ca0739a46a3b166907c136c0ca6691f92bbf3f1e5cfdeac57f27e705ffa900fb1e2fe2d751f7550f4e6dcde9918760e68ea964 SHA512 5ef3772bc405b69c0bed784cbb68cfdc3e31e7c1eba097b84712cb7c3592c5fe04b54525a3f759ae9e36358857e35020309cbbd93cf2c3096b568012194e5ba9
+EBUILD gupnp-av-0.14.0.ebuild 991 BLAKE2B 1c46b77563345a05be2e14d4e4ca0739a46a3b166907c136c0ca6691f92bbf3f1e5cfdeac57f27e705ffa900fb1e2fe2d751f7550f4e6dcde9918760e68ea964 SHA512 5ef3772bc405b69c0bed784cbb68cfdc3e31e7c1eba097b84712cb7c3592c5fe04b54525a3f759ae9e36358857e35020309cbbd93cf2c3096b568012194e5ba9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp-av/gupnp-av-0.14.0.ebuild b/net-libs/gupnp-av/gupnp-av-0.14.0.ebuild
new file mode 100644
index 000000000000..2d691e8af565
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.14.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala
+
+DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-av"
+
+LICENSE="LGPL-2"
+SLOT="0/3" # subslot: soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=net-libs/libsoup-2.28.2:2.4[introspection?]
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-1.36:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use introspection vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 83a08d73ec10..a4b2235e970e 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,5 +1,7 @@
 DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
 DIST gupnp-1.3.1.tar.xz 152484 BLAKE2B bfed35567da37f420568ae90acb8c33674f5ef754d00722ce11ec381c602f7aee86502276a3e6bb04abd98d49826ff11518bf6283d2c4be9c4ddf48fb880627f SHA512 ee632d42803cb689926839336c2427c9622c40d1a43e69ef4c48dd26714649d544772697b4a440861dc896a13faba6793b02b7b9ab7c5288b6cf125abbb2d477
+DIST gupnp-1.4.1.tar.xz 152964 BLAKE2B 1c59461f670731b5095e04f6dfb5a64ce5a2dde4f5c5c46c137475d88f9154c1c7a01a7be88d22c8d0a1193b4cda0227396769540311627706621681a8b69161 SHA512 c1aedcb03741e833fc17d3f799b7786a2df229e51feea0911e759f1fa4e92369799f358fef2bc03430728fba84bd188ac0c0aa08f359ee75f81cc20b90032763
 EBUILD gupnp-1.2.7.ebuild 2065 BLAKE2B 3fe0f17df8f0b46738a499c4bc397df8f2cee85c043dbc5e05c15c233eac2d4e913d2faf411b98426f4065e38ffe4be693e6e5cafd733015444ef956cf00429c SHA512 56fccfb391d16337c85fa9db4230eb3ec4c370b3b23c9953eb2cbe3c4b481be563eda9dd9858382ebf836063a60eec0af156389d2e0191853da5b657c7120f78
 EBUILD gupnp-1.3.1.ebuild 2113 BLAKE2B 0fc9f65d8f911620544c8c5366ddc1e8e069a45d83d987419b4ad1dc11396590cade2a106b7424f544e4f5d01fb230220c565a43364e6fabc5a3104a2c220be0 SHA512 87637045ab4ef3352f4d93ba15ec5c9ebd2888fb7eedb6cfba56afb889e82a5083345c15b49f49276dc65fc1b6da5377516cdb650acc57931f11edef384af0c9
+EBUILD gupnp-1.4.1.ebuild 2113 BLAKE2B 0fc9f65d8f911620544c8c5366ddc1e8e069a45d83d987419b4ad1dc11396590cade2a106b7424f544e4f5d01fb230220c565a43364e6fabc5a3104a2c220be0 SHA512 87637045ab4ef3352f4d93ba15ec5c9ebd2888fb7eedb6cfba56afb889e82a5083345c15b49f49276dc65fc1b6da5377516cdb650acc57931f11edef384af0c9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp/gupnp-1.4.1.ebuild b/net-libs/gupnp/gupnp-1.4.1.ebuild
new file mode 100644
index 000000000000..a221091df021
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.4.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson-multilib python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/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 ~riscv ~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.66:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.3.0: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
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.3.0:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+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}
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 8e31b0a48b58..8fc072cdcc30 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -3,6 +3,6 @@ DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31eb
 DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
 EBUILD ldns-1.7.1-r5.ebuild 2618 BLAKE2B 45660918f86ea19a7d6fbec418c642bdea4e74114b35558f1a183baed4b5cbc17f3c7364c40d63d8b9c50d3158825811c11c124557b46e2e00185488199e40ad SHA512 c6b4a485068fdc10b459be1d88e22af98e0f6a140b20edcf3bae438fb22146fcad5f424f9876559210b7e0eded08334d89fd26ade4c3a705b1f741e217e27d29
 EBUILD ldns-1.7.1-r6.ebuild 2344 BLAKE2B 7167648ba5ab423819900cbe26825504a960d6ab034a104540438541600ee2f545dce128bf5b405edff09a119aa45aaa4fd9ab31051843f64eca8e8b6516b8a9 SHA512 2a36d0997fb7b1b8aef41d4766a43266fa913d18cbfd514e2ff548c2a9f99d6c78e3ee6e0056b044ef8d7b04d9709308d2bee55b2b5eb24dc5f12290ff18aff7
-EBUILD ldns-1.8.0-r1.ebuild 3139 BLAKE2B 2e0e77df8774f15d69661543adc0a27b607e08751bc98e52747d70abfdda125ac5a7e2ddff4be8bd76b9e8a6bae14655ea138a1cf53b043d47f460142c7760ab SHA512 4fb65885581994dfa6ff62c5361214a43a1440e6492fa3c818936da1334446ca674060cd5f4a85452b631f8e822c5dd3fd2011eb35b3c3615f1028f7f995fa99
-EBUILD ldns-1.8.0-r4.ebuild 2980 BLAKE2B 662e3a8f15caff90b20dface61db03d14a79ed1d281a7a65370b49c53ef6c264f0d3d57194bc1d72849dd818d68f5235b4e43267c7ea6b3a90e6cf7a9456facf SHA512 0dc5c6c261726f39506bcfadafa1f5de3f6fccb42a4155b0916e51e600480a78801b4f218fe4750a0c9de5acdd979ee7cddcd8ad514e4435537529ee17f34abb
+EBUILD ldns-1.8.0-r1.ebuild 3138 BLAKE2B 898f2d979188e1abdd724117fded8cf5171d7a39b887c50e18519970b3d7bbbd5736aa13671ff4362422eaf11e08651f6b0596f54e94e0bf6167b6c0802cd6ff SHA512 08e1b24573f299eaa97e3f8eaf606bcf60b03d0dfcfb2a7bc9950b8435329e1668a70c93f62a38520d5ccfc9482ab4e5ed1bf89bed338a89e72c43ddbc24ba88
+EBUILD ldns-1.8.0-r4.ebuild 2973 BLAKE2B 9f8e2db3bc31be6eabed2afdefdf718d68601a0e113cbf9ea41fa48667ea0c4aa868aacccf24dd770aae6e3e72fd41c7b6ca183fd30f4e9daac9e527dbb92a2e SHA512 3b1744450a138f30a79eff6b4017bb4d29777d80f53fb1127ee9de70238a3ea3aa98d1f3697bf6e12caf7f70eea846e0707129a7d2ae3eab02204b4ddfbce4b0
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/ldns-1.8.0-r1.ebuild b/net-libs/ldns/ldns-1.8.0-r1.ebuild
index 05b556614f52..dce303cae0a4 100644
--- a/net-libs/ldns/ldns-1.8.0-r1.ebuild
+++ b/net-libs/ldns/ldns-1.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/ldns/ldns-1.8.0-r4.ebuild b/net-libs/ldns/ldns-1.8.0-r4.ebuild
index b0a5b7749b48..500135bc8667 100644
--- a/net-libs/ldns/ldns-1.8.0-r4.ebuild
+++ b/net-libs/ldns/ldns-1.8.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 examples gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index e9e57bb4f6e6..0e11b1f818ca 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,10 +1,13 @@
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
 DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae
+DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
+DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
 EBUILD libbitcoinconsensus-0.20.1.ebuild 2338 BLAKE2B 8a430de5b3110161dd2274cb49f704e448bbdc847e2bc0a762e1d6dc5858b3bf76639287aeab91bf1b25013010511df9e00ac1bcad224bd780ab69fe051f3ef4 SHA512 ce6847c95c6f2f1df8b085adf48548322e1a9d156bc69867189402579ef25436382c561b12ae6c8f5a987c55a31a8777c257992bb6c215c76209e476a59486be
 EBUILD libbitcoinconsensus-0.21.0.ebuild 2346 BLAKE2B 8cc7e7119962ca3598ee292773e10f4f5cd1c6a2c4079f55866b346e8e458bfc4ce7d122454f62461b81f5468b286e354c5a2ee61a39d427e8fc684c09f39cdd SHA512 95f09e34f4ba134ae829a86bdd9d0b035b07aed4af6d1ad085b7fed6d95edc5b718f3523084391ff7af3c560717fe3d485664fe1394dd72c51855798a0eaf029
 EBUILD libbitcoinconsensus-0.21.1.ebuild 2981 BLAKE2B fc9f64b99f54afe25ccad8de115012c50384196e85788a698093a72111661a6ab12753b79fe273719e204710bb5f975352a3715d1610977823e8a2579db64c05 SHA512 f984e35fb0c069c2cfc29856ff2b96619711fe039126de5bb37e66a877f5c5eb8b74be89fdbf38cb98428d81b3d072127717ff80181d4493cf2a8562e309ab18
+EBUILD libbitcoinconsensus-22.0.ebuild 3185 BLAKE2B 1e9d3291a2fa7e4658935b5c5cec55a9390956b7b47a4ee0d5ce241ce77e722cbdfb773746592e3fb64dc58fd7a763abdabdfd91d8906cc4f03beae5e5c383fa SHA512 7ea138cf0736ba7a9cfdc59d53a2e70af9fb4e1f0c2141ae30006a2ae6396bb1648adba51c8312f56940254b0f350b5218a041627a53d12da5a69e00ea932c83
 MISC metadata.xml 710 BLAKE2B 3d75198b842caa94dd3de1bca5cabc08559fcf3d03cea90602ebc8eabb4f1be96ee9aca89500096048655be67c4d09ae466e2d7094c77d905bc0b19ef2e99c6a SHA512 0384b791e087d1b2475d0c4fc355d5d9c160d7841e85d41a0c3c827269a0ec2d71e05f81fe68c65f32a1eb57aaf6609dd1c3a6663171e312650e5461ef563518
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
new file mode 100644
index 000000000000..a0b6796e935b
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+BITCOINCORE_COMMITHASH="a0988140b71485ad12c3c3a4a9573f7c21b1eff8"
+KNOTS_PV="${PV}.knots20211108"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots"
+
+RDEPEND="
+	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/automake-1.13
+	|| ( >=sys-devel/gcc-7[cxx] >=sys-devel/clang-5 )
+"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2021/09/13/release-${PV}/"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.21.1" ; then
+		ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED"
+		ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin"
+		ewarn "rules, beginning in November. Protocol changes require user consent to be"
+		ewarn "effective, and if enforced inconsistently within the community may compromise"
+		ewarn "your security or others! If you do not know what you are doing, learn more"
+		ewarn "before November. (You must make a decision either way - simply not upgrading"
+		ewarn "is insecure in all scenarios.)"
+		ewarn "To learn more, see https://bitcointaproot.cc"
+	fi
+
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! test-flag-CXX -std=c++17 ; then
+			die "Building ${CATEGORY}/${P} requires at least GCC 7 or Clang 5"
+		fi
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
+	fi
+
+	default
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--disable-ebpf
+		--without-natpmp
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-util
+		--disable-util-wallet
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-fuzz-binary
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index c0ff489fff12..9dde121f2dac 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,5 +1,5 @@
 DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
 DIST gfbgraph-0.2.5.tar.xz 283632 BLAKE2B 7a229e098623613c3c758dd7d9d4802cf82a6b8c7f6c81ad8de2392597d13b6db9978ef1794321aa6915f9065dca030e58ef1569d64f956a7048846e996cea23 SHA512 c3a1168935272377c211d95e4efcb8ed56d129589bcaa6e0d7b5dff7ca916f0c63dc30eb1a903aea3de51cb109ae787e985bdd9485fb97cd1b5b6971bea01a1e
 EBUILD libgfbgraph-0.2.4.ebuild 1253 BLAKE2B 13b7673066d2759daba70e95ca4063825190bc82d739c5c5fc3a21b4fcb8d51825f69d81a97cf5daa35e0653cc5678fcb7352f0771e357f0bdcc88e1c32c30aa SHA512 b716d4248eab483e82c4bf05deae33345d5fd1dadd1fbc7f95c2d5c649135343d8261877c96b5fede2e8d7ea9c9ac720116e814f344f136953cababb2e381915
-EBUILD libgfbgraph-0.2.5.ebuild 1227 BLAKE2B 3d3d90f151862104aa87ccaf829bcab8b3cac6185494f065aa2be3009113c40c47c0e2a0dd8e1d7256d0b770a0b811f9641b07ee57a48d0e037f4a876b4df5ee SHA512 b1d53b93e2908b0e7bb82b2f71d729a5fbd2c5e2ba191f189fa1a2465743f9c4a5a34a7ae94a3419021ae56a7e45dab338dc58a939e3fb1002a02ced3868ec15
+EBUILD libgfbgraph-0.2.5.ebuild 1225 BLAKE2B 56efc32b703c618c1040e534ddc57de637884f17bf575760fd84a2c0004dd4d929c0d3dc40687759fab71022bb60381f722a8802b74bac96215ea93c1d2c62dd SHA512 90f2a2051499acc540af00752210ca4c1106fd6b9b0b80bf77e762ab65e4f36ad8dec25ba50af06477cebca2e8f1c973538bfa9085c32dd8cc9b5d6c39a828d9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
index adc704afe62d..da63e53c252b 100644
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="+introspection"
 
 DEPEND="
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index 33b7935cecbf..c2b0d21b3fda 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -4,5 +4,5 @@ AUX libircclient-1.8-build.patch 340 BLAKE2B aae0969fce33301022fa11f93a2eb1c81b2
 AUX libircclient-1.8-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
 AUX libircclient-1.8-static.patch 209 BLAKE2B cc25d264d6d1801584ee06ca51921f7ad1dee1499b1e604c8d732779b44f22aa93fc076c97fee45d131d10cb46cf611a4e03220e61462d2b0003653554667217 SHA512 b1161ce28e5a8d668c852ee0ac336c186426a9467156c66ebe4805a722297ec225cc6b859c13003741d05a15ced1ccfaca0a20d98bf0bf933fc84fc1a97d8827
 DIST libircclient-1.10.tar.gz 288863 BLAKE2B 28bcfb36553c04be28ef4ffc0cf5fe3af8538704997f628f311719d245a0629ff49bee2c512d29e4d43a24a2803cbafc99512ebda7d5c991d9ecb2f1786a9d24 SHA512 d677ceae0bfabc112671b351fb94d048399a7ad025ff33a2ff1ae6313382fcc78b64d499f2c882eb8b894abdde949562395819e4059fd14640dfae6757b0c259
-EBUILD libircclient-1.10.ebuild 1306 BLAKE2B 3d4546c7a26a4af1120e349930f9f197c4583d4f652c2afd74051034e1439524eaa61d25f0e0a59adca1b2a260cd75e6b031fbb7cf1e1fc11ed444ab5385e7c1 SHA512 43eb71f42dc186eb3823725a18dd35376ad712436158a5064eb0ee358d24f3039192d6a3a4e7cc305faa23a73a8c5d2112762948d57054e8e4f6a71e7d9f3efd
+EBUILD libircclient-1.10.ebuild 1313 BLAKE2B e4533fcf923af5b97606da19c62ca8dc6c89b7ad85b57afaaaaa5e89b67caaa68d92a5404146135c3558a041b39d69eb82c38db50aef363bd1fb1602f2918a89 SHA512 a5d4ad4ad4bb3c202b25f07f56da6582c5d544c55e28cc60998a178f185c6f1da44b9b14dcc248f6309dfc49a5d1ab2e05ca59fb2a8d23650195c33194124f7d
 MISC metadata.xml 336 BLAKE2B 094297a8526c391f059c470a5cd9fe786dc057473c99ae1a1d54336fce2639b1f41cbb1293bba24c26d209f0d65f9c308b1f706c41c873164c5503647f7c9527 SHA512 27cc23cbf84e94df9bae7b62dfcf5480d86c5d72fb7636e7dc57ec5b1665183eaca2205d1502d9a091e0c5d477eb710d35c6a1860dda7b19e6575295786a7023
diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild
index 974269933386..9b134f6df9dd 100644
--- a/net-libs/libircclient/libircclient-1.10.ebuild
+++ b/net-libs/libircclient/libircclient-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc ipv6 ssl static-libs threads"
 
 DEPEND="ssl? (
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 3e10258a92b6..482ab6d52744 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,10 +1,12 @@
 AUX libiscsi-1.18.0-fno-common-2.patch 2058 BLAKE2B 00a2d3bd1ae4b08479593f92eaf8092fd5471ebe8df4bc6ff17786214a3d927b90928c014984ecf90b6c8950f8d2e74b5094ff7f903067ca939fcd14ed7006ee SHA512 e19867d6ca9373176bccf9ecb4b78a312f210bd719947a0bb590e8f18862da58d6254f396bab7b84410ca1bbd3ad1c24adfe3e3994e9e6424a4a27e17c65e420
 AUX libiscsi-1.18.0-fno-common-3.patch 1387 BLAKE2B f8bacb84a3c340a528576f56b52026fefc97792b9d5a136150bf348e378cd60b9ea702101b8e9443a320ddafe5a21d646f98a4a3434661adb39f595e2e9dc52e SHA512 b0c359393b70ee6a808e254a8aeb58d7bea25307fc0f957696369e74d82eced2d7b3edcbc18dc0c3be0b45016bdf331183bcf8fdfe853b292861ea28238aad2f
 AUX libiscsi-1.18.0-fno-common.patch 386 BLAKE2B c87a1e2c2b582277b3146a592cf385520a20513cc349a6244cba8e55f4a8f3e7f830cf16160564b07756899cc982993fff45900f512c0cb187340ecbb7bd1e4e SHA512 fc1aae874619ba263f404da0cbb4009fc09b907c2f9a65e29e18874b18daff7f0bc243b9666f19430d5a52e30adf5c784d380162c2bb65f1c79c9084981e2c8e
+AUX libiscsi-1.19.0-fix-rdma-automagic.patch 1049 BLAKE2B ec194008113e2ba1f06666d8e8538fae9dfabb227884fae7f79a1512bcfab55f65c03c4bc10cb997e9aad32e6dfcf605c53e9efbdba5f7faf2fd75c8243113f5 SHA512 80c950ca0925109322fe45ba6296ea7dc4117e06a6e4de18c0dfe1405bc2768d137eeac786be8f6672f17d0e8423e9a922dc6b7e1865ec8cdf7a514013dde047
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
 DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
 EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
+EBUILD libiscsi-1.19.0-r1.ebuild 1175 BLAKE2B 08f99506cf67dfe3c7c026d98b7e9e48906771c3f474bec81a9eacba802cda4a7ebae138d81d34ac8f51c2fc1663a019472d8f45df27cdea40ea2663cbf066dc SHA512 80b29d136343f74816f6eb12d6cbc33b21f40b70be739e47bf66ea3d3c703ccfa69dc951d6ecf2ec0ea0290b47e86dd88a4edb3d884abbc58b8615ee36d87b33
 EBUILD libiscsi-1.19.0.ebuild 1077 BLAKE2B 3c55ef59df3254c562ea0b6bf0d11e611aa2092e25b494e24a6bd522b006d2cd4621a87a94f13f14671861f5769533bb895ac15bdea895478e96f74cb079ccc0 SHA512 fad483abeaab71df65361c86cd51246daa687d455979e87b63bc83713d50bf26d6014e4144e2a03c9098ecf38c428f3d7448f12ffa240e439cdc9f9518f96186
 EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
-MISC metadata.xml 248 BLAKE2B 51d5eef69203392e4f35c46701dd3f52cb5587f3ee7f83f4a704a408865202beaf2d0a0854f478a525f9428fd6564f471c089b63743f7d8ea4a734e5d08fc28f SHA512 dcf5f6fbf0ee9aba971a98c8fb5dd817ef1a54f6545d4b73b8ea0dd2710846e561da6458badfcbc9833563db410a9b897d3c6958169aeff4baf419aab2bcd478
+MISC metadata.xml 352 BLAKE2B 675cfb96cc8e0a8f244a926ffc2e151f648722df008cfd9b50dba836996c264c116838ba51c90c85bc29c7797c0ba1d7971019ff99de86c6f1292beb17299055 SHA512 902862649e210c3de4e27552df8daee7278a0b27785d4669345922c3b4e9c26078157bfd8f2ec9a883c83f24dcd8502e8258c4532af747f42c24bffb690e7552
diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
new file mode 100644
index 000000000000..987544ffca68
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 5fe1deb..9efe153 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,6 +140,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then
+     AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support])
+ fi
+ 
++AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support]))
++
+ AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[
+ AC_TRY_COMPILE([
+ #include <infiniband/verbs.h>
+@@ -147,10 +149,10 @@ AC_TRY_COMPILE([
+ #include <rdma/rdma_verbs.h>],
+ [int ibv = IBV_WC_SEND;],
+ libiscsi_cv_HAVE_LINUX_ISER=yes,libiscsi_cv_HAVE_LINUX_ISER=no)])
+-if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then
++if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then
+     AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support])
+ fi
+-AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes])
++AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"])
+ 
+ AC_CACHE_CHECK([whether libcunit is available],
+                [ac_cv_have_cunit],
diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
new file mode 100644
index 000000000000..b44971289d2f
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="rdma"
+
+RDEPEND="dev-libs/libgcrypt:0=
+	rdma? ( sys-cluster/rdma-core )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch
+	"${FILESDIR}"/${PN}-1.19.0-fix-rdma-automagic.patch
+	"${WORKDIR}"/${P}-remove-ld-iscsi.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		$(use_with rdma) \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libiscsi/metadata.xml b/net-libs/libiscsi/metadata.xml
index fae5428e41b5..afb733ae6305 100644
--- a/net-libs/libiscsi/metadata.xml
+++ b/net-libs/libiscsi/metadata.xml
@@ -5,4 +5,7 @@
 	<upstream>
 		<remote-id type="github">sahlberg/libiscsi</remote-id>
 	</upstream>
+	<use>
+		<flag name="rdma">Enable infiniband support via <pkg>sys-fabric/librdmacm</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index e85ba7a26272..3ce4e78d0b3c 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-21.08.3.tar.xz 607028 BLAKE2B 1d0a1c2ddb406e709669bc0adb9812c510d8e02c9b325a9ad41d8523cf29bedbbf6d8209151fbc119412b239cf9a8b2907e34faf4c992f5f2f0bd10235f7cf2f SHA512 7c07b470b447497adf8faf0f17004d88130fb243682e28a34b6b86c1520e3cf09044401707f0014a229e589a93caf67efdc83f711580979e6e9603fa3892c5ec
-DIST libktorrent-21.11.90.tar.xz 605964 BLAKE2B c19b7f5d4ef19a60421cec17ed6eecbff3ec31a1b7b21f2732f1055289719460aed603fac05af901c76a32a5499917524307a60545026f2cab505998ca08c23f SHA512 28e4fc098baed6b9f7f07befa8a10cfa4d6ce30b55b5c09aa3bedc40089efd7bc02b69a53adc84c3c7404dd788dec6c86271edafaa6e8e1076998191072f9a49
+DIST libktorrent-21.12.0.tar.xz 605896 BLAKE2B 9e1f50d03ec6cbf7a73cfb4cddc16eefd81721ff5a493a0eb3e59f7280641994d8afc6d7a3a406cdb9dc34e7195c79bd8ff2a043c57215a67fc8638a97f2f82b SHA512 a5c036ee925bbb138d6cb1c4b83a927f4894d00b0b54cd72c32657b6cfbfe7722318198e9eeefb1990f1dfef49b239a83af9794621235b68ad06e3f08e0b30ea
 EBUILD libktorrent-21.08.3.ebuild 1451 BLAKE2B d75856de9629eb7be725756d2245dea6d5dd05b79c0f7e844b926c8701fa1ccdc9da5a8fcc0dbb16d9e08d95428efae6a034d7e7e1fbc80aa3c6431ae561d254 SHA512 96322bc21fd2599dee2420b7d85e3b54a6d39428c1ffa2e5cb27fc0be92bd5cf5cb59b99c7d26c4ee843ba08010a0e2df13a6d1f286c1648a84e963f3c64f700
-EBUILD libktorrent-21.11.90.ebuild 1454 BLAKE2B 9e3230f6fbb715dc5a60c4ebf7af2b2445e7210da797c86a3805bfd5643c14215f1da534a2213f617f09524702b45fc06a389b60a0cad3e306cb883808794457 SHA512 62e75ee27f3986864644692fbee1e35eeeea45b29a0432774e791a83e22313df7dabda75880761437910d17d0bae56a37a0c372c5386da749699ec026e3abc9f
+EBUILD libktorrent-21.12.0.ebuild 1454 BLAKE2B 9e3230f6fbb715dc5a60c4ebf7af2b2445e7210da797c86a3805bfd5643c14215f1da534a2213f617f09524702b45fc06a389b60a0cad3e306cb883808794457 SHA512 62e75ee27f3986864644692fbee1e35eeeea45b29a0432774e791a83e22313df7dabda75880761437910d17d0bae56a37a0c372c5386da749699ec026e3abc9f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-21.11.90.ebuild b/net-libs/libktorrent/libktorrent-21.12.0.ebuild
index 580da05f4f09..580da05f4f09 100644
--- a/net-libs/libktorrent/libktorrent-21.11.90.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.12.0.ebuild
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 7bc50b8c3a4f..a9c0a1ea5c51 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -3,5 +3,5 @@ AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c06730
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile-1.17.tar.gz 69834 BLAKE2B a3c88174d96fb84dc1226102a1678aecec35945b89adb6e143f32674188ff7406f89b05f7219748bf0e9c6207ff3b28b5b800706ffc11b733c294e1e1c232784 SHA512 2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83
 EBUILD liblockfile-1.16.ebuild 1311 BLAKE2B 1495377f36328625a0407a76b1bc1a373f8ce3bbdae66600e3e00c6315d584bc29331794b568480c1118c3ce160dc80466a5a9e252dc05a00409c0283c6b41a0 SHA512 d4c32d400e2ec2bfcaec81b91e8bd50c61e546dadc33a69a193aaa5d4a258c8a8d05fe603f024a29ddb988932144ec14107b52c59c8b66fd33a8750a36674b08
-EBUILD liblockfile-1.17.ebuild 1339 BLAKE2B ad231a19f023856b49cd817eb7ddd13fd6b56e4a025407e3b7ae1294b1587af438cb1ee2fc34e2e5b3d026ca69750e10de3cb09d7933a01dc54d36263eb95982 SHA512 b995d514738241d26706f9009a3429be19c18aa5f7c6b92072437249d60516606e4f83fbfbeaa938ea72f8688d652084556e4e10835bd5ee5cd862d79d295782
+EBUILD liblockfile-1.17.ebuild 1331 BLAKE2B 3b7fd01b12c16491fce8cbd344f08c0337ba8ea1aee6719fc0549861e6c1f15b4fa79ecdd582800a6d118bc9cc9b572cabc45a43f1ddedbd7b45c32ab4f07669 SHA512 4f4ac4d8829ff34a2986278c832dca1030daa7da051dc616711e021e54ef019d433834ec467a44d969d9985334393cedbceff045f466473f1a62dce08efffcea
 MISC metadata.xml 252 BLAKE2B 41941b57b97ac20b47abd1c6d3ca599461c97bb2b06a4473605a273c68e7964d2365be48afbc54655f1dbaf896f3b91baafc2ea16c298d8f50b6849be2adca38 SHA512 16dfabb38698963e47a19156df2c54d7c01430e30fe7b51d80c94275016f39f3d8e7981473f4fd042f63f4730e567acd7e1e8ba08ce4386f3a35e3fc537aff7c
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
index 82d39902f7c3..88f5b080023f 100644
--- a/net-libs/liblockfile/liblockfile-1.17.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 8f33268eb0cd..47013cf9c3c9 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,7 @@
 DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
 DIST libmbim-1.26.0.tar.xz 554672 BLAKE2B b020ea81d6f06bad4c655b285423075873ea01ad253c8eb79fe6e0ce8511d6a8c684c4d8541a64dcc23b46211de117f867d5b405f08942e904156304ce746779 SHA512 b987b3271166eabda7d6767b4b3cd8f34b07ea6a43d5ed1d7cf083561b0e57affeec175a155e5bf8b998dd60f49a303cf54ad6eda146df7483cabe099c401c27
+DIST libmbim-1.26.2.tar.xz 561096 BLAKE2B 11e5339b63dbaca8fb6d31ce2afaf4897774aa4b531cfbb09bb400f64ab975495093b711d0a836feff86e3d9fc72ae2b85ab5cd84fab3d266e0fecf1129125d0 SHA512 7cce1fa6ff5630a1cc565a2198544de9f4a1db20b30304fac96de6c698eaf56b17fe6ccb089151623d4484d88fda6abe980bced19dfbf0d3ef425fc954fb5844
 EBUILD libmbim-1.24.8.ebuild 889 BLAKE2B 4c377286bb2c5a5ca3e0b0937913329f01fa336e1f94e785d70b8ff93b785b4eaea1b8e72af50606c11a4867d31a9fbc0d587a2d254ea0feb6404765775a4f83 SHA512 622e5f13c75da85334d193b9da60033a6f3af3d58147cc4b8eb31597e93647bc81941a8f694fcfdd634df913625d33103c4ecd1a6375720779199503a47a4679
 EBUILD libmbim-1.26.0.ebuild 811 BLAKE2B 216c3f07fd9d6e69beb873be60b667e264ab1ed29ec7073d1191ff0e86dd3d4355801c6936ceac2cf851864ae364f74d60b862ecb7f61da1d7c2785ebe6c23e6 SHA512 36237cbab939734a660edb5d231190ee36f5e6e9aebc748edd9d3f98368d3109a2f3232bf84eb6361f810f09144518eda07012fd09fb56f0eb6e2b5a475cb632
+EBUILD libmbim-1.26.2.ebuild 817 BLAKE2B 8e154f2082e07dea8f46f8c49e1229540663ed49db47cb4284731ad53959e9fad8a20a0bfbdd2faed92465f9812180719456ac20c92b522b3fe6686da50b4e78 SHA512 d9eb1d4cde236039b9bb652e62072ec0177715b8e8589706d0f6687cb3e4ed75acbc8eb5cead898586c365d0096f5bb9dabd52a49a601a3f310ede8937cc7564
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libmbim/libmbim-1.26.2.ebuild b/net-libs/libmbim/libmbim-1.26.2.ebuild
new file mode 100644
index 000000000000..fc51435b2a20
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.26.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-libs/glib-2.56:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-Werror \
+		--disable-static \
+		--disable-gtk-doc
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 5f3e8d4dc2e9..bc7b9d181b9f 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -2,7 +2,9 @@ AUX libmicrohttpd-0.9.73-test-ssl3.patch 1227 BLAKE2B e4dad13af373f4ae5fb28fd94c
 DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13
 DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316
 DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3
+DIST libmicrohttpd-0.9.74.tar.gz 1962057 BLAKE2B 6751696740e2893b6ad1ecf5f6e6716dc4b053f788ca1c9c76a25051437942cd975dc0ee428a65af58da04f4cca41c4ed79cdd335b3f90d1dd52651185ee42dc SHA512 86e8b88e064f17557455617975888993a285f4de6d4051cb837ef3e7328d3718001ef280473d306724dd85a01e1787fca099d4bd18e5d78b766e41a3a9f126ef
 EBUILD libmicrohttpd-0.9.68-r1.ebuild 1256 BLAKE2B 859ca10c35695d9ca39109aef4966d029dc6f0f5c307453db26070fc57ab6d7d6a4d9ba16fa09bf5a80aa299b9a1698a0481b940d4b2f4e01aa0e22165f9468c SHA512 504463d6caf3edc4a594356fd7092cbe800da452c8d21fffd29d159a58f048b1f82581d189bcd80373e782de282ee7154fd83945dcd207cffad1aaf4b308e6d7
 EBUILD libmicrohttpd-0.9.72.ebuild 1292 BLAKE2B a4afc0c39b260ca28eefa81f54661d2ecfc77711aa318a1d3d99603a5fdba2364ad1917623e97cc32d052205cd62fa2243a17cdac192f0f3b17d28e16e8c7108 SHA512 d48f9b68ed4f2b9fd9a8e2104e844c365e2dc7de5abd638f62b6ba5966d17bb2077dfa338a49ccd201ddcd491a8b27c8b7420b700ecf3ecb4637d6b8234e75de
 EBUILD libmicrohttpd-0.9.73.ebuild 1419 BLAKE2B 8933009f87e45ab7c778bc047b62ef0112956db9d6e2f99d56491af39bbf1924a8bc2a8ff3555f22335b0aa04de1ae43ada3c8b1f69a1cfe4f314e3c74bd5fb0 SHA512 db5a749c1d20501bf6afc7a5093fb0b62d5b72f3c769779c0ba6a79a3fcc24a2404b68f89873c09db78385fb8ab8230b627cce3fc82ba7a3df4622d388def1ad
+EBUILD libmicrohttpd-0.9.74.ebuild 1379 BLAKE2B f54904a66857481886254efc322a6968c73a494153dbef04a143eb45d62b1a15127e7c93dd93fff0c0e8344f6b0f72922cb6766220256ccab30b63afa7d3c82d SHA512 e6a89377911a7e98439c146b74f3231da1197d902a730044ff9814b086aec02c7d8f349b5723d03d453e3d24ec67b01a062c2bc570f1ba883759ac9777b049be
 MISC metadata.xml 632 BLAKE2B 1944894dc81e31fc69c406a905d6f2670c62d55938b53da47d98ba4b64795226230671c0ca7188653807def9b182191c817a7cbf5cdcbb07ef2c42fb68e61ab3 SHA512 43ebbf10601c286197dda1f2361f80fc2c2a9525dfbfcfd5870810dc7428143fde1fd9966097a64c2ee1ae792deca17864efdb4cb5a57e57e94cc86dda9cb318
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
new file mode 100644
index 000000000000..0103838713fd
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Small C library to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2.1+"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+epoll ssl static-libs test +thread-names"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
+# libcurl and the curl binary are used during tests on CHOST
+DEPEND="${RDEPEND}
+	test? ( net-misc/curl[ssl?] )"
+BDEPEND="ssl? ( virtual/pkgconfig )"
+
+DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		--disable-nls \
+		--enable-bauth \
+		--enable-dauth \
+		--disable-examples \
+		--enable-messages \
+		--enable-postprocessor \
+		--enable-httpupgrade \
+		--disable-experimental \
+		--disable-heavy-tests \
+		$(use_enable thread-names) \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(use_enable ssl https) \
+		$(use_with ssl gnutls)
+}
+
+multilib_src_install_all() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 1f6844814df9..38f6875f1779 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,5 +1,3 @@
-DIST libnetconf2-2.0.19.tar.gz 300454 BLAKE2B 7ff97dcc964124f93631b2fe08f9f713deb698e7d591ca245f9638f32a19915ce6e8cf9e7170bcd6059369926044a705fc03ef18e28baba8eef1c8296bb52d8e SHA512 0e53d4803b8a5d3ff041b393487c71ca09878fa47cbe3ac4d1f26cf45f2ede80992964e339747435003c3bc61053f4b6297a29d6e2a5511ba6b4e93edb3ce136
 DIST libnetconf2-2.0.24.tar.gz 301111 BLAKE2B ffc4dffd797e4589a5892f3cf80d6a373808ee48c00e46a37ff02082c721c49b27aa06962e962698d3b443e08e9cba55b4205cc6e76958df325c6fc5a38fed22 SHA512 05cba691bc47e49abf747a36a6dcc978a4163fd155a90609315585201e4e4d20c9a30b683180f5cf03aac5b6a37933917e61a895067dd172b8de2142ec542dfc
-EBUILD libnetconf2-2.0.19.ebuild 894 BLAKE2B 2e0553f71ded70f135b41e30660e5598b1ddcc72f2e6840737e657cb879ad63ac7d00dbc53d5c6a190100d92b280a345eab173985f456d049600db8ae5eac047 SHA512 c4884bd12a3ef1e6ed348db538d08df3c28dd4573e42f82a6b42514cd0d7148c98344449deb4080ac887f333e42e5b2f1586923d6979cd8b296e4eec188f07a0
-EBUILD libnetconf2-2.0.24.ebuild 897 BLAKE2B fa005fddafe80431862a960dab2e39b4dd87c418be46a802655cb069d251f93fd8684a3d6d12f4284b017d503d9075fa70c7dd2e8445f2cf9d54a431b80840c9 SHA512 65295cf255efc9e539a7dbbc60485f2a8aa5a914451d59ba656ba430851193f72315ed04c6ea1e1538d48a1a2f46d69178260cfea7b088162f60ffa65d905527
+EBUILD libnetconf2-2.0.24.ebuild 895 BLAKE2B 67e1df91c44ff3ad36b9c53fda85de8cf86701e197a80251afba35b227d9bc4ccc76a0c2582281a619a0d3b24632cf1bf3a203eaab31f035709fa65d10f26d41 SHA512 54776987e709ebd7950047d26a53f5810945b182a5d32c411a4db26781d2ccae464348476d8bc4b7932052303db5b85406d35c6a5530bf598ef47e5421f19a2b
 MISC metadata.xml 331 BLAKE2B cdf31d4cc5f23689277be613336e351a92be7cc1ac1aeafb1e52fa88985f1fcb9d6b71de3ee149b0b0269f9660ec357d83d7ae4b18355a1121bf3d38b957f7e9 SHA512 33da7a046f20febb4e756f73dad37dd66ba07b7da865f07ee72b08026be7f81a026960ec7d4abe558a33ffd162806456454da89733944d974cc7132555176b16
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild
deleted file mode 100644
index d5a64fa35f35..000000000000
--- a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C library for building NETCONF servers and clients"
-HOMEPAGE="https://github.com/CESNET/libnetconf2"
-SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	>=net-libs/libyang-2.0.97:=
-	net-libs/libssh:0=[server]
-	virtual/libcrypt:="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VALGRIND_TESTS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc -r doc/.
-}
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild
index 831ee0c2cca4..89defd72deeb 100644
--- a/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libnetfilter_log/Manifest b/net-libs/libnetfilter_log/Manifest
index e9d66d19e286..bc635133cf68 100644
--- a/net-libs/libnetfilter_log/Manifest
+++ b/net-libs/libnetfilter_log/Manifest
@@ -1,3 +1,5 @@
 DIST libnetfilter_log-1.0.1.tar.bz2 262545 BLAKE2B 4dcc7ff5deef95fc657a956556a1ff389cddaae3eaabed9c77cb7028793d5a0e377d2d02d55000ec853300b94164943436d658f42344a6314432b2f8f965fb8e SHA512 4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436
+DIST libnetfilter_log-1.0.2.tar.bz2 304022 BLAKE2B 5976dc484f8a5dc7b5484f12c9913acd9cf7600844f321da6105805b05ad7176d88185c4770bf9ac167c8525b01f1cd8cbc560f77a7cb8b1f129f9f6983b5bb1 SHA512 6b33718b1dd7f4504bceae14001da3a652cec46a6725a5dee83a7b55028cfa8e768cba917f968a5d5b60fd9ff04edf6040ef271a68e5fb65858bf73f4f9ccf23
 EBUILD libnetfilter_log-1.0.1.ebuild 705 BLAKE2B 42febab635722cd8673c4512544eea0df814dc19af0092693c8bbd0dbb9eaa07f7c90790b9d95df9adc85791fdb5aafa74352cbe4b440c1eb24392108e434d10 SHA512 b0ac5df5cd2a7e5605ba732debffaf2eb8924a01dbfef5eb7d4f25ef318095bd158699c2396b201063db5469bfe17afda05a7fff804f33adca8def70cb19d05c
+EBUILD libnetfilter_log-1.0.2.ebuild 816 BLAKE2B 05cf5968c897e1bb21e2e6d5206b970a08aa87bb525e63c7e127d86ccebe70808d2c50799ca90f76117f2db8bf63f87c797972e0ec09303b302a6cd5b1afb3fe SHA512 40d14e6c4f1981189d7921dbf3e5fad5c226193a3801db9dc071c5b8262d155ca26821dd361baf5e7237b6b36c9eb8c9825da133be7897a9249b461ea45925cf
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild
new file mode 100644
index 000000000000..c6fec7fbcd9c
--- /dev/null
+++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Interface to packets that have been logged by the kernel packet filter"
+HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_log/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=net-libs/libnfnetlink-1.0.0
+	>=net-libs/libmnl-1.0.3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+CONFIG_CHECK="~NETFILTER_NETLINK_LOG"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc html-doc) \
+		$(use_enable doc man-pages)
+}
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index 9c06944f128b..31e834d20149 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -2,6 +2,9 @@ AUX libnids-1.24-ldflags.patch 422 BLAKE2B 407953c925cb226aa324e22ee5fa7d6802263
 AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c7eaedc23c5a70a34cf592081ba559e2b03ab4684bef7d6f8bf4c3d640374e516e466721a3e75d7ae540f5e28949 SHA512 de76de95ce3f10e36c15cce31c9743a3caf96445a9d38e7d922710d5d482d9f09e73fccefa75285f200086bd0d2476a4f59a1bbcdfca807ed84873d8726554da
 AUX libnids-1.24-no-inline.patch 1259 BLAKE2B 1ac7190a455e71617df1297f64d718ebb099cc6ad113a27de65f59b6eaf65225999a10dcb6adc524365580dc9662758a7cc452b81951f3b1d4942c29eed87254 SHA512 95e632891a4aea8792ab88f78d3bc2cdae203ad23b86033b829b743071a08ef57ee78256eb2958483d2946a2fa40582a7003c8b5471b5500591373ae789a2a14
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
+AUX libnids-1.26-revert-SONAME-bump.patch 772 BLAKE2B b18cd174289268c73b32559c7112cfe862d418240ca2a8c06bf12b40c1b28bff8dca8cd5cd141cec413d7c34b3f523d02d589f0dc4dc4f5086524e9a5a56a7ab SHA512 6e369b4fe73a107b13bc619b9efda67a894a4d5bbc3c43f04d272fa658d6792a0cc515a376c38b565a687d65814a87b563fad6938e17678d9702c18e4764a4af
 DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
+DIST libnids-1.26.tar.gz 146172 BLAKE2B c84329a8da493f49d340d263835070c948a00d8400cd3e7a2a727b567f672b7af8017446281879ec19cb6d9e89eb07564c463fdf0521aa441ad5dc6ac2b97c73 SHA512 d582287f2c64241895ae437e501e92ef68adc8eac1a3df597d089634b994faee35d8b1cc018bbf20ced440bcd286af28f48c6f88da740a7c3de935ce3723561d
 EBUILD libnids-1.24-r8.ebuild 1199 BLAKE2B e961b542b65561c290c50b7760a7a08f2393aaae0a9b1e45b2a00550e005a4e404c2b6bf83c611ed1b5a84f2bbef3505c41df51e63e3e809bb22e333e50a1552 SHA512 693b40bfa675398ef8752ea3b2b1827150d1a89661fa9ff390ceac5e23683dd9700ebf283380abd8a098c2d409b974fbef6ccb3d9570fea0df50979622b63159
+EBUILD libnids-1.26-r1.ebuild 1396 BLAKE2B c1e71df41acdd6b336fda115376cb36acbae38edd40a610ba3ac77d461bd657f1d3c48c1844d7f58716d6e0bff3fed3575334ba6d1a739faf4990ba59d4bfb96 SHA512 e5887f3a74e94f5ed688381df19866c0120b5476b4af0a49a2ea2e438d3b65375c28030e1f737daab001a03d13c23259db8473f8d92fad712a66d14da1371b1e
 MISC metadata.xml 689 BLAKE2B 427b3b74135ded960a4018145565bf5102432068f16272ee77c222a61a2a2b1c71000c2891e73d108036929ebe371c627cbd4704c21b5e16d14690843b6be67a SHA512 886e1ebf913dfb9e71b97effb737545b8e06dff2780ee92fd90ef86061a06b28f7f3f76eb8ead3bfbef8694184988ca91fd9a6a31ade302d84ac2740d53d98f7
diff --git a/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch
new file mode 100644
index 000000000000..dc6abccd8c83
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch
@@ -0,0 +1,26 @@
+From 0f07fe39585971b4c59f3a9b235e68d9c68184e3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 14 Dec 2021 01:30:00 +0000
+Subject: [PATCH] Revert SONAME bump
+
+Bug: https://github.com/MITRECND/libnids/issues/9
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index e7b6dd8..e72a5da 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -13,7 +13,7 @@ includedir	= @includedir@
+ libdir		= @libdir@
+ mandir		= @mandir@
+ LIBSTATIC      = libnids.a
+-LIBSHARED      = libnids.so.1.26
++LIBSHARED      = libnids.so.1.24
+ 
+ CC		= @CC@
+ CFLAGS		= @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@
+-- 
+2.34.1
+
diff --git a/net-libs/libnids/libnids-1.26-r1.ebuild b/net-libs/libnids/libnids-1.26-r1.ebuild
new file mode 100644
index 000000000000..364e3468fe7f
--- /dev/null
+++ b/net-libs/libnids/libnids-1.26-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="An implementation of an E-component of Network Intrusion Detection System"
+HOMEPAGE="https://github.com/MITRECND/libnids http://libnids.sourceforge.net/"
+SRC_URI="https://github.com/MITRECND/libnids/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="!net-libs/libnids:1.1
+	net-libs/libpcap
+	glib? ( dev-libs/glib:2 )
+	libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="glib? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.24-ldflags.patch
+	"${FILESDIR}"/${PN}-1.24-libdir.patch
+	"${FILESDIR}"/${PN}-1.24-static-libs.patch
+	"${FILESDIR}"/${PN}-1.24-no-inline.patch
+	"${FILESDIR}"/${PN}-1.26-revert-SONAME-bump.patch
+)
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	tc-export AR
+
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--enable-shared \
+		$(usex glib '' --disable-libglib) \
+		$(use_enable libnet)
+}
+
+src_compile() {
+	emake shared $(usex static-libs static '')
+}
+
+src_install() {
+	local tgt
+	for tgt in _installshared $(usex static-libs _install ''); do
+		emake install_prefix="${D}" ${tgt}
+	done
+
+	dodoc CHANGES CREDITS MISC README doc/*
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 52656fcbb53a..8a68a021b8be 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -5,7 +5,7 @@ DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31
 DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
 DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
 DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
-EBUILD libpcap-1.10.0-r1.ebuild 2476 BLAKE2B 473af4c3649a18692e8047304277f56d60917e86ecc092d86445e3fc78d8f64aed3d95d2611d4bf08189e6de8bfa2d6c4549731712929aea393b29ec4d3aafdc SHA512 df995bfabab982b7b1bd5c93b45b14f0071d95427bba84aba3adf3cd623df1d1f1c60493a7bbd84de85004a349e117053b87f35cb58b54d8cdfcaa8a62b421df
-EBUILD libpcap-1.10.1-r1.ebuild 2482 BLAKE2B 47040018e2ff1c68df1bb0b95967e51f779e9bc3e4851f669952062680b413124d915f69880128f12ebb7d057bac02aaf1be1a26f5d89b6c7692cfdf1f91045e SHA512 f53adcb4b308a9dfffa9ce571f4808bf2cf6e49ed8b9c5b873821c70fea28c679b24aa5d456d2b14093dce187eeed46278d27151353b770018b0f5470e5833fd
-EBUILD libpcap-9999.ebuild 2367 BLAKE2B f029798f3799a205ad53f90ae83219f8ef372e7f7d4f8b883f41555a17c1501415a0f39b209a0020d47dd3dc85521ac5eccfb20848817635d06a142f11b3ab47 SHA512 01f2afbf6937907e5f271ca3e65c03022137dcf584d82b2169d16a5379e657f264e789e4c338fa980db488875865b4aec51634b28ea9e663605b770a51be24a4
+EBUILD libpcap-1.10.0-r1.ebuild 2475 BLAKE2B 0f136a18dc356e53d1b17435d01ff9ea5b1195f1ef702c7055223442eb6238a2ee74a1717ad3ba8109c177b1bd76405c5d2f14a2579a867ea10baa623c3fb5fe SHA512 a3ff18fbc94ff96f79ee9cd1ad1e632b7c08fd340aba27396bf808511b141fcc97992624cb17dd5453772da5695a4027cbc2a10c9a1c4029d68ae6fee2fb17e6
+EBUILD libpcap-1.10.1-r1.ebuild 2480 BLAKE2B f02720edb102c10c14ea0267191c8d92c56ac2428acde0f36ec5dd74853eaeef342a1e80029559f080c99c1565fe8c9c6e6446ca5498970e367b9e4db3862a64 SHA512 10ecad877e7614f4a4193c58df6a7321b25686e8bce6054c453235ca19c3b07dc9e8e08d89f8a77477e79f0861d6e0468c973ca6ca9c30762f764b675510d756
+EBUILD libpcap-9999.ebuild 2366 BLAKE2B b5a13e590e29a2b965f43990f374aaf6add4986c1917d96b0bfde753e72dc4f821ba67503aed0a5fac0ed9aab4d297a0da253d831efb78896f3e4d24bc3551ca SHA512 e3b39860c6110547c945b29cb65be4d51dfb2598edd9e776fb02f9a588056e6f1ac5bc3c00bfcef5f471b8af5f9e6a8e5ca713ca4a0006e21316ab29bbd6dc89
 MISC metadata.xml 919 BLAKE2B 0d4146081122df26ec1c9ae4f7c66e9f93ef4c25458e0de3489de29bf69a6d428123ab84f4c2fbd0582525ea2197c5cbfc9e2b591459e43eb0e159cf6a684dcc SHA512 0bfdfd1ad64faebc2c122ac029ce5d7b30e84e630ceafd0503f9a659b1781f1c41bf6f0c431ab4f80187ec04506cd32ffc10485d9493cf93e63a466c5db69619
diff --git a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
index 13d40b16ff92..33b6906a9c48 100644
--- a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 "
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 fi
 
 PATCHES=(
diff --git a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
index c275946be987..a810d8d5d9f9 100644
--- a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD"
@@ -43,7 +43,7 @@ BDEPEND="
 "
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 fi
 
 PATCHES=(
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 02b3408cddff..531bf51fe6d5 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 "
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 fi
 
 PATCHES=(
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 3ee65360c6dd..9f1feebbb51e 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,11 +1,8 @@
-AUX 3.0.2-fix-leak.patch 797 BLAKE2B 9c4adbb52f79a84dd9e31c2473c502f55b0c33f10a8a18754bd36d83a3290b93bff918780bd7ff1ef70befb1f597736b4ca049d373a0b86d6ddaa800a7d7ab6e SHA512 b89195e2a886d0f0e8d324439f327bb9711294dce244c696313704fa9d2c6726063b9bc8f0239fde099106b97bbb0d7307ad6f5a004ce0c43ce3cea7ed0c3e6b
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
-DIST libsoup-2.74.0.tar.xz 1498224 BLAKE2B c03b817a7a7f708480581aad258e5e24c541c6c2f39e48c51597d67c729b3a0722ef094916ad841904a0cafc67f12ad20d05b74ac41aeb174cb79b49fdd0977e SHA512 d78374c31631d7d1fb30ceb7c6016ab970cb321b06191d3463f178ceea9dacd08c828b8f16f5a30c185489ebfbc93ff9da09ae4978be3e3ff11bf7ee95a2a9a6
-DIST libsoup-2.74.1.tar.xz 1496188 BLAKE2B 6f15415d5d4d68fa1f7167363cbed77dee9d4feea226357389209c96367c27c554fdc81fa25bcc8ce02290d6781dc2cc99298342349aada9ad9e32a10727c641 SHA512 107726e069becc0a79904905a10a0ceb0c010fcae57ee86fbb838e6edf58abfc464c8e6c3afb610e495d9c2a24ec6b4ba4c023921611642a9d3c89627daa154b
-DIST libsoup-3.0.2.tar.xz 1518728 BLAKE2B 17a476b08a78c06885de5bb63650b7232541bbb70aaa00a9ae67641b0a2d83fc726d8ef24c0c1cc1ca010b645e184bf7f17ced459d41e01a031712bf21108833 SHA512 0853d094555b3cff2a48f16ea1058ba55f9475ac1e0c1515792101e387596cdd8e3d69947eb4056b69b3cbee5d09111e99c3e684d207180d8e64b23a238f181f
+DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
+DIST libsoup-3.0.3.tar.xz 1525388 BLAKE2B cd515656647bfa9d0bc3b93ade90823803219f11b1ca9688e3b5e6ac62a0d12f72fd7bf9feb6059ced8885c22568768ae5511e270ddc72fe495f078ccecce5a4 SHA512 9ba6f7e9e2a975dff52e5b28b147cad707aa1596a67f45bb1b9feaccf130eca2cb0b80b7ebf0a424388ec4f0b5297578b51142f8b135cddc367ac59d00279094
 EBUILD libsoup-2.72.0-r1.ebuild 2935 BLAKE2B 4d611b5f77df37809765846aae89afe31af53b0d4dfb9b39e45e62dc9b91007442180b92c57e4cd57547d904ff3e6db9ab3ec5cebadbe54f10ba4dbd32ec70ec SHA512 b32dc99e460e040a6aa710d80363dd2fb5f462a36c1b7b79defda746456455e7b1cfce57f68a6bd6f7a940fb917e1ef5c1db1b538bde0637ce8cc0f7b20133c9
-EBUILD libsoup-2.74.0.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
-EBUILD libsoup-2.74.1.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
-EBUILD libsoup-3.0.2.ebuild 3035 BLAKE2B 76c45192ef31d286e1d6a788a9e6577894462e970b4efff699370766a3e0f033cff526ed00ab2d8a8816158c78e98c1605e86c82ade2bcfe561cf409c48facd4 SHA512 7e7e5b1ef8f5e0bac799000800c51b053db67eb4c2a045be5c5f358e4eb710b5fbdcedfea5a5c71021a124696e9e9b5f1829361049edc513b3b21d3be76d42e5
+EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
+EBUILD libsoup-3.0.3.ebuild 2999 BLAKE2B 6f3950a2cab178a471e94dd3860b3df32ab0d3a5778f01a76bf2449e17f3e020a1f26b9b950f3a69d984350be71d3d64aab382d84f0196cef2172948d22c8c9c SHA512 a5768ec45fdf8dc0f8ebff7da98e93a87a22cc8224691b507d520b4b9fe4871a18a4537ca1b7e9c81995e1a8e96ccf02cc7840c96934fb741dde29e11e2f759c
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/files/3.0.2-fix-leak.patch b/net-libs/libsoup/files/3.0.2-fix-leak.patch
deleted file mode 100644
index cad804a7a038..000000000000
--- a/net-libs/libsoup/files/3.0.2-fix-leak.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c7e251644c618ce5193881b2a16374ababc2ccf8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 11 Nov 2021 16:47:34 +0200
-Subject: [PATCH] connection: Fix memory leak in new_tls_connection
-
----
- libsoup/soup-connection.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
-index f2e35f47..38a91e46 100644
---- a/libsoup/soup-connection.c
-+++ b/libsoup/soup-connection.c
-@@ -585,6 +585,7 @@ new_tls_connection (SoupConnection    *conn,
-                                          "advertised-protocols", advertised_protocols->pdata,
-                                          NULL);
- 
-+        g_object_unref (tls_interaction);
-         g_ptr_array_unref (advertised_protocols);
- 
-         if (!tls_connection)
--- 
-2.32.0
-
diff --git a/net-libs/libsoup/libsoup-2.74.1.ebuild b/net-libs/libsoup/libsoup-2.74.1.ebuild
deleted file mode 100644
index 5bf1131885f8..000000000000
--- a/net-libs/libsoup/libsoup-2.74.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.4"
-
-# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
-IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	sys-libs/zlib
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	"${FILESDIR}"/disable-apache-tests.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
-	sed -e '/hsts/d' -i tests/meson.build || die
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	# But necessary while apache tests are disabled
-	#addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_feature samba ntlm)
-		$(meson_feature brotli)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		-Dgnome=false
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		$(meson_feature sysprof)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-2.74.0.ebuild b/net-libs/libsoup/libsoup-2.74.2.ebuild
index 5bf1131885f8..5bf1131885f8 100644
--- a/net-libs/libsoup/libsoup-2.74.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.74.2.ebuild
diff --git a/net-libs/libsoup/libsoup-3.0.2.ebuild b/net-libs/libsoup/libsoup-3.0.3.ebuild
index 42bc6d7a2963..4628b97f09f5 100644
--- a/net-libs/libsoup/libsoup-3.0.2.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.3.ebuild
@@ -51,7 +51,6 @@ BDEPEND="
 #		net-libs/glib-networking[ssl])"
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-fix-leak.patch
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	"${FILESDIR}"/disable-apache-tests.patch
 )
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 8325b9ae5fe0..2a0d40693da4 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -2,19 +2,14 @@ AUX libtorrent-rasterbar-2.0.4-asio-ssl-error.patch 878 BLAKE2B d9f82601d9600991
 AUX libtorrent-rasterbar-2.0.4-boost-1.76.patch 2557 BLAKE2B db450f88f5eaa17533cb1c0eadf292ef4d4efb5f0ec6093ecd2f3bcd2ddb45460a8bab55e8b440644e97955ae4cd4ee8b1b4977564011cc2c27d90a444df92b7 SHA512 d5f56fb9d2ce8d0807a85b69ab4a0060f96a498159ba76acd7c2f72f9808ac2bb161d263a2ee3bfc07376d2d1c8252ab7646c38fc5935676204c790b7766f653
 AUX libtorrent-rasterbar-2.0.4-boost-1.77.patch 1972 BLAKE2B 31b91cc9ec963fc94fdab61e2fa0f7b0e55f2fea1d2f84bbe2cda409863ec0d0248b4fdb2e85b049165a46ad77cf8e2fffbcd634d01b58549372d9a3045b8890 SHA512 78cca1965d2cabc384051e3c9555d49e5137f025b0211120bd5abdf90897af200f87c95526ff9dc919356f6794ea04ce973dfcb774e7b5d1cd20ebf34e80f89a
 AUX libtorrent-rasterbar-2.0.4-python-symbols.patch 910 BLAKE2B 9467f84b6edb168173ff4745649d8d930ddb6524d2b0aca1aafb7287f4fb0fae05edfa43244526e7f3ef116fe85e8547b9e515140d5754fa4cb19d6c89f02785 SHA512 c72324290bdf675aa211b40ffac3a83bdf77e9cda94e0a9cfea41264be815addc6432464cd7223d962a346a2fc3cd1b2c59968aaa067e98a755ef9c25834bf71
-DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
-DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb7459d4d37429e1c475434ca6ca2f465ffb6188ff519f49f2612941fe4806152511400a1c6fe121ade3ed35c6f40a79 SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62
-DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb606583007137288ccf93961185744ccc2a69922063a9004a2ebe627d7657c582eaee9f7ad2971de0dc41351bd59ed23953 SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20
+AUX libtorrent-rasterbar-2.0.5-boost-1.78.patch 2885 BLAKE2B 59e3dfae99d493258332b7af5e3eccd4401fc2ed7a7bd98639db5ddc8e27c6332189640046a9eb60adb0c9b3ca35dea13016ad0aa270dcbcec02111e675a3695 SHA512 fadb078a4726ec2ed0cc97787a71b0ec19f4be951d2e2358c5d3807d4f48c7f2eae9742cefc2999c997ff9b5e7b726c07043e19fab7980750658565e047902a8
 DIST libtorrent-1.2.14.tar.gz 3614077 BLAKE2B 423cd0c467510e3b4d33485ea108912a90ef0d66746e6f912eeb07930e7091d1ce8e28953a48dab3bb03c6232a9e958be423d4563bd63c083ec1423c4753b3df SHA512 9ba7d8a271ecc7330ae9c794f3966a6d1677b9d2a02a24df8b6e63daa4d5c0a7ef88607a73b417247b4afc5195e46cd0ca75859358f9e50915af56b3ed19f322
-DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
-DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
+DIST libtorrent-rasterbar-1.2.15.tar.gz 4163049 BLAKE2B 282d6cf19897706f96d68c75df3c1f5f004df38c07ca2fcaa760f0004512dc8759ea47d4e0c96ff4d8ac2d23569a05507c5dd0667d83c702e14825a0d9ffcd0e SHA512 c409c53ec9c299a05b51ab61d7df1209803cbd6070f0a014dd6fb42c30f6f5230ea90848330f901c61816bc70901e618409acacc95bb0e5acb7f81211d001fa2
 DIST libtorrent-rasterbar-2.0.4-ssl-tests-certs.patch.bz2 26530 BLAKE2B 0958f11be84860cfb0e9224901a6052d9acb80edbd9f9e6eeb2e621e30e75fac4c4db64c71573b7c7f91761e74b9c5781ef8d1a202aef06cd92e3edb15d9f810 SHA512 f3afc4e0857838a44fa3671d657b5f669194c504d07d8f72ca5ddc060786127e3d6ad4ae9efa39e9f02fbe396f4785a1755dd1fd9607c1cef31aa60574b3511e
 DIST libtorrent-rasterbar-2.0.4.tar.gz 4311319 BLAKE2B fee8255d46d5ca019cd487b57fc6003744c208ea5e78873b925f53881667c55c506d302fc7ae6cd5b5d5e776cfe059b714db94d16dd28cfc7939ec6f4fa4e5fa SHA512 66ce3c3369b1d2a83654727c23022d38b070b8bc3ad83b1001e2cfad945acbaa4d61990094bc758886967cd305ca2213b60b1b0523b5106c42d4701d8cff8db1
-EBUILD libtorrent-rasterbar-1.2.10-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
-EBUILD libtorrent-rasterbar-1.2.11-r1.ebuild 2675 BLAKE2B f3eca25e40c12852703a06522b6904d64ae7fcf71b42df5ef3c0d78c06c76898977a29fd51f4cffb60472526c8a99c4b145eca3fb5f02d31e3f7d7be2b647a2f SHA512 2ab394714973bf577cc5ef3d124a2d48dbdad8b9db0178755f53c34a8cc2b4f27d30dcc94f898e3df28c0f37b388836d64fb7beb0cd517c81cdecdcbaa6a9c33
-EBUILD libtorrent-rasterbar-1.2.12-r1.ebuild 2677 BLAKE2B 83ead7b61a014810584e8880f0e6484aa795334f36aa3e46b71faac9036d9a0fa1fdd545bc6732339747f67b2aa7e3f85fba02f6d0662ae42f81df766bc9bc16 SHA512 395be1fc23c0f7eb88a2531ffdfea79b67f4a575ba97dc59f41e0f3cba7bc91defdbc1aeb0532356b5a13c82b540bb76a1ec37d91bbebcdad5694383a30db395
+DIST libtorrent-rasterbar-2.0.5.tar.gz 4407260 BLAKE2B 71c64879be103326fe438ba6b11b672fb0d631ed0de4eb23c2595f3596b522693594ded9f8733c7827dd668e285cb5099cad78bcd437ec184837eafbd39b356f SHA512 be5b812135dada957e565085b5bdda06827c8427f78a4468ef263e1a1e33d3a0bbba7ac27235f0d17ae6087d54311281e3b1975eef81cda514acc8329862dc04
 EBUILD libtorrent-rasterbar-1.2.14-r1.ebuild 2588 BLAKE2B 481eb4d68ffde21e9839f04b1102348923087540e50172d5c612aeced221f76e1b99d44b72fd81a7772ce74989c33928957d77c579f996e5de492769f16b54f1 SHA512 642425ba009fe39ad2c7bd87daf1bdd45020b4b69de99e4ab5031c09dd1f24518c41c74281d6cbda32b24684c60134ee66496dd8674ac221796e8e625b1ae529
-EBUILD libtorrent-rasterbar-1.2.6-r1.ebuild 2440 BLAKE2B 0c36fbc1882e4f115de629bf842ac1f05378866db3a570e75e7bf2c5da99d663594c2893d7e914b5a8079668ba2f5c89b9c64cb91d93e1c1523cd37dd9eadb52 SHA512 87a88041183f8e5bf981ad19a941951c6341907f1396c0f1a1add6ce00337f57ccac51e0260bb1fcc5623386a990d6662af580242e5384ee270e51a5ba22075f
-EBUILD libtorrent-rasterbar-1.2.9-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
+EBUILD libtorrent-rasterbar-1.2.15-r1.ebuild 1725 BLAKE2B 64ba448ee625201de6b2def1f24dcb3f00e57c9d0d3036b609bcaacfee0ae2271c0dd590289a561c7e748864763c7725bf8e0d6f64bc251a1bcf59e0b45b2a68 SHA512 83616c412a0605e3a384c8c1d571eb82454df150c243bd0b754e10f2152c4c7517b7b202a2f2d4651ae24d16fc8668fada518a46fe3cdc3a8474ff4d0fcfec31
 EBUILD libtorrent-rasterbar-2.0.4-r4.ebuild 2267 BLAKE2B 4bdb1808b6ede39a38591d1cf65ba9c4a2311ec3b588cbab6baf2b5db78771eef2bb430829a0d42f27ddecf2e787121fc9ffce3cadf25a75b034515c1ba8bdd4 SHA512 739451f9e602217319e5487c7fd5abc1f846a3bca186d28ebc42cee68a8bf0582d1b6c2497d51dc5ddcdd609df4a158fbd49404cb79b9d3f6ed68ebefb40f158
+EBUILD libtorrent-rasterbar-2.0.5.ebuild 1890 BLAKE2B 4b12abd12057e52e06f20f7f4d2bc04c44945c534f046b77a7579ac91feb0ad3626222d348d25dfa99be7962d420e777e920a2edc126bf2274ce855754b1f9f4 SHA512 21e07043b15d8a9033ccc7da264cb2fb35947b6a4297ba77f7913b305de279fa7b91b01c5aa0315f24d1f5761a5a7dc9b06c15b6865feff7a46984a82d862afb
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
new file mode 100644
index 000000000000..93e14963e366
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
@@ -0,0 +1,46 @@
+From feb911a19c8a66bf13915973649d3a4f5d729f12 Mon Sep 17 00:00:00 2001
+From: arvidn <arvid@libtorrent.org>
+Date: Sun, 12 Dec 2021 21:52:15 +0100
+Subject: [PATCH] update allocator sizes for boost-1.78
+
+---
+ include/libtorrent/aux_/allocating_handler.hpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
+index 726032e085c..7096dfd2e67 100644
+--- a/include/libtorrent/aux_/allocating_handler.hpp
++++ b/include/libtorrent/aux_/allocating_handler.hpp
+@@ -77,11 +77,11 @@ namespace libtorrent { namespace aux {
+ 	constexpr std::size_t openssl_write_cost = 0;
+ #endif
+ 
+-	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*);
+-	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*);
+-	constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*);
+-	constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*);
+-	constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160;
++	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 9 * sizeof(void*);
++	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 9 * sizeof(void*);
++	constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 9 * sizeof(void*);
++	constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 9 * sizeof(void*);
++	constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 168;
+ 	constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104;
+ 	constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104;
+ 	constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112;
+@@ -124,12 +124,12 @@ namespace libtorrent { namespace aux {
+ #endif
+ 	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
+ 	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
+-	constexpr std::size_t udp_handler_max_size = tracking + 160;
+-	constexpr std::size_t utp_handler_max_size = tracking + 184;
++	constexpr std::size_t udp_handler_max_size = tracking + 168;
++	constexpr std::size_t utp_handler_max_size = tracking + 192;
+ 	constexpr std::size_t abort_handler_max_size = tracking + 72;
+ 	constexpr std::size_t submit_handler_max_size = tracking + 72;
+ 	constexpr std::size_t deferred_handler_max_size = tracking + 80;
+-	constexpr std::size_t tick_handler_max_size = tracking + 128;
++	constexpr std::size_t tick_handler_max_size = tracking + 136;
+ #endif
+ 
+ 	enum HandlerName
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
deleted file mode 100644
index 982c7a1fdd1a..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
deleted file mode 100644
index 6f2a72939805..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${ESYSROOT}/usr"
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
deleted file mode 100644
index 9a57948f7177..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${ESYSROOT}/usr"
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..459ca7926b07
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=[threads(+)]
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost[python,${PYTHON_USEDEP}]
+		')
+	)
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-Dbuild_examples=OFF
+		-Ddht=$(usex dht ON OFF)
+		-Dencryption=$(usex ssl ON OFF)
+		-Dlogging=$(usex debug ON OFF)
+		-Dpython-bindings=$(usex python ON OFF)
+		-Dbuild_tests=$(usex test ON OFF)
+	)
+
+	# We need to drop the . from the Python version to satisfy Boost's
+	# FindBoost.cmake module, bug #793038.
+	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Needs running UPnP server
+		-E "test_upnp"
+	)
+
+	# Checked out Fedora's test workarounds for inspiration
+	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
deleted file mode 100644
index 185c08bbf394..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-src_prepare() {
-	mkdir "${S}"/build-aux/ || die
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
deleted file mode 100644
index 982c7a1fdd1a..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	append-cxxflags -std=c++14
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-				# git rid of c++11
-				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
-				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
new file mode 100644
index 000000000000..7df4947a91b8
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug gnutls python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=[threads(+)]
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost[python,${PYTHON_USEDEP}]
+		')
+	)
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.78.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=17
+		-DBUILD_SHARED_LIBS=ON
+		-Dbuild_examples=OFF
+		-Ddht=$(usex dht ON OFF)
+		-Dencryption=$(usex ssl ON OFF)
+		-Dgnutls=$(usex gnutls ON OFF)
+		-Dlogging=$(usex debug ON OFF)
+		-Dpython-bindings=$(usex python ON OFF)
+		-Dbuild_tests=$(usex test ON OFF)
+	)
+
+	# We need to drop the . from the Python version to satisfy Boost's
+	# FindBoost.cmake module, bug #793038.
+	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Needs running UPnP server
+		-E "test_upnp"
+	)
+
+	# Checked out Fedora's test workarounds for inspiration
+	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index dd827ed83888..42c12c25b780 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,3 @@
 DIST libyang-2.0.112.tar.gz 1075308 BLAKE2B 13c5dee1817f93ec24580d24cfc5d1c066de54dec3d1de60e6f7d67caad527b13e40864301d5e5086b3d92b8769e200674168dd874bc2c786bd5101ec3aa958f SHA512 5da463b86656b9fc944925777a488b3306ef1a1e7efdaf4af677960a04b5544605126bb7e0441e55686b80f97fca70fe86605d0e7c64f634b4297dcc7bd779db
-DIST libyang-2.0.97.tar.gz 1066042 BLAKE2B 24ad593b4d4db2c54bf083d3f3469b17de8734aded878d167e383a5e7edb964706a48707e2f0847c7cd4f613b6c1e298325710c4b074f4a3fa1102e22265d632 SHA512 f97f29703f49ef22d04ecf3071d4437417ca95fd0cc2a696269ff646076cca15236874c40ef6a891f1ed4a1173600ba4c6cdd5e0879356b53414c4f0c415c389
-EBUILD libyang-2.0.112.ebuild 885 BLAKE2B b366c7331f3fc531c9d2d7fe99628e47fa17db3af8d6d112aad846e19bfd727a3865d91b9795d967b836479a5d29a9ce0811fd738d61a71f42c881aa6f229cbd SHA512 9121a9a0df6739e383c0c3c98e9236b09eafa0b21c743e2864ddd8fb2bfa009df2b82cf9de56ee8143af3b81e9f9c2a0584f71137792db19ba9f6dcef09d0d27
-EBUILD libyang-2.0.97.ebuild 883 BLAKE2B f26028913b1bb89fda2ca0567aea4e66cd89d4a0b77c4e17e9869fa0a11507ea97fa3834cacf5e8c8fac481e1d920ce91937488d3897f59d5252f53803d58db3 SHA512 286e32444fcc60b86871662b3adf6ce1a2a8fdbdeff899740badf190ccb11d7a0ff26339837b463dd7c9a27c86b7a4a35cd6632ba227e5f874d1ca91bbd57855
+EBUILD libyang-2.0.112.ebuild 883 BLAKE2B f26028913b1bb89fda2ca0567aea4e66cd89d4a0b77c4e17e9869fa0a11507ea97fa3834cacf5e8c8fac481e1d920ce91937488d3897f59d5252f53803d58db3 SHA512 286e32444fcc60b86871662b3adf6ce1a2a8fdbdeff899740badf190ccb11d7a0ff26339837b463dd7c9a27c86b7a4a35cd6632ba227e5f874d1ca91bbd57855
 MISC metadata.xml 435 BLAKE2B 23ee5c217c07799c169828436f3abe2100418ce870a9a2a523b6571d4f789ba5c56b4b74c48d3ce3e9db035efbc7692d5a3eae2dcb6732f6677c81e11122334e SHA512 63ff1dedf5aed1463b90733271f0d623233bd371d19126944b92cea27795f3753a93c2ad328a817bb6f7b9360f20cb838b2518cd156b95151a1a73d6b3478042
diff --git a/net-libs/libyang/libyang-2.0.112.ebuild b/net-libs/libyang/libyang-2.0.112.ebuild
index f34f5a455181..2b0dd6643d25 100644
--- a/net-libs/libyang/libyang-2.0.112.ebuild
+++ b/net-libs/libyang/libyang-2.0.112.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libyang/libyang-2.0.97.ebuild b/net-libs/libyang/libyang-2.0.97.ebuild
deleted file mode 100644
index 2b0dd6643d25..000000000000
--- a/net-libs/libyang/libyang-2.0.97.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="YANG data modeling language library"
-HOMEPAGE="https://github.com/CESNET/libyang"
-SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libpcre2[${MULTILIB_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VALGRIND_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	multilib_is_native_abi && use doc && cmake_src_compile doc
-}
-
-multilib_src_install_all() {
-	use doc && dodoc -r doc/.
-}
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index ca2fb7d032df..b5b91337496b 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,4 +1,4 @@
 AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a5824479d110e2bd235a4decc79456f11d3c57d1288c0043fc15c466998b9e52687a9a0d59fe3269c043cb2daaf88f SHA512 f5636e0745f81d4a7c85efa45238bf26cf70b5c43fbf32e9746a7ad534dd33abf10b7547ac7361ae7d5f7b5fa422a1a3028b8ffaa9fe0e5b843934a056e0b0ce
 DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce
-EBUILD loudmouth-1.5.3-r3.ebuild 1081 BLAKE2B 432f2a710d14400adbbaa55b2c973d9e8022dedf57f8a9af4513c77647b2f281cf9d9fc7ed21f1d2c3b915e8b96beb18e109a680596e706d86beddb946a8e3ff SHA512 b18bcf635a5c63d1c91ec0a0d8c4b7bf7991ea81ac38b6afdcea969275b899b21221d496a7b0826160c05803973d246d06506132c9a7cc6c7ad20ed62b8625a5
+EBUILD loudmouth-1.5.3-r3.ebuild 1088 BLAKE2B ba43d3d9a0426d742891569b93145ad08f7708a8982faa4a9603f2adca5a33e55c0dbe3fd029b7c2c31cd9384da6d899d86c956805c37633bb777311295d439e SHA512 86b049d3058a4862e4907b1835659b6a3db182f5b90223cf79d6620d936d8feb0e6f51a629957084ce259b481e69966a1c376aece76f16ac7da91b48ff07ef25
 MISC metadata.xml 563 BLAKE2B f44dddc4df6f315de0c29f89b1289f8c3ad22b5c475953ea71bb270d0f51e86c97ba0b70aceab8c1fa347e50411eb7bb0b4b587461fde9dce9a2bbaf78fd2e38 SHA512 3824533be94b80a627930881ec08ad942bc6d1f6127ffd339ecb86a0bfaad48097742935d7909d76aba60089fa94d703dd03a8f916aac32cba0a375332d5adb1
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
index 4a48f8ae0e73..13e7508b5b20 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 75d889111ec9..880792cd0c8a 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,7 +1,11 @@
 DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
+DIST mbedtls-2.16.12.tar.gz 2702190 BLAKE2B 3cbe0bcfd0eca279d9b4b3816416b8e778f0aa38d368d810701e65140f0d1524afabe4fd1a1a65297f872a7dfafb7d2feeb7382fe8ea2b180f24551ceac53c26 SHA512 40c4487cc40afcf929bc7158d735a869ebada41c811f63a10d74e9b9644960e2a0aeb7c7c9841c0aef815425990847d47e7f42f9bafe0b2a959e769e3d74ebe9
 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
-DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
+DIST mbedtls-2.28.0.tar.gz 3712239 BLAKE2B 1141465bc5b73e7fd94bbd02c79290093fd075626be93aea839a54ebff81fb00917f0a4fe7911fee983a36147fa4922d258714a330b40b0da4764a3b2419df8b SHA512 2ddc161caeebe8bf1e8cf23c398f65ceff699eb6487a7bcaf6a665879aac5458e21e26b06370085cbdae6ce6b5394afece656aa6307bbb3f5b701bcb41f3dd64
+DIST mbedtls-3.1.0.tar.gz 3766628 BLAKE2B a52e8fb9a3b88c1cf7cb0c8f5598f90a1c9ca05dbc399432293c3acb77aaf0a1b92a9792bda986b47e925736b21c83de1c891b21d45fd2dc8cb5d7d1b09168e7 SHA512 c374fafad89f8793ed1a302634a403b855317d9759377d4bade13c61857d0317a2fc144ab3a9aaee52901ff7a3c4b4b0e7e81ebe5510ab4d228103def01ae628
 EBUILD mbedtls-2.16.11.ebuild 2591 BLAKE2B 13fcba2f6e4b3397df3629dd1f302de9730eacaa78f850a527ef4ddd4f6daebfbc01d8b8203b5453da0e820b5b584210197ef89de685e211105f27c04b7e09f6 SHA512 7de94d90b5f9dc757a3570e60cc2971c58f555d1e230ad0767b8c5bc525e6b0723757371756109038078d32114ceae2f7b69eda94c85388a972301e5b2096276
+EBUILD mbedtls-2.16.12.ebuild 2592 BLAKE2B 9a884118813fb8e373395bfff0cf16cbd4ef4777d4a8eafa3eac094118e8e77cef56f85066cf454c3536c69b33b0eb10327a30a98e964dff0db314a5132280a1 SHA512 b3da54ab7e3dc763f41e74b22fbe0112bef36704ca4f55a9494621829aa4dfe8fa1f968f080dfb0fcf7877761f1f7023ebd13bb298d11302b4c34f39a972f938
 EBUILD mbedtls-2.27.0-r1.ebuild 2658 BLAKE2B 0f8abad89ee22296b4493419f537ed484065ade24d014061d90c304644286692d1f774149de8c62a7e3634caa4d9060a38d147a808f1a4d0c674d2f5085f513e SHA512 637c754102dc34304984c7c9909089b788fc967a8ea44821e9941de34650e166292c7776964bf2a74e174645389ef87976c111852d0f2346a31c1f5e6a825832
-EBUILD mbedtls-3.0.0.ebuild 2416 BLAKE2B 1f10d91faee5f4d8db8a3dd82da4308e156a280ffd1860764726189212cda26f5d4c8f71abf2de81002c16b5335f39ba5a08605c9eb023668cb25b7b6bb6add1 SHA512 95baf23bb04e80b76c4a394d30712a28dd7575b68aa84730b9293733492dc463b6b3533c620608551828d3c48c39a2b7eccf7832ac4e59afffb06b0b550285fa
+EBUILD mbedtls-2.28.0-r1.ebuild 2659 BLAKE2B 94091acaf04320075b1fb04d60a9cab040c86c73570cc48a555b6e3f3eb8eb34edd7bd423dada58dc038585397429a4c2777ae26931a185c6c04688f04dcadac SHA512 3ecf8c6d28a34adaa9b8622f0d432dddaba6b6ca9ba071e18c5fee0a09d97dcdb310c2415320f172ed5a899f5b99d4bbc0793d75927eaa68003d5b94055a11ab
+EBUILD mbedtls-3.1.0.ebuild 2416 BLAKE2B 1f10d91faee5f4d8db8a3dd82da4308e156a280ffd1860764726189212cda26f5d4c8f71abf2de81002c16b5335f39ba5a08605c9eb023668cb25b7b6bb6add1 SHA512 95baf23bb04e80b76c4a394d30712a28dd7575b68aa84730b9293733492dc463b6b3533c620608551828d3c48c39a2b7eccf7832ac4e59afffb06b0b550285fa
 MISC metadata.xml 750 BLAKE2B 9adfb9c0b5ce5ac9b3a56878b7d0d4b0dc883c911b92b00ed772242293b7181b0a43760341ad01d897c2022f507b193145220a8a1c16f0fce8fc64e08486e8a1 SHA512 66092068631e2812b1c3bca713d43ef502ee29a22532a12b204d47f86b3dddc2182c4c41b15200e89ee24f25c976508b602492e9cce02c88dbbb9f35e7aa54a2
diff --git a/net-libs/mbedtls/mbedtls-2.16.12.ebuild b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
new file mode 100644
index 000000000000..7db86d91cc8a
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:0=
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
new file mode 100644
index 000000000000..ba87ea3b4a02
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:0=
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-3.1.0.ebuild
index 54ef48f6e4fa..54ef48f6e4fa 100644
--- a/net-libs/mbedtls/mbedtls-3.0.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.1.0.ebuild
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index d18becb51bff..9b08457a130c 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d
 DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
-EBUILD miniupnpc-2.2.3.ebuild 1528 BLAKE2B 885da6385fa578ff976659c3c349ec4bd27cfeb5f10389d89d2693546c364f7a532b9f171f73ef7bf3d5e161bca2d8a167b0ac9e13e2e456f6dfd7b371f55c77 SHA512 29ad46f9e9f844edff0b887e0614bb5ecdb7f8076ebd19982d38fc5983014c586c2424d7e37e4874826656f9fb8acaf18f528ad8e5410e6323aa7b33383d5043
+EBUILD miniupnpc-2.2.3.ebuild 1527 BLAKE2B 2edf306d6b46f1eb714647a0c1091d7787fcb0e7420ee7604ccd499d1a0493115d3c9b607fab56caacfe1e0decf578d96c7e904f5877472823b9dfb2b015ec55 SHA512 0875e450a22f3f3c591288a0278ffd0f43fa4005195f6228cacd2a07bf3ff3119198ef7c5588520574667f3e877a934a6763db64d1d62815925b478c0509094f
 MISC metadata.xml 244 BLAKE2B a3306e4b6476e267c2dd1f4e24a57bcba54d6ac43270610af57976f19046bb17d1f9afdeadf07407c045b9c66afe1c5b631e0955ff1346e49151e604717dc1be SHA512 b2b16db336068dd5e6c40f2721e1b1e8a6626954196287bf409082db21ff804375fd740a76c5d2ee6b4ec13abf25dfa3f941944a7b25eb332b90a1da9c740868
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
index fc6f2fcdf34b..2416d8c66676 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
@@ -18,7 +18,7 @@ IUSE="ipv6 kernel_linux"
 RDEPEND=""
 BDEPEND="
 	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 4804da982ad2..e8aa8469e18b 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,5 +1,5 @@
-DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
 DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
-EBUILD nativebiginteger-0.9.48.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
+DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
 EBUILD nativebiginteger-0.9.50.ebuild 1597 BLAKE2B 513a3b204f66ddab99bc3c7e6b6e61b992fc1816816ca3405a3e69c73f98498f3cd859f8a9651080d50480d9e5c7007042603a764a850b2cc54c4a56eaf015d9 SHA512 4c744c1f5c8ae58c79ee3deed71332f9991fa22dd006b6935a0ee1f154d633f1066d9d03f462b4d746feb9f35d5b9f9f9221bff0f4e24ca2239feb5e52cb438d
+EBUILD nativebiginteger-1.6.1.ebuild 1592 BLAKE2B 8ef61aaa202a62268320525ceacb1c50b3d34ee02e5964417a081759f25171d570b7f81b0305b2c6b3095b74d9aab9571fe1251cbd8ca6bdade2e8475c2ae86e SHA512 2684164a124802cc31fed8e62ef5bf5c64240a41a1bb1ab0517712be1deb384799ed6cce8b6bd29d9ec6827178236eaad2be6a3c298be09f1112e1e788f2629a
 MISC metadata.xml 398 BLAKE2B fd781dc140f624c85f13ecb03585bbfa64da7e2c25dd8f390bfe08c1590c2ee9b2aabdc3b52d578c7de68c2fb9081d7bd88e5e25521b0bef93b45fb0d525311e SHA512 f61d95738d459dd3bb50eeec2017e7b744a903202fae14907dda8588bd92dedb58e386e3786663fa8d0df392c39eb4a61524b43c8c8e84266ef83b5c22fc847e
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild b/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
index e0d376b7aa6d..f8721a066fc9 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit java-pkg-2 toolchain-funcs
 
 DESCRIPTION="jbigi library used by net-vpn/i2p"
 HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c00beee29e06..bf172d563a14 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -16,6 +16,7 @@ DIST node-v14.18.0.tar.xz 33698388 BLAKE2B 0a26aac559f2cd44d863b5375bc26692f1abf
 DIST node-v14.18.1.tar.xz 33693816 BLAKE2B 310a53a7319620d8ff77b4e5947c7f2196efe96eb0d4311c8fb91b500331128750096e7b0471def73bee00cfa6a9da968cc8176b1d46d06d14c3409dedb9203b SHA512 a92d6f392e960008efd0c1f48471a3e294aa5292065fb31acc62723e8924f7f1a22bb02f3ab51a440f6e190bdee3c1667a275808c6b76d053a77aa6d7ad68aef
 DIST node-v16.10.0.tar.xz 34046720 BLAKE2B e745443a4707eca97ebfc0d3cb8e697f64cd3eb98a419debde79100291ab64306d2c7cbda6ce1bfe6174cbc53880ddbda2965b0b6b8aa4b4b278781f002da277 SHA512 278f3e29f14362c017fbfa768bf0aa54cd208048741622413a67d3277e35fbdbc099fb84ce1de77837616e0e6f485916ccc771a7bee0b2ac5d30b4d4a6cf94f6
 DIST node-v16.13.0.tar.xz 33502788 BLAKE2B d30a63e77ef3b423bfa3a43299f7f6576ee5b0544757d1dbf233cbbc4bc9c70971927283ca87497add5ed05c9bf5d5501b36992cd242468fcd12e7f950ee29c2 SHA512 5d840fa49e8e637398f20b166b590a57e1070fd04c62bcb9b2d56646cf5a97719a70dbd9e0e29a548a268ac84c9a6c63c02ed6d38536ed45d82ffb96896a61c0
+DIST node-v16.13.1.tar.xz 33907544 BLAKE2B 9243145f53619cb8285dc686d30317b71f474e67853eb16266b4bf4f2af2f81ad1d78d39ffa70024c4a99612230f07605fce69674a5b12013291e7746252dbc4 SHA512 bb0739089965785dff59721303ac68605a459d40318e1eada071c720e1499569cefb61a59a378062794d8533b8d54b8d5fef0e380f7e159206a89b0bb0b9cebf
 DIST node-v16.9.1.tar.xz 34026992 BLAKE2B 8bb0d75ab91a00d5b03a31ded17a6b8845894630185d353ded616bf8435b672ea5cef06b4ca5bd01bb3536c5c50774f6ad0aa08a0fa8cbb00d8866e29561c2ab SHA512 e570c39fffa5d79c8d3fa1fe90ece53b22729af6e882416a35b54362be7169eeb3d37cf8be69ee1b748a981b1fbc725d8c85a739bc5cb0b22d6d2e313ab646ac
 EBUILD nodejs-12.22.5-r1.ebuild 7142 BLAKE2B bfaf19e3bd423ea2bbfce9c1686acd0131ed4fac60317ddf0bfa4ceb8a377740258d354ac4e92b3b8229d348002fdd3ed4b0c26f6c65c6e2cd0567956320fe50 SHA512 fcaa734a798a031ddfa918e62500cb2f8821def45cae91519c34b454c4e709a4e799a66d44e8b57666b94aaaa084017aeee4c907c827afa2b2fd7c1b70ea9608
 EBUILD nodejs-12.22.6.ebuild 7142 BLAKE2B b98dea007a50bf3ed4c99fc68388bd7a73860e01e944f772ef121e148eff46a74042731841ee4baca2bceaf43c1d2c4ada7b16ded13aab00e21f79a349854ead SHA512 3f6421f074ca6b81fefcd18fe2a0f629f14a6f427c9befdb4024c861324ea64076c6189f113b3d7acb0c63f23f70a8be7f0fc8b65140eec299d2415f8b716693
@@ -26,6 +27,7 @@ EBUILD nodejs-14.18.0.ebuild 7131 BLAKE2B 2b4c6af8c96bb0be0c16254ac6a017766f9446
 EBUILD nodejs-14.18.1.ebuild 7131 BLAKE2B 2b4c6af8c96bb0be0c16254ac6a017766f94460f46501388611cefea94dbfed342aff0c5b62b4a8299137528f10cf71b7318b52f9b9b9e9aa5c77ceff53cf63d SHA512 40b6313d9f089783688d5fe2e4e71d289ddd7fb74e188c393f8c552e42940a2bcb105c6075943cb61e948d89c0d5a03b56107ff5ab23bc2456ddf75a97ea6488
 EBUILD nodejs-16.10.0.ebuild 6632 BLAKE2B 626aca3ced6df517ab6235d061fc53b77bcc9fa53f5f20805187aa2845c04e76210be44d6df718dbd5f13b24c9686c03dc672712c7c5af52567431913cd2c96b SHA512 5927f4ef96d126aecbbc9926be4b64990e91d08fa23277f4a82b62054083c2b43ee9a0d46e1fafda8597899541df08b216378315e0f8d53e573ca65c04b95404
 EBUILD nodejs-16.13.0.ebuild 6575 BLAKE2B fe9e15c9ddf726c90562877fa676d02d3d9bf1fa1d5b6c7b7554a54d0b839abdafd02107d9455ed3d861f9c455a99188853e0c884b12f02077137321cee89f1a SHA512 7f5f987705341b956e681019ae8aaef7abcd6d85d65ac5904838dc964b26fdb6cbb526d379ef5d6d900f86b260e193e849bac132aadd375679bcbb968075d73b
+EBUILD nodejs-16.13.1.ebuild 6575 BLAKE2B fe9e15c9ddf726c90562877fa676d02d3d9bf1fa1d5b6c7b7554a54d0b839abdafd02107d9455ed3d861f9c455a99188853e0c884b12f02077137321cee89f1a SHA512 7f5f987705341b956e681019ae8aaef7abcd6d85d65ac5904838dc964b26fdb6cbb526d379ef5d6d900f86b260e193e849bac132aadd375679bcbb968075d73b
 EBUILD nodejs-16.9.1.ebuild 6632 BLAKE2B 626aca3ced6df517ab6235d061fc53b77bcc9fa53f5f20805187aa2845c04e76210be44d6df718dbd5f13b24c9686c03dc672712c7c5af52567431913cd2c96b SHA512 5927f4ef96d126aecbbc9926be4b64990e91d08fa23277f4a82b62054083c2b43ee9a0d46e1fafda8597899541df08b216378315e0f8d53e573ca65c04b95404
 EBUILD nodejs-99999999.ebuild 6489 BLAKE2B c4e59483c43302d8940092ae30fd6bc8a07da74303c48a2266ea7ca9b9eefce583a396a1cce568cf5f07b583c6e1731f7ec3b01ffec7bcf5085dacffaa3bfddc SHA512 5f9c426c2a5c89cb76f21b9842a07deec615e6de79754b0be527b729b1e822cd8787340052dffba4e6d703dd9a2cbe5cd8bca299465589cc37417b2505ae533f
 MISC metadata.xml 822 BLAKE2B 159eb2a921f10115d8d42c4c7bce446984f020b096f238c107c3cbcc960775340bd68a5fa43f8b5580cccc226aaaab915ffc1604ef0b4ee15ccb8f84b969839e SHA512 ee4e6b8c56ef5987c849e571b98c9bd7695d47f1581c22671b165d80b9448aa0cf61120b87f34279710423bcfffdbf6d6b2ab48df4c8cc9bf2ff7fe318582007
diff --git a/net-libs/nodejs/nodejs-16.13.1.ebuild b/net-libs/nodejs/nodejs-16.13.1.ebuild
new file mode 100644
index 000000000000..b7c26db64cbe
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.13.1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 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/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR 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
+
+	# 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 )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	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";;
+		lp64*) myarch="riscv64";;
+		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
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		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() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/obby/Manifest b/net-libs/obby/Manifest
deleted file mode 100644
index 8f1f7c16d6e5..000000000000
--- a/net-libs/obby/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obby-0.4.8.tar.gz 530525 BLAKE2B 81a309763a0720139e91670e03d5107da13ab097e2443b7882c774cfcea1c1a9f8a084e7214590fadc1402c490dcabc9db36a8d9d7090955617980c0732f2b5f SHA512 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0
-EBUILD obby-0.4.8-r1.ebuild 767 BLAKE2B b90c9873c0c2552c9afcca4fb21e605114698bb559faadb9172a445b9d212a5daf4a66dc30011b9d569899086c49dad8a49a21ed38c253be5f0fbfafaa18c049 SHA512 a0ec62111bbc20b8c3bd82a63899af50000c7468fddf1e634c1f754d3ec7ef1f9cda9f95d356b0bc88d762dca11446dc1691030c492952dac511f7845f338974
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-libs/obby/metadata.xml b/net-libs/obby/metadata.xml
deleted file mode 100644
index bef24d2c2337..000000000000
--- a/net-libs/obby/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-libs/obby/obby-0.4.8-r1.ebuild b/net-libs/obby/obby-0.4.8-r1.ebuild
deleted file mode 100644
index e60864110269..000000000000
--- a/net-libs/obby/obby-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic multilib
-
-DESCRIPTION="Library for collaborative text editing"
-HOMEPAGE="http://gobby.0x539.de/"
-SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="ipv6 nls static-libs zeroconf"
-
-RDEPEND="
-	net-libs/net6
-	dev-libs/libsigc++:2
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with zeroconf)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib${PN}.la
-}
diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest
deleted file mode 100644
index ef768b3d14b1..000000000000
--- a/net-libs/onion/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX protos.patch 1239 BLAKE2B e20e0efee1cbbb04caee2d1754164e54545d17ff79a36100b5abc5de2f6174dc49daf776fff137dadb9a298977083a2dccb09286c7f1acaf5c8e8a784fba8712 SHA512 0dd7f95dab267b1df6279fc60869696d506b62756a863c86ade9725dc17e48bc4b71b984d53bce94e88448ab295673fbe27e7687e2807d32841d0ad5ddf6b018
-DIST onion-0.8.tar.gz 344347 BLAKE2B c43bbbf31d29ccc99d2969c7c8dc9aec8d5e514cc785091e3e0e6d1fc1d5db5f8561d5c2c745b4150a493b607c6c271d669e7ca541f72bf4d8872beeba00b220 SHA512 c40a36346de7dee6e98d0b5c38b5e133606046e29bacb06a0055a361013077ec0f6adb04dfcbf2f4ce0b72317c9ed918573299aed8760f069dcfd7c211a302d7
-EBUILD onion-0.8.ebuild 1896 BLAKE2B 55d5f6f8859c0112633bff5c7029487cbcaf0ccaf8709b9fda67fe5f80c3b1ee43d388bb0494c168ed30155e4749a67946ff1437cea61e67424b8d436f8e6eb0 SHA512 63fec9eb50f04791b1e5a38b95da998b0c157abb90a6e0ec0d34bd6f3716a0b4f97ed8f1f23f70ee265ebe13e51c30c46abae2b8c191d082ea31229c4acd52bb
-EBUILD onion-9999.ebuild 1856 BLAKE2B e1d9c0f34a4d36f36f4bf60c3f9503b05d73a635f057a1b4bb62e7eea882e266049a624e6e42e021605af797c49915f2eaf4de1500ebdaee1f5f2a3ea0b5ced1 SHA512 0762467d259eb558913cc1bede82503266c5885826084314a9318d62b0c6f32b11551c44a564bbf5021e4a66a68e82efb11e35cf0a3b8c4f1fbb6806728d56ca
-MISC metadata.xml 720 BLAKE2B 12e01dffcb43e37d32796c1cf178eb1979676b2abb359fdbf92e10827892d62a4237b318fcd65d3cd07d0a3f57e425254b85eb61da12dcc0fc3246f09f7e45a9 SHA512 734bc5d7f363668047b179c019458873949339a6affaa40ff407adf33e4b2f34ea78b4e0ae38bcd7bc30eb1932fd54f446ab884ac07f8590751e8d57e444917f
diff --git a/net-libs/onion/files/protos.patch b/net-libs/onion/files/protos.patch
deleted file mode 100644
index 59050a95c4e6..000000000000
--- a/net-libs/onion/files/protos.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Prototypes do not match, fixes some build failures.
-
-Index: onion-0.8/src/onion/poller_libev.c
-===================================================================
---- onion-0.8.orig/src/onion/poller_libev.c
-+++ onion-0.8/src/onion/poller_libev.c
-@@ -75,7 +75,7 @@ void onion_poller_slot_set_timeout(onion
- 	el->timeout=timeout_ms;
- }
- /// Sets the polling type: read/write/other. O_POLL_READ | O_POLL_WRITE | O_POLL_OTHER
--void onion_poller_slot_set_type(onion_poller_slot *el, int type){
-+void onion_poller_slot_set_type(onion_poller_slot *el, onion_poller_slot_type_e type){
- 	el->type=0;
- 	if (type&O_POLL_READ)
- 		el->type|=EV_READ;
-Index: onion-0.8/src/onion/poller_libevent.c
-===================================================================
---- onion-0.8.orig/src/onion/poller_libevent.c
-+++ onion-0.8/src/onion/poller_libevent.c
-@@ -77,7 +77,7 @@ void onion_poller_slot_set_timeout(onion
- 	el->timeout=timeout_ms;
- }
- /// Sets the polling type: read/write/other. O_POLL_READ | O_POLL_WRITE | O_POLL_OTHER
--void onion_poller_slot_set_type(onion_poller_slot *el, int type){
-+void onion_poller_slot_set_type(onion_poller_slot *el, onion_poller_slot_type_e type){
- 	el->type=EV_PERSIST;
- 	if (type&O_POLL_READ)
- 		el->type|=EV_READ;
diff --git a/net-libs/onion/metadata.xml b/net-libs/onion/metadata.xml
deleted file mode 100644
index a9a869a84ec7..000000000000
--- a/net-libs/onion/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<use>
-		<flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag>
-		<flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag>
-		<flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag>
-		<flag name="redis">Add support for redis sessions.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">davidmoreno/onion</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild
deleted file mode 100644
index a283da472b81..000000000000
--- a/net-libs/onion/onion-0.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/davidmoreno/onion"
-fi
-
-inherit ${SCM} cmake-utils
-
-DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
-SLOT="0"
-IUSE="
-	gnutls pam png jpeg xml systemd sqlite boehm-gc
-	test examples cxx libev libevent
-	redis
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:0= x11-libs/cairo )
-	jpeg? ( virtual/jpeg:0 )
-	xml? ( dev-libs/libxml2:2 sys-libs/zlib )
-	systemd? ( sys-apps/systemd )
-	sqlite? ( dev-db/sqlite:3 )
-	boehm-gc? ( dev-libs/boehm-gc )
-	libev? ( dev-libs/libev )
-	!libev? ( libevent? ( dev-libs/libevent ) )
-	redis? ( dev-libs/hiredis )
-"
-DEPEND="${RDEPEND}
-	test? ( net-misc/curl )
-"
-REQUIRED_USE="test? ( examples )"
-
-PATCHES=( "${FILESDIR}/protos.patch" )
-
-src_configure() {
-	use test || echo '' > tests/CMakeLists.txt
-	local mycmakeargs=(
-		"-DONION_USE_SSL=$(usex gnutls)"
-		"-DONION_USE_PAM=$(usex pam)"
-		"-DONION_USE_PNG=$(usex png)"
-		"-DONION_USE_JPEG=$(usex jpeg)"
-		"-DONION_USE_XML2=$(usex xml)"
-		"-DONION_USE_SYSTEMD=$(usex systemd)"
-		"-DONION_USE_SQLITE3=$(usex sqlite)"
-		"-DONION_USE_GC=$(usex boehm-gc)"
-		"-DONION_USE_TESTS=$(usex test)"
-		"-DONION_EXAMPLES=$(usex examples)"
-		"-DONION_USE_BINDINGS_CPP=$(usex cxx)"
-		"-DONION_USE_REDIS=$(usex redis)"
-		"-DONION_POLLER=$(usex libev libev "$(usex libevent libevent default)")"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
deleted file mode 100644
index 10ba2b76bbf0..000000000000
--- a/net-libs/onion/onion-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/davidmoreno/onion"
-fi
-
-inherit ${SCM} cmake-utils
-
-DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
-SLOT="0"
-IUSE="
-	gnutls pam png jpeg xml systemd sqlite boehm-gc
-	test examples cxx libev libevent
-	redis
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:0= x11-libs/cairo )
-	jpeg? ( virtual/jpeg:0 )
-	xml? ( dev-libs/libxml2:2 sys-libs/zlib )
-	systemd? ( sys-apps/systemd )
-	sqlite? ( dev-db/sqlite:3 )
-	boehm-gc? ( dev-libs/boehm-gc )
-	libev? ( dev-libs/libev )
-	!libev? ( libevent? ( dev-libs/libevent ) )
-	redis? ( dev-libs/hiredis )
-"
-DEPEND="${RDEPEND}
-	test? ( net-misc/curl )
-"
-REQUIRED_USE="test? ( examples )"
-
-src_configure() {
-	use test || echo '' > tests/CMakeLists.txt
-	local mycmakeargs=(
-		"-DONION_USE_SSL=$(usex gnutls)"
-		"-DONION_USE_PAM=$(usex pam)"
-		"-DONION_USE_PNG=$(usex png)"
-		"-DONION_USE_JPEG=$(usex jpeg)"
-		"-DONION_USE_XML2=$(usex xml)"
-		"-DONION_USE_SYSTEMD=$(usex systemd)"
-		"-DONION_USE_SQLITE3=$(usex sqlite)"
-		"-DONION_USE_GC=$(usex boehm-gc)"
-		"-DONION_USE_TESTS=$(usex test)"
-		"-DONION_EXAMPLES=$(usex examples)"
-		"-DONION_USE_BINDINGS_CPP=$(usex cxx)"
-		"-DONION_USE_REDIS=$(usex redis)"
-		"-DONION_POLLER=$(usex libev libev "$(usex libevent libevent default)")"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index d54de35a9891..de94e8d657a7 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,3 +1,5 @@
 DIST stem-1.8.0.tar.gz 2853802 BLAKE2B a275a38e53c5a4a3771a30528fd5781c51370352dd384a77ce27b31f034bece6fef448d74008adb82d2d909104b7338b5168a1a343c799637f9e12d39028bd09 SHA512 aa2033567b79aef960f8321e4c6cbc28105c59d6513ff49a9f12509d8f97b1a2e8a3b04dc28abb07fad59b0f6ba66443b92bbefa0d08b26038bbaf24f7f2846d
+DIST stem-1.8.0_p20211118.tar.gz 2862928 BLAKE2B 0c284be96332e11c011eb69d4448fab5c33cc59e4107abad44d7bc1186629112ca8658aade28e486c0eed873524e18ed87edf5920520d5c8dd854b2fec7867ea SHA512 b8afb5d2203b19930e8c1eaa3cad331c0df8b8bcffe4b224b8bab549866f53a5f06001d2141a0a8b7becfa8b7c1281ef5d9584423c8ba25dc4198cfaf07d3a14
 EBUILD stem-1.8.0-r1.ebuild 1395 BLAKE2B 5e092a51d3b69ff6a5236d6ada3b9111d322bb4ded72ffdb48a75f0e76da7e8814a96efc3dc6f4dadd5861a964a6435c55e832d348e4f9ce8bee98acefcfee7b SHA512 81f4e627c46daff8a966cf1b99aff6bc474eb43e49baee81b9fd39d51a9d8d85251921245640ce44376bc79e7d422b49fb8bd2efd75d66d3f5ce5bf243851742
+EBUILD stem-1.8.0_p20211118.ebuild 1512 BLAKE2B b39dc1cc632dfe05a10025a40246be18d9adcc38ad3051ee55eb3e3d519cc48794e7a8cbc1c63749894028eae4701b9a53e5fa1f77002528830fa4bc0af16930 SHA512 432d3ca03560a0350e085a8eccca87a38af5e749f51e419fcf7663ed3316ed94374693706029d0f3f7684bbce7f1fc836cd0d3f0bca16a19eea0cf04cdc90131
 MISC metadata.xml 330 BLAKE2B f529c586660d4a2caa9966961f63ddfbaef18ea51a3f87140869f7b0042d195bf64af087ef13c441f9fd939c8c52d7ba74b3ceb6556b292c0c01afdb0c56b08f SHA512 022b4613382a49849600577afe970f45540c12e4b0eb8a6acc6c79cdb37c1635d890a11640319fca31531821b73338757212952e2ffef121ff4fe96f6f535233
diff --git a/net-libs/stem/stem-1.8.0_p20211118.ebuild b/net-libs/stem/stem-1.8.0_p20211118.ebuild
new file mode 100644
index 000000000000..b4a053ab34d7
--- /dev/null
+++ b/net-libs/stem/stem-1.8.0_p20211118.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{7,8,9,10} pypy3)
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+COMMIT="57364fae7269ec562c5fc8cdb073ff9463d9a0f0"
+SRC_URI="https://github.com/torproject/stem/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+	net-vpn/tor )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-vpn/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+	# Disable failing test
+	sed -i -e "/test_expand_path/a \
+		\ \ \ \ return" test/integ/util/system.py || die
+	sed -i -e "/test_parsing_with_example/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_parsing_with_unknown_options/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_saving_manual/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_sdist_matches_git/a \
+		\ \ \ \ return" test/integ/installation.py || die
+	sed -i -e "/test_connections_by_ss/a \
+		\ \ \ \ return" test/integ/util/connection.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 7c3e9992d289..0d4a8263751b 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-glib-0.24.2.tar.gz 3855853 BLAKE2B b98701e4897da5f1e1791af1d36f0f8e98fc0a043406a2e1e6c56437acfc7ed83701163a8c30d1ec2506cea4ca9a64827fca96ea0c3ea1566d38519b63a3a201 SHA512 736590c299b6522c41153e01e80d9bfdac1d4cbec646b28c9fba67a07429426ff2c8e38818f2cddd7ccdc38a061d210906f6e551f7a6059c34c4dd08b789b501
-EBUILD telepathy-glib-0.24.2.ebuild 1505 BLAKE2B 1090eebfa53e4873ecf3f8c2e33d1fc3aab0403d87a5454717e54024a38e644684473397f293d97f57b0d17116edc69a4bfa4e7669cd958b11cd6cce07ea140c SHA512 bc3a831e049528f873cc6fc9c1d2576c478450936df0700d58d817c9242d226dbb34b48af4aae6c8ab6bec4bcde20e821829d0bc93fbe9fc04257eba7af01d08
+EBUILD telepathy-glib-0.24.2.ebuild 1506 BLAKE2B f45a5dcc65e2284f836663022acba1d5181d16aa6fc4b18fdea95cba84c0e81c239c36f285da0f770914143a3cae0de34b2813d3c0b113a13993d2e5c710c02d SHA512 f5d609b93f059b37080be304c0bbe65a35a53ffad96a6d17c0a79c2ec76785932050db006dbbeefd9fb94f3062460d685f9280576af026457044052b13db9b0c
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
index 241006fa8303..7f1d649611ab 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 55f63fa6eef3..48fa5924ac16 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,6 +2,8 @@ AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f23529
 AUX 2.34.1-opengl-without-X-fixes.patch 953 BLAKE2B 06d9e12a9ccb37950e87c89031d1067c8cea5c9cc4b0f802386d32c4ca8499537c95af799b9f9e9c57008e65c38716b01cf0dfd012900ae32a36d813311b48f3 SHA512 854dcaef25ad6927a288bdfbf842dcec385954abff1af710c9e789cdf4e194a271561b2bd8a695d051f675a3c2219563d834461f19ceee10e2320f6ac2bb5284
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
-EBUILD webkit-gtk-2.32.4.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
+DIST webkitgtk-2.34.2.tar.xz 24996572 BLAKE2B eb89965065e39d6cc2b54a4a167a19fee50387a25a5285b5eb369b6f2a7af550bff5b476fc27d5e4348c40e2523b76c31116d9ce2f70578f38ce81b2379143af SHA512 37c40fb067ee9f5bb8786bf2ce92aac885e9c5c2da4bc5f4e81682ccfb5eeb0aa94d5094f6aa99a9af216f542d1823094cf27aea13c7be3e5e6e3f6a9729c7a5
+EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8
 EBUILD webkit-gtk-2.34.1-r1.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
+EBUILD webkit-gtk-2.34.2.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index 2dd5eb64206c..50c1d19b401f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ 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 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild
new file mode 100644
index 000000000000..fec3dc003ca7
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd 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.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+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-61.2:=
+	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.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	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?,X?]
+		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= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${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.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	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=gles2-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}"/2.34.1-opengl-without-X-fixes.patch
+	cmake_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
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "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=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_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/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 3ac12ad5206e..2e381068f425 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,9 +1,8 @@
+AUX xrootd-ceph-5.4.0_no-werror.patch 537 BLAKE2B c07404d729e6b8328c849125b543d2d31df51c05d97dd7481c39762c5b32a20b6e9715afdd9db448d90b06be15b6207021bf1c213593c8c2046304c4c284e312 SHA512 1418e185a6c799ebf9d4eb97044055cba3afdfd8f742f08e34f6cea8a01f795cf538a7a3ec1b387e9cbdba01776bbad27d83f8c58898c3f128d369c342830ce9
 DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
-DIST xrootd-ceph-5.1.1.tar.gz 81981 BLAKE2B 6f0ddfd2e20c0127223d3d41e614fbefefb8e1ce20ae9a805fc0d01d7c442f0b9b9323ba1761a9b5a160f63bfe1c823384f84c160eb98d316bddc3c1affe2b6c SHA512 fede94cbe614b6c7dced07d1bbe8661706c0e0c98c77cab0a777b62cb7b1a0790ce597bb6764b36b6d2cba9884f23f6d37d54adb5b11cb6d20e32b95a2877ef3
-DIST xrootd-ceph-5.2.0.tar.gz 82017 BLAKE2B 604c2c9eae857f05160b3cd853591283c5aebdec2345a810d2454f34bc22768db15f973ca9f672e6522297f939586ca8e996222487e2c1733205159521bf4996 SHA512 fdfe71c9bd087d216c2c4536b130cf90a392032ac8d0ad294b8ee7358449cbdf779f0f5d5aca02062cc04f510678bc6171f3dd29ad1f7aa207617aa3dfbd6f54
 DIST xrootd-ceph-5.3.1.tar.gz 82029 BLAKE2B 1946da121e620c68ddafe448f049d4495ec5326cfc0286944cea41cb940ac8982ced939989efddb3879baa694c34f93f75f6e58c00b75c5d385da863daa15154 SHA512 bcf4fc341644e6c4d2c83b4bc913203187385964da3d00d019d69de0e0abd19915a5194713574bb1b8562e80edd3eeefb6fee1762e7c8595b14d13657c237861
+DIST xrootd-ceph-5.4.0.tar.gz 82031 BLAKE2B 5c964597d7b8de3a217c7df58e214d58e1bfdc980f74cfbc571343e7325d61804060e6374912f02a3f73e4df721c87e38860a023de4422b58878915a52aa04b1 SHA512 7b33fc194fe5245de78daa7829dd978c96b1eccd979610e26d60ed0c284e192413192b2b581e5a18de25d6f7f93737598d180b6d5419307156a6abdea44c4b27
 EBUILD xrootd-ceph-5.0.3.ebuild 953 BLAKE2B 3be28efa893f4d0a7b9a37229e460acea95e45f3714901e499ed05010199722a7e8000faa75b12b55a79fcd1e101a51c9e427604891cae7f71cb95736b188539 SHA512 e0d229329f66f98099a15968b2965a9136c59d6eda74857531cfc56a29e304488ddfd2c37e618983f95fe37d0f0596419f98b1aee429a45a63fe82d29e7625cd
-EBUILD xrootd-ceph-5.1.1.ebuild 954 BLAKE2B 5a3a42d548a67994e6a20fcd5747c7f3e28ad5e67dd65f1b29c5b9f06fa39bca44101283791011a2f3fb2ea8c1577a188deb1cb0ab7db97f522fb23bf9925123 SHA512 d172a7eac4a2f2a23241257cba29df211fdba7bd136dcb7f0960c7f2c1fd19a3f043ad24be1fbf14a312435b16608592d7f303dd86fd2e5de04e9794002706b3
-EBUILD xrootd-ceph-5.2.0.ebuild 866 BLAKE2B 4940f24e57982d9e0c1f19f3e7d9a9a5ef31e57b7a76f4a6d4830b5028dd018617c0296566781c490839994d5ef51d9c4eca627199051322f78e240f507d0368 SHA512 224ca2782fc5776fad99d4bfcd657e919dcf2f7b8edbcb1acca6d7fe02d5f592daa62c67ef0e7ad5e0fdd9aeb0f9b259e37442fd7b93ae7e70236e77ec91426b
 EBUILD xrootd-ceph-5.3.1.ebuild 866 BLAKE2B a36c00db48baef5e8c6c3ae3fa6ae0d18b9e7bfe1fe4147043ed119b5c58cc644759d4e4efbcfa7f83afef6f3418c51414dc99973937b1e43181de73eb3af762 SHA512 00c2ea7a0891f71c9dd78ca4772f7bf473fce35ba89852ec3907e51985279acb459c191fee26532da0edde0e2e54880f969cdc96d01a7e72fa21c37904b7a840
+EBUILD xrootd-ceph-5.4.0.ebuild 922 BLAKE2B 48d47fbb6ec16ddd0fe68007cb086d9ae2511179e59af7d4e31305eab1079be36cfbd44c5ab11aa8ff064d9a1b504cf805dc24aed36cc69f1c5d83c8eaf551a3 SHA512 db5d1e4e5ef59181077dad5f649f3a0fcb35fb90f6a4e6f2c31daa409d102261f25a9ce69c6c18cf262d35839e8dc83ac6e3880251981646e369fb512945461c
 MISC metadata.xml 497 BLAKE2B 00adeee3406c60c439ddc3855a8e470837ef34c5e29b26641255df7833fb59f1f68e62316fdb359012683415291f8af9ea21d6be59547bae4d3aa02fa8179fb4 SHA512 81179966535b582a62bd4e758dd55839b8c3063f6a7666eb8720dabd78ce4a77c143c2afd0367031ba483088d4e5769e3e35e9b04fcd4f9f1844aac03f7c53c3
diff --git a/net-libs/xrootd-ceph/files/xrootd-ceph-5.4.0_no-werror.patch b/net-libs/xrootd-ceph/files/xrootd-ceph-5.4.0_no-werror.patch
new file mode 100644
index 000000000000..f67fb513b455
--- /dev/null
+++ b/net-libs/xrootd-ceph/files/xrootd-ceph-5.4.0_no-werror.patch
@@ -0,0 +1,11 @@
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -12,7 +12,7 @@
+ #-------------------------------------------------------------------------------
+ if( CMAKE_COMPILER_IS_GNUCXX )
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
+-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
++  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" )
+   # gcc 4.1 is retarded
+   execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild
deleted file mode 100644
index bdacb70cc802..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=net-libs/xrootd-5.0.0
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		# As of 5.0.3 the default plug-in version is still 4.
-		-DPLUGIN_VERSION=$(ver_cut 1)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.4.0.ebuild
index a9f500fa3351..9267d0cbd7b8 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.4.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -20,6 +20,10 @@ DEPEND=">=net-libs/xrootd-5.0.0
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-util/cppunit )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.0_no-werror.patch
+)
+
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
 # see https://github.com/xrootd/xrootd/issues/447
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index c581eef448b7..aaf957729766 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -5,11 +5,9 @@ AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
-DIST xrootd-5.1.1.tar.gz 2869346 BLAKE2B daad5f4e1253dce7d83d144aabbbd24afca9affafc6643b8e7124c68ff8651a3a15ed1b40680a40b737411132ccd0b697d4cacfcdd2bd64d5b5640875684c464 SHA512 aee5373f2064eaa489abc7a560ca61b98f824e8f0b3665dbea82e0362a91a3b4f9e6457d0a304692ae58619ef7c16333a8c69a69d282bd48948a968dd4a06e4f
-DIST xrootd-5.2.0.tar.gz 2935040 BLAKE2B 1aa58ea188faef3e3691e77b08529d14e0bf04c18127b8b8ae6a7154700af67b1d900b64cf4f505b90963e2925e32935d4bcf9d1d913ba0973713b5c69301dd2 SHA512 cfd41d2e678ad339677abb62f329828de368ea5af9c9103722b75bcbb0812a2f1695986ca953651e2418fc839d7a50072635b806c9292aeaff702e269bbc11da
 DIST xrootd-5.3.1.tar.gz 2957788 BLAKE2B 6669ce4811e6c65ef17f06ae219e19e1f12027f4f9b620ad447df53ac437b30ce6425dc783a0ac7e4557d18ab562c266ac2497d93e93a2058fe5bd4aa7bc1d42 SHA512 a65436fe649233bb28123d9529d496c11b4ff40ba5490cbcbb32ff5379e555cfd684fad350c784c80e70056bb5d2e9701a80543c7f4a8ceb11e935aea01800b3
-EBUILD xrootd-5.0.3-r1.ebuild 2659 BLAKE2B ef00e762b9a87844071def65dc36e910ac6983f307e34d0c9d788e50f0d4a8ac62fb0b448298309f682073a467213a11e1eab3f918a7692b1e7f2715800add77 SHA512 c7dbe619f7d07d208bf0f7b13d6e56ec7b607e59a30f610cb00842ed7414661b945e2d978bd296af7317eb0259e92a16a1fc54b3e5e60bb9c6ffa7f4dabf1d5a
-EBUILD xrootd-5.1.1-r1.ebuild 2661 BLAKE2B 74ac0bb6b496b92b34c356531719bf8cf11ecd2b626fe54deb3236a5a53d76ee879f8ab9974546f8b4e4365aa7079a34705a3c4d794384fc9f802c71fd1517d4 SHA512 21a1ab43f2cd6c6fe55db4ab0bcfdbb82e837921cc20b6e34f99e5d785de41439df2bd396253bfbf4199e6d0c56b6a48411bb18a6cf1719c27f8e9aeff885b5a
-EBUILD xrootd-5.2.0-r1.ebuild 2662 BLAKE2B f334ec858c7d994f95681b8e3e11ff88aa5cfc5b188eb8813d201f249a9fb947087003543cc211b2effe3d5b6afe1c1d3d22b342a22251cee0e7adf87c09f1e3 SHA512 9d01f933228d78dc39234be3a40b6fa0991d73fe290e195bd58dd05e8f76557d636b2f3b3e845c86e4da506f6994509da071114710aa5648e9346b5f5d944bb1
-EBUILD xrootd-5.3.1.ebuild 2662 BLAKE2B 45c31e1c64310416a568c636a7ae6b01c59a252de9b22ec50644be593fd6f1a0ee318df13814b11a8ab6b6fd604081cc4550b6135ac9ecd30e51c54c77491106 SHA512 10e2c064d38c951cff50375c58222d5e231e0e64fe7785d9ef747420dbb43d0b50a357dc463e8146ec46968c3ba64443dc10cd029202e845b3fc953ce63a0aa6
-MISC metadata.xml 841 BLAKE2B 5d6a775f6e0b2b092b3d553cd400e936e7103b82cf97ca8c57e63cdaeecb4d9e36ad8bf2e82f21e6bc91a9748e13d78451f33dd9e3881790c3a3539b48912e99 SHA512 4e0e03c54deee1fce38ff239cba4ca934515023d590353c32ea47ca58f78699ecff01a35be0c33de30d5781ac37d3130c2a77d3aedd77798bae967eb126b28b5
+DIST xrootd-5.4.0.tar.gz 3225065 BLAKE2B cda6b14fae4c4c8d34367fa3ff448c02bf3ecda9c6bb4029d3a6b53370a57445ac25de77d5324dd4dab8c92cda77490efdbb862e4db6b926e19ad3363278f046 SHA512 59f93db433f0e88439d5edfffb75d7813bae253e50c390fe8c43ef924bc36f5f4a56db9b00a44013c60c4b4bd5a0accaff2a8ca793fe37e59dc77dd8ab8f6837
+EBUILD xrootd-5.0.3-r1.ebuild 2666 BLAKE2B 553cea29036e2bfc922ab6604f66d001acc838c800b478131f46a674406b3f6302a7c4439e162496507a13ff7b0ef7665abe37edfcf5eadeff96720a5a908592 SHA512 daa560edcd935fc8ae9c21013fc5c83257ffc1eace97f2bf9aa90666d615b5206c817462f5f5fef84573a6e86db23f71a66afb5443829bfa7495bca716a8b384
+EBUILD xrootd-5.3.1.ebuild 2669 BLAKE2B 8a2fb7476bad3e7c018572b25502f7764a894def158c1a242d1db43064010672d40922114bcfb5266ef3d04605265a409663bfdd6c7b7bd5a394df0a1fb3b5e3 SHA512 b9775cbd2d27aea34839255059023e5019f828c201953ce6d1bbd899c9eb35eaf0664d32ad3adc801682210eb4442186ce0ec0d240fdbb8686d6f631d4bc1602
+EBUILD xrootd-5.4.0.ebuild 2959 BLAKE2B 26f003fdf3caed2bdfa4308b9868f94b07c1352b2950324ee53c717274d20a761b8dbfff285b11743b4608e23c05778f5d332c4417bb859accda0d62e40a3c71 SHA512 1f73a0f22645206068ab8669108c6acff07475e5fdaae31bd741544889816a9de9c28a7764023a7e5733e05c278575e255dc0079edcb1435213abce6b0f169a7
+MISC metadata.xml 914 BLAKE2B fa0f01645c7e2fb128738a2439e1614e83c0a5fea40efa894ae3e9ba5ab302b419e03b2f10563e406caefcda6318661cd25aa3fbb8976039bf3d4e82fdd22141 SHA512 cd9046d8cb1f45f3c20a8ada0a85282f798dea1c431eafa516ae72351f27492757e59f623eb20b526569a415a31bf8749491681488f5db99622ce2f772b3dfef
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 07427db64e20..a911c7c2e75c 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -9,12 +9,13 @@
   XROOTD software framework is a fully generic suite for fast, low latency
   and scalable data access, which can serve natively any kind of data,
   organized as a hierarchical filesystem-like namespace, based on the
-  concept of directory. 
+  concept of directory.
   It is usually used with <pkg>sci-physics/root</pkg> and its PROOF
   facilities for cluster computing in high energy physics.
 </longdescription>
   <use>
     <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
     <flag name="http">Enable http protocol support</flag>
+    <flag name="server">Install xrootd server and related plug-ins</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
index 260b6f8047ba..63d03a9265a8 100644
--- a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
+++ b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
@@ -27,7 +27,7 @@ CDEPEND="acct-group/xrootd
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( <dev-libs/openssl-3.0.0:0= )
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
diff --git a/net-libs/xrootd/xrootd-5.2.0-r1.ebuild b/net-libs/xrootd/xrootd-5.2.0-r1.ebuild
deleted file mode 100644
index 0b53eaf8ca75..000000000000
--- a/net-libs/xrootd/xrootd-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-inherit cmake python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.3.1.ebuild b/net-libs/xrootd/xrootd-5.3.1.ebuild
index 7f1abe069f44..a33ccf3fde4d 100644
--- a/net-libs/xrootd/xrootd-5.3.1.ebuild
+++ b/net-libs/xrootd/xrootd-5.3.1.ebuild
@@ -27,7 +27,7 @@ CDEPEND="acct-group/xrootd
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( <dev-libs/openssl-3.0.0:0= )
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
diff --git a/net-libs/xrootd/xrootd-5.1.1-r1.ebuild b/net-libs/xrootd/xrootd-5.4.0.ebuild
index dd384c7040ef..b13ed2e2e71d 100644
--- a/net-libs/xrootd/xrootd-5.1.1-r1.ebuild
+++ b/net-libs/xrootd/xrootd-5.4.0.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 # Upstream does not support the building of Python bindings
 # via CMake for more than one implementation at a time.
 inherit cmake python-single-r1
 
 DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
+IUSE="doc examples fuse http kerberos python readline +server ssl systemd test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="acct-group/xrootd
@@ -27,12 +27,14 @@ CDEPEND="acct-group/xrootd
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( <dev-libs/openssl-3.0.0:0= )
+	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
 	doc? (
 		app-doc/doxygen[dot]
+		virtual/latex-base
 		python? ( dev-python/sphinx )
 	)
 	test? ( dev-util/cppunit )
@@ -43,6 +45,7 @@ RDEPEND="${CDEPEND}
 REQUIRED_USE="
 	http? ( kerberos ssl )
 	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( server )
 "
 
 PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
@@ -57,6 +60,8 @@ pkg_setup() {
 	use python && python_setup
 }
 
+# FIXME: no systemd automagic!
+# FIXME: support xrdec - currently only builds against bundled isa-l
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_CRYPTO=$(usex ssl)
@@ -66,6 +71,7 @@ src_configure() {
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_READLINE=$(usex readline)
 		-DENABLE_TESTS=$(usex test)
+		-DXRDCL_ONLY=$(usex server "no" "yes")
 	)
 	cmake_src_configure
 }
@@ -94,12 +100,14 @@ src_install() {
 	keepdir /var/log/xrootd
 	fowners xrootd:xrootd /var/log/xrootd
 
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
+	if use server; then
+		local i
+		for i in cmsd frm_purged frm_xfrd xrootd; do
+			newinitd "${FILESDIR}"/${i}.initd ${i}
+		done
+		# all daemons MUST use single master config file
+		newconfd "${FILESDIR}"/xrootd.confd xrootd
+	fi
 
 	if use python; then
 		python_optimize "${D}/$(python_get_sitedir)"
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /net-libs
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)