gentoo auto-resync : 01:11:2022 - 21:08:07

5 files changed, 15 insertions, 240 deletions

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 1dcb6f9a0c09..0e49d1caea7c 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,15 +2,11 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-3.1.5.tar.xz 1414500 BLAKE2B c05fcd9e99d4c7dba03ad9fd9a1131ca4c2556d4911640ef929e68d4caea26ae69ddc61fa19f8c3c4f29efcd0c4c2e47593e86a0ac1826cc96c25f2fe4145bab SHA512 3a8cf04a2d65e04343a70009d43796ae00bf09e34348119b55ba70dac7deb7ff42906d88ef0e413d33dec28a952396a51781dee96727c0c2047b4c5ade54e6fa
-DIST knot-3.1.7.tar.xz 1418944 BLAKE2B d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047 SHA512 4b6982e8b44addbc77f42d0a1c435dd257cc8a8f112677c371d16063ee8e769b646a6425d54ef338cd21555f276d8d6f4faad2da2f24bf92437ce4af9ff1fb44
-DIST knot-3.1.8.tar.xz 1439912 BLAKE2B bcc089d547a7cad8150e93d70da036273a60b0e740df9693bc38813c3d7ed1968b8f97ce4d32c2359ba509fdfcd8403e73eed1f0107d470e6cd4ba4e7012f96d SHA512 af72cbcc5b511dad148e7ce990819df00bdf99c110b44b3b521eddd8690a6ebd4c76c24e63d843956971d5f158bbfa851804616630d34f3a0ec06888c78ecf2c
 DIST knot-3.1.9.tar.xz 1441408 BLAKE2B 383829107bef6b35cbef3c531bc91050e7742ca930bf6645c25cab04203ee360837808c3b5342089ce9ba9ee704290ab95b2f76172577d251c6a9c18796245a0 SHA512 e4ba1c006edcde2dc820e74c39df7a8b8983dfb2d8b8845ac759c6c67dfaabc5aae38282995ed92879a683665c0c179502858631c89ad53c2738f79df951eef7
-DIST knot-3.2.0.tar.xz 1665720 BLAKE2B 851f8278e2936459ca8bf4f06332d6a49e89152e634aaa94235d180c91a073c648797f8e42e371f563bbeb708289fdf3839f66508fbd41b7e045efbbe5d72374 SHA512 e007d633f1debb559d47a7646b055dc970502be11a1849063da3e3d28355f77e6cba41e34f06726bc5945e4e2ba3ecb84a4b39813a8079514d3bf584d7d565a2
 DIST knot-3.2.1.tar.xz 1626796 BLAKE2B f530438bc0e970abe5a6ed148dfb88e1a384ff54c91694af98d261aa3efc73201e60dc9e5f29c1a96b6d406a34fb4ea6cbde0c28dfdc772aa53836fb47e3f2f7 SHA512 2f12750dc0db06fd915c1b322626780c1d66e10c0b8170dea57559e514f66ee105ed8dbbc0a5f8084fcf772e82c242a8b09ae449631960abf4d60af4a13a1ea0
+DIST knot-3.2.2.tar.xz 1632748 BLAKE2B 185567dc883f946570fe60cd7d01d96162c5f13ac84330e5551c293b5011c162401fd25ddbdb43bf9242e13c3cdc8225be107dc579619fe54c05335601cd27ae SHA512 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f
 EBUILD knot-3.1.5.ebuild 1983 BLAKE2B 2479b556fcfc0ba8a4058bdf9fca6018fc0d07184f31cf61e4eb9fe71c7061cfd2c36376b074768a3606e610a5eb67c2621d229527d659860ed5dca52740d667 SHA512 ed49e7a8c7e7e06977aab5ee79c1705fa58c009764aa61234a789d10f22f45b01dd1720d1d75c4c7598d58a3d15dbca129b7bb8ca0fe53fb210884e5a7c9cfb1
-EBUILD knot-3.1.7.ebuild 2126 BLAKE2B 708d7da8fd74699cee959d91cb4820523cf62d71e0f22df212d2945c20422ef02ba50ac47f8b7f78b071a9de574f0a49bcd39a0018005e2e8d4bc1abbfcb12f4 SHA512 bafc0af04899dae5884fe7a8905381231a20496487c4b80356d578217538a161097f7f6f9946f1577db43824fce4b9cbe3c18f3a43e830fb43ae735dc7b2a35f
-EBUILD knot-3.1.8.ebuild 2128 BLAKE2B a0c52ce7c910b14b2055ac09a7c11e135256e7e3db3eb450ce2fb78b5220008889bbb18d2b2b7fffc0ae181aae355f40e3e5214babae301bc7a4cd26f2b0662c SHA512 b399f78f9af4e0c2df6b5ef5fd235dcddc284286ac730e68c11773b470d1f61e0312b0295d447ccba07727d1d4853497a0aa0b64ff728035e75a30968d6caaeb
 EBUILD knot-3.1.9.ebuild 2128 BLAKE2B a0c52ce7c910b14b2055ac09a7c11e135256e7e3db3eb450ce2fb78b5220008889bbb18d2b2b7fffc0ae181aae355f40e3e5214babae301bc7a4cd26f2b0662c SHA512 b399f78f9af4e0c2df6b5ef5fd235dcddc284286ac730e68c11773b470d1f61e0312b0295d447ccba07727d1d4853497a0aa0b64ff728035e75a30968d6caaeb
-EBUILD knot-3.2.0.ebuild 2128 BLAKE2B a0c52ce7c910b14b2055ac09a7c11e135256e7e3db3eb450ce2fb78b5220008889bbb18d2b2b7fffc0ae181aae355f40e3e5214babae301bc7a4cd26f2b0662c SHA512 b399f78f9af4e0c2df6b5ef5fd235dcddc284286ac730e68c11773b470d1f61e0312b0295d447ccba07727d1d4853497a0aa0b64ff728035e75a30968d6caaeb
 EBUILD knot-3.2.1-r1.ebuild 2226 BLAKE2B 7a7136b65c6de6e9786f679da8be36c14759523fda18cc24e8fcee7f2b95d2519181bd63d3a8cca10432ff166509cef3db1e3c71dcea4e68db38e8fda5e2be1e SHA512 54f07dddef5db82a94eed74e9c9fdecd58290ab5de85d76c0e8925eed0be0e5cf3d27557a3a9de9cb27c20740496b98fde0a43271fb671d09c7bd91e591b2588
-MISC metadata.xml 1970 BLAKE2B 5743cd2e6b0201db02b8f2016d1b6abb58bf96b9ce2ed392f1230d11d277ada99ed3969660aae48568413ce1ac67d7a44ca09070004702e6256dcdbb7de6f09d SHA512 6a90979ace766ae50a74f62ec375e1179bafd8d4b0be111ee10e93256404d10dfba8bd71580b4541ead5b619d2585ddb54004cd48d79c7c1ab11aa7d46445d94
+EBUILD knot-3.2.2.ebuild 2305 BLAKE2B 0540860a567bd229951e5029611fb01b1435ceb0676b03de91dae17cdfaf1c2e9c4713c0bbc261788ba859479cae2d0c911254fd7c34e21e63c9f76b1275a0f1 SHA512 fe72d484aa5c998a427a9e5ea228900e70dae53cc3424a16244f709c85b0a6a9fdd085600c742169c79d871d29a1bc6393d25ecd3497162ebc34cef7202b4453
+MISC metadata.xml 2058 BLAKE2B 1cdf35289c3096bf71f693b7ec193305ffaba9e94ecdf88fe8b7f478d3302ba332c1685bf6372a24dfe933dd58318a0fe57faf499925004b871941f1219145b1 SHA512 e0dcde9be38b5c515d7c883b0a917ba2c5127a6812c11ce455c6e3cf9bb7eae91046ee73add633cd7b7aa2694ffbffe7fa357505de4bdca38e80ce08440a92b5
diff --git a/net-dns/knot/knot-3.1.7.ebuild b/net-dns/knot/knot-3.1.7.ebuild
deleted file mode 100644
index 80d222d2fe5e..000000000000
--- a/net-dns/knot/knot-3.1.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps doh +fastparser idn +libidn2 systemd +utils xdp ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	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="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(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
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/knot
-}
diff --git a/net-dns/knot/knot-3.2.0.ebuild b/net-dns/knot/knot-3.2.0.ebuild
deleted file mode 100644
index 4a454d5cd861..000000000000
--- a/net-dns/knot/knot-3.2.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps doh +fastparser idn +libidn2 systemd +utils xdp ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb:=
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	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="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(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
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/knot
-}
diff --git a/net-dns/knot/knot-3.1.8.ebuild b/net-dns/knot/knot-3.2.2.ebuild
index 4a454d5cd861..29120ab563c0 100644
--- a/net-dns/knot/knot-3.1.8.ebuild
+++ b/net-dns/knot/knot-3.2.2.ebuild
@@ -5,13 +5,16 @@ EAPI=8
 
 inherit flag-o-matic systemd
 
+# subslot: libknot major.libdnssec major.libzscanner major
+KNOT_SUBSLOT="13.9.4"
+
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="https://www.knot-dns.cz/"
 SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
 
 LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+SLOT="0/${KNOT_SUBSLOT}"
+KEYWORDS="~amd64"
 
 KNOT_MODULES=(
 	"+cookies"
@@ -26,7 +29,7 @@ KNOT_MODULES=(
 	"+synthrecord"
 	"+whoami"
 )
-IUSE="doc caps doh +fastparser idn +libidn2 systemd +utils xdp ${KNOT_MODULES[@]}"
+IUSE="doc caps doh +fastparser idn +libidn2 quic systemd +utils xdp ${KNOT_MODULES[@]}"
 
 RDEPEND="
 	acct-group/knot
@@ -47,6 +50,7 @@ RDEPEND="
 		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
 		libidn2? ( net-dns/libidn2:= )
 	)
+	quic? ( net-libs/ngtcp2:=[gnutls] )
 	systemd? ( sys-apps/systemd:= )
 	xdp? (
 		 dev-libs/libbpf:=
@@ -66,9 +70,11 @@ src_configure() {
 	local my_conf=(
 		--with-storage="${EPREFIX}/var/lib/${PN}"
 		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable caps cap_ng)
 		$(use_enable fastparser)
 		$(use_enable dnstap)
 		$(use_enable doc documentation)
+		$(use_enable quic)
 		$(use_enable utils utilities)
 		$(use_enable xdp)
 		--enable-systemd=$(usex systemd)
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 56b218b58761..6fc839da3260 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -45,6 +45,9 @@
 		<flag name="queryacl">
 			Enable the module for query access control
 		</flag>
+		<flag name="quic">
+			Enable the DNS over QUIC (DoQ) module using libngtcp2
+		</flag>
 		<flag name="rrl">
 			Enable the response rate limiting module
 		</flag>