gentoo resync : 24.07.2021

4 files changed, 4 insertions, 123 deletions

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 51b4571f2061..1b74cb7e681e 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,10 +2,8 @@ AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179da
 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.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7
-DIST nsd-4.3.5.tar.gz 1184220 BLAKE2B 0ded84d9a0c25b86af6c05a7ab3ffb680177142b79a96f952cdeb92d87d9d0f306fb3c864b8f3cb769b05b0a863a7470df9407e6f3f5f0bc9a32891185d32b6f SHA512 bd031da779ff7b9b53fb4ea4d038a51f3b8f7b59a2927f674def46ca775f30afa059b471fed7d8ebcd2b7d02968945972b98856198eafbc4263d3064dae01029
 DIST nsd-4.3.6.tar.gz 1197835 BLAKE2B 943ae0700a2f49fffa9414f1d2718fef5e6a2f181373cc0a17ebe04433bce22d3863c8f17bd4d0412264503a80720d6dea9ce0d3ad6305f54dc3a2496118c90f SHA512 d87837b483ab37fde5d3eae7dca4c9e2672a718a1f49847db13232358108a5e0d6395c07d3fac72092a949d3c9861cd1dbed3e9bd0342ba6cbe7ca32feba09d0
-EBUILD nsd-4.3.4.ebuild 3049 BLAKE2B d84f9df0a35e63354adaf78ac2b579a79db4e31626105907b85d1c376713b51b4e8e017a37ea90eac9fda4276a53aa568360a45888feeeae02e4a53d848b78ea SHA512 a1acc0e770919a4165d7c98fbf750e12f711c4f7da11e01dfa645c8ac541f9c21e134cf065797e89a5e4d709e7575759688780a794add1044ceaa85cb911e498
-EBUILD nsd-4.3.5.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
-EBUILD nsd-4.3.6.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
+DIST nsd-4.3.7.tar.gz 1221215 BLAKE2B 79bd49324f62812a7f0f5800a686d09600620d1dc87ed9e7d4c1f2822c68700b73f5c58c328927fdf7f4af61a401033e39a8e59e054e53c564acfefc86d68bde SHA512 ef5fbcbeccba7e90cc7eed32c6a6f61f5471e13bfb74e5dd072cc9be7af67ebf97c93c0902e115efeda89489399e0543566a6847788ea7bebf13b9007f2c6193
+EBUILD nsd-4.3.6.ebuild 3049 BLAKE2B d84f9df0a35e63354adaf78ac2b579a79db4e31626105907b85d1c376713b51b4e8e017a37ea90eac9fda4276a53aa568360a45888feeeae02e4a53d848b78ea SHA512 a1acc0e770919a4165d7c98fbf750e12f711c4f7da11e01dfa645c8ac541f9c21e134cf065797e89a5e4d709e7575759688780a794add1044ceaa85cb911e498
+EBUILD nsd-4.3.7.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
 MISC metadata.xml 1160 BLAKE2B bd724c7485cbabe2738d0439b442c28858f66200acd237ec2a79f0b583fe4fbd0c82a68efd3af277a4e7d5333fc371b8150cea742373100d5b3667cb7d161145 SHA512 8576175fa8c53b3f7c2c588fb467ca633f6a628c90d7c08cb0d9414a5e721ab57c29c012f8021a7710aeac9be8d4d1ccd69acd6cb7309804460638ca6b51aa1d
diff --git a/net-dns/nsd/nsd-4.3.4.ebuild b/net-dns/nsd/nsd-4.3.4.ebuild
deleted file mode 100644
index 21733815a1e3..000000000000
--- a/net-dns/nsd/nsd-4.3.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.3.6.ebuild b/net-dns/nsd/nsd-4.3.6.ebuild
index 729d48122082..21733815a1e3 100644
--- a/net-dns/nsd/nsd-4.3.6.ebuild
+++ b/net-dns/nsd/nsd-4.3.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/nsd/nsd-4.3.5.ebuild b/net-dns/nsd/nsd-4.3.7.ebuild
index 729d48122082..729d48122082 100644
--- a/net-dns/nsd/nsd-4.3.5.ebuild
+++ b/net-dns/nsd/nsd-4.3.7.ebuild