From 602417250d8dd17b628875b93142f07255db3e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Wed, 4 Sep 2024 01:46:38 +0200
Subject: [PATCH] [net-dns/bind] sync

---
 .../bind/{bind-9.18.29-r1.ebuild => bind-9.18.29-r2.ebuild}   | 4 ++--
 net-dns/bind/files/{named.service-r1 => named.service-r2}     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename net-dns/bind/{bind-9.18.29-r1.ebuild => bind-9.18.29-r2.ebuild} (97%)
 rename net-dns/bind/files/{named.service-r1 => named.service-r2} (80%)

diff --git a/net-dns/bind/bind-9.18.29-r1.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild
similarity index 97%
rename from net-dns/bind/bind-9.18.29-r1.ebuild
rename to net-dns/bind/bind-9.18.29-r2.ebuild
index 67294f9..79fe4e3 100644
--- a/net-dns/bind/bind-9.18.29-r1.ebuild
+++ b/net-dns/bind/bind-9.18.29-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -141,7 +141,7 @@ src_install() {
 	fperms 0750 /etc/bind /var/bind/pri
 	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
 
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	systemd_newunit "${FILESDIR}/named.service-r2" named.service
 	dotmpfiles "${FILESDIR}"/named.conf
 	exeinto /usr/libexec
 	doexe "${FILESDIR}/generate-rndc-key.sh"
diff --git a/net-dns/bind/files/named.service-r1 b/net-dns/bind/files/named.service-r2
similarity index 80%
rename from net-dns/bind/files/named.service-r1
rename to net-dns/bind/files/named.service-r2
index 65fbdb9..4ca3454 100644
--- a/net-dns/bind/files/named.service-r1
+++ b/net-dns/bind/files/named.service-r2
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 ExecStartPre=/usr/libexec/generate-rndc-key.sh
-ExecStartPre=/usr/sbin/named-checkconf -z /etc/bind/named.conf
+ExecStartPre=/usr/bin/named-checkconf -z /etc/bind/named.conf
 ExecStart=/usr/sbin/named -f -u named
 ExecReload=/usr/sbin/rndc reload
 ExecStop=/usr/sbin/rndc stop