From 90e0a5af34aef33b1dc846e253c0eb5687cbb08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sun, 18 Feb 2024 20:44:36 +0100
Subject: [PATCH] [net-dns/bind] sync a bit from gentoo

---
 net-dns/bind/Manifest             |  1 +
 net-dns/bind/bind-9.18.21.ebuild  | 20 +++++++++++++-------
 net-dns/bind/files/named.cache-r4 |  4 ++--
 net-dns/bind/metadata.xml         |  4 ----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 3fe831f..9dd26be 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1 +1,2 @@
 DIST bind-9.18.21.tar.xz 5507132 BLAKE2B 6b7e542d5b81d969e24bbce80578cad6dfc426e6ce4a9719184e19207f96419f7647dd1eeb2eab7503fa13f87786ad7bef98fcb587f021a7d281f5f1967525f1 SHA512 3cbc1775b6ca3d5eda0c277ab1246b5baa535dac53df3e60690aa7a2529bcb0fb644f7749b21b757870e5b3bc5f53ae9f0c0db182664de1b23f7e62c3fa8757d
+83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
diff --git a/net-dns/bind/bind-9.18.21.ebuild b/net-dns/bind/bind-9.18.21.ebuild
index 786246e..63309de 100644
--- a/net-dns/bind/bind-9.18.21.ebuild
+++ b/net-dns/bind/bind-9.18.21.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{11..12} )
 
-inherit python-any-r1 systemd tmpfiles
+PYTHON_COMPAT=( python3_{10..12} )
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc
+inherit python-any-r1 systemd tmpfiles verify-sig
 
 MY_PV="${PV/_p/-P}"
 MY_PV="${MY_PV/_rc/rc}"
@@ -13,8 +15,13 @@ MY_P="${PN}-${MY_PV}"
 RRL_PV="${MY_PV}"
 
 DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+SRC_URI="
+	https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+	verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz.asc )
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
@@ -22,7 +29,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn geoip gssapi lmdb selinux static-libs test xml"
 
 # libuv lower bound should be the highest value seen at
-# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_18/lib/isc/netmgr/netmgr.c#L202
+# https://gitlab.isc.org/isc-projects/bind9/-/blob/bind-9.18/lib/isc/netmgr/netmgr.c?ref_type=heads#L203
 # to avoid issues with matching stable/testing, etc
 DEPEND="
 	acct-group/named
@@ -62,7 +69,6 @@ RDEPEND="${DEPEND}
 	!net-dns/bind-tools
 "
 
-S="${WORKDIR}/${MY_P}"
 RESTRICT="!test? ( test )"
 
 src_configure() {
diff --git a/net-dns/bind/files/named.cache-r4 b/net-dns/bind/files/named.cache-r4
index 8b8a3b1..860b808 100644
--- a/net-dns/bind/files/named.cache-r4
+++ b/net-dns/bind/files/named.cache-r4
@@ -9,8 +9,8 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:     December 20, 2023
-;       related version of root zone:     2023122001
+;       last update:     January 24, 2024
+;       related version of root zone:     2024012401
 ; 
 ; FORMERLY NS.INTERNIC.NET 
 ;
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index 43399ee..aa2583b 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>