From 4ea66e22be1ab08f4350baa8bf36cc6379b2bdca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Fri, 23 Dec 2022 15:22:36 +0100
Subject: [PATCH] [net-dns/bind] bump and sync a bit with eras overlay

---
 net-dns/bind/Manifest                         |  2 +-
 ...bind-9.18.9.ebuild => bind-9.18.10.ebuild} | 25 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)
 rename net-dns/bind/{bind-9.18.9.ebuild => bind-9.18.10.ebuild} (91%)

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 6743f14..cdb4de0 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1 +1 @@
-DIST bind-9.18.9.tar.xz 5281732 BLAKE2B be03b33a7596cb2c2e7059dc65190427037ef13d80e5b22aeb38892b9f2138ff93ecff1e13ccb8260313f5ed84953efd0b4e8adfa4f9ba6dae1f6df9c594b84a SHA512 7d9bca47e29e8634416ab52819d78ce4ec6196c0dcbd9fe95a24687337f71c69b6472cf20bf49ea0ae1751a861944f354f9122acfb01780f51278ad4a3fdd817
+DIST bind-9.18.10.tar.xz 5261572 BLAKE2B 7fdf92fbb92b739ceefef1e87cb89d489763c503199c409f36b809e24df13b43436d8c393864e6281b93866382ff2a946f03d725dfd042c00fab642e8835a1e6 SHA512 517b070e28cc3c3ab6bc47d353d00ea5d365c0f46859d80c4712df97da759de5176126efe7d53887a2f141d06e61adfe4c0036df8e79db1ca93b0818a1d65b5e
diff --git a/net-dns/bind/bind-9.18.9.ebuild b/net-dns/bind/bind-9.18.10.ebuild
similarity index 91%
rename from net-dns/bind/bind-9.18.9.ebuild
rename to net-dns/bind/bind-9.18.10.ebuild
index 575251a..ed87ee4 100644
--- a/net-dns/bind/bind-9.18.9.ebuild
+++ b/net-dns/bind/bind-9.18.10.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
 
-PYTHON_COMPAT=( python3_{8..11} )
 inherit python-any-r1 systemd tmpfiles
 
 MY_PV="${PV/_p/-P}"
@@ -18,9 +18,8 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn geoip gssapi lmdb selinux static-libs test xml"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-group/named
@@ -54,6 +53,7 @@ RDEPEND="${DEPEND}
 "
 
 S="${WORKDIR}/${MY_P}"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local myeconfargs=(
@@ -79,6 +79,7 @@ src_configure() {
 		$(use_with idn libidn2)
 		$(use_with lmdb)
 		$(use_with xml libxml2)
+		"${@}"
 	)
 
 	econf "${myeconfargs[@]}"
@@ -86,11 +87,15 @@ src_configure() {
 
 src_test() {
 	# "${WORKDIR}/${P}"/bin/tests/system/README
-	# ifconfig.sh up and then down as root
-	#default
+	# as root:
+	# sh bin/tests/system/ifconfig.sh up
+	# as portage:
+	# make check
+	# as root:
+	# sh bin/tests/system/ifconfig.sh down
 
-	# just run the tests that dont mock around with IPs
-	emake -C lib/ check
+	# just run the tests that dont mock around with IP addresses
+	emake -C tests/ check
 }
 
 src_install() {
@@ -151,13 +156,9 @@ pkg_postinst() {
 	tmpfiles_process named.conf
 
 	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
-		einfo "Using /dev/urandom for generating rndc.key"
+		einfo "Generating rndc.key"
 		/usr/sbin/rndc-confgen -a
 		chown root:named /etc/bind/rndc.key || die
 		chmod 0640 /etc/bind/rndc.key || die
 	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
 }