gentoo auto-resync : 28:03:2025 - 00:31:34

20 files changed, 450 insertions, 701 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d1817920f067..c71859d82c82 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 6ca95b249d99..1a326a874b5b 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -4,5 +4,5 @@ DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192c
 DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603b7225522fe5b97d04c519f68f017fe0ccaf7ddeff029d17c0b4c3932a09f009376553f987671ba21f6b9cdb7d SHA512 0650ad5d55da2d9fe848d68aa59b16998b781152209ebcaabaea68144dab75ff9f4cfcceaa87a6b6da4f2f98fcf6f9eddd16d19ddf958fef242d93da03516dbc
 EBUILD bind-tools-9.16.48.ebuild 4437 BLAKE2B ceb368911ac87e28313213ac67024c1bb2ae9c03fd12322a309ff74bc8b113401e5cff37fd1a69e28c8fd4959a5597c5e90ec7ce80fee9e16fec21445918ffe8 SHA512 7025d670c51ccf1c0467ab183a353042d4466d64f68511072ebc2f416b607e49d5517cc4c1e5c261dab4f82d231f0ffc5380084c46863b781935738c9ac89dd0
 EBUILD bind-tools-9.16.50.ebuild 4440 BLAKE2B 95f0ead2b8b16727014533324bf47f73040fa71781e9c09d39d4cb1d41f9d7a181d487fd89fb7e66e4c56199f46954dc2e129f247823232e50349cc9637fc448 SHA512 4090b3d0cf02c40670b579494f53828c75455f76d05c771ff14699afb43f753b545e8418582faf7666105d8b0a3dacd6727061eaaaf40b7c3dcbdd59047c4f33
-EBUILD bind-tools-9.18.0.ebuild 1084 BLAKE2B 57a529ebcd51bc45efff84b66456bb6124928f5c029d92fccae43a9d2750343de4bb33f0bec99ef9905a57a42f05bb1fca49dfd9324fee5db80626e35bbb2b99 SHA512 ad9107e08064b84db16564f724a820834cc63a770e8af2b791cb4fed9abe37aa63b621a937b3be6a8ab52af2e500bd05a63fa379731a9dbb6b47594177485431
+EBUILD bind-tools-9.18.0-r1.ebuild 1198 BLAKE2B 3c96d2e9b40e9c6710cbf671f3a4d610c2462f9d4434ca48b2ec4507f68c775d4525dd46828d26c264b5d0b332e146b00e28c5dafdd097eb6e8b61e852fd5f37 SHA512 f32ed6fab606e4b9c9a797206972ec36fc03821d5f0dc8b18de22e403647740f28f39c7aec38fb03aaf8d1a3b5fd70b717c0191b244c2fc9f464f8482c8f5d5d
 MISC metadata.xml 393 BLAKE2B 90453ff0da1ce62c68dbe5c2f8ad99747388e8476afb02fc3794705d9acebbde1fb1d0c1f282a5e3fec62211b02af74c05783ebc2353dbdee3f2f0ba51541430 SHA512 d4e6b6f90058fedc771b2ecde5fb8cb8b3aa4069bded3a7a1ffe01766ca05b08a25b2a7f6d3f9cfa796868b9b290b20d2531ad25b7548427807125a2b8ea5bad
diff --git a/net-dns/bind-tools/bind-tools-9.18.0.ebuild b/net-dns/bind-tools/bind-tools-9.18.0-r1.ebuild
index 28910ffc41bb..8189ad3c49fd 100644
--- a/net-dns/bind-tools/bind-tools-9.18.0.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.18.0-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+HOMEPAGE="https://www.isc.org/bind/ https://gitlab.isc.org/isc-projects/bind9"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+caps doc gssapi idn libedit readline xml"
 
-RDEPEND=">=net-dns/bind-9.18.0[caps?,doc?,gssapi?,idn?,xml?]"
+RDEPEND="=net-dns/bind-9.18*[caps?,doc?,gssapi?,idn?,xml?]"
 
 pkg_postinst() {
 	ewarn "net-dns/bind-tools is now merged into net-dns/bind and"
@@ -23,4 +23,7 @@ pkg_postinst() {
 	ewarn "Please run the following commands:"
 	ewarn "* emerge --deselect net-dns/bind-tools"
 	ewarn "* emerge --noreplace net-dns/bind instead"
+	ewarn ""
+	ewarn "For the latest maintained versions, including >=9.20,"
+	ewarn "ensure you are using net-dns/bind directly."
 }
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index a7c0859fc305..03a69b1ee426 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -18,9 +18,11 @@ DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192c
 DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603b7225522fe5b97d04c519f68f017fe0ccaf7ddeff029d17c0b4c3932a09f009376553f987671ba21f6b9cdb7d SHA512 0650ad5d55da2d9fe848d68aa59b16998b781152209ebcaabaea68144dab75ff9f4cfcceaa87a6b6da4f2f98fcf6f9eddd16d19ddf958fef242d93da03516dbc
 DIST bind-9.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459e82ad908a918fff1da619f91ef4896595ea210b43f2b492d763d7be2b71105495858da55431b60874c7fd2312 SHA512 6c2676e2e2cb90f3bd73afb367813c54d1c961e12df1e12e41b9d0ee5a1d5cdf368d81410469753eaef37e43358b56796f078f3b2f20c3b247c4bef91d56c716
 DIST bind-9.18.31.tar.xz 5385812 BLAKE2B e069ab3caab887a87220b54804e5b19a4c21b8d3e4e8f1bc6a7135b3990a228d6c48b1ca4a22c75242485275eff1de145a9aff89addf81124e7dfcafd8ab30cf SHA512 e51873484be3ee367eb1e601b8e0adc45abcdb16df04021ea42ffcc51b99821f8b30f67b2a693a90ad3efa51698a651c8da9d7947ee8fa19680f627afe1f7034
+DIST bind-9.20.7.tar.xz 5655168 BLAKE2B c5198939382e7295b4dfcb2ddbd86e5bccc10047d5e963dab2381404eb7a14543218e3caa438b395a2982cb607da84012f3a76a41c790a48ed615238bc080b5c SHA512 b9570c0c6588819108017d30dc7fb5e2f34361f941186d29da3d2830bbe3333c8c16bdb6581f5bec4786d90b74db860a9cad5f66d4f1c65168eae69f401a9df0
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.48.ebuild 11761 BLAKE2B 18aa8cc8e62794c72bd1ecb6cfc189b2b840b13e49077c6289fc991ebf7802dbb50573e06277b66fd818df6e293d21d8336b0a9fd002375964244b00e4f0f9a3 SHA512 b6b4887ca05afda804c0c3ebc6f06464a0865d86e2d8992c646a119f60c6c88df73ad4af833d88a7f5fc688ddd4cf1d507e38f30f27e6d686025fbf9adb0c7e9
 EBUILD bind-9.16.50.ebuild 11764 BLAKE2B 16277674954db9c35c488ea1189340c83a596e2bc0f89694fee6e23054aac467923fbc247b1b670b715280cdce4c1ce4747a2cd040d85fbc98b2ce1ca61d0493 SHA512 2ba2e093a4ab7606d3f200124e1b7255c716dd9a3ae4bd9a084b575614c32620d899f63d7c09fcd719da3f452868c8a43d3ee27f7e4f4526ca2d091d69cc4e33
-EBUILD bind-9.18.29-r2.ebuild 8061 BLAKE2B 822c6eeffdeb29b33d01161c9ab021a23e455e82e2f60c209ff39af833cbd0934f1d07981b1502781692f9fa54cfaf804ea6b001003338a773f4b4752ae81a4c SHA512 4fe80f58be8946faafa3679c01450c5d4bca84fac68bb5872fb63749db0c1085ce58def805a35d56aa869bd9e57db90abd355f052c9feea804afe79e9574ce6b
+EBUILD bind-9.18.29-r2.ebuild 8059 BLAKE2B 83177d8730b434be0b85d40e66c10bc4da90b3cdc542c096d0146df4908b349fdbad80e0116e3255a74e4004a9a3f0aa70a7cfa8b11a13f6d6aa0dcd701d8f71 SHA512 d1668e8f437b869cab9bffe27dd2ab9d5965bbdec1046c39f42dc96c19243a3b8d735b754d42983612ae5e8863fb8a83d0e487cc876e929a3cc250cda6fe5438
 EBUILD bind-9.18.31-r1.ebuild 8157 BLAKE2B 8c8c8f73b8256ccab95976e352ace4a91963b1984a4672a91131d34cbc05f1e77c9323a56725e1198b9efb20e8db7fc0018ced91283339bc95ea0050b4ea3d31 SHA512 cd511adc466572116ffad991cf918ef5ead59f87f09b16c5af72d0b2f40dcba5faf61e2242dd3df4f0ce5b4be621fcecd54a65d777cd70fe509d79271a75cb3a
+EBUILD bind-9.20.7.ebuild 7951 BLAKE2B 4ca102e01d0cb5ebab982398ae1c4a8cc45a4c7db222cc019834895c055507d4e558c70a5a819b1384b9bc8370efd1853851224df717ea2d0d4cbf68308a552d SHA512 067621bbf40d8a7b8d534efbae93b366659553aeeaa2b76fe499f44a6fb2d8c0dfb8967d223172c0bafee027eb96430e58fee788c5311f0e439f79fc7d2a571b
 MISC metadata.xml 915 BLAKE2B e415b3c30f15ba3e3d367dd28ed8dac1e6791fbec6b90ebd5881e217db11987365a8eb574b5e6f008e1228fb38aa461a85e7c45c3521e0a48fb6a4808b3b82ce SHA512 575d7c9992c1b3fd82a28cd5bbb585f568240f90dff5e00384c8ff4f937f582d37d2121fa35664b812192b20a16f2a44c196fb841e4fa3d4fd2c725900ac7d51
diff --git a/net-dns/bind/bind-9.18.29-r2.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild
index d0dbaebdee2d..ba1fbcbae748 100644
--- a/net-dns/bind/bind-9.18.29-r2.ebuild
+++ b/net-dns/bind/bind-9.18.29-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/bind/bind-9.20.7.ebuild b/net-dns/bind/bind-9.20.7.ebuild
new file mode 100644
index 000000000000..097857a4740c
--- /dev/null
+++ b/net-dns/bind/bind-9.20.7.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit eapi9-ver systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/bind/"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	dev-libs/json-c:=
+	dev-libs/userspace-rcu:=
+	>=dev-libs/libuv-1.37.0:=
+	sys-libs/zlib:=
+	dev-libs/openssl:=[-bindist(-)]
+	>=sys-libs/libcap-2.1.0
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	doh? ( net-libs/nghttp2:= )
+	geoip? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	idn? ( net-dns/libidn2 )
+	jemalloc? ( dev-libs/jemalloc:= )
+	lmdb? ( dev-db/lmdb )
+	xml? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc
+	!<net-dns/bind-tools-9.18.0
+"
+# sphinx required for man-page and html creation
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-util/cmocka
+	)
+"
+
+src_prepare() {
+	default
+
+	# Don't clobber our toolchain defaults
+	sed -i -e '/FORTIFY_SOURCE=/d' configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir="${EPREFIX}"/etc/bind
+		--localstatedir="${EPREFIX}"/var
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		--with-json-c
+		--with-zlib
+		--disable-dnsrps
+		$(use_enable dnstap)
+		$(use_enable doh)
+		$(use_with doh libnghttp2)
+		$(use_enable static-libs static)
+		$(use_enable geoip)
+		$(use_with test cmocka)
+		$(use_with geoip maxminddb)
+		$(use_with gssapi)
+		$(use_with idn libidn2)
+		$(use_with jemalloc)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	CI=1 emake unit V=1
+
+	# libtest is an internal test helper library, it has no tests,
+	# so suppress the QA warning.
+	rm tests/libtest/test-suite.log || die
+}
+
+src_install() {
+	default
+
+	dodoc README.md
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto dnssec-guide
+		dodoc -r doc/dnssec-guide/
+
+		docinto contrib
+		dodoc contrib/scripts/nanny.pl
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+	newins "${FILESDIR}"/named.conf.auth named.conf.auth
+
+	newinitd "${FILESDIR}"/named.init-r15 named
+	newconfd "${FILESDIR}"/named.confd-r8 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	if ! use static-libs ; then
+		find "${ED}"/usr/lib* -name '*.la' -delete || die
+	fi
+
+	#
+	# /var/bind
+	#
+	# These need to remain for now because CONFIG_PROTECT won't
+	# save them and we shipped configs for years containing references
+	# to them.
+	#
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r4 named.cache
+	# bug #450406
+	dosym named.cache /var/bind/root.cache
+	#
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	dosym -r /var/bind/pri /etc/bind/pri
+	dosym -r /var/bind/sec /etc/bind/sec
+	dosym -r /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /etc/bind/{named.conf,named.conf.auth}
+	fperms 0640 /etc/bind/{named.conf,named.conf.auth}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r2" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ -z ${ROOT} && ! -f ${EPREFIX}/etc/bind/rndc.key && ! -f ${EPREFIX}/etc/bind/rndc.conf ]]; then
+		einfo "Generating rndc.key"
+		"${EPREFIX}"/usr/sbin/rndc-confgen -a || die
+		chown root:named "${EPREFIX}"/etc/bind/rndc.key || die
+		chmod 0640 "${EPREFIX}"/etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source "${EROOT}"/etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+
+	# show only when upgrading to 9.18
+	if ver_replacing -lt 9.18; then
+		elog "As this is a major bind version upgrade, please read:"
+		elog "   https://kb.isc.org/docs/changes-to-be-aware-of-when-moving-from-bind-916-to-918"
+		elog "for differences in functionality."
+		elog ""
+		ewarn "In particular, please note that bind-9.18 does not need a root hints file anymore"
+		ewarn "and we only ship with one as a stop-gap. If your current configuration specifies a"
+		ewarn "root hints file - usually called named.cache - bind will not start as it will not be able"
+		ewarn "to find the specified file. Best practice is to delete the offending lines that"
+		ewarn "reference named.cache file from your configuration."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source "${EROOT}"/etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source "${EROOT}"/etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source "${EROOT}"/etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p "${CHROOT}" || die
+	mkdir -m 0755 -p "${CHROOT}"/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p "${CHROOT}"/etc/bind || die
+	mkdir -m 0770 -p "${CHROOT}"/var/{bind,log/named,run/named} "${CHROOT}"/run/named/ || die
+
+	chown root:named \
+		"${CHROOT}" \
+		"${CHROOT}"/var/{bind,log/named,run/named} \
+		"${CHROOT}"/run/named/ \
+		"${CHROOT}"/etc/bind \
+		|| die
+
+	mknod "${CHROOT}"/dev/null c 1 3 || die
+	chmod 0666 "${CHROOT}"/dev/null || die
+
+	mknod "${CHROOT}"/dev/zero c 1 5 || die
+	chmod 0666 "${CHROOT}"/dev/zero || die
+
+	if [[ "${CHROOT_NOMOUNT:-0}" -ne 0 ]]; then
+		cp -a /etc/bind "${CHROOT}"/etc/ || die
+		cp -a /var/bind "${CHROOT}"/var/ || die
+	fi
+
+	if [[ "${CHROOT_GEOIP:-0}" -eq 1 ]]; then
+		if use geoip; then
+			mkdir -m 0755 -p "${CHROOT}"/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p "${CHROOT}"/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index bb149a2907da..4026c6e874bc 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -7,7 +7,9 @@ AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc334
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
 DIST dnscrypt-proxy-2.1.5.tar.gz 4065395 BLAKE2B f8984121776565342c1920832839a9cebe8660eaa5f380baf5db6530a137efefbe270f61f9967426f3bea44110bf66b50524d2b891ec285eef1ad7329b1e305c SHA512 2c9a0e0896483b4453cb3779efd41205be8839e61e17b86701deb91e531676529a82b8859ae0975d121322ec8cc05bdd13a1324b8f56010692e1ac9f36a99d69
 DIST dnscrypt-proxy-2.1.7.tar.gz 4195998 BLAKE2B 2b8e979a178301eb560d7f3be33755401a9fd1808dcd5919c9513a7f2f5513c4d12606af0b38dc6cabdf4f243d69df8a61f2af30071634251309721144521b1d SHA512 53b100d5238186ae99add2a8aff4069e6491f9d687e63cc3e5648630626c86ff4f9d246789ae40490030b20584a3c82e1abce8a8ca685f18111a2bcfa0519c09
+DIST dnscrypt-proxy-2.1.8.tar.gz 4185376 BLAKE2B bf2c6e8fbe83980579a4ba460d7648647b998bd589ad83c633f6fc9f6e855d846fa7a867df6d7c7b6331070999b643c0114d805739ad53dc8173cb63f2b74536 SHA512 249e2d22b4b7f2c7142a7a626aa13fd80e5e250e2c84093e74360c895b0b8a7105d413fcd78e118bf51ffbf887fde654a7277f34bb6beb7b11a25531895edb6e
 EBUILD dnscrypt-proxy-2.1.5.ebuild 2750 BLAKE2B 72bf04dac40c677017a5fa6abac7e2e9055fad876d315ab0710aee5dc39017506a9f052ca77a3c83943a945b522449e32a428f1d4fc1ec02887c4af9aa850bec SHA512 a8f898baad7bd7f2b418fa451b7239252e50bdb01c467547c910c21df473bede2811385537fbe688ea0b8d9a23ee7071b678009502c7e458c94a79da4e4cfdf9
 EBUILD dnscrypt-proxy-2.1.7.ebuild 2750 BLAKE2B 131466ccc2d96c1d6cbb97444e5f89000d29145e308da627dbb4fe33faebd48211a15aa965eada1e2b54144a29d3bb04c089914b207145c44f320b07e190562f SHA512 261b06b76476a58085e5ebfe4676eba6f0d76e7b4a79218bac93a3117cf42c001a3ace758f3f3c6daa1e0d98f8e261383abb2c5270c92d05c4ed0f15620d45fd
+EBUILD dnscrypt-proxy-2.1.8.ebuild 2755 BLAKE2B ffe8a29315f4d175fb31d745aec6b0c848ddd0781aa857782a22d3398dd2958378162669c441c394e828e9222f861acd19312dd2504bedeea3d140c352fa8407 SHA512 97317e8dd67144967bcf9a28e06199cca561592d9006e39838b60236c9dadac5abb31175de1c795029d9dae0d0bbe1d83ded6fd2ea0daa4e25a77bdd95a8f247
 EBUILD dnscrypt-proxy-9999.ebuild 2755 BLAKE2B ffe8a29315f4d175fb31d745aec6b0c848ddd0781aa857782a22d3398dd2958378162669c441c394e828e9222f861acd19312dd2504bedeea3d140c352fa8407 SHA512 97317e8dd67144967bcf9a28e06199cca561592d9006e39838b60236c9dadac5abb31175de1c795029d9dae0d0bbe1d83ded6fd2ea0daa4e25a77bdd95a8f247
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.8.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.8.ebuild
new file mode 100644
index 000000000000..91fc991e7cb3
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module prefix systemd
+
+DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.7-config-full-paths.patch
+)
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	ego build -v -x -mod=readonly -mod=vendor
+	popd >/dev/null || die
+}
+
+src_test() {
+	cd "${PN}" || die
+	ego test -mod=vendor
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	eprefixify example-dnscrypt-proxy.toml
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{allowed,blocked}-{ips.txt,names.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blocklist/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
+}
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 20716ab2d103..64aef0c0824a 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,21 +1,9 @@
-AUX 1.9.6-boost-1.86.0.patch 1018 BLAKE2B efc91130b651534467b505d18bfbd3ebb04186766499423f102bd0af565422a738734baf6a641ed9df4043708162e18df640559efb4a677f55b4a9545d43b501 SHA512 93fd7f6da8568a82e59e76f1572e5f6455b39e5935fa6361f04a54de97ca2c641117658f82f3764246e9d8efd0d5cbf0446919f04026a39f99abd945bb10ed0d
-AUX 1.9.6-json11-gcc15.patch 588 BLAKE2B 3f623a06f42eef59d3ec7ce502f554e5ebae7913a00cbb040958ed73995483baef2e111aab2f1317327967fdfe204f7743f5e748414a1280f216acc0b1d55a86 SHA512 13c476975802ba40319b23dff76fa5b737a1640c69fad21c2bbc050a94dca991ceba846b7fe433068993854070c3d4e7d4608256491ce93ef4496f79f4080402
+AUX 1.9.8-quiche-0.23.patch 2511 BLAKE2B 716c858f51be62eccba712feb9ec6c22080ce78667d8ff65c0ebae46e00746da6af1961b718be3c5545f6ded877b23c065f4c12023531ce7a31e6480339b3ee7 SHA512 8ebc9eba5b33dd11e0ed7cfaee7c98efa1209af60bd930871f207db8575a6e76fc1786b10219439f5ce2110b9ab3e6cd6bf3a0dcecd53c715c7f966612a52e56
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
 AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
-DIST dnsdist-1.8.0.tar.bz2 1480500 BLAKE2B 47cfcfe3756cdc4520c1ba1e11b7d60191125ef900ba829ff7437ac2041352b845ab5f7183f53fea9b3aa6f44c5745de3878c2b72f2be048fa57d2c2e9325c0c SHA512 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1
-DIST dnsdist-1.8.1.tar.bz2 1492793 BLAKE2B 84fdf2f360c41ea235f3989d2bc14ad05e98d7b51dd20d983e7ad53ce5a6c00c7075b673e8a15fe3fd710a4e15c80db4d7431256bfb4291bd5785482d3f7f7e5 SHA512 db50c56587084ebdea3eb7f8e5b79178aea67b608cf6afce1453932b5225b3474a459cdc3dc8e4618a36a9edb405403dfefaed7fadd5848b5612de6bfb356f3a
-DIST dnsdist-1.9.4.tar.bz2 1591994 BLAKE2B a8cfc5c2da135ed96b857f9f1b6c3caa796b27f66ff7ead6e976b871a5e5db208ef3ce275c23085318bd7ff2f0fa2ec19e28ad36234991d84b8d13e74acb2f34 SHA512 e013fa3e582cc30d104a66ee44eec50dd1d04cb2bd0dc5b3c9dfec95f3e0e5f3da5f2a1bb9a713b50e5659908669957fe4deb5b1ca10f728e6ceaf550a3223ef
-DIST dnsdist-1.9.5.tar.bz2 1607962 BLAKE2B 2723abd3ba9ab2824c232f65901601c558054ae70dc668632514c4f9bd60f1e3dd7d67d6a58a974a054d33b6869b72dc888024a8f23256c078d7779dbb1b1836 SHA512 1c38f346b6199063e3862dcc5ff8283b3fe17473ef88660a122793b07c806e47fd1c47602d0edf66fd060f2170fb2f678d94e6cc6cc4800e70912b80a4c26c7d
 DIST dnsdist-1.9.6.tar.bz2 1598874 BLAKE2B adb56707bb768ceae974cd9b725d2bf1f4beaa6e3edc6ede22a7d93920214614f10c82d71dbb773741f56dff04e0f0aa26dc0a0e2d5d405bee89d8ada1130303 SHA512 8d0c88336864b788df320298678e2a8556d7c4ff468ec1b4165b87c2fe5c6c167a2c75cdd2df433346fac12694d8e39d30910b8d1d4be7f35d9e0d85edd5ef5a
-DIST dnsdist-1.9.7.tar.bz2 1594532 BLAKE2B 895a581caf00e8274787d7280e790372868354cceebe5c34fc9bd960778758c6e39b1e47e11038b3f85277a9ea0231ee9951cd01febbf1c8edb0c5ae1059c644 SHA512 7d49136efd811d10e86e5df2e4972fdd31245686294efe618107ebb80e13762a0f9a5677af59277484a7b69a05c84bbc6b26f8fabbdcc34acdfcdd7e7b155aac
 DIST dnsdist-1.9.8.tar.bz2 1593902 BLAKE2B 854344eb6b82f98001171830715fe5cf564628405b4c79c07b43fccdbca0a4c9da7e527a748bc2972261a32ed9c51582eac2e6fdbef5c25bd71b161318a62155 SHA512 b89bc1ba62a2cf009a305a71eaa2553810d6d5f25f71098cb34acd86bfe5632e5f9f4b5ce057ea93665f1f5dd65e6a3d67fa364e8cecf0b648559c73061baddd
-EBUILD dnsdist-1.8.0.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
-EBUILD dnsdist-1.8.1.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
-EBUILD dnsdist-1.9.4.ebuild 2711 BLAKE2B f55a4211d6d6f62e19930615b45f51a955d719e32a6e59d4182aa75121d56fec0ee2b95281f70e7e75f35a3ce8ec89ecbf1584dc37919e608aadbead7a0d807e SHA512 f9c609bdce1398633011156a24ffe2d85411108902fba995837b07a6c8758c8f5108e6d7016bc18d56a1f9c21ffa3b9e6cf2a204ed92427137a3b8d360c7772b
-EBUILD dnsdist-1.9.5.ebuild 2711 BLAKE2B f55a4211d6d6f62e19930615b45f51a955d719e32a6e59d4182aa75121d56fec0ee2b95281f70e7e75f35a3ce8ec89ecbf1584dc37919e608aadbead7a0d807e SHA512 f9c609bdce1398633011156a24ffe2d85411108902fba995837b07a6c8758c8f5108e6d7016bc18d56a1f9c21ffa3b9e6cf2a204ed92427137a3b8d360c7772b
-EBUILD dnsdist-1.9.6-r1.ebuild 2804 BLAKE2B f9e0352b533521dd282225a65102a8516da81463e79fdaef877ca20b9ae2520c1e198da9fa11d17cbabed72f1466beaa632be33c3fc4be264435e917f1962ed7 SHA512 b65fd11fe357b9bc5e8855f52bf9abfcecffbba8c5cb23bb762848ca9b2adb366f2de3248f7d78fed1e6b78fd0e9144d92504c653f626eed31da95131069cab1
 EBUILD dnsdist-1.9.6.ebuild 2710 BLAKE2B 5148ee3d8471495e0b4aec5a69078afc2f4a931c1c223270b31b59ec98a26ba1dc27dcdc5b264e0bb6978d0f3bd8488c58cbbb18db43d691b0edd307833bb7cd SHA512 3ff14d72f3faf0f828c763b7cd980f51f5390fc34fb3d182cdaec49e2b611e8e0e4104a80dc6b3ee05c92b87cd47da42dad8ccd1733b66f9b0367280def31900
-EBUILD dnsdist-1.9.7.ebuild 2711 BLAKE2B f55a4211d6d6f62e19930615b45f51a955d719e32a6e59d4182aa75121d56fec0ee2b95281f70e7e75f35a3ce8ec89ecbf1584dc37919e608aadbead7a0d807e SHA512 f9c609bdce1398633011156a24ffe2d85411108902fba995837b07a6c8758c8f5108e6d7016bc18d56a1f9c21ffa3b9e6cf2a204ed92427137a3b8d360c7772b
-EBUILD dnsdist-1.9.8.ebuild 2711 BLAKE2B f55a4211d6d6f62e19930615b45f51a955d719e32a6e59d4182aa75121d56fec0ee2b95281f70e7e75f35a3ce8ec89ecbf1584dc37919e608aadbead7a0d807e SHA512 f9c609bdce1398633011156a24ffe2d85411108902fba995837b07a6c8758c8f5108e6d7016bc18d56a1f9c21ffa3b9e6cf2a204ed92427137a3b8d360c7772b
-MISC metadata.xml 1965 BLAKE2B 2d5f3a088a14fcdc2a36ccb3dae1cf47c44c3601264a3fd379e66d6440ac37182384d53d041e35a7bac72227800ba3cadd0ab02a2b0ab53883b6ed44d8803e13 SHA512 a2f3a0d9e17b653912d4269edf4f34e25ff0ebfdf19bea030b41830332ea880fb6fb49a4cb41a21e41402ce6b8478bee7a826874b68da1619dc3198b771d8b11
+EBUILD dnsdist-1.9.8-r1.ebuild 2816 BLAKE2B b9905719b8a60b10a421ab15319315bce05f32bdf8f6f263b9be7bb086b24750d90aa846a16fdf982a88a5d476b740b5aead909027a6e3c61158c95361a981b1 SHA512 995b8d9a777bfec1e75fb426eec6855be9ba684ed897f17976f871c70f95ead7766b8931a19038b287c011387826eb4a72f2e7193ac156e71fa9c84f8718c120
+MISC metadata.xml 1861 BLAKE2B c160b636f744acabe9ee303a60f8170bb5474d70e58b858e5585eb60e41b5b9d80f4e6cb8f49304b6ec7f11d0378332f8b9ebdd79d06d6d62cc9299b40e5e4ed SHA512 c034972452c33b6ded417772883af3d91f9b7f8f364fc9536337c91dbb23971592be082e8acac59d03b4b28779c081386e881085c5941b19d95ba3b3c544c65a
diff --git a/net-dns/dnsdist/dnsdist-1.8.0.ebuild b/net-dns/dnsdist/dnsdist-1.8.0.ebuild
deleted file mode 100644
index c0ec5088ac0e..000000000000
--- a/net-dns/dnsdist/dnsdist-1.8.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic 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 ~x86"
-
-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:=
-	dev-libs/libedit:=
-	dev-libs/libsodium:=
-	>=dev-libs/protobuf-3:=
-	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() {
-	# bug #822855
-	append-lfs-flags
-
-	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/dnsdist/dnsdist-1.8.1.ebuild b/net-dns/dnsdist/dnsdist-1.8.1.ebuild
deleted file mode 100644
index c0ec5088ac0e..000000000000
--- a/net-dns/dnsdist/dnsdist-1.8.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic 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 ~x86"
-
-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:=
-	dev-libs/libedit:=
-	dev-libs/libsodium:=
-	>=dev-libs/protobuf-3:=
-	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() {
-	# bug #822855
-	append-lfs-flags
-
-	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/dnsdist/dnsdist-1.9.4.ebuild b/net-dns/dnsdist/dnsdist-1.9.4.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic 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"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-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/dnsdist/dnsdist-1.9.5.ebuild b/net-dns/dnsdist/dnsdist-1.9.5.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic 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"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-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/dnsdist/dnsdist-1.9.7.ebuild b/net-dns/dnsdist/dnsdist-1.9.7.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic 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"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-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/dnsdist/dnsdist-1.9.6-r1.ebuild b/net-dns/dnsdist/dnsdist-1.9.8-r1.ebuild
index dc311688bbfd..b51d68a3dba2 100644
--- a/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.9.8-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit flag-o-matic lua-single
+inherit autotools flag-o-matic lua-single
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
+HOMEPAGE="https://www.dnsdist.org/index.html"
 
 SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
@@ -49,16 +49,16 @@ RDEPEND="acct-group/dnsdist
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/1.9.6-boost-1.86.0.patch"
-	"${FILESDIR}/1.9.6-json11-gcc15.patch"
-)
+PATCHES=( "${FILESDIR}/1.9.8-quiche-0.23.patch" )
 
 src_prepare() {
 	default
 
 	# clean up duplicate file
 	rm -f README.md
+
+	# reconfigure
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-dns/dnsdist/dnsdist-1.9.8.ebuild b/net-dns/dnsdist/dnsdist-1.9.8.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.8.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic 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"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-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/dnsdist/files/1.9.6-boost-1.86.0.patch b/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
deleted file mode 100644
index bf9d23984bba..000000000000
--- a/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Fix compilation with boost-1.86.
-Patch path prefix adapted for dnsdist.
-
-From: https://github.com/PowerDNS/pdns/commit/eed56000b1d68ac083b8e8bea4ff0ea30a1579c4
-
-From eed56000b1d68ac083b8e8bea4ff0ea30a1579c4 Mon Sep 17 00:00:00 2001
-From: Michael Cho <michael@michaelcho.dev>
-Date: Thu, 15 Aug 2024 22:49:17 -0400
-Subject: [PATCH] Fix build with boost 1.86.0
-
-Boost 1.86.0 changes seem to no longer indirectly include header which
-causes build to fail with:
-```
-uuid-utils.cc:38:58:
-error: 'random' is not a class, namespace, or enumeration
-```
-
-boost/random/mersenne_twister.hpp has been available since Boost 1.21.2
----
- pdns/uuid-utils.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pdns/uuid-utils.cc b/pdns/uuid-utils.cc
-index c59e0a0d0daa..301daff0bb1e 100644
---- a/uuid-utils.cc
-+++ b/uuid-utils.cc
-@@ -30,6 +30,7 @@
- #endif /* BOOST_PENDING_INTEGER_LOG2_HPP */
- #endif /* BOOST_VERSION */
- 
-+#include <boost/random/mersenne_twister.hpp>
- #include <boost/uuid/uuid_generators.hpp>
- 
- // The default of:
diff --git a/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch b/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
deleted file mode 100644
index 9aac470625f6..000000000000
--- a/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-Fix compilation with gcc-15
-
-Bug: https://bugs.gentoo.org/937628
-Bug: https://github.com/PowerDNS/pdns/issues/14549
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
-
-diff -rup dnsdist-1.9.6/ext/json11/json11.cpp dnsdist-1.9.6-gcc15/ext/json11/json11.cpp
---- dnsdist-1.9.6/ext/json11/json11.cpp	2024-07-15 11:46:15.000000000 +0200
-+++ dnsdist-1.9.6-gcc15/ext/json11/json11.cpp	2024-08-09 18:03:51.090140981 +0200
-@@ -22,6 +22,7 @@
- #include "json11.hpp"
- #include <cassert>
- #include <cmath>
-+#include <cstdint>
- #include <cstdlib>
- #include <cstdio>
- #include <limits>
diff --git a/net-dns/dnsdist/files/1.9.8-quiche-0.23.patch b/net-dns/dnsdist/files/1.9.8-quiche-0.23.patch
new file mode 100644
index 000000000000..a99897a691a3
--- /dev/null
+++ b/net-dns/dnsdist/files/1.9.8-quiche-0.23.patch
@@ -0,0 +1,52 @@
+
+Manual backport of upstream commit:
+https://github.com/PowerDNS/pdns/commit/661b071b347193a66deaa0d5b8350a2c816f6534
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+diff -up dnsdist-1.9.8/doh3.cc.orig dnsdist-1.9.8/doh3.cc 
+--- dnsdist-1.9.8/doh3.cc.orig	2024-12-17 10:14:37.000000000 +0100
++++ dnsdist-1.9.8/doh3.cc	2025-02-18 10:04:11.843950262 +0100
+@@ -751,7 +751,11 @@ static void processH3HeaderEvent(ClientS
+   }
+ 
+   if (headers.at(":method") == "POST") {
++#if defined(HAVE_QUICHE_H3_EVENT_HEADERS_HAS_MORE_FRAMES)
++    if (!quiche_h3_event_headers_has_more_frames(event)) {
++#else
+     if (!quiche_h3_event_headers_has_body(event)) {
++#endif
+       handleImmediateError("Empty POST query");
+     }
+     return;
+diff -up dnsdist-1.9.8/m4/pdns_with_quiche.m4.orig dnsdist-1.9.8/m4/pdns_with_quiche.m4 
+--- dnsdist-1.9.8/m4/pdns_with_quiche.m4.orig	2024-12-17 10:14:37.000000000 +0100
++++ dnsdist-1.9.8/m4/pdns_with_quiche.m4	2025-02-18 10:04:11.844114375 +0100
+@@ -10,16 +10,23 @@ AC_DEFUN([PDNS_WITH_QUICHE], [
+ 
+   AS_IF([test "x$with_quiche" != "xno"], [
+     AS_IF([test "x$with_quiche" = "xyes" -o "x$with_quiche" = "xauto"], [
+-      PKG_CHECK_MODULES([QUICHE], [quiche >= 0.22.0], [
++      PKG_CHECK_MODULES([QUICHE], [quiche >= 0.23.0], [
+         [HAVE_QUICHE=1]
+         AC_DEFINE([HAVE_QUICHE], [1], [Define to 1 if you have quiche])
++        AC_DEFINE([HAVE_QUICHE_H3_EVENT_HEADERS_HAS_MORE_FRAMES], [1], [Define to 1 if the Quiche API has quiche_h3_event_headers_has_more_frames instead of quiche_h3_event_headers_has_body])
+         AC_DEFINE([HAVE_QUICHE_STREAM_ERROR_CODES], [1], [Define to 1 if the Quiche API includes error code in quiche_conn_stream_recv and quiche_conn_stream_send])
+       ], [
+-        # Quiche is older than 0.22.0, or no Quiche at all
+-        PKG_CHECK_MODULES([QUICHE], [quiche >= 0.15.0], [
++        PKG_CHECK_MODULES([QUICHE], [quiche >= 0.22.0], [
+           [HAVE_QUICHE=1]
+           AC_DEFINE([HAVE_QUICHE], [1], [Define to 1 if you have quiche])
+-        ], [ : ])
++          AC_DEFINE([HAVE_QUICHE_STREAM_ERROR_CODES], [1], [Define to 1 if the Quiche API includes error code in quiche_conn_stream_recv and quiche_conn_stream_send])
++        ], [
++          # Quiche is older than 0.22.0, or no Quiche at all
++          PKG_CHECK_MODULES([QUICHE], [quiche >= 0.15.0], [
++            [HAVE_QUICHE=1]
++            AC_DEFINE([HAVE_QUICHE], [1], [Define to 1 if you have quiche])
++          ], [ : ])
++        ])
+       ])
+     ])
+   ])
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index 000b9a78abb3..83896633eca4 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -26,7 +26,6 @@
 		<flag name="lmdb">Enable support for lmdb</flag>
 		<flag name="quic">Enable support for dns over quic via <pkg>net-libs/quiche</pkg></flag>
 		<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag>
-		<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag>
 		<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag>
 		<flag name="web">Enable support for the web UI</flag>
 		<flag name="xdp">Enable support for AF_XDP high performance packet processing</flag>