16 files changed, 122 insertions, 49 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 07188e19b00c..9b153db8ce07 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 70176f88a008..5001cfa0b914 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,5 +1,5 @@
 DIST c-ares-1.17.2.tar.gz 1538276 BLAKE2B c6f5ad65ca75f8467b624daf3caaee2f35d6e4714ce46ebe1bbf79447feecf8615915b00fa5e7bd1e97c6232864e06c53a792fbadf36a5399883529769273e24 SHA512 f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8
 DIST c-ares-1.18.1.tar.gz 1560165 BLAKE2B c03a572726c6bbb24a3e4773673d0c87f4833bb9582aed57a424eea8c965beb6e232f502b61922b124d37403d91ebfefe0db7373673fc22e0d752c4e5036eb07 SHA512 1276ec0799916019f8c0af6b55a139701bd15e0ca4a00811d07963893978bc96c107b980f0fd49f81aa70bc8b3b8cd671195ba357c390772d4c2c5643c50c5a5
 EBUILD c-ares-1.17.2.ebuild 1636 BLAKE2B 957cfedf11d1622afaa924dd10610aa2dc3c59f654a19da07fa98d31213f074ab97936543980bd6c3dd2f72b5145c79fe85e08ec1b77eda4c7324dcdfd840365 SHA512 f87322f2a0291633b3d4b7aa99f9d0b66ada23033a5bfe955b34438693c5408dcfb25722c6cfde0657aeff4080c4e8ff0a76e9db9a0423d8206a38d36ece1782
-EBUILD c-ares-1.18.1.ebuild 1644 BLAKE2B 413930a00c2c7ce9d80db3477572a2dc0d7bbfba31cfc42ef49fb027c7a5d135aef152a318593fb14154fce76820a961fbbddbf913b8d608d401f865f92a88d4 SHA512 97af9246f9a499ddecbeafed86c23c3b0abff06390bf28d92577cc296d755cad9b9ea47cdafb2f4df0034798023ac3302747ce0fe93b658d0e791e7a642301bf
+EBUILD c-ares-1.18.1.ebuild 1651 BLAKE2B 256d55ce1984e99541ca9bcbd9d5bf1e641183e6893f64e96f73d921eddce5ad34fadd179e4774f3f5e97c45e820e4d16d5da7b1d5692fe21086d335baf6fce9 SHA512 7a40210fcb1eabe359ae4cfab937643710a4eba49941223698cda79de7052ae289ccbcbc8c57f950f5872324e183775fc15e8f73a91e0c0ee29d20c7a98020aa
 MISC metadata.xml 340 BLAKE2B 9193fb644d2dc9bd9e81cdbbc9f8f7617a99a2c6bfcbd4f61a08b2ecec349f9cdd572a5fe55e1704744e4b17a2e81cd49ee46838cef22856f25012b35714ffb6 SHA512 1d6b287e44ac9e60db23b074af2f8cf7894133138e28c15ae300b37f0ceedf4d57b604a1d05f711f46d9db7b6519a597a00b725f8bf151d386bf5670b42bbf4e
diff --git a/net-dns/c-ares/c-ares-1.18.1.ebuild b/net-dns/c-ares/c-ares-1.18.1.ebuild
index ba4436c724a9..a344ab8ed3e2 100644
--- a/net-dns/c-ares/c-ares-1.18.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.18.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 # Subslot = SONAME of libcares.so.2
 SLOT="0/2"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 71b71f98e51b..ea98e84ee9c7 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -6,8 +6,10 @@ DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204f
 DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577c32a0e5d5024fb372180d2bdd4ff0c82546142f6c2c01904bdd15407f0a39dc1d658e04e171cffe386cfc1e943d SHA512 f6a1676c431d5622af075bc184c9f82b4ea0bb40ec84797a8fe835804f91bc0a93a745495f193bb52f3a5204ec0e98ed41bc206c997d1f5b13e872bb31747b0f
 DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90
 DIST dnsdist-1.7.0.tar.bz2 1392585 BLAKE2B 3766da5f63df6390f555307d665efcbb2ad1462abae3af44503479d4c6ae6453e43527d2bcac718fabeb8b60ec989f264860532b480c465afc440405f9efac74 SHA512 abaed7aaa18f4acaf220dc938da6896e521373b1da3b6b9c4114467dd5d8b0e6cd9809534edbc6ba5b789ed8387fb47317c47bd4e00e66a6ccb035f6dd6068af
+DIST dnsdist-1.7.1.tar.bz2 1392179 BLAKE2B 48189da6bceb1723b19bab7c42ec8cd834f3ef6d822b5da23fe2f4e02ec825d1566bce472f522fa9ac0b027d36f3089ce7c0c7eb1c7e1161c050dc50305dfdb6 SHA512 eee44a9994c6cab84977cad58539ca59882149d6898dfeed9e4190f06ddbc280b836bf426d22e6980d8acae1437290bddcc5166af165b6eb48c77c669281a310
 EBUILD dnsdist-1.5.1-r100.ebuild 2294 BLAKE2B f8e88f0caba126be55c3ad6524be37321da60dba6f50e0cc07be0a70eb5897f35f361090fb1319ed2c08dd7fc38684d12c517ba782deeb3b54c8585d11f77dd9 SHA512 d65e938918fbd2b35a807d48cbe8466a2c6c705b3b18147bd4a79e77f7fd4775835c1ce8b05feaa7f7d4c24e92338a44197e2902db5b39b8451a518689749268
 EBUILD dnsdist-1.6.0.ebuild 2269 BLAKE2B 1a23ebd28849897dd3d62a312be60222da8b9048cb32ad21214b726b24fffa4bd43c4bc104fa4f367b4e07af51933b3c0c885f03e163f90a459ca91524aaf35d SHA512 8466bc936352defae74c6a9d4f19c970399b251b0eeb3f0fd59f3e2e922f88576be257006ff9e69c54a19d1aaa64ac2498ad2ad7c8329eedbfd4e382345929de
 EBUILD dnsdist-1.6.1.ebuild 2201 BLAKE2B 6cc3f47e8790d6a3f657b6bacb0bcd61a850f5f4fdb6fe87222a83e3a7081c1d6ccf514e4bca62cfe4ec5f240f53ba32494d88ab40038c00f26be861908b63ae SHA512 78b30965e4e89cfd241a83f40c9379d3093df0caabf75d6d0d78b8f72ef0e8882b76744f7c6ff9bc6bba4194a8ac501ba2ae38893ce898ae2771707e03e86fd1
 EBUILD dnsdist-1.7.0.ebuild 2219 BLAKE2B 3d5465d75769c886068ee6b75cb313d6fa0fe8170724548ce4a7f52fba3d667320e4fb5d963f6874bade766da5c83644b63a8bd7f82b60ea15d98bc56aa54814 SHA512 da8c63a23c564393a661dbe20740304b1c48eb5f26139d03c03ef52953ef9f3f2c345686a27db1f2e14a411de9e8a606103770cbd9b1dd3f492c6d9a9e447eb9
+EBUILD dnsdist-1.7.1.ebuild 2206 BLAKE2B 14eb16aa3933a861549d40e932aa82cec012a59e595aa1691bd466a61b073edc0c7697eb904feb89841e0083a66a489082df7908870ce8f9c4dac9ec5d618012 SHA512 5a1b4fcfc4991cb37dcdf0dc44032b2d1886cb78c869fd265a0e9a33b2c73dcea7ab69483171fd82ed54e6cf467ae0ba35c3625b3fee8935e864c6505bd6b48c
 MISC metadata.xml 1131 BLAKE2B 6e5955ebbb27298cc8e1be2afdec0a04cd29c99196586937c0fb518f0bfaf87d0a0cd369bd4fcb3c6815cd4fb7fad306b1c9982fb85df7f36d2f6220355a74e7 SHA512 3cca5ac1fa28c0efa56372a58271c6f8cb491e47dc16926e786b4174edfc14116ee0ea83e338f82fd01e58222e998e1d105e37763f4d7c1c4a8313503d7da085
diff --git a/net-dns/dnsdist/dnsdist-1.7.1.ebuild b/net-dns/dnsdist/dnsdist-1.7.1.ebuild
new file mode 100644
index 000000000000..0a7f9c72b105
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.7.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+		dnscrypt? ( ssl )
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	>=dev-libs/boost-1.35:=
+	dev-libs/libedit:=
+	>=dev-libs/protobuf-3:=
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
+	regex? ( dev-libs/re2:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
+	${LUA_DEPS}
+	net-libs/nghttp2
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		--with-lua="${ELUA}" \
+		$(use_enable doh dns-over-https) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
+		$(use_with regex re2) \
+		$(use_with snmp net-snmp) \
+		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
+		$(use_enable systemd) \
+		$(use_enable test unit-tests)
+		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+			-i "${S}/configure"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 3eb755c34520..0c5d33bf2cd9 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,10 +1,10 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
-DIST knot-3.1.3.tar.xz 1407576 BLAKE2B 03cde89e32ac2440e721157db1af9b9cbb40ad2d8d813b0d8bc26fe1feb28f59055a3cbe287d50adb13f5190ce3ed532521189997d03b4fe9e4264f309032e23 SHA512 537013e914c3f00615a384c92da06c40bb33871e7dbd28e987280d62d91df42026774cfe0596ac72a218dafa650d8d600b1d831dd0a5c28a9fd796c5cd799838
 DIST knot-3.1.4.tar.xz 1408656 BLAKE2B 637371e5cc9aa0b880fda96d1d61f9e168cc96c244551b17381a1641a8b6ace7cac7ac6b7cf40fb2e86ac8f606be8d1342e548e5cadd64770610b2a5aa35f1f0 SHA512 307667a12b989fee443832d4642fc927231f38f0331439c8c7196c489d196245eca368d96a36fe49639b773f652f7cb80bf0c16bc1ad107e11b47b70e1f04060
 DIST knot-3.1.5.tar.xz 1414500 BLAKE2B c05fcd9e99d4c7dba03ad9fd9a1131ca4c2556d4911640ef929e68d4caea26ae69ddc61fa19f8c3c4f29efcd0c4c2e47593e86a0ac1826cc96c25f2fe4145bab SHA512 3a8cf04a2d65e04343a70009d43796ae00bf09e34348119b55ba70dac7deb7ff42906d88ef0e413d33dec28a952396a51781dee96727c0c2047b4c5ade54e6fa
-EBUILD knot-3.1.3.ebuild 1960 BLAKE2B ddc73a188149520aa83f0f4ab09e2530d970a75a3ad43fca967f641dd584d6c2b5c9bc054a959a9117ad243ff5f8f1986f2a39b23aec7172b5f05ce19f8bcaba SHA512 f5ff45b173fea526541effe6be9a75fe3b9963c088e5ef220bd8195063e024c564e551f6a24bcdad5c96bd784fab97ff5c76793ba062f83b6adfac0c859543f4
-EBUILD knot-3.1.4.ebuild 1960 BLAKE2B ddc73a188149520aa83f0f4ab09e2530d970a75a3ad43fca967f641dd584d6c2b5c9bc054a959a9117ad243ff5f8f1986f2a39b23aec7172b5f05ce19f8bcaba SHA512 f5ff45b173fea526541effe6be9a75fe3b9963c088e5ef220bd8195063e024c564e551f6a24bcdad5c96bd784fab97ff5c76793ba062f83b6adfac0c859543f4
-EBUILD knot-3.1.5.ebuild 1960 BLAKE2B ddc73a188149520aa83f0f4ab09e2530d970a75a3ad43fca967f641dd584d6c2b5c9bc054a959a9117ad243ff5f8f1986f2a39b23aec7172b5f05ce19f8bcaba SHA512 f5ff45b173fea526541effe6be9a75fe3b9963c088e5ef220bd8195063e024c564e551f6a24bcdad5c96bd784fab97ff5c76793ba062f83b6adfac0c859543f4
-MISC metadata.xml 1708 BLAKE2B ff4a36469ebff05b5cceb5c07b1aa7d2d2a81850e7f091dd74db3ee4566a54cd8928190800df21952bc21afc4bc4de6c4a36dcdb807e489a36588a27c6e9fa20 SHA512 50f3a9709a5e38e0968a2daf78f5799ea73d4f424375e8a3e03150b0d38f6cf5e2e35bca629256c1f48b03ab70eb270408f811880484761fa4fa2fc2b10b2e68
+DIST knot-3.1.7.tar.xz 1418944 BLAKE2B d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047 SHA512 4b6982e8b44addbc77f42d0a1c435dd257cc8a8f112677c371d16063ee8e769b646a6425d54ef338cd21555f276d8d6f4faad2da2f24bf92437ce4af9ff1fb44
+EBUILD knot-3.1.4.ebuild 1984 BLAKE2B 2340cbb90adb417e89119ce6b62d18452a6147cf74b5f8e873ce730b696bdd1fd5ddc55aa82bf6aeb88f2b442390374d021eab270f5d9177bca3a87a166e7da3 SHA512 972d8d2925300b5c54bb256f86d5cf8173bf45f4398ec207d931c5d78520068f8e86298491582fc9ac88b4bd4e5e5f4529db71263527910638a330a8255fd3ca
+EBUILD knot-3.1.5.ebuild 1982 BLAKE2B 4ed81ba340aa7aaf970b60efbf443c3ed13664ec2cba99678620afe76c0947b9f720460641e6f1ed2e190d3a100b25dfb2d32819e75537256e922df760b89d0f SHA512 7631d193f56ce90ea8fe5f793a300f8b8efd8cecf0b21a835be60906a0ad34342333911b9bd4c20d24ccc5fb04e900a61970d7fd15446883f8745233703e9658
+EBUILD knot-3.1.7.ebuild 2125 BLAKE2B fab1938925de8da6870ce8821593a66985de36650618575fe4367eb3d1e801fc5e7011796abcfcba3c87e8a87d629c75fd7f3afa2cb69387fc5b9711e8a7c824 SHA512 0a216dbca834d16cdf5a1d6b316e223ab920f9362facb5310f3f7c7c08bbc27de5f2db63705329acefd9063e33943d6eb295b4a822a77ca1523e27d4bc268b76
+MISC metadata.xml 1843 BLAKE2B c65bcd213f52e20388fd3ba6733ee9ae62c563b0d0ac6f58deb015d64355c2c90647d5b0b03c7ac5978caeb418da1a55f2e98125fe7fd5a20469e3351968bd1c SHA512 eb6c2a1252155c0a8fc21f1f24434a84de01e81a7b0e8f583c80f50ed198e57ddbc19aca33138771dd4c6bec133a3b19a5a95a7eb161e7f17f02cdc63fd62245
diff --git a/net-dns/knot/knot-3.1.4.ebuild b/net-dns/knot/knot-3.1.4.ebuild
index 4b7058faa52a..f94f823b4198 100644
--- a/net-dns/knot/knot-3.1.4.ebuild
+++ b/net-dns/knot/knot-3.1.4.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
@@ -103,4 +103,6 @@ src_install() {
 	fi
 
 	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/knot
 }
diff --git a/net-dns/knot/knot-3.1.5.ebuild b/net-dns/knot/knot-3.1.5.ebuild
index 4b7058faa52a..2e9df0831f3f 100644
--- a/net-dns/knot/knot-3.1.5.ebuild
+++ b/net-dns/knot/knot-3.1.5.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
@@ -11,7 +11,7 @@ SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 KNOT_MODULES=(
 	"+cookies"
@@ -103,4 +103,6 @@ src_install() {
 	fi
 
 	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/knot
 }
diff --git a/net-dns/knot/knot-3.1.3.ebuild b/net-dns/knot/knot-3.1.7.ebuild
index 4b7058faa52a..307ad4216af5 100644
--- a/net-dns/knot/knot-3.1.3.ebuild
+++ b/net-dns/knot/knot-3.1.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=8
@@ -26,7 +26,7 @@ KNOT_MODULES=(
 	"+synthrecord"
 	"+whoami"
 )
-IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+IUSE="doc caps doh +fastparser idn +libidn2 systemd +utils xdp ${KNOT_MODULES[@]}"
 
 RDEPEND="
 	acct-group/knot
@@ -34,19 +34,24 @@ RDEPEND="
 	dev-db/lmdb
 	dev-libs/libedit
 	dev-libs/userspace-rcu:=
-	dev-python/lmdb
+	dev-python/lmdb:=
 	net-libs/gnutls:=
 	caps? ( sys-libs/libcap-ng )
 	dnstap? (
 		dev-libs/fstrm
 		dev-libs/protobuf-c:=
 	)
+	doh? ( net-libs/nghttp2:= )
 	geoip? ( dev-libs/libmaxminddb:= )
 	idn? (
 		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
 		libidn2? ( net-dns/libidn2:= )
 	)
 	systemd? ( sys-apps/systemd:= )
+	xdp? (
+		 dev-libs/libbpf:=
+		 net-libs/libmnl:=
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -65,8 +70,10 @@ src_configure() {
 		$(use_enable dnstap)
 		$(use_enable doc documentation)
 		$(use_enable utils utilities)
+		$(use_enable xdp)
 		--enable-systemd=$(usex systemd)
 		$(use_with idn libidn)
+		$(use_with doh libnghttp2)
 	)
 
 	for u in "${KNOT_MODULES[@]#+}"; do
@@ -103,4 +110,6 @@ src_install() {
 	fi
 
 	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/knot
 }
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 17a31725bf20..8c39b17e75fa 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -13,6 +13,9 @@
 		<flag name="cookies">
 			Enable the DNS cookie module (RFC 7873)
 		</flag>
+		<flag name="doh">
+			Enable DNS over HTTP (DoH) using libnghttp2
+		</flag>
 		<flag name="dnsproxy">
 			Enable the tiny DNS proxy module
 		</flag>
@@ -57,5 +60,8 @@
 		<flag name="whoami">
 			Enable the whoami response module
 		</flag>
+		<flag name="xdp">
+			Enable eXpress Data Path
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 4847f4316389..c030f30fe783 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,4 +1,4 @@
 DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1
 DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0
-EBUILD libidn2-2.3.2.ebuild 1490 BLAKE2B f054d3abdb9e40c0ad649af86a5364b2a01b438b713df305d3a5449701e92c7db8bf7c6c5b93efd2301c3aa6c776d61ae5ae08ea8bdfd987961c8d4ee85f1d7e SHA512 3e9c64e5806fb8aa8b04f4c4bc06122766c4139a000ae12c3732d3076eab1a6dc7658ca16088015f467f6a975cd13a2e448d6ee94523c11594c6823d2b47ff78
+EBUILD libidn2-2.3.2.ebuild 1497 BLAKE2B a6300cf64188321bd851b338b9a42c2f9906c17abf05947ae18fda5e86101d72e3126a9c2dbb354010f806de9ce9b707a0206c440d942aedcbf1cef2dc975a56 SHA512 5254e872ac2066fdb0edd3f4f70e46a764eedf579414180888c1785798c788d5737df983f09aef9c1dca72def996aa13d84e702f99c8c8140127cdd8a36ea3b7
 MISC metadata.xml 562 BLAKE2B 2c0acdc86f7ed795dd961bb9d1dab56c31cf7c50f458e659f758a1317be25631e8da5326c74c54b78c12d9b788d8ccbfa666c98217c730e4aee9ab3bdb29cdc2 SHA512 b8daf38cbe7670f7172edd2b05be23bd70e419817398d22583199e5f8f997fc395b869a8143ef69cffc3eb9834876bc22b40d89d60b5df1b16cc179606272273
diff --git a/net-dns/libidn2/libidn2-2.3.2.ebuild b/net-dns/libidn2/libidn2-2.3.2.ebuild
index 55f4916f1263..e27a6c7cf366 100644
--- a/net-dns/libidn2/libidn2-2.3.2.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.2.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
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/a/}
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-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 ~loong ~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="static-libs"
 
 RDEPEND="
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 825a1688f657..2904aa3cb1aa 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,3 @@
 DIST openresolv-3.12.0.tar.xz 21008 BLAKE2B 1609d8e97a9abe82f9ead7179727dd4323571e92b36aa2ca2a1177972f3a61946f612dd0cf81a804087f1c71bda25e78dab8b085ad2be55ce21214dc9870fdf6 SHA512 60348ca35114b105c8b3121e5f2d301311fcc7251a9be60c45fedc27267cfd94e413e77c7d5c91d0a0ccb8f1b4288bc147582b0ac9be64afcaa96ad3d833f26f
-EBUILD openresolv-3.12.0.ebuild 1092 BLAKE2B 30bb8108da251346992e03b9a5b9f07c193c1ff6108b34d025c925a56aaa2aa8806b6065c60ff74c4507f82c715a9b352bd9b1bf3e34201b7b44a55878414ebc SHA512 27ad43c3c3b8a572c0aec3d21637b07d9a33a1184b4b984daa63d29160d3181dac7176d6a8644b492a21f7b7dc830eb099cf51fc3a52af9c482110a3517759aa
+EBUILD openresolv-3.12.0-r1.ebuild 1097 BLAKE2B 1a1700a0f48b529d5b7d9496c70ec1b892b6b84e28d89a1f514603981c21be693d9aaef1d2c2f81aacbc6ca017f71230f76f4128ea809996bb23b594b7092905 SHA512 c139a1cb475091d000abbf96908735e6f0ab496398ea2dc15520d1945500f25151aad4fe1210ed37262447ca3e99a36a5b2a1d7d85f43fa627983038e6a2b992
 MISC metadata.xml 269 BLAKE2B d0d144cd9556f6d5c5fc6d104f72fbed37a946646dfea7485d08adb835a40ee3075a5a924070dc67b7c8a485ece82282460b5f84744cba2b56915f38254187a4 SHA512 05fe6aceaa193a65f9d7b107e14e0c2e88f331fb42af2c76cc0a311ee2b472faea7fb71c118aeb35fe784c611073b3024b7a98f78e91e1c3efa1e4f22c103db9
diff --git a/net-dns/openresolv/openresolv-3.12.0.ebuild b/net-dns/openresolv/openresolv-3.12.0-r1.ebuild
index 02760645cc01..f70291af0349 100644
--- a/net-dns/openresolv/openresolv-3.12.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.12.0-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
@@ -25,8 +25,8 @@ src_configure() {
 }
 
 pkg_config() {
-	if [[ ${ROOT} != / ]]; then
-		eerror "We cannot configure unless \$ROOT=/"
+	if [[ -n ${ROOT} ]]; then
+		eerror "We cannot configure unless \$ROOT is empty"
 		return 1
 	fi
 
diff --git a/net-dns/updatedd/Manifest b/net-dns/updatedd/Manifest
index e463b54d986e..fa08f4cb173c 100644
--- a/net-dns/updatedd/Manifest
+++ b/net-dns/updatedd/Manifest
@@ -4,6 +4,5 @@ AUX respect-docdir.patch 1189 BLAKE2B 45906d6aa2211bb1e28f46dd264e5fab5d49ab76ca
 AUX set-socket-timeouts-for-ipserv.patch 1001 BLAKE2B 0a2d769313f49bd198338af4ec43663cd2667b1ecbbcd5938398bc7bab3bd4389b56df90de322f2951cc5bc534753edc4e226af6558564d6e64804db89fccfdf SHA512 def30f688dbef6c6547a671914120b0da3fc6177236ed563e4a0f26f5c4200a393ce2fd6e48042cce3eca281c5073e0ad8c6aed98e507be9b52781f8e57b29bd
 AUX updatedd-2.6-options.patch 385 BLAKE2B 35a85ad990250a799d512bbb5494ac22acdee4567056ab09c92ccb4ff9641cf05d5a4e6cd3a768b6cd05f377f587a60c5203a3972737b3b8d414708662635ded SHA512 e509e177d0147cc047d8272051541f132a6b64beabff14db9fc7936e780b61947653cd9c501f76877c869ebbbcb052fc263d539ee42bba8eb46c47a6b24eac33
 DIST updatedd_2.6.tar.gz 667104 BLAKE2B 7cae9eab63c0dcf97203d5cd10527cbe8f937f048a2508983feb26d44755189af0789c0b741b41dad51abaad51e3e3aa1e3e77328094b04734552bb33e14cdf0 SHA512 f8a83dfc612d4f0dfc7ffabb9934fbfc236a21f7bbd38355dd1234e45cf5fa616c1cc48036a29a2b82195c0b9d1f9b6bb3b78a3acc8f28c1c65b87f27f2b832f
-EBUILD updatedd-2.6-r5.ebuild 672 BLAKE2B 96dc853d6c689137c707179884575a135fc345b6972b318829318d9c4d7d6e18858cc4592b803217835bca8b7d193f465586dc14f6308897b59e44cd40e90441 SHA512 bf69c39898c1666d23f58d98c12b0e8e45addaf0dc588115f51862f04546ea3132a4026f46833a98419d41292db856447cc1481ae9ac2d3984f569e053666d03
 EBUILD updatedd-2.6-r6.ebuild 709 BLAKE2B d2829d0ea4b0f8a88ea86b395aee9102c5f4e598373db6cdf68522eed7bc1dc26d0f440e99d81245a106b3605ebd55b0fe57ecacbff3c499545240f325bf7b29 SHA512 c1bf1f98fd49f8ae5a8168c736bb64efe7b15c376c26129a35656b8214cd045e38284551dac229e8a770c23aa1f792d9ec6d9f99e71871bb20d47421ac1626d1
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dns/updatedd/updatedd-2.6-r5.ebuild b/net-dns/updatedd/updatedd-2.6-r5.ebuild
deleted file mode 100644
index 681a56e9575c..000000000000
--- a/net-dns/updatedd/updatedd-2.6-r5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dynamic DNS client with plugins for several dynamic dns services"
-HOMEPAGE="https://savannah.nongnu.org/projects/updatedd/"
-SRC_URI="https://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/IO-Socket-Timeout"
-
-PATCHES=(
-	"${FILESDIR}/${P}-options.patch"
-	"${FILESDIR}/fix-ovh-DYNDNSHOST.patch"
-	"${FILESDIR}/respect-docdir.patch"
-	"${FILESDIR}/set-socket-timeouts-for-ipserv.patch"
-)
-
-src_configure() {
-	econf --disable-static
-}