gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /net-libs
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
48 files changed, 479 insertions, 744 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8e0334a05a04..a56c841d6cac 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 6f8438bce22b..a420a65c1d75 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,5 @@
 DIST glib-networking-2.72.0.tar.xz 265060 BLAKE2B 2ffb25b059db40fcf9b65b104cd50d81dda9482bc75031d62c10f70eaaa2e9fcfcdfb2b718253255a2565d7b6bc9ead2214167d1b5f482c0ddd3af8573dd2ef5 SHA512 2b42aebcf496f51604005f6f3243ed7e613ab3d485742b7d8af10e103b07eefd8931cc86c1cb021889fe1415ad98bf4d877a3f33203cb53688cc2c41373a8ce4
+DIST glib-networking-2.72.1.tar.xz 265308 BLAKE2B 84264df5e094a4c57d86edd57fdedb11ad00eec5937eb056de34ec3d38a0e0e2ec3d71a5ad4ab0386c45681c8784b792ca6ded9c048d93c3ed1ad47d2f31f44e SHA512 243f54f4fbce40211f276c4f56e4e40507ecb0b23527a04b2d5bd67185c017f736f088c71ebf225e69e1ae8efa5b835edd68ea5c96df3ff69a25fd391e5c52d0
 EBUILD glib-networking-2.72.0-r1.ebuild 2004 BLAKE2B 7940597d2b326c67ce959273b033da365eb5f46825e837b02104947ec7557cd578b7b38605c495ed9fb89f8f0f827a64638a8f48846ae66965b61fb1dee9e470 SHA512 afdd73225c34ee65730ef93815a45de4787c8d42fab4212d4f24612c5935a43dd4980e421a6563efdd02b8089c737b507b43eaad30c98ef787b15a41a58401ec
+EBUILD glib-networking-2.72.1.ebuild 2011 BLAKE2B 7ceb8c79478b66938a3094d8b65e17a5ce6b418e00c637dc84c6af285fe9977f585950018d4394b12682e1f78daaf7a0d41e2e228adda7da114dc4b00929beb5 SHA512 30ec3fb8ae63bfe1e6ca2c996bb9a38101ff8dca165a94d3835c12ddebde27591ea42528cf275811a2b947a0c24dd53fae9faeaf75c0fc349f17b155f658b7ba
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.72.1.ebuild b/net-libs/glib-networking/glib-networking-2.72.1.ebuild
new file mode 100644
index 000000000000..f5cb25001455
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.72.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~loong ~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() {
+	default
+	xdg_environment_reset
+
+	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('tests')/d" tls/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/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index 6a01a3ee3363..d703f99de09f 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,5 +1,5 @@
 DIST gupnp-av-0.14.0.tar.xz 93128 BLAKE2B d66ba820aabf82be37a8c19a64adbacc863b495cb6a68849ee236cbe6956cc94fc992a3d4f351d165efaa8257ece2f3173dd845d2a9313bc9ff1a97a178d9632 SHA512 b357b5413d3e01e4ecaf9dbdf5f5f15555506aed662154d03c6232f0c82c4a49543deddf34350a204d467c1a33fed04e406500fd51d6e412d32ac909e974e041
 DIST gupnp-av-0.14.1.tar.xz 93484 BLAKE2B 5e4c070bc7f0dd1a1b67f58fb178ee575df5f9f3920c8c40f8975ac79c61f707df39a243d4783ff79f691dd42553c3a6eb89715be79bb7683910785afdd83b19 SHA512 b17b38c32fe068b0b74a7ee357be5f3a0df3320fd04338b5f6b04231c601d6cc57d2770c6e6ca42ded5e1be28a6b2746d16417eb322889ffe6a975ec58205655
 EBUILD gupnp-av-0.14.0.ebuild 989 BLAKE2B 95274b93e3f47e9f1ddeb54ff208b828d31da1b6ae780059b28f16da3aa0371e6d1f654b294e09bd8c91f4d7dd479a9fa8183fc38a424efe907164afa8408eaa SHA512 7fdb7e56122486f998636f1816759b4dac9f587e8ffeebd1d1665704d7edd263c0ecfa13e091e5ed31606106b0913fbaaff2e487278972095a3e55c91170f6eb
-EBUILD gupnp-av-0.14.1.ebuild 991 BLAKE2B 5cd14768262d4d0d96a29fd4c14d442903b5bdb9d839af6aa41ec79b21dde83153c122f30bcce7042f09713cb90363a1bb5b97b81d22e8f14e8f3790c0294d74 SHA512 9e0c576f36e5e6012c2dc55c847564b23e418d6d11e5ece7ac00417f8984f19b2ff993feef22668118fdf4f79b35fef2b97d9ad50509b068eea6acbb77ad0f94
+EBUILD gupnp-av-0.14.1.ebuild 989 BLAKE2B 95274b93e3f47e9f1ddeb54ff208b828d31da1b6ae780059b28f16da3aa0371e6d1f654b294e09bd8c91f4d7dd479a9fa8183fc38a424efe907164afa8408eaa SHA512 7fdb7e56122486f998636f1816759b4dac9f587e8ffeebd1d1665704d7edd263c0ecfa13e091e5ed31606106b0913fbaaff2e487278972095a3e55c91170f6eb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp-av/gupnp-av-0.14.1.ebuild b/net-libs/gupnp-av/gupnp-av-0.14.1.ebuild
index 4c2317e33e7a..46ae3f74a272 100644
--- a/net-libs/gupnp-av/gupnp-av-0.14.1.ebuild
+++ b/net-libs/gupnp-av/gupnp-av-0.14.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
 
 LICENSE="LGPL-2"
 SLOT="0/3" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 137609d8e108..6d8435b4ef39 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-21.12.3.tar.xz 605960 BLAKE2B a4c0d7d1942647a759cd3890cb675ee6ccddf3b875836f91b1006f51230b15f0b55bdffd8b79f6c96af8f30f611cf6d8cd5a7677a39a8aedb17d3c0705f19186 SHA512 04ff8cfa6a945eeb36d88972e530371b011ba664eb742436ffbb5a09c10ae25053fc3553d6d80b9d68f65a9deee65595b0554bd3ab0f2b71414c621ddd28d2d1
-DIST libktorrent-22.04.2.tar.xz 606372 BLAKE2B 71e9b2dc92fc22d7124e2bbbad6853ac00e8b85d2c4de1d34a3af68c348cc044ecec5fc8a350dee75917475522dc0b6c85465174dae4c17d3400b0bb8f64bfa4 SHA512 b5ef82b2d2c9235e0760fff0c4b30339abb076f47c75bee85379d247c4b0d0fffd7d194b90ba4594d4ac6461d8045570f0bcf56dd484527338afd94a6ea2eeda
+DIST libktorrent-22.04.3.tar.xz 595672 BLAKE2B a014e6cfe8f79953422f31fe94d01c48cfbadb2a5f144c13b960d860f0c581c7c301545cfd9b5f490dd10e06a2b7d2d56e7b9609c19bb3c83524a325d9f8c86a SHA512 3ea6530c62e1a022f8d679f9ed54654c3c468cfdd0aceff4b7f6e0a1687ec1ddf59aebcdc08a258d7a169f827ea0de4e8b5489df4225f4fb15988010bd0f4b99
 EBUILD libktorrent-21.12.3.ebuild 1451 BLAKE2B 0147ae58939ebbdf6d9952fbd79b89977ec7f76d2c9e9e6036d88e257bad8828edede38284d55137da8a2d1e69bd8310d848453fab57698adaa6249e2e25bd06 SHA512 71827239b8a51d2123878ef0f46b17cba45739435fda8b3bde2f9ee005beb64a99242fabc6971eebd043540995820d9e2ee10dca420ad4e19245cf09e921fefa
-EBUILD libktorrent-22.04.2.ebuild 1454 BLAKE2B 6f6cbcbba558ae94965045e0544eefef5b10597de6e5520eafe67e23ce2ecd9957aa4e84c0234a625975ea7af40909fbb15f4a05ea1b8dc86782e509cb68d902 SHA512 ad234512b5edce0ba5df4de838d92210819fed38cd7ab2c96e05bf871eba4167ece64897f42a136860d8b61431a24a17e35629a45acc343a03c8f70bced43294
+EBUILD libktorrent-22.04.3.ebuild 1454 BLAKE2B fb5388099d8a62d97984256ff1864624cc43aa3634e32b2c9b8834a32597f005784eedd70ee863b56dce24a9d30fbe76eb50a542b138a3af1132837b5a0bb6fc SHA512 8c9a0326890bcf319d39eda0d119e54779578649329e0f0a10771739fb572c568a9f14844cb2d5712c32f05f9c5687a00a87736c7561e627c584ffeaa5dc35e5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-22.04.2.ebuild b/net-libs/libktorrent/libktorrent-22.04.3.ebuild
index 4adfd65b596f..23f2d34e21d9 100644
--- a/net-libs/libktorrent/libktorrent-22.04.2.ebuild
+++ b/net-libs/libktorrent/libktorrent-22.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_TEST="forceoptional"
 KDE_GEAR="true"
 KDE_ORG_CATEGORY="network"
 KFMIN=5.92.0
-QTMIN=5.15.3
+QTMIN=5.15.4
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index ce3443f88f00..135ce783630a 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,5 +1,5 @@
 DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
 DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
 EBUILD libnice-0.1.18.ebuild 1325 BLAKE2B bf5d9de8fe2bc263d2c2126e23e7ab158d44657901a34dd0775a169b2f44b439afd5fdcebb2abbfb1b16ae56cac13849fea51b13954a2026de09b30b3077cfb5 SHA512 79af9f4f494b2cca4bfadeeee6a87ff588128dc479851bf37280d8d2cc414dab52d1e78a849c855e92c815f5d270a42b42657a0c60f9712b31ac1a956f1ac9f0
-EBUILD libnice-0.1.19.ebuild 1356 BLAKE2B d7372ff64d7a29f7e4315977e6ce1d1846d14cc210cb443fccbd92814b290c5b37b8d4774eb5a078247228d7bc9f1286abde68baf102c82c66585330d53d2efa SHA512 eb1f43fc7ec009b379f368328e0e99681c6fc37894159d4ac784d1466c27ad891bdc2cf3d80737accd6fcacb7c22caca1b4cd8960ef834e97109533d3034b329
+EBUILD libnice-0.1.19.ebuild 1490 BLAKE2B 7ff2905b4127ece1ddde5bb6676c759a3955841528cff694e323bbc0daee78247e84275ca4f95db21142a942da652dcffb143f960e2b79f8df15009acfff9427 SHA512 0e79a4520d708f53b5f341da90b125154ae8229ef258ed6364caf37330f5252a1e775ae7b6a2d0e6956b3ecb33ccd7b85e2d43a503253f1d7618edbf2f442707
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libnice/libnice-0.1.19.ebuild b/net-libs/libnice/libnice-0.1.19.ebuild
index 228a38e0d2ee..8a740872122b 100644
--- a/net-libs/libnice/libnice-0.1.19.ebuild
+++ b/net-libs/libnice/libnice-0.1.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+gnutls gtk-doc +introspection +upnp"
 
 RDEPEND="
@@ -29,6 +29,13 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.1.2 )
 "
 
+src_prepare() {
+	default
+
+	# Broken w/ network-sandbox on (bug #847844)
+	sed -i -e '/test-set-port-range/d' tests/meson.build || die
+}
+
 multilib_src_configure() {
 	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
 	local emesonargs=(
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 7429c9d8b08e..b17528eabc3f 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,5 +1,5 @@
 DIST libnma-1.8.38.tar.xz 1347004 BLAKE2B 108fc7d0a01ca72c84a738f831d442d82990f7b82301de3a47d8331af1e080a33c10806fb75830463fbfb8a4a1f556cdf5272ee52dbc4616ea3dbca1959cd128 SHA512 0421c598ccb6e3659f182b596eec76ffd695e51c11fd11b8325c2d08cb259536d7e74c11bbaac3ccb841016a0bc69a87f1c682b934a9eb569a74116e677eba63
 DIST libnma-1.8.40.tar.xz 1350560 BLAKE2B 9c5124a1dcaa801c7d0135ef64dedccd098988fdd199938e2409e80bee86df71bf368cada113dceae4046a5c2c5fe954aa9fc0c19519721a4e8ec7b8f7ea8d44 SHA512 28f4704f97941308f43b27a309fd14050e8ac7e0c6665cada3cc08a759e140f043a80b21ccfe02ce348f8490cad8107b4fe27026dbaafed46ec1c7c46824e3b8
 EBUILD libnma-1.8.38.ebuild 1676 BLAKE2B 4d25b6609021722dc209259e3414444f3419a94153e42c1decebb7cf3e9e5ca0d0103150ed6da3b1b2f3039dc4ecb3fd4e3a682b374b239718836d13813e03d7 SHA512 68e5d459f420a05512b69cc722c1a69e9f65e31ad10d8081fe635250a452e42c6febfcf9826741a3c67464e7e7241d452bd9084b43951423df08adf4f6a121bc
-EBUILD libnma-1.8.40.ebuild 1682 BLAKE2B 5f2d2a76d3a776776cf254135180bd8ae493f74163dcde431cdc5d89da0722bf364392b8597e105326ddca5318378b3e086b5c8e33d0abcdbe3b6ba9c1a3f074 SHA512 434dd3138a59e226de5c97e3de69b5738d87f9f6d52752a19bd5331aea3b8bbd3aeda8680065bb9756c7ac139880387e891643da009393679208cf7877eb9869
+EBUILD libnma-1.8.40.ebuild 1680 BLAKE2B d619bffc5f523e09d75c03806ab0ed9f01c4f2807c98c72e08207e187103c04b5606c0caa82d5836e7089f3cf0aad16322edf7e4ed34f7c24d612f851234a9bd SHA512 e30db252e35eb6fe64e02a99a11f5ef12d5b6e5343d1dea1fb03005f3d4726d813ae62db1a264e57937b83b9b8deca926841b731f1cb8335f06de2348c916081
 MISC metadata.xml 373 BLAKE2B 4107438e2ffa5c0e8a276745f518001ab71a5322ac3136fa2b23b1a767958f76c775ea551dd587877512ef18520926cbe74ebad8b36f9c2d4263645990ea3781 SHA512 488b3102778233f87a8fd06bf516ba31d62df2edd22dd9d556e7090483707c00ff12db7d2d372f396d9e5dda9d2f48a77415cf6de0e08c6279a541f43221d68d
diff --git a/net-libs/libnma/libnma-1.8.40.ebuild b/net-libs/libnma/libnma-1.8.40.ebuild
index 76713c40ed01..809e0cf3449e 100644
--- a/net-libs/libnma/libnma-1.8.40.ebuild
+++ b/net-libs/libnma/libnma-1.8.40.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=gui-libs/gtk-4.0:4
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index a575fc2dcffa..8fd89f540681 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-4.2.1.tar.gz 544987 BLAKE2B dee3b5ffb0a3005c1ac9a262df61c8823f59cb0e1b204776ff4f7a465b5caf226a6149315af0862b397607bd07783c2f876fd143090cc92174e081d9a4dbd585 SHA512 89c83bf05e64684432698b36a2152b4b35e8cffd7e4ef12046289533bc54f014ab0275190e98e79338efe8ebee03d6e7e20a032d1d293b2eb01bf5e0f9e6154f
 DIST libnpupnp-4.2.2.tar.gz 544198 BLAKE2B 450b3bf3f3ef2027bf50ad339c74b20dc4f075aac5c1b2419954bd558f114ca1dd973f5c14962b046cd6e57a0256586070aab7639b7da080452406d8a0fd24bc SHA512 22262e3dcb42f8c5ceb3df6296682ba993c4f86a810aaa63c7a6b5ec277c525d3d666a58840fb40833096e4f69916d309ca549bf67a137f200a236b1f71ec1f8
-EBUILD libnpupnp-4.2.1.ebuild 850 BLAKE2B b05d2e16f0bd4350e700612e64dc94a3b5ac5d837dac32ce496b7cdb0d6d4a27c3db8023b53140827e207aded102ad96d24daefecf082578a078363b3900140e SHA512 f64276e9411d0c4c9d44a308023cd0399aeec0b15b614e9e61f694ed3d183956b555e3f86fae7c28538e18b6ae2d63165c6f8dcac25de2001175ce2addca8f61
-EBUILD libnpupnp-4.2.2.ebuild 852 BLAKE2B ddb1c7f5c5a03da81967eac39adf85757c7d353a4d3bdb30a8011bf3a7de1475a94fe4caf87fee2ff4f3690869a4993529065e22f94bc85ac7ec02f29c88e267 SHA512 d393e2303e54f55b601675a63a56cb76f2349b48a8b2c4db428bd2c11232621988bf32298b00caf2d276db054cd6886284012d6765f2b806be435e9cf2d3aca9
+EBUILD libnpupnp-4.2.2.ebuild 850 BLAKE2B b05d2e16f0bd4350e700612e64dc94a3b5ac5d837dac32ce496b7cdb0d6d4a27c3db8023b53140827e207aded102ad96d24daefecf082578a078363b3900140e SHA512 f64276e9411d0c4c9d44a308023cd0399aeec0b15b614e9e61f694ed3d183956b555e3f86fae7c28538e18b6ae2d63165c6f8dcac25de2001175ce2addca8f61
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
deleted file mode 100644
index 19af384d8482..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
index e43e9d04e31f..19af384d8482 100644
--- a/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 060aab164302..060ed5902fb6 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,6 +1,8 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
 DIST libsoup-3.0.6.tar.xz 1527232 BLAKE2B 28a2aec2323686af692bfcee3126c76b8506c7721b81bd3beb276b488ec6c26498e4b1396ea6d3537cf00a203cbca2798ea414c4d2227f9c520660fc61459804 SHA512 4de84b3c251b6fe75903b1cd2647ac22055f799382a186efe6f45d3f75bf6c82040f0aaceb40d0019769cf1c0295511eb0afbbc7236e93b168ed70c2ae975a89
+DIST libsoup-3.0.7.tar.xz 1525104 BLAKE2B d9a8fddce286691f58901052f484c7a81e46e5c4625514609fc319c8a383b459631fbee95a0f3cfcbe296eb96907571c8fa57cf5c1b9cd742453d366057640fd SHA512 bb48b2475ec4b073de144ad91459843946ba902fc0849b88c548ccb774fc3854451239267dd097a3da4e40f025ae746609b669ec0caffdb15e7b07118e881cfd
 EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B 83795dff978db6701967be68903382ce13f25a138a7d851cdaf25c18d0a21813ef8366c38102ed9cad349b2a4aae3492e89830029128a7ac3c7e4c64b46f780c SHA512 4d018f152a378112785f6af8d040a969a3ba8bcb81423261126f3971d8118e4e5ea550690b1d48b9b3f1c7ecd98271d0f30334264b5ac7281c6ce24e2c3ef005
 EBUILD libsoup-3.0.6.ebuild 2924 BLAKE2B 4edf981426806b0998b339da797b1f212b49601bc843d1e1e2ecf50fa923d89753498c47f228196c1d7ff0f63cb51f702aca9b1fdb335241683b2b902cf84ffc SHA512 909656228775b3bdf03f050d2dccd29b07f1013840fc61f865a917dac36bbdbaeb4f2b3be2c5c9a6a8b1daafd0abc39d619aa2917170d32a18b36705fa2e3be9
+EBUILD libsoup-3.0.7.ebuild 2924 BLAKE2B 4edf981426806b0998b339da797b1f212b49601bc843d1e1e2ecf50fa923d89753498c47f228196c1d7ff0f63cb51f702aca9b1fdb335241683b2b902cf84ffc SHA512 909656228775b3bdf03f050d2dccd29b07f1013840fc61f865a917dac36bbdbaeb4f2b3be2c5c9a6a8b1daafd0abc39d619aa2917170d32a18b36705fa2e3be9
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/libsoup-3.0.7.ebuild b/net-libs/libsoup/libsoup-3.0.7.ebuild
new file mode 100644
index 000000000000..84e2cca340d9
--- /dev/null
+++ b/net-libs/libsoup/libsoup-3.0.7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
+
+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="3.0"
+
+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.69.1:2[${MULTILIB_USEDEP}]
+	net-libs/nghttp2:=[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${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.70_alpha[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? ( >=net-libs/gnutls-3.6.0[pkcs11] )
+"
+#	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() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+	# 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 unnecessary 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
+		$(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_feature test pkcs11_tests)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 47e99758327a..154274e95504 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,11 +1,4 @@
-AUX libtorrent-0.13.7-execinfo-configure.patch 907 BLAKE2B 7af92d6e3901a8683f86a61e27072ab0d002d54a30bcb756cc9c0fb56621b09cada5bae2ccd7149fa18f98ebcb01544eea6eb0ab0dba71706c6208944b1d1111 SHA512 4bf8c5063f82833f84da6cef56bd892d77bba30d66a2fff4e4705629dfedb222fd025001ae78841d0ccff67d5b9f14ba46d5b569332a03eeab2f78331a254f89
-AUX libtorrent-0.13.7-kqueue-configure.patch 1439 BLAKE2B f7a55999fe7760ad7edf9b1d6e2b3d64e457a115517d8f188ff3ffa6f0e32bf9039b5c8fd690345955b46f902c013aa1be05ef0a2f4729eb9f283f9972540e61 SHA512 795789be85bd461d907d52884a6fe9ef2f7e100b27d5aba0920bf7d56b5e812391796f277c02f9246c3b792a43e1f25144a4f4064a4c68b436a03c2a287623af
-AUX libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch 3172 BLAKE2B 2a56ba61b9516b3cf430a79c146c81bd2934449fd46f85bc41ecfc5032faba58cdde86233790bf9d456b28f6760132096188afaeca5b8356ce586e6ad9fbd494 SHA512 e427b4b96a92e1dbbb8883d84688984b9ec7c6815f333bca8a0ad0a8a32b25766100a8182a3d11720563d376501f64b71d86d92379450e41da706dd47e0381d5
-AUX libtorrent-openssl-1.1-part2.patch 1902 BLAKE2B 1d0e405a0a72be250c7a79e410860d8a0afefda3f574d3854469620157d1a3184d63d902af9694d27c786728beb45d93225c09a8b427edf630675fe251d63298 SHA512 baee88e7609fe3976d59bd220c545473a336765fe9f618502cbc6450b43f8c384b56afeea379d42b2f2ee748ab088badb841140d2ea82a91b9f34cd25ff05ef3
-AUX libtorrent-openssl-1.1-part3.patch 1882 BLAKE2B ad7b62d238ad57966c91e38f32b2d45673d9caa1bb4347788cde366a5235c1a02b0b290c3b4e010c0c19baf36c0e2ad7b2651c9bed67a51714b877924f0e6c22 SHA512 aa83d4e636b3327cf78e9eb4bab14e3254d90829549020240e4498d78308cdc6e058035457341d51a1d5d6cd9b89364ebad33f6d46364f9b72171abb49c954f0
-DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb
+AUX libtorrent-0.13.8-sysroot.patch 851 BLAKE2B 17ee86d4f92e87b678b62a5c00c1ebba69dd2cfca8a09aa3dca7ba36801469281ad5cb47f1d3ea920b989d7c210f180c4d94bf23da6dac7ef078b7b1f4d07048 SHA512 883c02909863354f0450161d4a7e191ef90cc6692b7f0739693a9e3047cb0c23668aabc98bbb9d2a0986535f4416b3fe7d92809e3ef35116e261a06851f67625
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
-EBUILD libtorrent-0.13.7-r1.ebuild 1946 BLAKE2B 78e63b6d7f8242f88308d24276ca9b067556e399849df3a188a81d337d5d90dff63959be3fe92fe9777f57f3a4b46b14bbc208e8b8a73029a224848531cdff69 SHA512 1b717332a854c8df3e391ebb0121db61675bb4d48fb2ca46adefd4140639fa9b35e2de7bc542f35187bf3c9d340a8b59a2432b0abf2cf571b79e3f9813878df5
-EBUILD libtorrent-0.13.7.ebuild 1810 BLAKE2B 601e5454903fecbda7df1d1125de727e9c78b79f25455bdbd987c2cd2e6ed58ebacc7c2a8b0c8eeaab7c961662d665ebf86bccef81f444aaf38204ebb7f15d14 SHA512 1d9130fe49e8a76aa255585cbfa45fcf55e527479c9b4bd2665b28c20210a1536bcbfe879cbcc291961f305199ed45ff133dbddc9fef510da3c48129d96711b7
-EBUILD libtorrent-0.13.8-r1.ebuild 1668 BLAKE2B 8124c909ae8df30347131c8b6aa6290e7af9ab81182ea1d5a0bea2f0c1279ba5cd214efa5a26350e1472f86a9988f07e2653bdd3052d0c9572edfbaf727a1701 SHA512 26a8b530ca6cd6e3c37ed7a1b778bd259f545e7ed35049b16df640c0a0073b1ecd134072b2a82754434ad5d77171f087d38a924a9858e0654b897aa98f8a1c3f
-MISC metadata.xml 458 BLAKE2B 2c606f962f731b694b15abe7c8ba072856740433acb1d557785a319aef0ca9b2ff6a086a953391f5b06a0ae5ffc2521f7505376d73058211aa1c9b9bc0331705 SHA512 7181c32330f6bc7cbc2e0422a7274a3d7fe6629a70a6b453f059276f5c37c8cf8b6cd3d23b6d23f3f01a311d5a461db2e5980a662364830b66bb73888e2baa6a
+EBUILD libtorrent-0.13.8-r2.ebuild 1762 BLAKE2B ee26974c1b9ce4ea95e0bab1cc7dd1b53ba54cea94bad6ab7781aa5e4a57733b3b4fb82cdbfd48c818270b8aea9c2fe75ee6b8c40372f9e35ec9b4948171d4b6 SHA512 66d186c0791b0a634010cb8bbf7d515f9bbe5ed53d2b10df399738653afe17eedc93e2c3ba57492c73ba40e8bba3067dcccf9e6df582ae139b3e33d18bba38f7
+MISC metadata.xml 332 BLAKE2B 83ae91b4dea009d642d92334a5675f7adf861a1e623ef3f483d3ffdcdcce91f9b9b3ed0e5b164ea5c31c228fc4992638df50e221cd6b97e04b96d1518b901546 SHA512 2745495bd2d107326ab4ebeff7d7669b2706a130571ee4f2144ae67d92835acaf04d9ba4f45148f16b0138170ebe6d50019d5ee1b9ad66332338e9c02ecd3624
diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch
deleted file mode 100644
index 1865e48992c4..000000000000
--- a/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f4dadb3850ef15dd7898d07fca72d2fa7e32ca6f Mon Sep 17 00:00:00 2001
-From: Stephen Shkardoon <ss23@ss23.geek.nz>
-Date: Mon, 25 Jun 2018 20:05:18 +1200
-Subject: [PATCH] Use AC_COMPILE instead of AC_RUN to check for execinfo.h
-
-This way enables cross compiling, since we don't need to run anything
-during the configure script.
----
- scripts/common.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/common.m4 b/scripts/common.m4
-index ff023928..b6d051f5 100644
---- a/scripts/common.m4
-+++ b/scripts/common.m4
-@@ -153,7 +153,7 @@ dnl   Need to fix this so that it uses the stuff defined by the system.
- AC_DEFUN([TORRENT_CHECK_EXECINFO], [
-   AC_MSG_CHECKING(for execinfo.h)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-       #include <execinfo.h>
-       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
-       ])],
diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch
deleted file mode 100644
index af8e53ddd233..000000000000
--- a/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 755daf78769b048c868e6b62c68b4e545494c181 Mon Sep 17 00:00:00 2001
-From: Stephen Shkardoon <ss23@ss23.geek.nz>
-Date: Thu, 21 Jun 2018 14:38:30 +1200
-Subject: [PATCH] Modify configure to prevent unnecessary kqueue checks
-
-By only running the TORRENT_CHECK_KQUEUE_SOCKET_ONLY check if kqueue support
-is already detected, we increase the number of platforms that we can
-cross compile on.
-Otherwise, the cross compilation fails due to TORRENT_CHECK_KQUEUE_SOCKET_ONLY
-using AC_RUN_IFELSE, which fails during cross compilation.
----
- scripts/checks.m4 | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/scripts/checks.m4 b/scripts/checks.m4
-index 8d77fc5e..c9333561 100644
---- a/scripts/checks.m4
-+++ b/scripts/checks.m4
-@@ -88,6 +88,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
-     [
-       AC_DEFINE(USE_KQUEUE, 1, Use kqueue.)
-       AC_MSG_RESULT(yes)
-+      TORRENT_CHECK_KQUEUE_SOCKET_ONLY
-     ], [
-       AC_MSG_RESULT(no)
-     ])
-@@ -137,7 +138,6 @@ AC_DEFUN([TORRENT_WITH_KQUEUE], [
-     [
-         if test "$withval" = "yes"; then
-           TORRENT_CHECK_KQUEUE
--          TORRENT_CHECK_KQUEUE_SOCKET_ONLY
-         fi
-     ])
- ])
-@@ -149,11 +149,9 @@ AC_DEFUN([TORRENT_WITHOUT_KQUEUE], [
-     [
-       if test "$withval" = "yes"; then
-         TORRENT_CHECK_KQUEUE
--        TORRENT_CHECK_KQUEUE_SOCKET_ONLY
-       fi
-     ], [
-         TORRENT_CHECK_KQUEUE
--        TORRENT_CHECK_KQUEUE_SOCKET_ONLY
-     ])
- ])
- 
diff --git a/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch
new file mode 100644
index 000000000000..9f696c01ef61
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,6 @@
+ TORRENT_ENABLE_INTERRUPT_SOCKET
+ 
+ TORRENT_ENABLE_ARCH
+-TORRENT_WITH_SYSROOT
+ 
+ dnl TORRENT_WITH_XFS
+ TORRENT_WITHOUT_KQUEUE
+@@ -59,8 +58,7 @@
+ CC_ATTRIBUTE_VISIBILITY
+ 
+ AX_PTHREAD
+-AX_CHECK_ZLIB
+-
++PKG_CHECK_MODULES([ZLIB], [zlib])
+ PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
+ 
+ CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
+--- a/src/torrent/utils/Makefile.am
++++ b/src/torrent/utils/Makefile.am
+@@ -23,8 +23,9 @@
+ 	thread_interrupt.h \
+ 	uri_parser.cc \
+ 	uri_parser.h
++libsub_torrentutils_la_LIBADD = $(ZLIB_LIBS)
+ 
+-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir)
++AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir) $(ZLIB_CFLAGS)
+ 
+ libtorrentincludedir = $(includedir)/torrent/utils
+ libtorrentinclude_HEADERS = \
diff --git a/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch b/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch
deleted file mode 100644
index 55d0cb901b71..000000000000
--- a/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 4607bbf78040789dee29266878ce109136b984ef Mon Sep 17 00:00:00 2001
-From: rakshasa <sundell.software@gmail.com>
-Date: Tue, 20 Dec 2016 19:51:02 +0900
-Subject: [PATCH] Added support for openssl 1.1.
-
----
- configure.ac                |  4 ++++
- src/utils/diffie_hellman.cc | 36 ++++++++++++++++++++++++++++++++++--
- 2 files changed, 38 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 65e34872..27e33570 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,12 +69,15 @@ AC_ARG_ENABLE(openssl,
-   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
-   [
-     if test "$enableval" = "yes"; then
-+dnl move to scripts.
-       PKG_CHECK_MODULES(OPENSSL, libcrypto,
-         CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
-         LIBS="$LIBS $OPENSSL_LIBS")
- 
-       AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
-       AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
-+      AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
-+
-     else
-       AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.)
-     fi
-@@ -85,6 +88,7 @@ AC_ARG_ENABLE(openssl,
- 
-     AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
-     AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
-+    AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
-   ]
- )
- 
-diff --git a/src/utils/diffie_hellman.cc b/src/utils/diffie_hellman.cc
-index aa653d45..7ec13165 100644
---- a/src/utils/diffie_hellman.cc
-+++ b/src/utils/diffie_hellman.cc
-@@ -54,11 +54,23 @@ DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength,
-   m_secret(NULL), m_size(0) {
- 
- #ifdef USE_OPENSSL
-+
-   m_dh = DH_new();
-+
-+#ifdef USE_OPENSSL_1_1
-+  BIGNUM * const dh_p = BN_bin2bn(prime, primeLength, NULL);
-+  BIGNUM * const dh_g = BN_bin2bn(generator, generatorLength, NULL);
-+
-+  if (dh_p == NULL || dh_g == NULL ||
-+      !DH_set0_pqg(m_dh, dh_p, NULL, dh_g))
-+	  throw internal_error("Could not generate Diffie-Hellman parameters");
-+#else
-   m_dh->p = BN_bin2bn(prime, primeLength, NULL);
-   m_dh->g = BN_bin2bn(generator, generatorLength, NULL);
-+#endif
- 
-   DH_generate_key(m_dh);
-+
- #else
-   throw internal_error("Compiled without encryption support.");
- #endif
-@@ -74,7 +86,19 @@ DiffieHellman::~DiffieHellman() {
- bool
- DiffieHellman::is_valid() const {
- #ifdef USE_OPENSSL
-+  if (m_dh == NULL)
-+    return false;
-+
-+#ifdef USE_OPENSSL_1_1
-+  const BIGNUM *pub_key;
-+
-+  DH_get0_key(m_dh, &pub_key, NULL);
-+
-+  return pub_key != NULL;
-+#else
-   return m_dh != NULL && m_dh->pub_key != NULL;
-+#endif
-+
- #else
-   return false;
- #endif
-@@ -103,8 +127,16 @@ DiffieHellman::store_pub_key(unsigned char* dest, unsigned int length) {
- #ifdef USE_OPENSSL
-   std::memset(dest, 0, length);
- 
--  if ((int)length >= BN_num_bytes(m_dh->pub_key))
--    BN_bn2bin(m_dh->pub_key, dest + length - BN_num_bytes(m_dh->pub_key));
-+  const BIGNUM *pub_key;
-+
-+#ifdef USE_OPENSSL_1_1
-+  DH_get0_key(m_dh, &pub_key, NULL);
-+#else
-+  pub_key = m_dh->pub_key;
-+#endif
-+
-+  if ((int)length >= BN_num_bytes(pub_key))
-+    BN_bn2bin(pub_key, dest + length - BN_num_bytes(pub_key));
- #endif
- }
- 
diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch
deleted file mode 100644
index 60542e4b4464..000000000000
--- a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 43213fecfad863e2c9e47accde9b76496ff6d1e5 Mon Sep 17 00:00:00 2001
-From: rakshasa <sundell.software@gmail.com>
-Date: Sun, 25 Dec 2016 11:58:04 +0900
-Subject: [PATCH] Cleaned up openssl automake script.
-
----
- configure.ac | 37 ++-----------------------------------
- 1 file changed, 2 insertions(+), 35 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 27e33570..33f755c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,41 +65,8 @@ CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
- CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
- LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
- 
--AC_ARG_ENABLE(openssl,
--  [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
--  [
--    if test "$enableval" = "yes"; then
--dnl move to scripts.
--      PKG_CHECK_MODULES(OPENSSL, libcrypto,
--        CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
--        LIBS="$LIBS $OPENSSL_LIBS")
--
--      AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
--      AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
--      AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
--
--    else
--      AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.)
--    fi
--  ],[
--    PKG_CHECK_MODULES(OPENSSL, libcrypto,
--      CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
--      LIBS="$LIBS $OPENSSL_LIBS")
--
--    AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
--    AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
--    AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
--  ]
--)
--
--AC_ARG_ENABLE(cyrus-rc4,
--  [  --enable-cyrus-rc4=PFX  Use Cyrus RC4 implementation.],
--  [
--    CXXFLAGS="$CXXFLAGS -I${enableval}/include";
--    LIBS="$LIBS -lrc4 -L${enableval}/lib"
--    AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.)
--  ]
--)
-+TORRENT_ARG_OPENSSL
-+TORRENT_ARG_CYRUS_RC4
- 
- AC_CHECK_FUNCS(posix_memalign)
- 
diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch
deleted file mode 100644
index 3fc338d8b088..000000000000
--- a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From d36561c8cc91698f3075c264af6d7d99e13cbff0 Mon Sep 17 00:00:00 2001
-From: rakshasa <sundell.software@gmail.com>
-Date: Sun, 25 Dec 2016 12:09:35 +0900
-Subject: [PATCH] More stuff.
-
----
- Makefile.am    |  1 +
- scripts/ssl.m4 | 39 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 40 insertions(+)
- create mode 100644 scripts/ssl.m4
-
-diff --git a/Makefile.am b/Makefile.am
-index f175e634..9507b9ea 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,6 +8,7 @@ EXTRA_DIST= \
- 	scripts/checks.m4 \
- 	scripts/common.m4 \
- 	scripts/attributes.m4 \
-+	scripts/ssl.m4 \
- 	doc/main.xml \
- 	doc/http.xml \
- 	doc/torrent.xml \
-diff --git a/scripts/ssl.m4 b/scripts/ssl.m4
-new file mode 100644
-index 00000000..e9cf6303
---- /dev/null
-+++ b/scripts/ssl.m4
-@@ -0,0 +1,39 @@
-+AC_DEFUN([TORRENT_CHECK_OPENSSL],
-+  [
-+    PKG_CHECK_MODULES(OPENSSL, libcrypto,
-+      CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
-+      LIBS="$LIBS $OPENSSL_LIBS")
-+
-+    AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
-+    AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
-+    AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
-+  ]
-+)
-+
-+AC_DEFUN([TORRENT_ARG_OPENSSL],
-+  [
-+    AC_ARG_ENABLE(openssl,
-+      [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
-+      [
-+        if test "$enableval" = "yes"; then
-+          TORRENT_CHECK_OPENSSL
-+        else
-+          AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.)
-+        fi
-+      ],[
-+        TORRENT_CHECK_OPENSSL
-+      ])
-+  ]
-+)
-+
-+AC_DEFUN([TORRENT_ARG_CYRUS_RC4],
-+  [
-+    AC_ARG_ENABLE(cyrus-rc4,
-+      [  --enable-cyrus-rc4=PFX  Use Cyrus RC4 implementation.],
-+      [
-+        CXXFLAGS="$CXXFLAGS -I${enableval}/include";
-+        LIBS="$LIBS -lrc4 -L${enableval}/lib"
-+        AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.)
-+      ])
-+  ]
-+)
diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
deleted file mode 100644
index d1d53acab68d..000000000000
--- a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="BitTorrent library written in C++ for *nix"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-# The README says that the library ABI is not yet stable and dependencies on
-# the library should be an explicit, syncronized version until the library
-# has had more time to mature. Until it matures we should not include a soname
-# subslot.
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="debug ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/libsigc++-2.2.2:2
-	ssl? (
-	    dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/cppunit"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch"
-	"${FILESDIR}/${PN}-openssl-1.1-part2.patch"
-	"${FILESDIR}/${PN}-openssl-1.1-part3.patch"
-	"${FILESDIR}/${PN}-0.13.7-kqueue-configure.patch"
-	"${FILESDIR}/${PN}-0.13.7-execinfo-configure.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 518582
-	local disable_instrumentation
-	echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die
-	$(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
-	if [[ $? -ne 0 ]]; then
-		disable_instrumentation="--disable-instrumentation"
-	fi
-
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	CONFIG_SHELL=${BASH} econf \
-		--enable-aligned \
-		$(use_enable debug) \
-		$(use_enable ssl openssl) \
-		${disable_instrumentation} \
-		--with-posix-fallocate \
-		--with-zlib="${EROOT%/}/usr/"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/net-libs/libtorrent/libtorrent-0.13.7.ebuild b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
deleted file mode 100644
index 73c2cd137518..000000000000
--- a/net-libs/libtorrent/libtorrent-0.13.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="BitTorrent library written in C++ for *nix"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-# The README says that the library ABI is not yet stable and dependencies on
-# the library should be an explicit, syncronized version until the library
-# has had more time to mature. Until it matures we should not include a soname
-# subslot.
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="debug ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/libsigc++-2.2.2:2
-	ssl? (
-	    dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/cppunit"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch"
-	"${FILESDIR}/${PN}-openssl-1.1-part2.patch"
-	"${FILESDIR}/${PN}-openssl-1.1-part3.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 518582
-	local disable_instrumentation
-	echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die
-	$(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
-	if [[ $? -ne 0 ]]; then
-		disable_instrumentation="--disable-instrumentation"
-	fi
-
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	CONFIG_SHELL=${BASH} econf \
-		--enable-aligned \
-		$(use_enable debug) \
-		$(use_enable ssl openssl) \
-		${disable_instrumentation} \
-		--with-posix-fallocate
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild
index 5d3d38cc3667..5bb36208d46b 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild
@@ -1,35 +1,37 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="BitTorrent library written in C++ for *nix"
 HOMEPAGE="https://rakshasa.github.io/rtorrent/"
 SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
-
 # The README says that the library ABI is not yet stable and dependencies on
 # the library should be an explicit, syncronized version until the library
 # has had more time to mature. Until it matures we should not include a soname
 # subslot.
 SLOT="0"
-
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="debug ssl test"
-RESTRICT="!test? ( test )"
+IUSE="debug ssl"
 
 # cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182
 RDEPEND="
 	dev-util/cppunit:=
 	sys-libs/zlib
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.8-sysroot.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	# bug 518582
@@ -37,6 +39,7 @@ src_configure() {
 	echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die
 	$(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
 	if [[ $? -ne 0 ]]; then
+		einfo "Disabling instrumentation"
 		disable_instrumentation="--disable-instrumentation"
 	fi
 
@@ -46,12 +49,11 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable ssl openssl) \
 		${disable_instrumentation} \
-		--with-posix-fallocate \
-		--with-zlib="${EROOT%/}/usr/"
+		--with-posix-fallocate
 }
 
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index a6f8bb76cf75..3e85eb36e275 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/metadata.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>ss23@ss23.geek.nz</email>
-		<name>Stephen Shkardoon</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-
 	<upstream>
 		<remote-id type="github">rakshasa/libtorrent</remote-id>
 	</upstream>
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index c357c8df6c74..78976503ed86 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -3,11 +3,8 @@ AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab64
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
 AUX libtrace-4.0.18_p1-build-system.patch 4161 BLAKE2B e2811873721fa703e5f2202258e2e943320a601020d6d1172b215917ddb3c0e04b22a2c73c948d64ca7e65716a4f4b7147f49150b607bd6364f4da244db76311 SHA512 cec579934f535ca5f0ae1f32860e13bfc9a5e7f1467d66100be3edb6c10585b2190987d93ab558feb5dd464c85c153faece29fe37f6e2dd8037f240c96ed0040
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
-DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c SHA512 82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e
-DIST libtrace-4.0.17_p1.tar.gz 1961123 BLAKE2B be961bc58496414415b9affb0a6b77e5f234b92196fb719f3a2e8058ae80ade90977c44d57c75d37cbf26ff2e0c8816a4b376b77b6e44d13833960c6095b7e2c SHA512 85280edd515acf52361c34ebe5324fd95f4fafc72aa22c2c8bd43a6bca9a6b5fc9a046480fc760bb39d8b577532ed416caf10a630cea9465d305f2ed4dcb318e
 DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f SHA512 fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2
-EBUILD libtrace-4.0.15_p1.ebuild 1496 BLAKE2B 88e72d28f4b35dda288f0149ca2c889fc3c3608f2d35b033e1594ca0a46911ab1397a4634548f3e8ed2cdc89ead8e592f648a6e33c3876a19e45e3cbaf67e441 SHA512 7458355a9c04d27d4f048a20be606e7c480de502aa71c006b15ceb2790a618b642212ea488471d710b30e4daea530322256921afc573f2eb4b7ee028742dff75
-EBUILD libtrace-4.0.17_p1.ebuild 1475 BLAKE2B 7f565abbfde064b57c025ab153b061bdd6773cd228c092a8040f7058b9615a70c8f7dc19f39f340c4bda5611af5114e65c96e737181513dd31f4992f1aa2256c SHA512 f35d8f786d59410a56c64069adf044027aef6b065b29f6bd1d3992a39a2c702a2f62175b78b276e39531d345d308c1dfbce1ab8607f54147691d356d8cc9fb63
+DIST libtrace-4.0.19.tar.bz2 844871 BLAKE2B ff55935b46fb2193ae2e4ab10971d0983da18be20a52a18664f0e72cb829ab444a22e00aeedbd2df85aebbcd6b8352636c559e55d05466a599cc332f018f14ad SHA512 f2744337b4dcff8fc782cd90e44ea6f21cfe120840f626dfac365d3ffaecb82bfdd04a35458b67f663addc1f7ae792c5b0ec7538ed90a2deb386586bc55e1c54
 EBUILD libtrace-4.0.18_p1.ebuild 1447 BLAKE2B fc83d13a6c55acd782ecf7323a3015362587586f27b0ed08e1bba0ec690efecb44625d11575fbbbf71b0ad8909bbce33b88bac192a2d3f78814597725c4da363 SHA512 e04d235323a8eb091ee9ac37af8e899db41cddeab1421ebd738e55561288f8abca4aa221a53248174e9aa679fc743915b52ccaf5ca7011ba9db6977c231a5e80
-EBUILD libtrace-9999.ebuild 1400 BLAKE2B 026e83c497d2fa1cd2d5ef6a41aac994dbfe4a10dc6bd7f28b391bf5f4538e9c194e723ed10076425951cfb7fd31ee26ec4be489c90673d4c343b06cb659c476 SHA512 c381dcd69c2a0398c27ffdf4bd4850bd0384153f2514c8edb4bc78461f60ed0bbfaaacf925523d320205ee969acff2691b90d2215ce26f56e6812fe819db4bf4
+EBUILD libtrace-4.0.19_p1.ebuild 1330 BLAKE2B 7f3e772a189d6c4b29bf838255aa2d6471ec302ced31da63b26206dd77476f63620a11dfcc71c00d20cbec2b5be046f29f96f62b7c221afd5039a721cc8276be SHA512 e4490b390d92f78d2e40b7ff34c28e4db5e35e33b9e16d2b153ac07c991a940d3356fb2db58091f3c9f27476a1cd4f3a8fe1f051b888f237c736abb443dc875a
 MISC metadata.xml 525 BLAKE2B 02976e0d1f606614b5902644f5ee4d6580f6b0db53fb5a348a44a0e653052007a1e9f31bbf8185f0b2fc5cd890ffac517aae512c78625e8f30cdda4223f7a5f3 SHA512 fb048667eb5579363b3a62b1c6b7ac2d1f3e2a25b980f9f485b418dcf9d794f27608de847f7eb444765ef69dfcbcbd710af87f051d492fdb2b21f05a1ff231a8
diff --git a/net-libs/libtrace/libtrace-4.0.15_p1.ebuild b/net-libs/libtrace/libtrace-4.0.15_p1.ebuild
deleted file mode 100644
index 4f14188b0ead..000000000000
--- a/net-libs/libtrace/libtrace-4.0.15_p1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa"
-
-BDEPEND="
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-	"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-	"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-	"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-doc/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--disable-static \
-		--with-man \
-		--without-dpdk
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/doxygen/html
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libtrace/libtrace-4.0.17_p1.ebuild b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild
index fedc23bfe00e..744613536b3f 100644
--- a/net-libs/libtrace/libtrace-4.0.17_p1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild
@@ -1,51 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
-
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
+SRC_URI="https://research.wand.net.nz/software/libtrace/${PN}-$(ver_cut 1-3).tar.bz2"
+S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+# doxygen is always needed for man pages, but USE=doc controls installing docs themselves
+# (not man pages)
 IUSE="doc ncurses numa"
 
-BDEPEND="
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-RDEPEND="
-	>=net-libs/libpcap-0.8
+RDEPEND=">=net-libs/libpcap-0.8
 	dev-libs/libyaml
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
+	ncurses? ( sys-libs/ncurses:= )
+	numa? ( sys-process/numactl )"
 DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-	"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-	"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-	"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
+BDEPEND="app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc"
 
 src_prepare() {
 	default
 
-	mv configure.{in,ac} || die
-
-	eautoreconf
-
 	# Comment out FILE_PATTERNS definition (bug #706230)
 	if has_version ~app-doc/doxygen-1.8.16; then
 		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
diff --git a/net-libs/libtrace/libtrace-9999.ebuild b/net-libs/libtrace/libtrace-9999.ebuild
deleted file mode 100644
index f8ed9c02d13b..000000000000
--- a/net-libs/libtrace/libtrace-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools git-r3
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-S="${WORKDIR}/${P/_beta/}"
-EGIT_REPO_URI="https://github.com/LibtraceTeam/libtrace"
-EGIT_SUBMODULES=()
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc ncurses numa"
-
-BDEPEND="
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-	"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-	"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-	"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-doc/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/doxygen/html
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index 87de741348e4..c88e22ecd07f 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,3 +1,3 @@
 DIST libupnpp-0.21.0.tar.gz 478894 BLAKE2B 093803ff0a4a0b76272f44e470df69169053c66ae27a42b483623b50d0c2bffa61f51e0ca9a82b4fc759492640c68d0eae90cdc46a1e6e6f38f7655190e4101b SHA512 1032ef83e6880c1e4ae4903f6e175640b1d3da7090bfb04bf480f70d58436ef89e6a43886c86dcda2c4aab8370cbd0d5260601ac359a3dded0688ac2748d30fd
-EBUILD libupnpp-0.21.0.ebuild 456 BLAKE2B d3ac35555bc43c38346885de4ad7a4fa1d0b99f057da246dbbae36391ebcd3baa403f6c6fd8814366173d3473bdeae5ca9495853863c535f74eab95b22ed082b SHA512 c7c026e809794d451834e55c99cf1c733780336e3f56732b85216166937dbfef242519ce2b529d64f3902ffecac79a12b36a55596fd4111d59bd260a8a9cd44f
+EBUILD libupnpp-0.21.0.ebuild 566 BLAKE2B 84678b7cde17be4d585319edd9869d63e97317ebfd8acb21cb8d082e1eb1f748e742d970fd4169a80ac292f0147adbdd35e5b9c5b43b1fae65d572f6b77cce46 SHA512 9de74d19426ced16705557057d60759738ff829625bce0ca224f6d097036c274f0f47dc741e2e830a4667ace09648a555a25ea470fb0bf7c9fd628d7fbacd470
 MISC metadata.xml 218 BLAKE2B a724c5fc41f88a8b75cf9091c58241ae839c3d8a0275a28e4b61e76d8d51865b3dc363752961f61562b702b9e70c49643533164340360ac2d1fd41f8487d5c82 SHA512 e4a1847c2fb757c0e4fef284e730e49814e005f0fd7fcc12a3a4ed70867160635cede513455be1e88ca1b7fd8e671655ac6475be3ea8fe47d979523970ed2851
diff --git a/net-libs/libupnpp/libupnpp-0.21.0.ebuild b/net-libs/libupnpp/libupnpp-0.21.0.ebuild
index 14aa6943cc85..1e34570c792d 100644
--- a/net-libs/libupnpp/libupnpp-0.21.0.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,3 +16,8 @@ DEPEND="
 	net-misc/curl
 "
 RDEPEND="${DEPEND}"
+
+src_install() {
+	default_src_install
+	find "${ED}" -name '*.la' -delete || die "Couldn't delete .la files"
+}
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index e1fd96ce8d69..2d284eeef928 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -4,8 +4,10 @@ DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4af
 DIST nDPI-4.0-patches.tar.bz2 8744 BLAKE2B 48bfb2cf240823b64ab15a3f8a21acece878102ebb4cc807648b264ef091107a05d66fc672cccd1bc721ad3ea0edde786a1f133dfc84c91422604a9929e327ed SHA512 99a780c18c048ceec29c42828c420fe3f9624906eaef70f92af6abdbf7bc29133e048d7f8de85d8b73aa6667066e7ab5843fa293221d5ec8bbe87803dde83db6
 DIST nDPI-4.0.tar.gz 120053617 BLAKE2B ea0f333bd62622c1ab792137f9bbf2e35cb3790aae191c5caeaea36c7ce376bfa84633e99e321c16bcfbe5812d6674b825bdc4197297cee76064ed88f344a577 SHA512 2526041bc02a210e65bad31323a66167d79a37d14697cf4459054cc54715e53f9673b0000cefa6b452bbe3b3e6c25f0bafcf59d24323d210e2ce6782d9153f81
 DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
+DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468
 EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
 EBUILD nDPI-4.0-r1.ebuild 1425 BLAKE2B 5085e685f10038dad0b6f22f4e03cb933725f2dcdec5e011065ad1ad21413ef11fed9b82b2e6ff9d5ab142c9d15f6e9a558579c2503d7b21dab4459e9bebae4e SHA512 6eb175d07df79f2750721f3d4c5880bbdb6aa6106e052c4b5ecea2192a034e95c9f18543f36171992e67536bd0c482246eb12fd1e72c50c48f38b3e2a1e5d82f
 EBUILD nDPI-4.2.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
-EBUILD nDPI-9999.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
+EBUILD nDPI-4.4.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
+EBUILD nDPI-9999.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
 MISC metadata.xml 293 BLAKE2B 9a139bc75f89728980d35a12c076b25ba8d0f95a6ec0815646588d8f602f2cf6b19c5fbcf6d4eef08b9b7967197e34c7f337b55aa052ccd30ac1cb6d30ef3357 SHA512 32b7db90abc45b9550430d5696f292e16cc467243c289d721b92f1fbec771bbccad095a46de98997fbb16f916f85c801a1139ea90d10d48cb89c2285a7d10d63
diff --git a/net-libs/nDPI/nDPI-4.4.ebuild b/net-libs/nDPI/nDPI-4.4.ebuild
new file mode 100644
index 000000000000..e2efa26265f9
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ntop/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# "local" here means "local to the system", and hence means
+	# system copy, not the bundled one.
+	econf --with-local-libgcrypt
+}
+
+src_test() {
+	pushd tests || die
+
+	edo ./do.sh
+	edo ./do-unit.sh
+
+	popd || die
+}
+
+src_install() {
+	default
+
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index a7730e61c252..e2efa26265f9 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools edo
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
 HOMEPAGE="https://www.ntop.org/"
@@ -34,11 +34,17 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	# "local" here means "local to the system", and hence means
+	# system copy, not the bundled one.
+	econf --with-local-libgcrypt
+}
+
 src_test() {
 	pushd tests || die
 
-	./do.sh || die "Failed tests"
-	./do-unit.sh || die "Failed unit tests"
+	edo ./do.sh
+	edo ./do-unit.sh
 
 	popd || die
 }
diff --git a/net-libs/rpc2/Manifest b/net-libs/rpc2/Manifest
index 652cdeec54d5..a9725ce62882 100644
--- a/net-libs/rpc2/Manifest
+++ b/net-libs/rpc2/Manifest
@@ -1,3 +1,5 @@
+AUX rpc2-2.14-include.patch 177 BLAKE2B fea7e5cfdff26d17bc5ba4970cd44e8d6893585842c5565d00fe6580029f43b4859864286679800cb26526cbab5a63138ef777c357a28597f34d68be2c0cc7de SHA512 fa7ea580dfcec3411f0f10ec15f69e2c1943e8a8723284493f03fa82d4f44ceb483cb3211dd6ad385dcd73bb19de7bf265b2eb0e355367d2aac6b35bf6eb650f
+AUX rpc2-2.14-respect-flags.patch 468 BLAKE2B 627f5cda9e72b2fa695c41e36116e644cbd4598473722d5e1ee1c5403655610d085e1f2dd466a12d6cdd5145f44a23d2eb6ed4bbebd8e7305da3f0ca7d1d53aa SHA512 5d4c58ec9973e4b054aabc4e6ad48b97038ddbed2c1e4e117f903f3ffb05de59edd33d90004c4bb75d8402466399eddad47d61c4cdea9ddb7c2dcafbdcc84e83
 DIST rpc2-2.14.tar.xz 427144 BLAKE2B e0b2fb6d0eb8d1391b7049142cfea7d4e8d760e6c2d5d646c705b4efbfcd9ac7ea40168ca40e0c184e2b04f0b3a26afd19fb2f2bda4bd12b511d44962749f7ca SHA512 b8a1b87ee27d820cbe30e7d031ca36b5e07340e3795755672d3831109f844de9b3985deb371b52cd9cde0b023d59a8d9d6c73576afcf0af8034b29bf9f3602be
-EBUILD rpc2-2.14.ebuild 607 BLAKE2B 09a8d165ffa219c27411bd5bfaa36d26e5ad0925c428caa56f324263bd531302db022fe079c4cb475dcd10882488ff306a7953d6a6226e3f29cf922d82cfee9e SHA512 3078849916fc6f5057aae505085370659b81cdcbe0a5ef8025add9b911f99b4e9e7fac76046fc7d8208e99d8545e3d34e19355f8ec62821a2386a56357f58c6d
+EBUILD rpc2-2.14-r1.ebuild 588 BLAKE2B 9977303583335ee6f39b6b250d5bc7030bdcab6234fdb74dcad51285ee998f5f586332525d34b68fa690c17c71f6b233192e596db02a22bb916d7d71b50506cd SHA512 e7b7144dd3e4af874c1ed632765caa6318e9e95561e0f065a97518f91d599bc7f06eed9cd8861008e97b0db30feeb3bfa9ec07d671d4a8d3136c51fe24c794c6
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/rpc2/files/rpc2-2.14-include.patch b/net-libs/rpc2/files/rpc2-2.14-include.patch
new file mode 100644
index 000000000000..248604654427
--- /dev/null
+++ b/net-libs/rpc2/files/rpc2-2.14-include.patch
@@ -0,0 +1,10 @@
+--- a/rpc2-src/rpc2b.c
++++ b/rpc2-src/rpc2b.c
+@@ -42,6 +42,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
diff --git a/net-libs/rpc2/files/rpc2-2.14-respect-flags.patch b/net-libs/rpc2/files/rpc2-2.14-respect-flags.patch
new file mode 100644
index 000000000000..e93e08ab6a4c
--- /dev/null
+++ b/net-libs/rpc2/files/rpc2-2.14-respect-flags.patch
@@ -0,0 +1,21 @@
+--- a/rp2gen/Makefile.in
++++ b/rp2gen/Makefile.in
+@@ -198,7 +198,8 @@
+ CCDEPMODE = @CCDEPMODE@
+ 
+ # override any cross compilation target flags
+-CFLAGS = -Wall
++AM_CFLAGS = -Wall
++CFLAGS = @CFLAGS@
+ CONFIG_DATE = @CONFIG_DATE@
+ CP = @CP@
+ CPP = @CPP@
+@@ -225,7 +226,7 @@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = 
++LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
diff --git a/net-libs/rpc2/rpc2-2.14.ebuild b/net-libs/rpc2/rpc2-2.14-r1.ebuild
index 8a998507de08..6e2f4af36aa0 100644
--- a/net-libs/rpc2/rpc2-2.14.ebuild
+++ b/net-libs/rpc2/rpc2-2.14-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
 HOMEPAGE="http://www.coda.cs.cmu.edu/"
@@ -10,17 +10,17 @@ SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
-IUSE="static-libs"
 
 RDEPEND=">=sys-libs/lwp-2.5"
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-include.patch
+)
 
 src_install() {
 	default
-	dodoc README.ipv6
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 7845a6ddc1dc..9f19d97c8b1c 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -2,5 +2,5 @@ AUX 1.13.8-Fix-array-size.patch 1849 BLAKE2B 2d266e72f7ae03d02049d1328c7e8b814d0
 DIST sofia-sip-1.12.11.tar.gz 2927808 BLAKE2B 2723aef491b5f85c047cc54a191fdd2ae63b23445f24b6ee9910af88e2daa684eded6e44cee50c3a52bec2901b5310f34c09e7cf4efce714210755046ceaecd7 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c
 DIST sofia-sip-1.13.8.tar.gz 2551359 BLAKE2B 505d3cdac29b00589f63782c296b68f36ba9247ef87bcbda7b2765c0079aa2313ac72c0062ada5ba29e07faa892a991722c53468756ce8ef4cd385b90afda564 SHA512 f857eb9cf25d3306476bc6d0bda786385529021d498cf0c2c779cdbae31295af4ed59a67fb0c882b09bac738623d273a94ebbda360c7a2b3d7da140852ccc6fa
 EBUILD sofia-sip-1.12.11.ebuild 767 BLAKE2B 17a614a54d0c98e778beca5771ee39cfe17f954a5d68f1515b90c1550200adf20db6db976cbc90bfed896859d13d2bfb34b24571bf46c6695b4a9e1ccc7ee286 SHA512 d509b066bf4ffca99f6c5e99e3405dbac8a06cf5473f56a265f70d38113fedf631aa6ce145901bee307aa1fdb439650ce98b7790fd3c29c9d72fea2c3496cbf9
-EBUILD sofia-sip-1.13.8.ebuild 932 BLAKE2B fe7f30db30231b729c1c8609e9a00bd59c5636a7c738c75877662e04d875191ff4301997be4235cb7f1f8fd10f6713403e4968c775d4018db7ee30f700a8e0d1 SHA512 52744c3e2eed29f2a1ac7a8ac5cf4919d3630db494de36ba6442871e9cbdd8087bcdea1c2904f9bea4dd5805a58b02158b9d676b168de9f9591646348a5d19a4
+EBUILD sofia-sip-1.13.8.ebuild 930 BLAKE2B 231f16ec8a1c82dd036368a430302f68680b9f9f8df1a2a1f7ae82d641cd56ec319f14c701c123790c8b518a7ca109113e79691f6ee3c3fd932bfbd7a0919e2c SHA512 98f22412f67822091948e49c8b381f1e89113f2146f58c24152a28ab3d036ac96a05c1a4e0871afb70da09a83a7571888d1e6794de5caa7ad3758e7ecddf1954
 MISC metadata.xml 333 BLAKE2B c1affd2a0937b16cc617e0e0fe2ecfdd7fd11608e5884a51bbdf9ed8b6fb1f5db4c677ce1ba2cde8c5257e45fb16562fc49417bf36af8cba7731884864cb97f1 SHA512 f0f6ede0eeae3ec1c4cb5b76ace17f7c43640c22175938a2205c6c47e56304d3068665a08b4b247d6ac6af10da72b918b5192f1bc54a5d67a2e772cf8a46b9ed
diff --git a/net-libs/sofia-sip/sofia-sip-1.13.8.ebuild b/net-libs/sofia-sip/sofia-sip-1.13.8.ebuild
index 640a845a0cea..4b52032164f2 100644
--- a/net-libs/sofia-sip/sofia-sip-1.13.8.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.13.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freeswitch/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index 885d1cbf0eb1..617a5d1fb085 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,3 +1,5 @@
+AUX wandio-4.2.3_p1-fix-lz4-check.patch 418 BLAKE2B a728dc17df93a161d2bca3fe964f18a7aad073028794ce06a6dd316d60eec529e392e5c2d7e5e66ab3b6100d4f962b66cb21acb782bde49c3b35707b3909b2ef SHA512 ef8b4c659975a4562e720dfd6b2ad1ddb51086778b0f9100516e442df24cc4d45bfe413727d88619453f4972e8e60ce83fd126cb9f8eb5c5ab21364e51686606
 DIST wandio-4.2.3_p1.tar.gz 15418423 BLAKE2B 1274f10b87964e2dc87ed25a465991b1e4e9211b75fb5ac5a13a0aa535ff30ddfa69059b3d41de7dc758220bda8dd9d02ca7ed31b7c0ca2997641968cc729e48 SHA512 b4bfff9d33010c04826318c560592ee7f7aba9fccd0eba0f29c6294a636971bf4ac5105ffb9addfc22946e7b7234396dafa6c7e0a0d8de3ee1b7e586c069b438
 EBUILD wandio-4.2.3_p1-r1.ebuild 1075 BLAKE2B c2b0086b33f6e43826cfba1520bbae67b5b67dc34fb46c2e2d9c08d883d5365d74eea3e113a528bed9285885a97c366f13a624699a45c1c3fdf45fa5e2fa8cd5 SHA512 b3d777a31fab7bf88b76e8823fdaa3771cfd2387119421752ce0d12d0d6f9e6fb0fe99e45628372efde653f2bde962479e2b4f89d33657d547ee264b63a8d651
+EBUILD wandio-4.2.3_p1-r2.ebuild 1216 BLAKE2B 59373a72385eaba7bbc432cea4ed23243e85080fc8b50a3adbe590f01ed50158bbce6545c06b0aa69175f9c57b2b8b546a9366d4268fbcdf52f69ccc972f344b SHA512 cc87484f8b3e523a1b24f72e36ff77d0f23ad26bc5ce3f67ceb18b1a33b4cf2a5458004a74fe51f299429a9c940954878005dc1fcf34f1108feee75044a29a54
 MISC metadata.xml 413 BLAKE2B 928bdd9e84f02a894ce36b6db96f7b842736f79f77b9152f98af110c9b8f2fca60ae45e0860ed7e3fc6c035c469fc0baf1c115a96d776d1d8df5e645626a952c SHA512 27b9579f785dcf1717c606e771b9e492889a6d97b0be2904a505adb83460e8ceb322d9432fa3a72d2bf2232a9eacb528807cb4eec4b20f1ab68c85b0007b1523
diff --git a/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch b/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch
new file mode 100644
index 000000000000..db50cf1c0c04
--- /dev/null
+++ b/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch
@@ -0,0 +1,12 @@
+https://github.com/wanduow/wandio/pull/51
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,7 +260,7 @@ AC_ARG_WITH([lz4],
+ AS_IF([test "x$with_lz4" != "xno"],
+         [
+         AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
+-        ], [have_zstd=no])
++        ], [have_lz4f=no])
+ 
+ AS_IF([test "x$have_lz4f" = "xyes"], [
+         if test "$ac_cv_lib_lz4_code" != "none required"; then
diff --git a/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild b/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild
new file mode 100644
index 000000000000..d927232b4f66
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C library for simple and efficient file IO"
+HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
+SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo lz4 test zlib zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lzma lzo )"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	lz4? ( app-arch/lz4:= )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( app-arch/lzop )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.3_p1-fix-lz4-check.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with bzip2) \
+		$(use_with http) \
+		$(use_with lzma) \
+		$(use_with lzo) \
+		$(use_with lz4) \
+		$(use_with zlib) \
+		$(use_with zstd)
+}
+
+src_test() {
+	pushd test || die
+	"${BROOT}"/bin/bash do-basic-tests.sh || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 65323a42e5d9..4415c0e19c0c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
-DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
-EBUILD webkit-gtk-2.36.1.ebuild 7442 BLAKE2B e573bec3b57464a80aec549ad4759418d8a8a0f4ce812e510c8f17ca45bb760d41c0634c63c3973c328e7d4ce4275f01dfac4f77463d3170061f530f44ec0e26 SHA512 2acd23be1757f6e40f6be3e39d9bcc1c4a8ee885a4d621a2775d4ed6befc94d9755e7bd397300af0fc96177c4b3739740c3160532a747c384088013be30811ac
-EBUILD webkit-gtk-2.36.3.ebuild 7410 BLAKE2B eb95c068b7c42dbb49d031be9a7bf6a8635d5126a0052b2215cbc4e6c44192ab754627b006dedd2d85a637749eba96f33366075b9af2a5322e460b88a955d846 SHA512 684c6085cb9dfe377e0870292b6c31461c1a4a733aceff2637ffbaec21479b7a71091d570940005f2daa2f1253dd4908200ce4486188fa4895a2402f9aaf8663
+DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
+EBUILD webkit-gtk-2.36.3.ebuild 7409 BLAKE2B e2f941a57bb827f86ae95e98af0187b0a4a301402470165be293e03efd9cd96834866bf7c69eefe3369d26a7926afb6b5b46061362b166652dcf29e581f120c5 SHA512 3d6226815a55d0b67550c6a0a405f7f4442715c528ed653858b6152f61ac36db6c080e9eb44fc504d61830a84da56a265e6f6dd2abb38227d9ff752393bd2cc8
+EBUILD webkit-gtk-2.36.4.ebuild 7431 BLAKE2B 448433c468ab5cd2ed5d7f3e052f884096f68b467c1a715d7e76cd0bebb070360ea6f9b448de55d38ef4249809ff330e3dd84ed79fb0c60ff68453a1f0e7984c SHA512 94decf9608f83c87d3d46bcbbf06659089e3518325b36610c2ee42d172064a868b23e9f5a6aca9b0e6661b819238eae4e231e64c67b5541fdcb201fc2fa4d882
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 7cf7405ca3fc..32a324c88e1e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,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 avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
index bb28e81e3161..ac5ee1a431b0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 USE_RUBY="ruby27 ruby30 ruby31"
 
-inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -15,9 +15,9 @@ 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 avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 
 # gstreamer with opengl/gles2 needs egl
 REQUIRED_USE="
@@ -43,7 +43,7 @@ RDEPEND="
 	>=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=
+	media-libs/libjpeg-turbo:0=
 	>=net-libs/libsoup-2.54:2.4[introspection?]
 	>=dev-libs/libxml2-2.8.0:2
 	>=media-libs/libpng-1.4:0=
@@ -60,12 +60,12 @@ RDEPEND="
 	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?,X?]
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
 		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
 		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
 	)
 
 	X? (
@@ -107,6 +107,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
 	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
@@ -120,16 +121,11 @@ BDEPEND="
 	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
 #	)
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -211,7 +207,7 @@ src_configure() {
 		-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_GEOLOCATION=ON # Runtime optional (talks over dbus service)
 		-DENABLE_MINIBROWSER=$(usex examples)
 		-DENABLE_SPELLCHECK=$(usex spell)
 		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
@@ -248,3 +244,7 @@ src_configure() {
 
 	WK_USE_CCACHE=NO cmake_src_configure
 }
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /net-libs
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)