gentoo auto-resync : 08:12:2023 - 11:11:23

3 files changed, 5 insertions, 31 deletions

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 19597290e233..1c341f30a3c8 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,12 +1,11 @@
-AUX nsd-4.6.1-incompatible-ptr-types.patch 791 BLAKE2B c1c4985203f95c59c0ad761ce6692b3669140e3928e97cdd08cbc42d12bfbd57594e4812af8fd942f29d654ee7cf1e0e8045e2b65bc9a60a98c8024919ef9276 SHA512 997d56676ac083516ca4ca5416fd655fc3462a0cb20ddf476a1f44a1785d64cf072a3b932ea2f60271cf855e0ab6ad366d13cf3b22174c8682b8fb6745957ea9
 AUX nsd-4.7.0-no-bind8-stats-no-ssl.patch 724 BLAKE2B ed9b6014a37e819f89624928a50499163f41cd65e881f5d835cbb9c7d9613dd9e24a790f69ae30135d95b8e5aefa10c606f6a47750254f3d89d0259ae780921f SHA512 3823eb145aa5c6b55992c498417d07643e85255d6033ae7444c51e2432475620f46750681ee9cf758fd7f2fc5336a9f7906d57fb8c78940641d88a1dff8311f1
 AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179daccde4e63a3972124247e6e8ce725c4dbd34a7fcd4f14b40899d7b59ba4937bdc59c493f6f7e173 SHA512 f775c78b529c5c7f1130035ea9c6cf1c1e9c1790c5df84fafd86a41294748a46c82b66c58df8385f8f4bbca8113427c665051aeec5720073bd9823607c9f8ce1
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.6.1.tar.gz 1281583 BLAKE2B 5eff5560ce16451a57905bb9d979c81918b6b55f72e1f1b89ab8d2e479ac36bf4f95152c77b1f1b3ce0af90bde8f25d2cad7226450c5cbc879f112adea2b3a69 SHA512 cab557a20cf8564cbf6e38405ca28b00baa6e14105527c3b16f49f57fed5e39cdb2bcd62999bad4aff2c69e0967bdba66a1eaa7b73a0d4d99d97535cc5860bfe
 DIST nsd-4.7.0.tar.gz 1289477 BLAKE2B d3949c8b65376ea78c700efaeb988acbfac5a5ba338f9bf29035176a7da6730ee8b7a2b6bfc5573ad178db80166ca74d71d313bf3d405acc666bf87f17dac63b SHA512 387e66993517c015ea49fc7a985c1f746623ae30a82bd01f224efbdb7c58d1d2f3e5a5a3574203959047876c632ec464b6682d1644f0e0f157ec0e6fb3f0cdbb
-EBUILD nsd-4.6.1-r1.ebuild 3209 BLAKE2B 389c985799ffa9042b6068090e361474ea3ed46d1e4011331db85b89260229801e7af8c6c0bbb00a086dec5598cc0b225ddf4546a7da5dc490146d54d7bde2ed SHA512 67cc70e82fa0c2b8bd236867b58eca15951c819c5446bb2d336e73458c193e4eae1f192c620b0eea6b7183fc1da012651abdc64bd363373a8cb12a8863ffb094
+DIST nsd-4.8.0.tar.gz 1273228 BLAKE2B d1e6a5e8fb158bb32081bc7674d957e3f5a596ed10ee89dd6a5f6af9a79a8c130f2de7070345bee69cb7798e9f373d856a9336a9e9f65f733ff45e15e94833ff SHA512 13c9cffffe6adfcbabf744ee2effebe6ae265d83476345a1edb60dc9c6d7f838a5e239e9b18e667924e5e76b74b2caac63818fcaecf7f0fa651ff21736174a46
 EBUILD nsd-4.7.0.ebuild 3217 BLAKE2B 6aa499c19a9d72b9b31c026cc67faabbe18ef4128684acc56e0ae5bb5cb2c909cf3e5682761cc8382d8974f654b16a120887a7483d64f88428d0ac5c827ee033 SHA512 b024a97f5208d01baaeacd5e225d2da71cb5ec56a891e879bea5d94f8a13fd996a688e8e2035fd0ea60ceefa2f36ea08d53b2cc7bab3f397cf764bfca5a1fc0e
+EBUILD nsd-4.8.0.ebuild 3156 BLAKE2B 6ed71c48f19645490d77a04d05325d235a19ee742bcbe51eb1af8d8db242b5ad5660e778b9bc052f48930a6dfde1427ef27b251a7246e039d3862509b62aa7fc SHA512 c4b82c928010a4ec5b57f736c0874f1b588dd1c3e2c9cb865e5fc94bf64888ab349b18a39819e1f60e45581397b037250cf72c1dc5efd4de6f6439c97f857182
 EBUILD nsd-9999.ebuild 3156 BLAKE2B 6ed71c48f19645490d77a04d05325d235a19ee742bcbe51eb1af8d8db242b5ad5660e778b9bc052f48930a6dfde1427ef27b251a7246e039d3862509b62aa7fc SHA512 c4b82c928010a4ec5b57f736c0874f1b588dd1c3e2c9cb865e5fc94bf64888ab349b18a39819e1f60e45581397b037250cf72c1dc5efd4de6f6439c97f857182
 MISC metadata.xml 970 BLAKE2B bdadf7cb1a1a444aff44b9f1ad7ea64a5b01d72888d91662f55cb321a94f8b03ea9f050e78df9cc2a81e2c538a81d463c95f998b8c7f65c192425d3a5917a25e SHA512 bc769f335f452a8f81f83d8333bf3db11620212b156eac80ddd9622312605b80b56d4fa6ebdb609b7c1999cc995672350b0181666c012ee69e21ff5b511af48d
diff --git a/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch b/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch
deleted file mode 100644
index 4b87be966eb0..000000000000
--- a/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/NLnetLabs/nsd/issues/239
-https://github.com/NLnetLabs/nsd/commit/7162600301205c3c62a1695c0b29e079694b65ae
-
-From 7162600301205c3c62a1695c0b29e079694b65ae Mon Sep 17 00:00:00 2001
-From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
-Date: Thu, 10 Nov 2022 09:47:59 +0100
-Subject: [PATCH] - Fix #239: -Wincompatible-pointer-types warning in remote.c.
-
---- a/remote.c
-+++ b/remote.c
-@@ -1212,8 +1212,11 @@ do_stats(struct daemon_remote* rc, int peek, struct rc_state* rs)
- 	/* force a reload */
- 	xfrd_set_reload_now(xfrd);
- #else
-+	RES res;
-+	res.ssl = rs->ssl;
-+	res.fd = rs->fd;
- 	(void)rc; (void)peek;
--	(void)ssl_printf(rs->ssl, "error no stats enabled at compile time\n");
-+	(void)ssl_printf(&res, "error no stats enabled at compile time\n");
- #endif /* BIND8_STATS */
- }
- 
-
diff --git a/net-dns/nsd/nsd-4.6.1-r1.ebuild b/net-dns/nsd/nsd-4.8.0.ebuild
index df0ec4a834af..d9028ba457da 100644
--- a/net-dns/nsd/nsd-4.6.1-r1.ebuild
+++ b/net-dns/nsd/nsd-4.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,11 +17,11 @@ else
 	MY_PV="${MY_PV/_rc/rc}"
 	MY_P="${PN}-${MY_PV}"
 
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
 		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 		S="${WORKDIR}"/${MY_P}
 
-		KEYWORDS="amd64 x86"
+		KEYWORDS="~amd64 ~x86"
 	fi
 fi
 
@@ -51,7 +51,6 @@ BDEPEND="
 PATCHES=(
 	# Fix the paths in the munin plugin to match our install
 	"${FILESDIR}"/nsd_munin_.patch
-	"${FILESDIR}"/${P}-incompatible-ptr-types.patch
 )
 
 src_prepare() {