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

---
 net-dns/bind-tools/bind-tools-9.18.21.ebuild | 42 +++++++++++++-------
 net-dns/bind-tools/metadata.xml              |  8 ++--
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/net-dns/bind-tools/bind-tools-9.18.21.ebuild b/net-dns/bind-tools/bind-tools-9.18.21.ebuild
index fcf041b..4b167e1 100644
--- a/net-dns/bind-tools/bind-tools-9.18.21.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.18.21.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit flag-o-matic
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc
+inherit flag-o-matic verify-sig
 
 MY_PN=${PN//-tools}
 MY_PV=${PV/_p/-P}
@@ -10,18 +12,22 @@ MY_PV=${MY_PV/_rc/rc}
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_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}/${MY_P}.tar.xz
+	verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz.asc )
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+caps gssapi idn libedit lmdb readline static-libs xml"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 lmdb readline 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
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-libs/libuv-1.42.0:=
 	dev-libs/jemalloc
 	dev-libs/openssl:=
@@ -34,16 +40,23 @@ COMMON_DEPEND="
 	)
 	lmdb? ( dev-db/lmdb )
 	xml? ( dev-libs/libxml2 )
+	!net-dns/bind
 "
 
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!net-dns/bind"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="${RDEPEND}"
+# sphinx required for man-page and html creation
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+	verify-sig? ( sec-keys/openpgp-keys-isc )
+"
 
 # bug 479092, requires networking
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local myeconfargs=(
@@ -105,6 +118,7 @@ src_install() {
 	doman ${man_dir}/nsupdate.1
 
 	emake DESTDIR="${D}" -C bin/dnssec/ install
+	local tool
 	for tool in cds dsfromkey importkey keyfromlabel keygen \
 		revoke settime signzone verify; do
 		doman ${man_dir}/dnssec-"${tool}".1
diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml
index 2a0bcb3..b79cb1a 100644
--- a/net-dns/bind-tools/metadata.xml
+++ b/net-dns/bind-tools/metadata.xml
@@ -1,16 +1,14 @@
 <?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>
 	</maintainer>
 	<use>
 		<flag name="gssapi">Enable gssapi support</flag>
-		<flag name="lmdb">Enable LMDB support</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:isc:bind</remote-id>
+	</upstream>
 </pkgmetadata>