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

8 files changed, 37 insertions, 11 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index efb85bd8809e..e5c9e6596562 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index ff8ac10e669f..957d9ef74e70 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -4,5 +4,5 @@ DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192c
 DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603b7225522fe5b97d04c519f68f017fe0ccaf7ddeff029d17c0b4c3932a09f009376553f987671ba21f6b9cdb7d SHA512 0650ad5d55da2d9fe848d68aa59b16998b781152209ebcaabaea68144dab75ff9f4cfcceaa87a6b6da4f2f98fcf6f9eddd16d19ddf958fef242d93da03516dbc
 EBUILD bind-tools-9.16.48.ebuild 4437 BLAKE2B ceb368911ac87e28313213ac67024c1bb2ae9c03fd12322a309ff74bc8b113401e5cff37fd1a69e28c8fd4959a5597c5e90ec7ce80fee9e16fec21445918ffe8 SHA512 7025d670c51ccf1c0467ab183a353042d4466d64f68511072ebc2f416b607e49d5517cc4c1e5c261dab4f82d231f0ffc5380084c46863b781935738c9ac89dd0
 EBUILD bind-tools-9.16.50.ebuild 4441 BLAKE2B 6d0be779cca5491aeffef4ecf222c6f09dd9c888b07d7c3afee665a2bc83308576341e538a3cd83213128d74607a7067efe074bc7f78ec3acbf2e1063d6d2754 SHA512 e9dc4768f6968eaa656d98aecc01625ff98372b0b0c502778bbf04930e0591ee428d99c81c8b1ee28dc48c0e6605974c491ef1cc1cffaa93f0658a3cd11655d3
-EBUILD bind-tools-9.18.0.ebuild 602 BLAKE2B 673ba8264973cfeeaa0779537eae7e96f06cb6ba98e973ccb0af5622934abea6b83b0e7694ebdd962f9d32355657de57bb86eec20c4b6ee7527f7216a09830b0 SHA512 34735e1d85d5ad1eaf38fdfbbe9c12eab597c3b8ac1c86f4f618f6f9d16d7eece1956dc4b060b8830cf6378e1afe1273586e0b56778aadad47520ac98da3b0e9
+EBUILD bind-tools-9.18.0.ebuild 1086 BLAKE2B 9b3129caf6ea02d5439b1e25f1eec36dfdd14e8ee886f66c5077c9d6f8d8cccccbdcbe8b655ead3998ac38c6462eaeb27dfd35570ed0b85f17ff97d56b8f2fd2 SHA512 2e626a2e132434518f36244406bd83b20ea56e5c75783a1647e41c6c69fc6b96b6ed49fe9f7b6ac5a1bd731952a70bfe6b8686e12c506f988f9c0cc546aa9274
 MISC metadata.xml 393 BLAKE2B 90453ff0da1ce62c68dbe5c2f8ad99747388e8476afb02fc3794705d9acebbde1fb1d0c1f282a5e3fec62211b02af74c05783ebc2353dbdee3f2f0ba51541430 SHA512 d4e6b6f90058fedc771b2ecde5fb8cb8b3aa4069bded3a7a1ffe01766ca05b08a25b2a7f6d3f9cfa796868b9b290b20d2531ad25b7548427807125a2b8ea5bad
diff --git a/net-dns/bind-tools/bind-tools-9.18.0.ebuild b/net-dns/bind-tools/bind-tools-9.18.0.ebuild
index ddb9c952d6b3..ac583a3ecafb 100644
--- a/net-dns/bind-tools/bind-tools-9.18.0.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.18.0.ebuild
@@ -12,3 +12,15 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s3
 IUSE="+caps doc gssapi idn libedit readline xml"
 
 RDEPEND=">=net-dns/bind-9.18.0[caps?,doc?,gssapi?,idn?,xml?]"
+
+pkg_postinst() {
+	ewarn "net-dns/bind-tools is now merged into net-dns/bind and"
+	ewarn "net-dns/bind-tools serves as a dummy package until it is"
+	ewarn "eventually removed. The split was already a maintenance burden"
+	ewarn "because of lack of build system support for it, but this became"
+	ewarn "more severe with >=9.18.0."
+	ewarn ""
+	ewarn "Please run the following commands:"
+	ewarn "* emerge --deselect net-dns/bind-tools"
+	ewarn "* emerge --noreplace net-dns/bind instead"
+}
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() {
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index e06701dae747..876d2ffab719 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -14,6 +14,6 @@ DIST unbound-1.20.0.tar.gz.asc 833 BLAKE2B 14e53fcb692c1e078ae334d298c76ed30b8dd
 DIST unbound-1.22.0.tar.gz 6682466 BLAKE2B 28cf5c6c5e29d4026beb33e8a17b012d1185a3a100fafd3e2717233f47c7b0ad2bf7b7fc2d5ad8c15b6fef496ed9d9c95d116535c3c34c945b27c2a42fa197ff SHA512 6c873e19902ce6cd59cec7084d5dba1a5bd5fe4437c827ae69bdf9273bcd8d2d1ec0dc183076f8d2e1fd38730bf8c10852d678399f0b2ea8ccf7e39119568978
 DIST unbound-1.22.0.tar.gz.asc 833 BLAKE2B 02e582f5c77d8aee1a19ebb67ab081972461c298983f407d3e1d4daf6d771f087b95a19c93b7368cb3d76c350e40c3b886088d5772d5c259d0f2672a8f009153 SHA512 afbf5a125f104a25576b1c416b32f68d715b41a025fc3a61e6ee3bc28f9988b4277c7f0dd188c51cbe5641f51ade20f740ea131d1a7b5db38e2d1462a9edbb69
 EBUILD unbound-1.19.3.ebuild 6499 BLAKE2B cd4b63183a3c40ae340466593ad65f59b528951b18111e053d49e71826bcff4b7b2cf0d5e92e9597557cc76c08c64bcaadd004224101f2169f6bddda37ed5de6 SHA512 9d2dbf869631feb4b663743e3e243f922ead89501420bc5baeb533ff60f3a6a418836aca62558e69bcb76c27fd16372c3246e80468a6000aaf10085752d86d14
-EBUILD unbound-1.20.0.ebuild 6503 BLAKE2B f67ed1609632c9ad3b8bce93f6a2624992b53f3fbaa8ccec27e10ec94192b61fd5ec505116b092e0c60e7a9998da493d8c283c508185134658e11ec3c892fed3 SHA512 aae6244faafd4ed466b8d4f363a8bda3fb734929ab81c9023779a71d20002c35d0cbc29656da16586b173b18412c968e121c8878cda9a4be1d7f7ea97698225a
+EBUILD unbound-1.20.0.ebuild 6501 BLAKE2B 4e480643ac3016aba2040841c7ed5a41135e4cb802773a24c4e1c237976783c06ab55dc9c9396faae92ed6df35a42b6aab9297f666478c93f750fe46c50230a2 SHA512 59c7dfb70e27fe648ed0133965a34b2be8cf38d7fca29b471f3d1f88a6ce02b32012453001da99ec6d2875d5dc78cd79b3aa1015710bd1a7fa51f5aea49c072c
 EBUILD unbound-1.22.0.ebuild 6505 BLAKE2B fe2434f5ba333740f3b908048732893fc32c4ac412f7e852bb21e95ffccc4b91ba778ff8a461db651021c2d1e880f993e26326fa3b7d3ecb6adb5b71468a0ad7 SHA512 bb14da8c754cdb83f381c3f58eb3dd6111bc3ee182657699a5e83f7d273e525a5918a1d516ce15f9f36312ce5cf816ecc1b7978cf0a01f930cb2c46eef0daa24
 MISC metadata.xml 1475 BLAKE2B d0e34f4ba056c090af979f2686d5dece53a554c7ea7612fee1991ce6838ce161359bd8405d6358c5e184b6721affeee5d6e1bd93095b92765cd38dba928daa5b SHA512 8fba72eba420d4c06fb3a9119c3f324c5679fe268b65fac23878ef15f3c3d784d372874c7d6428d1c7c2eb3a75380ad2e4d5fc1691e7c2d1b426b8cfa381222b
diff --git a/net-dns/unbound/unbound-1.20.0.ebuild b/net-dns/unbound/unbound-1.20.0.ebuild
index 3175b1e15ddd..330ea4a71649 100644
--- a/net-dns/unbound/unbound-1.20.0.ebuild
+++ b/net-dns/unbound/unbound-1.20.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"