gentoo resync : 12.05.2022

5 files changed, 30 insertions, 11 deletions

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>