gentoo auto-resync : 26:10:2024 - 04:04:26

3 files changed, 22 insertions, 8 deletions

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 9aa0cf301a17..9ccc5a94fde5 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -21,6 +21,6 @@ DIST bind-9.18.31.tar.xz 5385812 BLAKE2B e069ab3caab887a87220b54804e5b19a4c21b8d
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.48.ebuild 11761 BLAKE2B 18aa8cc8e62794c72bd1ecb6cfc189b2b840b13e49077c6289fc991ebf7802dbb50573e06277b66fd818df6e293d21d8336b0a9fd002375964244b00e4f0f9a3 SHA512 b6b4887ca05afda804c0c3ebc6f06464a0865d86e2d8992c646a119f60c6c88df73ad4af833d88a7f5fc688ddd4cf1d507e38f30f27e6d686025fbf9adb0c7e9
 EBUILD bind-9.16.50.ebuild 11765 BLAKE2B d6a951f9a3c9df2429fd5be6b7bbe2a0d7a3023d1309848c6b6f27ecd624a836c1ccfe87b3671bf1273adc9d599a29611ef1838bf1edc726161b09301d41f5fe SHA512 d63ee808be0167bfafa3ff882435889bb826bc17c82af77e76550049942fc0423ba8cb3cf25de62453d8f2a4bf33f5f2513700a77fabfd6f244f5496da771db5
-EBUILD bind-9.18.29-r2.ebuild 7689 BLAKE2B 21b7cf4ef693b88d2a91c5621eb344d58980cf62d903b29eb8648ec804a523694040fe3731070332ea0eaa8e1b37b8c35237703aafddc536211f1f23b64a277c SHA512 3bca3f48ba49ef4e815ef05e7adaf865e77c334855288ff20d10043d0cbc6a8b65a68061701731d89e652639b1b32f716b51f22f15689938243696f665ba2391
-EBUILD bind-9.18.31.ebuild 8045 BLAKE2B 554ac0f390cd2d7071bc92a99ae06a69e34f10d535cb289a1b0a417c2be26a6c331c35bc130a8521587b341005d9fc9c591d63bc9fd8f6baa38d9b34eee80c55 SHA512 784a0cbc8d6fd987412ccc0f69c43db1233e9bc1e5f346376c1d21e6356b7d7b396c625ae5f536b3961c5d6aa3c8b82ed7179eec6006e702ed1dfc4b7b92282a
+EBUILD bind-9.18.29-r2.ebuild 8048 BLAKE2B cc00e846fb51989388efc812a5007bc59fc405f69bbb149b65dc919069918885ed674db6645e21cb6b2d9c9fc9b0e626be13b801d55c8d138bac6a2cdaa5a3a5 SHA512 015018ac4df5dc7f54837817566d9e39e146b862fbe8df1939eb8e7314fc0b8c217d48bf287cbe7308a7660ad38865e30c4f72d2caf4e0b2f28137f21de969b5
+EBUILD bind-9.18.31.ebuild 8040 BLAKE2B f40730eaa030d1ebaa83d1de58c268f9f32d2b6c054d5684209b0f65784e4d1b4b24c776b1df59625be410c6f05440c47a7686ba79e1abf6bfe94845b7a89dde SHA512 d1f2987c4e5812ebd368ceee567915b122ee3280def125a681d7a7aa08e911d32142563e6aef10e48c97fa3fc5f7a17cff295ef61c850d359f70d6c084007f55
 MISC metadata.xml 915 BLAKE2B e415b3c30f15ba3e3d367dd28ed8dac1e6791fbec6b90ebd5881e217db11987365a8eb574b5e6f008e1228fb38aa461a85e7c45c3521e0a48fb6a4808b3b82ce SHA512 575d7c9992c1b3fd82a28cd5bbb585f568240f90dff5e00384c8ff4f937f582d37d2121fa35664b812192b20a16f2a44c196fb841e4fa3d4fd2c725900ac7d51
diff --git a/net-dns/bind/bind-9.18.29-r2.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild
index 1f40ca79c839..e242b6cde6eb 100644
--- a/net-dns/bind/bind-9.18.29-r2.ebuild
+++ b/net-dns/bind/bind-9.18.29-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multiprocessing systemd tmpfiles
+inherit systemd tmpfiles
 
 MY_PV="${PV/_p/-P}"
 MY_PV="${MY_PV/_rc/rc}"
@@ -51,10 +51,19 @@ BDEPEND="
 	doc? ( dev-python/sphinx )
 	test? (
 		dev-util/cmocka
-		dev-util/kyua
 	)
 "
 
+src_prepare() {
+	default
+
+	# Don't clobber our toolchain defaults
+	sed -i -e '/FORTIFY_SOURCE=/d' configure || die
+
+	# Test is (notoriously) slow/resource intensive
+	sed -i -e 's:ISC_TEST_MAIN:int main(void) { exit(77); }:' tests/isc/netmgr_test.c || die
+}
+
 src_configure() {
 	local myeconfargs=(
 		--prefix="${EPREFIX}"/usr
@@ -73,6 +82,7 @@ src_configure() {
 		$(use_enable fixed-rrset)
 		$(use_enable static-libs static)
 		$(use_enable geoip)
+		$(use_with test cmocka)
 		$(use_with geoip maxminddb)
 		$(use_with gssapi)
 		$(use_with idn libidn2)
@@ -87,7 +97,11 @@ src_configure() {
 src_test() {
 	# system tests ('emake test') require network configuration for IPs etc
 	# so we run the unit tests instead.
-	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+	CI=1 emake unit V=1
+
+	# libtest is an internal test helper library, it has no tests,
+	# so suppress the QA warning.
+	rm tests/libtest/test-suite.log || die
 }
 
 src_install() {
diff --git a/net-dns/bind/bind-9.18.31.ebuild b/net-dns/bind/bind-9.18.31.ebuild
index 0793437baab0..b632aae9726a 100644
--- a/net-dns/bind/bind-9.18.31.ebuild
+++ b/net-dns/bind/bind-9.18.31.ebuild
@@ -16,7 +16,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="+caps dnsrps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
+IUSE="+caps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -75,7 +75,7 @@ src_configure() {
 		--with-json-c
 		--with-zlib
 		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
+		--disable-dnsrps
 		$(use_enable dnstap)
 		$(use_enable doh)
 		$(use_with doh libnghttp2)
@@ -101,7 +101,7 @@ src_test() {
 
 	# libtest is an internal test helper library, it has no tests,
 	# so suppress the QA warning.
-	rm libtest/test-suite.log || die
+	rm tests/libtest/test-suite.log || die
 }
 
 src_install() {