From 6867dbd1cf1fbd0f08cfb45088f6eee307a5cd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Fri, 30 May 2025 01:24:28 +0200
Subject: [PATCH] [net-dns/bind] sync

---
 net-dns/bind/bind-9.20.8.ebuild               | 21 ++++++++++++++++---
 .../files/{named.conf-r8 => named.conf-r9}    |  1 -
 2 files changed, 18 insertions(+), 4 deletions(-)
 rename net-dns/bind/files/{named.conf-r8 => named.conf-r9} (99%)

diff --git a/net-dns/bind/bind-9.20.8.ebuild b/net-dns/bind/bind-9.20.8.ebuild
index 315ccec..76186d0 100644
--- a/net-dns/bind/bind-9.20.8.ebuild
+++ b/net-dns/bind/bind-9.20.8.ebuild
@@ -20,7 +20,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"
-IUSE="dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
+IUSE="dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs systemd systemtap test xml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -42,7 +42,8 @@ DEPEND="
 	idn? ( net-dns/libidn2 )
 	jemalloc? ( dev-libs/jemalloc:= )
 	lmdb? ( dev-db/lmdb )
-	xml? ( dev-libs/libxml2 )
+	systemd? ( sys-apps/systemd:= )
+	xml? ( dev-libs/libxml2:= )
 "
 RDEPEND="
 	${DEPEND}
@@ -58,6 +59,9 @@ BDEPEND="
 	test? (
 		dev-util/cmocka
 	)
+	systemtap? (
+		dev-debug/systemtap
+	)
 "
 
 src_prepare() {
@@ -68,6 +72,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# configure automagically uses sphinx even if prebuilt man pages
+	# are available. Force fallback to prebuilt ones.
+	use doc || export ac_cv_path_SPHINX_BUILD= SPHINX_BUILD=
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
 	local myeconfargs=(
 		--prefix="${EPREFIX}"/usr
 		--sysconfdir="${EPREFIX}"/etc/bind
@@ -83,12 +96,14 @@ src_configure() {
 		$(use_with doh libnghttp2)
 		$(use_enable static-libs static)
 		$(use_enable geoip)
+		$(use_enable systemtap tracing)
 		$(use_with test cmocka)
 		$(use_with geoip maxminddb)
 		$(use_with gssapi)
 		$(use_with idn libidn2)
 		$(use_with jemalloc)
 		$(use_with lmdb)
+		$(use_with systemd libsystemd)
 		$(use_with xml libxml2)
 	)
 
@@ -125,7 +140,7 @@ src_install() {
 	fi
 
 	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
+	newins "${FILESDIR}"/named.conf-r9 named.conf
 	newins "${FILESDIR}"/named.conf.auth named.conf.auth
 	newins "${FILESDIR}"/redhat/named.rfc1912.zones named.rfc1912.zones.conf
 
diff --git a/net-dns/bind/files/named.conf-r8 b/net-dns/bind/files/named.conf-r9
similarity index 99%
rename from net-dns/bind/files/named.conf-r8
rename to net-dns/bind/files/named.conf-r9
index 39f9be2..62b34bc 100644
--- a/net-dns/bind/files/named.conf-r8
+++ b/net-dns/bind/files/named.conf-r9
@@ -87,7 +87,6 @@ options {
 
 */
 
-	dnssec-enable yes;
 	//dnssec-validation yes;
 
 	/*