gentoo resync : 25.03.2022

28 files changed, 220 insertions, 40 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index b944764dacbd..699ddd200dcf 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 1cd1a3e8b62f..c1fa42aa2d9d 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,6 +1,6 @@
 AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
 DIST courier-authlib-0.71.3.tar.bz2 2208794 BLAKE2B 4b0f56f066368383d471dd8f46941f7b652a87be939ba6319cf99115991c03dd117d6bc246cc802fa7066ce5c75aaa102c59ae397948dd31ddbbb024059566ef SHA512 02c55ff1a91aac581942f8a4a01edd2bb8e2e1a07faf551d40a97583ce2f6eab12e850e3170df255c1e7680a34e418784ec14bb033825d6bac21192ae37ce55d
-EBUILD courier-authlib-0.71.0-r3.ebuild 4444 BLAKE2B 29edcd353d2d1a45c3404c6b83aba0545b0dfbc3ecb4a2bcdc3c780b1b243da6a2e4d9d19b46c015a5a4b1c0701b3ed49888bd6a2e642767071eae23951a8ae8 SHA512 880a8e090c1e00b727135823de254fedbe3994514f37ff530adc9ca3a68519ed38a874cb189cf62c4c59dd2740bbb4c4795762a002e6c8b3deab4be8f2a4b279
-EBUILD courier-authlib-0.71.3-r1.ebuild 4455 BLAKE2B 77c3e47af105ad0d11d13f77e5578464393d414b5ec3fb9fd173e865818ec1eb1a4bed9f469d9d1f0ef5812abb218acb003abe0c0e12467a75ceac3c3cb62d8f SHA512 0aba06a057f4de4f6e8ff6281aca56c391705f26fc060e1f5107bacded5a6b28a239524ce3cfcdda13ace5a1db66d793ac566a8943425f0dd8d707ce02af4494
+EBUILD courier-authlib-0.71.0-r4.ebuild 4446 BLAKE2B 9d0042f3e6c65a735532eb7b0b30223d01d49b7c6197ef88511f734d6b7af9b779c46761eea445420f6ac27ad254b0cf7eff850b99f1c5a69a855341d976a334 SHA512 8f708363dc3519931ae0854543b9060d0209181a5e01c65ea6d2d4f6024043ba7f66bd95815f75f4d9eb6d02e13a32385792461da5ca741553187f4de64ec054
+EBUILD courier-authlib-0.71.3-r2.ebuild 4457 BLAKE2B 54e9a672c2e6c97cdf8c8b411433cd109ea957f49c055d838141798c861b48ee5ae123f9cd92931cd0b5c24908395226ce66ea4e548e94b24d84586eb30820ba SHA512 832d5a1922ead2969ec026929aad0e4e159e65586cf3b472104774637903011ff89baab34dbd2ae1ce4db11551cef98fbf73639086f7aeb3b8942c09fb091110
 MISC metadata.xml 302 BLAKE2B f4a6bbc1e616a769172499ca1f863a8e43d608e25d2a99a6384fd0a0880e4e23f2c64c97404ad80ae12c3cd23eda5854ded0ed2c9000875c701aa22ff70b9e80 SHA512 3f25d55e6f6169b696d210cfbd7df486337885cd0905b62d307e6b3fd1595ac1471dccb59794ecfe0bbcd009339348ef7bb9debb4752533d1b28043cb5d1f918
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0-r4.ebuild
index 741f18b564d2..65762bfae119 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0-r4.ebuild
@@ -22,7 +22,7 @@ DEPEND="net-mail/mailbase
 	gdbm? ( sys-libs/gdbm:= )
 	!gdbm? ( sys-libs/db:= )
 	dev-libs/openssl:0=
-	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.3-r2.ebuild
index 2c57e1a9719b..45725d6e9a45 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.3-r2.ebuild
@@ -22,7 +22,7 @@ DEPEND="net-mail/mailbase
 	gdbm? ( sys-libs/gdbm:= )
 	!gdbm? ( sys-libs/db:= )
 	dev-libs/openssl:0=
-	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index f552d08f2a64..a6a3f8e6a7ab 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,5 @@
 DIST glib-networking-2.70.1.tar.xz 261312 BLAKE2B bd0fb33e1ad359b36f78c8003ceb15290a9403d978400573ec7caabc44851f83f080d651085b85f7a5836a39c12c499222d8f9ad5bde51e5b24f6344332be1f7 SHA512 a06b4df4481f95193f9ed4be6d39bbe9ecaf4de8e11a48750f7110d4cfa71aa56b7ec5b36af70b7128150447f1a39ce3aeadf71e2ac516f61708f1212f8f855d
+DIST glib-networking-2.72.0.tar.xz 265060 BLAKE2B 2ffb25b059db40fcf9b65b104cd50d81dda9482bc75031d62c10f70eaaa2e9fcfcdfb2b718253255a2565d7b6bc9ead2214167d1b5f482c0ddd3af8573dd2ef5 SHA512 2b42aebcf496f51604005f6f3243ed7e613ab3d485742b7d8af10e103b07eefd8931cc86c1cb021889fe1415ad98bf4d877a3f33203cb53688cc2c41373a8ce4
 EBUILD glib-networking-2.70.1.ebuild 1983 BLAKE2B dea87eb33410d28f6929d8b84babee64927c526afbe96f16e9d004389ee7527b8a2d773485c6077b1597b9df627beca6e3e722634ce42a2ecc9a87539d9ff2b1 SHA512 6767aad2c2bdf36daff61daeaa5f7c23a94af2c977e1d55e0191b00bc99fc857a2d5ac3e1b47d231f512671bad143047c39709c9e534982faaf4f1628e32a72a
+EBUILD glib-networking-2.72.0-r1.ebuild 2004 BLAKE2B 2db675d3a69088fed74b8d9d01af665c44ad6adc335146982c3c9d3f15deb3aa765a618ed40549cbd66f6890a00927ea8308cb7ab1a82515c43a747a1e4c1f7c SHA512 c03377913e9cf75ca45f8ad648316812477a217a8d089f6fc62fad451bd65462b1eccaa6d17a3eec15fbb3b386c3e4ece1053afb405f5c2432d23e8b08149fec
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
new file mode 100644
index 000000000000..845eea9072fe
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.72.0-r1.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 ~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/gnutls/Manifest b/net-libs/gnutls/Manifest
index 52e5f06f596f..3f89adbe8197 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,7 +2,8 @@ AUX gnutls-3.7.4-configure-compression.patch 2329 BLAKE2B f013a14ec2c7aba5cb44e2
 DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
 DIST gnutls-3.7.3.tar.xz 6119292 BLAKE2B 811e6fbb62fbd35fa63e66cfcbfc3bf899cea5cece1d2a68bc650f507df0f7be9f59c707c90fa19b7ef5a52455a663da49682704e0884af06075c566afbfc0bf SHA512 3ace744affe23e284342658d6d2d2de49dd50065489cbc8be18fc7d38187253e5268ca54027ce5cd517056c249ac039a7481e4548cec04325de37ae85617d077
 DIST gnutls-3.7.4.tar.xz 6131772 BLAKE2B 1c44528952275f48e4e458558c4e03c5b90dfb267482d6815f6c836f9530abb486a23ae5ea70ba2db7e272eee8e2066b259374f02a9bb9e714487466fd5994c9 SHA512 38b488ca1223d9aa8fc25756df08db6f29aaf76fb5816fdeaa14bd89fb431a2e1c495fefc64094f726337d5b89e198146ec7dc22e9a1bca6841a9d881b0d99e6
+DIST gnutls-3.7.4.tar.xz.sig 685 BLAKE2B ad485450abb916a229984f8f0d74fe7c46a0a87627f9d739f8121dccf36f4ca454007178f2a4e9bd5fffa2813363481bf80eaeee40f86e1b9c23b1f25dff7b4c SHA512 74b8badd67e215313583bd25c7b639207860af45d6f5cbcb81f1aaf46dacf0992b6d06876979594688e13dac5b8b27ba39935626374b4ddaa3e48118bbc2e7de
 EBUILD gnutls-3.7.2.ebuild 4235 BLAKE2B 262daac5098ec971880045c668f61e138a2838f3e5b2e18e150bc1917de96b768cbd2716b9585893aa96737f3def5e78c3925a11ca0bffc438ea0ea008b6b70a SHA512 1f5a728084f2bf7bd634a96243b279ca29c88bfd2c51bff13767f158e9168a9f84419eb1270edcd18de0479451e1e59723a329f141c9bf25f7b8cfe7693611f6
-EBUILD gnutls-3.7.3-r1.ebuild 3960 BLAKE2B 234b7fe6d1020cb46c470f44a581379bbb0f4b3b0226400c29c1ee8364247a7a3db1bb49ec4f888293b371eb74208d8a3bfd84242a8c9ea85a7afd4d4fca41aa SHA512 ac7f84c334d4117328013ea644717614f0b84d759cfdb7b9d901e6bf55fa46bf98b9b19231a224cdcf0747aa07b17925125dd7cd3bbc2d8e5fab23459da36c3f
-EBUILD gnutls-3.7.4.ebuild 5349 BLAKE2B 60b017a242fcfac1512d900215501afad2e22b735f4550e2e988742637495fb15e5b47d33e2c95f1e5b6fe3ac6285a768ac94a5b67327dc4ddee4c8b7bcfb903 SHA512 0892a8aeac860d98e2271fb5d8394faac57cbc01ea0f3edecd05212a1d3a6482b1f08794df5f379e35898ae8cc32a8abb5935b0acd43b1316601f06c781969e2
+EBUILD gnutls-3.7.3-r1.ebuild 3959 BLAKE2B 2dc901734e3731da1a8bb4b4ba114cadb57f407966f306428020aa2d10b1d1cf930ea79e3da9fa8cec64fc934e1a0ef2c0cf15b6bfbb7df0db3e8127fe8a11fd SHA512 9f1431238555a0722528fd25b3863472c29f50649378441ef447457da2f396fdca5862252a2c004725d631fa9904896e1a80a0027e184a4aa145282f9ac4046f
+EBUILD gnutls-3.7.4.ebuild 5040 BLAKE2B 11aedfc4a6fc9e51c2521e42a78ac54adb52a4d95d4d3f0620de82194e03c56f23e8959f1bcc63fd2973892bf5e91e5c04ab64cb89fe734b23ffd163c09bdf34 SHA512 481416e643c536d1febbc29294cad4f6eb0f098469c6086fb1006e98d29cb74b61ef7aa409e9414a7befcea8f9630828c52ee4ab77a5d72355eff791201240c6
 MISC metadata.xml 1369 BLAKE2B 586c5d851b4188a27db257e76ac6676e4f90b932e719f12be0d02c891cd943108a1747cfb572c56bad2489b8dbbe40c5ca6aa72d704e3d4445dad7419e0944ff SHA512 4bc3e4f0e896f75ef489922c9e3d7e43e485fa3b8498c5fe393c28f88c3754b116d5bdb152163cc987c28e168a3b5b9a7213990053e4ba9c80686f71aa655fc5
diff --git a/net-libs/gnutls/gnutls-3.7.3-r1.ebuild b/net-libs/gnutls/gnutls-3.7.3-r1.ebuild
index 5f98acdc7e4e..b8efb393ff71 100644
--- a/net-libs/gnutls/gnutls-3.7.3-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
diff --git a/net-libs/gnutls/gnutls-3.7.4.ebuild b/net-libs/gnutls/gnutls-3.7.4.ebuild
index da1e22472d7f..6eaf9997a965 100644
--- a/net-libs/gnutls/gnutls-3.7.4.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.4.ebuild
@@ -3,19 +3,13 @@
 
 EAPI=7
 
-# 3.7.4 has an additional signature from a non-listed maintainer on gnutls.org
-# and verify-sig.eclass dies on it. It does have a legitimate signature from
-# a listed maintainer though, it's just that the eclass dislikes an extra signature
-# from someone it doesn't recognise.
-# https://gitlab.com/gnutls/web-pages/-/issues/3
-#VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc
-
-inherit autotools multilib-minimal
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
 HOMEPAGE="https://www.gnutls.org/"
 SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-#SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
@@ -55,8 +49,8 @@ BDEPEND="
 		dev-libs/softhsm:2[-bindist(-)]
 		net-dialup/ppp
 		net-misc/socat
-	)"
-#	verify-sig? ( sec-keys/openpgp-keys-gnutls )"
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20220320 )"
 
 DOCS=( README.md doc/certtool.cfg )
 
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index 94d24ee8779e..d73509fb54d5 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,3 +1,3 @@
 DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
-EBUILD libdom-0.4.1-r1.ebuild 1136 BLAKE2B d3d15c3e3b55b3fde3474695bcf16503ecb6389496340dec419442d722e2f87a4eb41d6f2b44a7e1e42fba8835417fe95d8c134bab582c886fbb96eb14264cf2 SHA512 42b739e8c2e72bc99844f77a74bdc3518265ddd726dc3a5e74bb3c5cda2b327233e5fb13d768e0087475d605dced0fa6240074860765bd39630bc6df5fcf76f5
+EBUILD libdom-0.4.1-r1.ebuild 1143 BLAKE2B 42d9be4512739d1086e98c77ae425948fe85b89df420dbb92e41191a084f875dc6ca0ca4da90cf62f45f2527b2c8b96e29757c8b0c596ffe8a0cef85656415f1 SHA512 961057e38e7764bc66af87fbbaed52d1136169eedccba5c8fe104b0caf8035f8c86119f16a9330c3a8c88759646a91525dd15eb756345ccc3f2114c6094e9054
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild
index 7cc2bb687a41..4d56bfc61deb 100644
--- a/net-libs/libdom/libdom-0.4.1-r1.ebuild
+++ b/net-libs/libdom/libdom-0.4.1-r1.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="expat test xml"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index ff7f544a9be2..449592b9de31 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,5 +1,5 @@
 AUX libesmtp-1.1.0-fix-soname.patch 672 BLAKE2B 2bb9a535b94e444af19597f0ca0c06b07aca2c42e0b21510c27aec76c47fa70fa12e5b26656dc6a685b3ca95b40ba630dc93cd205f348224f4c7508ae6f4376d SHA512 881fe2a531f0f50baa449c3b9faa8c99ea4ce6d1bf3a82d5f5f7e8ca530233a5668f8a498390cd91769972420750dd73988db76c53acd4734ec45bb528b9b2af
 DIST libesmtp-1.1.0.tar.gz 169134 BLAKE2B 94ef87c65101557f6d60a6bcd7a8b0de638c24d46536ddf602da05c09858780b0a50f9fd8dae1e54a5e9a7826d45fa6da10bad751a9be50475a8f441c94ad455 SHA512 fc2a9d9922a1807cce8c8cee627ea8fd3a79c33f0987c5a487080b1a1659fd504bc45da2f919d30eced33ab3e950105383a46ecf3365493134adc1183eb99e53
 EBUILD libesmtp-1.1.0-r1.ebuild 1284 BLAKE2B a827b146d0f2207079c3b01bec67128355743ddfc32a7d49561d5e23a0248e158f087bc0bc52b635f7af542d0a7288f31e1db8fcfc5bd405abaa7026cc940826 SHA512 773e6587877a42412fbd4d6e55e866bec0c43c870f43a747254f35a4164f1475c6a5ea4d8b33cb0334ade03736093af8a5ee2839f4bf81135adcd73d05f06636
-EBUILD libesmtp-9999.ebuild 961 BLAKE2B bf1d5b91f7d31f016aa779b13821dc47af17a926c3457e6ea20455dfc6159654f455c648ca11375d0b38469fe5279bfdabdf04aa4ec398eecb386aa1f12ca7f2 SHA512 01375e20aa83e2f0732891d609c9b55df0b116d7a9b36a2e4a1022326aa75133890276faf13fba046369fa981d892f1891f2c02b5262f652f25d3b7985c57b2d
+EBUILD libesmtp-9999.ebuild 1241 BLAKE2B 7408afacb3eb3c73cc02f7ea5b3c4fae74e46eb4cce59fa5d3441c08a59989bbaa91acd32bebba99162668f3bd3a9d8c4a38970ebe0ffb89a7b26cd5e8194ed0 SHA512 94799222e77ba684fd347b80561c9381b304cec8d83fae4e4e27c27d2f7c7a0e1d4054e072ee5a9d876571a65825c1b8ab56934ae277153dd85747741b18668b
 MISC metadata.xml 250 BLAKE2B c156a03877b8e9096c64e5d031d532fe7b880c5cfd439312750f1206db620c660cbc6f85638af6b8210bac2beba0b70234b52ccfcc9a4a2783b5f3a875de7b4b SHA512 90930cf59b7f9e9ae7217acbd53f052c77f782db5f0164bac4b7fd7075cd067d3b3d1b33068292d09367d2b071f2e8ad5f4c0782be44e2538ce21b7715dc4606
diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-9999.ebuild
index c117af101c94..2701484ef986 100644
--- a/net-libs/libesmtp/libesmtp-9999.ebuild
+++ b/net-libs/libesmtp/libesmtp-9999.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=7
@@ -14,11 +14,16 @@ else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/libESMTP-${PV}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/7"
+# 0/7 was a snapshot before 1.1.0
+# The SONAME was fixed just before the 1.1.0 release was made
+# ... but a patch was needed to get it exactly right too
+# so, we're on 0/8 now, even though ABI compatibility actually remained
+# in terms of symbols with the original <1.1.0.
+SLOT="0/8"
 IUSE="ssl static-libs threads"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )"
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 007c967ba60c..442395cfe1e1 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,4 +1,4 @@
 AUX libhubbub-0.3.6-json-c.patch 1020 BLAKE2B ddeeec6a9dce9329b91fd09afd347663aaaf1bd3b5cae0ecbc96520d8e4f034e6f1a2b8d6caee19419f38ae8aca96f51baba64b072d8c8affdf8769b8cf9966a SHA512 33c8cae170757b5890d7168c8c2e7ceb013aedbb322eb8b57854264bd6e470472ad88a737ca360ef2eaa6d732f3f0ee9f6592def2b1803d83335ae47f02f5ad8
 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
-EBUILD libhubbub-0.3.7.ebuild 1206 BLAKE2B 011dd18bc170c5ca6a0cefc55143873edb274460a2744ae87b486e73bad11e2703ad963bf50e895bcbbfc5abbe43103261a0dd9dbeae4faa8bb758bd1ff46977 SHA512 b638f25b1057d6d645e8f54b7d3d57e122039aaca2cc271245b659cfb97b6625acc44d81816229f3ab7858129266911fa2d74b9cddf23638a4e1ad4e04348604
+EBUILD libhubbub-0.3.7.ebuild 1213 BLAKE2B 5d9ef2795e1c40cd3951fda3a9a01c9ee0a4d2e41b0b6bb18a63e92bf49d977b041233148c7693797c3cd6645bda8daa4f622a7131a1fc5dcd062e2c4cac5d39 SHA512 53f0eb984d3570d7c9720c4718792435498eb33d1fb5da39645f61218ad7155bcbf3603ebb8d588ca762b2aa71ef7b72384592827f272caa443c3f9c2886bfad
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
index f5f01b8ad5f4..b2416650628a 100644
--- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.7.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 38f6875f1779..0d9f5ffab8a3 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,3 +1,5 @@
 DIST libnetconf2-2.0.24.tar.gz 301111 BLAKE2B ffc4dffd797e4589a5892f3cf80d6a373808ee48c00e46a37ff02082c721c49b27aa06962e962698d3b443e08e9cba55b4205cc6e76958df325c6fc5a38fed22 SHA512 05cba691bc47e49abf747a36a6dcc978a4163fd155a90609315585201e4e4d20c9a30b683180f5cf03aac5b6a37933917e61a895067dd172b8de2142ec542dfc
+DIST libnetconf2-2.1.7.tar.gz 302011 BLAKE2B b83faebb8d04d9ecaa0bc3aa1fed1bc3b94388d1a6dbc8d3e8c2ff2bb73dc57a460eaf9cc7bf2d07a8e09ef612826417990d8c70bab9c58f9cb71b53766b035b SHA512 fd46a3c31a062324e6c9f2d66006ba8cd852ccb389bf8749d1d0d085b880409e1e373d1d1f2d79c1d88f5eaa72d56195889c07863d0eab1607da89484e21b86f
 EBUILD libnetconf2-2.0.24.ebuild 895 BLAKE2B 67e1df91c44ff3ad36b9c53fda85de8cf86701e197a80251afba35b227d9bc4ccc76a0c2582281a619a0d3b24632cf1bf3a203eaab31f035709fa65d10f26d41 SHA512 54776987e709ebd7950047d26a53f5810945b182a5d32c411a4db26781d2ccae464348476d8bc4b7932052303db5b85406d35c6a5530bf598ef47e5421f19a2b
+EBUILD libnetconf2-2.1.7.ebuild 900 BLAKE2B 234b512698239554d6ba5b34f75537c11e8cbe2b162de1b19a1ebba7e8641e3f27c7134486a93066ae4a2586cf015dcd2957c6b4a9d69c8d547e1fc72a063fba SHA512 64d582f20cf356e20c196967d15659a9aac8b065a915f87796705ca29064d1fa15f7f25e1400f8c6bcb26587c118a613f3a69a0d8f9b7d4ef58e4d219247e8e6
 MISC metadata.xml 331 BLAKE2B cdf31d4cc5f23689277be613336e351a92be7cc1ac1aeafb1e52fa88985f1fcb9d6b71de3ee149b0b0269f9660ec357d83d7ae4b18355a1121bf3d38b957f7e9 SHA512 33da7a046f20febb4e756f73dad37dd66ba07b7da865f07ee72b08026be7f81a026960ec7d4abe558a33ffd162806456454da89733944d974cc7132555176b16
diff --git a/net-libs/libnetconf2/libnetconf2-2.1.7.ebuild b/net-libs/libnetconf2/libnetconf2-2.1.7.ebuild
new file mode 100644
index 000000000000..b37d8f46bccb
--- /dev/null
+++ b/net-libs/libnetconf2/libnetconf2-2.1.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2022 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.164
+	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/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index f51d6c152060..a1850701034c 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,5 +1,5 @@
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.27.ebuild 1302 BLAKE2B fc4f5897de7896f328bfd2e14c422f84cedb50713d4ab92245758f8cba71f781f72298644774495bf1b9cfb25b8c28bdf30a7d16d86a8b25b2b42fb3c4fb3191 SHA512 2dfe7a494ccebfba195810b6ca9519209bac16d1ad3c55aab9e92836b6ec0a5a8ed3b1b3ed9ee4c4c7cd15fae4c6acaf78e01f1ce2f1a4a80e191c39ca91184c
+EBUILD libnfsidmap-0.27-r1.ebuild 1304 BLAKE2B 215ba5ef4d7c641960fd7959ea66b72324917e5d21d8b7141c763162d36be9dee2cddfd9b041522d5649cc2bd7fce1ef7447acecd5c5c2ac6d7ed6698444339c SHA512 eadd5cbb6028851d9cdde2021a7f81d18069bea21313938e2bbc99081ee73535be409812baf7001fbd67908618a9eef7ee351b22cb83d1bd9158bb67fdb1b67f
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27-r1.ebuild
index e93e96fb27fb..2d736e7faf37 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27-r1.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=6
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ldap static-libs"
 
-DEPEND="ldap? ( net-nds/openldap )"
+DEPEND="ldap? ( net-nds/openldap:= )"
 RDEPEND="
 	${DEPEND}
 	!<net-fs/nfs-utils-1.2.2
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 25ed283cf3e0..0d4f6e6542c2 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
-EBUILD libpsl-0.21.0.ebuild 1481 BLAKE2B b25bad445cd8b81f56a10867f57c9aea656099136191e959a11d89af9639948323b3008a4b70e63482188b35a0b9f003eb67f5724b74f645076fdb4a15ed92a5 SHA512 bf5d0b5d0318a349eba6570117390ad0dd054859ff74cbbcdc56c6588802d7c0de1b4ddada5eaca005f197defae2845d4e1b3fe19b32332b5f61ebbea0d8d08b
-EBUILD libpsl-0.21.1.ebuild 1502 BLAKE2B 0e118ce4df0bd8717d5fe18bc8057319edac0edc4029f7bbd8fa7a3f9ae2f88840c5430379a51c1958801002ca8e7588947bfd6a6f78a2ccd722b833fc0675f1 SHA512 8e766ca3a310fd8df15958a32513472ecb8ca12c365ce3480690f339667110c39f4e82f596fd6a7ba378cb951cb5d2dd889a3f6693aa620b1cac6be018c57dfa
+EBUILD libpsl-0.21.0.ebuild 1482 BLAKE2B 5b31899b18c634047d32b55d82fe2e0f7c78318492aef52af159bbd4db5c1a7a8fa505cf2fe0f28d4b4d2dc53b4e24cac4b90f09b873c0606b00140efdb31cc2 SHA512 e514bd98166aa2be3a15a92392346e0552f6ce380dfcff131a757cde1e53f010911fe9786bd9ee718093a81ddd77e3094bca45bedf1e2fb7cb1da446a38f1d4f
+EBUILD libpsl-0.21.1.ebuild 1503 BLAKE2B 07c8f2e680fe3d5c45531dccdcdc3b91a372a558fbf46a78989c9133153b6a516e4293ba2913deb20d59a9660e3abcad7b13faf935f48279682fa82951b0dbc8 SHA512 07ffa35ea9ffb7ece7bdfd01e32564350bc0e2d771331e21a256d0ac10fc70308f83d59001b18a456e9767984fcd6dec499fd174c8c8dd865945ba78399326db
 MISC metadata.xml 344 BLAKE2B 3c8f92722db6f51476a4317fbfd47614782d3f999232df6c777a722195204ecb4b805b45789a54475a9f4941c7ea0c003599b2aa99b0cfce6423d77ebba24cff SHA512 5ee4a6da960951ec9ce6b22ee9f9fc2c3182d5775434fe9268ea712312032cb60d8f512ad45ec8170b868db8636c734dabaaec26fdacea15b85ff6534bb0485d
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 33ab42070c4a..9f62b4a5210b 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
index 3af43132fb4f..a64f5cc0f2d7 100644
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 42c12c25b780..4ed3d7ef7ce7 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,3 +1,5 @@
 DIST libyang-2.0.112.tar.gz 1075308 BLAKE2B 13c5dee1817f93ec24580d24cfc5d1c066de54dec3d1de60e6f7d67caad527b13e40864301d5e5086b3d92b8769e200674168dd874bc2c786bd5101ec3aa958f SHA512 5da463b86656b9fc944925777a488b3306ef1a1e7efdaf4af677960a04b5544605126bb7e0441e55686b80f97fca70fe86605d0e7c64f634b4297dcc7bd779db
+DIST libyang-2.0.164.tar.gz 1120619 BLAKE2B 7b9fc93ae4c7d42c3d818a26448bf1f7fc8df21634668f46e14256d094997ef22f74ae5e8f46807692e1bab176dd14d9d3036712013bf83716f6069664a74436 SHA512 016e450110e968665195bec692ef1eca6889636de79bd873f74cddde6a58859ac1df4d1fb2bc3024ff05d82ff4c2b0f4eb8df06ddfd4b04d3a0c5f5fed44af65
 EBUILD libyang-2.0.112.ebuild 883 BLAKE2B f26028913b1bb89fda2ca0567aea4e66cd89d4a0b77c4e17e9869fa0a11507ea97fa3834cacf5e8c8fac481e1d920ce91937488d3897f59d5252f53803d58db3 SHA512 286e32444fcc60b86871662b3adf6ce1a2a8fdbdeff899740badf190ccb11d7a0ff26339837b463dd7c9a27c86b7a4a35cd6632ba227e5f874d1ca91bbd57855
+EBUILD libyang-2.0.164.ebuild 890 BLAKE2B f265e91ad35d249e917dc5e307556ab12cd9c3eb87ad04671f354fed8923ca4a6fbd768644eafcc56c12eaa2e10921da7e9c0c4eb61664682c57e60005e01a0c SHA512 9e586ebc7e1bc84f4d64c5b9e6e01def7782536675223a951265d81767dcc490c0ef6541edae87accd7adf735900123f704715aa109bebde6ce20164ffa8c8c9
 MISC metadata.xml 435 BLAKE2B 23ee5c217c07799c169828436f3abe2100418ce870a9a2a523b6571d4f789ba5c56b4b74c48d3ce3e9db035efbc7692d5a3eae2dcb6732f6677c81e11122334e SHA512 63ff1dedf5aed1463b90733271f0d623233bd371d19126944b92cea27795f3753a93c2ad328a817bb6f7b9360f20cb838b2518cd156b95151a1a73d6b3478042
diff --git a/net-libs/libyang/libyang-2.0.164.ebuild b/net-libs/libyang/libyang-2.0.164.ebuild
new file mode 100644
index 000000000000..4f71c69760dd
--- /dev/null
+++ b/net-libs/libyang/libyang-2.0.164.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 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/signond/Manifest b/net-libs/signond/Manifest
index d98961798d70..956c4bd9455a 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -6,5 +6,5 @@ AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d
 DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
 DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72
 EBUILD signond-8.60-r2.ebuild 1801 BLAKE2B c819c6ad7dbe0242da49a20bb584f48558a76db6366e420999aa902cbfc490c884bf11b9b543e322494d141f9d6cdcc401f9349dda12c3c6294d7da74b7d3a35 SHA512 d83dc62835f6266e82895bc0702e7b74eb81e0a1f355d23b28fdc756f2bebb03e43a6c6aa486a3965dd11e4e4e6ff91e5b3a76d549cbafce6a10027a8b312fb1
-EBUILD signond-8.61.ebuild 1728 BLAKE2B 23f5d565dde55e23a2ee19335ad35b041ac961d090aab07b7fab7386c322fcf8c59e8cb2a670a61a4e3e49fbf850b20c47a8379641e8197cb68bc86f4b9d7fda SHA512 0210b5666b087a1a47c8f2db9bb40b6ecf2ed3a8b3e18b8995e3e96fa90ef6ce444192d4e25d791099170a06f9005f835ddc573319ccef3b722a2b84152a298a
+EBUILD signond-8.61.ebuild 1733 BLAKE2B 14c613c8518e43e31353a7021040fa497f8548d5832caa175cb71cb1abc46d32a8de8416e09c383fdadd68477c31b76392cc3b333959d7e5a9974cbb17e862b1 SHA512 237a1cee6ede8d8746a48d4e91d1e177b537fff5d67c44d0eab3f35fe3105b7d6ce4bf41a3b4f945929996bd93654ad063b3f58f8e0b814aa0c4e0c2bab2c5ea
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/signond/signond-8.61.ebuild b/net-libs/signond/signond-8.61.ebuild
index 44b186d433e8..7e9ebaa7005b 100644
--- a/net-libs/signond/signond-8.61.ebuild
+++ b/net-libs/signond/signond-8.61.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-8.60-buildsystem.patch"
diff --git a/net-libs/udns/Manifest b/net-libs/udns/Manifest
index d48cd6915039..80cddafd1c25 100644
--- a/net-libs/udns/Manifest
+++ b/net-libs/udns/Manifest
@@ -1,3 +1,3 @@
 DIST udns-0.4.tar.gz 84716 BLAKE2B df41b325ae2ffaaaf09e1bb6f52d9e9a7c468c70d8bec849cb90ebcb1fac773ee2dc7e37125a75750b61a1a78d0416e6c9aeb72e43780b474d36e370a1b9cd8d SHA512 2990d57b3b6bf176a12ee07fd4391921e13634fc8409e8ce4df8dbe7b3556a116ae59ab328a1b6a95ebc94298f6b56ec7197a06a649d8d642b371b8ecef3e40b
-EBUILD udns-0.4.ebuild 893 BLAKE2B 7b67c92518e41801f16b9fe6b7e35e631dd57470ff990dc096c34e78a73561abfd0f8165e32a0f18763c393648f2b74a05a1b402819ec6efa6aeba5a03ef4a9a SHA512 8764faf2b5833b088da391a77d1cc9cb2a333914b4a3a4e301f728a275a7e5c8e9ff80734eb5f70bf8fe5359faa0aee198351dab0c5b2b802564a80355a834fd
+EBUILD udns-0.4.ebuild 895 BLAKE2B 2768f20b20dc0212a5410dcfe8b5ac9544af5df8ce6afaa6877c446654d558b540f9bde0a10f43c389d8199429bcc9acfea4880ebef703cd4bf2c585cb5567bc SHA512 0c4a6302726e6f0ec1392a2e50f1e1866fb0b3f0ebf3b91f49147e1b376d1c5d1ba2f6e6137779c3fe4a59f77e122aa2a11cafc3b954ec809ed448f12dfed253
 MISC metadata.xml 410 BLAKE2B 1e21502a7b8c033b1a659a3cd235069d51a50531ed37c2873f610df9131723764971b3886f59ba4c212685db3fef6a8df17681942f011bd905ff4d07c83a7c49 SHA512 073730684153f02c08348567177e5e048ab93441ea3429ff40f15e32ee555e7a30476c19566b55cf86da835fcd479cc7f408bc95ef371d66cb4e7e8408b5cc04
diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4.ebuild
index 0953628925ed..da981b2165e9 100644
--- a/net-libs/udns/udns-0.4.ebuild
+++ b/net-libs/udns/udns-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="ipv6 static +tools"
 
 src_configure() {
 	# Uses non-standard configure script, econf doesn't work
-	CC=$(tc-getCC) ./configure $(use_enable ipv6) || die "Configure failed"
+	CC="$(tc-getCC)" ./configure $(use_enable ipv6) || die "Configure failed"
 }
 
 src_compile() {