From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 14 Dec 2020 13:26:14 +0000
Subject: gentoo resync : 14.12.2020

---
 net-dns/Manifest.gz                                | Bin 8526 -> 8526 bytes
 net-dns/ddclient/Manifest                          |   2 +-
 net-dns/ddclient/ddclient-3.9.1.ebuild             |   2 +-
 net-dns/idnkit/Manifest                            |   2 +-
 net-dns/idnkit/idnkit-2.3.ebuild                   |   2 +-
 net-dns/ldns-utils/Manifest                        |   2 +-
 net-dns/ldns-utils/ldns-utils-1.7.1.ebuild         |   2 +-
 net-dns/nsd/Manifest                               |   8 +-
 net-dns/nsd/nsd-4.2.4.ebuild                       | 116 ------------
 net-dns/nsd/nsd-4.3.2.ebuild                       | 116 ------------
 net-dns/nsd/nsd-4.3.3.ebuild                       | 116 ------------
 net-dns/nsd/nsd-4.3.4.ebuild                       | 118 ++++++++++++
 net-dns/unbound/Manifest                           |   4 +-
 net-dns/unbound/unbound-1.12.0-r1.ebuild           |   2 +-
 net-dns/unbound/unbound-1.13.0.ebuild              | 202 +++++++++++++++++++++
 net-dns/valtz/Manifest                             |   7 +-
 .../valtz/files/add-support-for-srv-records.patch  |  83 ---------
 .../valtz/files/allow-underscores-in-records.patch |  48 -----
 .../valtz/files/fix-generic-records-support.patch  |  33 ----
 net-dns/valtz/valtz-0.7-r3.ebuild                  |  24 ---
 net-dns/valtz/valtz-0.8.ebuild                     |   2 +-
 21 files changed, 334 insertions(+), 557 deletions(-)
 delete mode 100644 net-dns/nsd/nsd-4.2.4.ebuild
 delete mode 100644 net-dns/nsd/nsd-4.3.2.ebuild
 delete mode 100644 net-dns/nsd/nsd-4.3.3.ebuild
 create mode 100644 net-dns/nsd/nsd-4.3.4.ebuild
 create mode 100644 net-dns/unbound/unbound-1.13.0.ebuild
 delete mode 100644 net-dns/valtz/files/add-support-for-srv-records.patch
 delete mode 100644 net-dns/valtz/files/allow-underscores-in-records.patch
 delete mode 100644 net-dns/valtz/files/fix-generic-records-support.patch
 delete mode 100644 net-dns/valtz/valtz-0.7-r3.ebuild

(limited to 'net-dns')

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index f960f5312886..c3d9ba5c77b6 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 9df110c5cd4c..0f0697dae428 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -3,5 +3,5 @@ AUX ddclient.initd-r6 584 BLAKE2B 6f1c9ddf862e50013208adbbd77f471ed03faf59381ed3
 AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc22526331fe28585ad1abc2c19fb3f2c65df1dd32bd20f3f121bf2f7d936ed42831067fc232024383c768a SHA512 1bcceae10d8076cb3fa5cb0215c0eaf17588e943d802c40cf5334f125a3697b103646bc393ba4db90845ad8e6ff1d4301b86afba5609ecb3bff98a5623f09195
 AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e2486a99d50d055edb85adff869209631cdfd8c2aa49263c31817868b765e7af27e222ad9f0b19bf439d74 SHA512 13c6e541ff23575d799eee943b8e10e277e5073732cd7c9705c23ee557bd99978435c0fe8b546fa3122a60cfb0499e27853e1968f0c1e0225890b68ae678e0c7
 DIST ddclient-3.9.1.tar.gz 63469 BLAKE2B 8ae6543353d96f76d926117ae53d74da6e8bc8f116fa15b8b0d39bc29a4c334bfc3d673b8f1c57139213b91414d1b9a2063fde9e1015f03fb76ba70a60956a7e SHA512 a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346
-EBUILD ddclient-3.9.1.ebuild 1562 BLAKE2B 794aee9b51e1380f0b6b8063e033a53803db76daad761cbde224e7955c6c9b94642c4c4aa1a2ac6313104d36c3e750105cd916741d599acc224d5c6502d570ae SHA512 d40f8c1a5172c24e9e0bab90f598715ef10368340d73dc78f920be4bb11c3bca43649a25b25aee4f5ccd6c017339313e262901107035ae7f73d7c96678ea8739
+EBUILD ddclient-3.9.1.ebuild 1561 BLAKE2B baa30b6b674fcea5a89d0abcfd5b82d9ddd9e56dae2ab6adf145c2480dd40477be8acc7890c69488b99ca5e7236555b4f740dd03646d68f30e14b589561ddd20 SHA512 391189e3d39d957d2cfda076aceaa15cfe1d77d82fdedea3ccedf1047e03e4698199c93bc4f3583672bec5bc3c587ff679b5790c84ff0260f3592e5582596e4b
 MISC metadata.xml 999 BLAKE2B 03fc5ec95eaabd6a8c15006f04ffa5e1c9d809719629319a8f919237a1d7359d8ea82ffa29b2796099eafd7ee152e81b544971734f1d751bf8f61e2cb51c1f0c SHA512 f70662793b7eca94703847084e4c0882ab6a6ec891383bd012c03afbb26c7b252db5adfdfaa9937dce1988b1c88bcd91f1a7a3c318b1fe3a5a6479d74de4a6b0
diff --git a/net-dns/ddclient/ddclient-3.9.1.ebuild b/net-dns/ddclient/ddclient-3.9.1.ebuild
index eb32b5024e2b..35ab76e4bda1 100644
--- a/net-dns/ddclient/ddclient-3.9.1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://ddclient.net/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index cbeb59091676..19c86f3e545a 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -3,5 +3,5 @@ AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
 EBUILD idnkit-1.0-r2.ebuild 1035 BLAKE2B f1c1f0b78d45d8dd324e496211188a33be3f12e2293df7d835e5ad6ceb71b5c6393398ba046f9cce15af060ff5211658ad348e676bb8417ab3b2fb6df8115415 SHA512 183fd2b7f6330de7e79b073caf961c5388a7c46a91d9d516c8ef9c634a88089122c0c6541bc3ad64318e13eb7904cbaebc8fce58dd3a2c21276f48defc81c3a0
-EBUILD idnkit-2.3.ebuild 642 BLAKE2B c5912f0984cd70da1805e2ff756a035575c5948eeca1edc07b0089141f5b0957215af760c943aba3ae0270c0336c7884590774659c98a8f2798b031bd48359c7 SHA512 dd36ae79d5a4d90aefa16dc832b14faf17031d0082acec30605fe89dfca0fe93318ea6048099af171cc4e93312fd502bf285ceb29c379b10078dbee223717793
+EBUILD idnkit-2.3.ebuild 635 BLAKE2B b510282bbfaa8d659515ec5a00393e37fc5bfc490e277d52e3ccfdaeccf5178bf440c29fb6ad5610c39d52fd4313aeea46d3eb1989f68a7657fd991f927898c4 SHA512 63ef55ddb1dd9d9e14bde80d836b9ed28201ec918b6c7b00c33d08bda6fdd71fda6c43ba8a627d49577f8f6698e31f3d50c5d7809d0ce926d15a9424d2cd887c
 MISC metadata.xml 246 BLAKE2B 053eb1eb0345156eb262d7eb10e70636fda57808641af19b715d4d323f19127491fe53e1dc7028454bc4af3f5ed282acd8d8632617b65c2003382193716510ca SHA512 02003cbc53a83f024e07311dc98a6255bcaa23c879f9b7da1263261e323c678bcb80fb0f9c3025076eafedaa0a85a52a98e963d37a692e8902bb9c6d68b54390
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index ddff15c12c15..e80d11bc44b0 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="liteonly static-libs"
 RDEPEND="
 	virtual/libiconv
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 3a00f7ef2896..8f3410d320c5 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,5 +1,5 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-utils-1.7.0-r1.ebuild 1194 BLAKE2B bd2ee91e3a1adee034b4864ec624e15531bf27cadd9625744344c5df88a2a5adc0fc6c02045ef36bc4e88042bda9e85ad658c076709cdc413ba5f041dbd9c871 SHA512 a59e00760c948641198c9693f503244b62166cc4f628c1fe49fb6aa3a7abddeb47e616fded6d466e85d982a1d921883d51f0776f88dad3c0162f40d017561b22
-EBUILD ldns-utils-1.7.1.ebuild 1481 BLAKE2B e26d3fea31d6de2b15c15b035699e589dd7b2f40df01a9fa435a0d96d947426cc3db8aa168efb6fb6f645b9035a2d2fd05e0af3d764787137dbe4e3dd5c9dec6 SHA512 c12ba1bdb889e7431c0b69b9f90174f633bb7eacb140fb092c98237a19e2a5da3a1eab3a9ba4492afe94dfba96b4b8f187ea0a45bbe092e0a0d4fba842ede643
+EBUILD ldns-utils-1.7.1.ebuild 1476 BLAKE2B 3394248b15bd9111b06f44836692f55bff86d5b1db7d021e2f204d5e17db9513151198e3a014bfad5528c2f41445960dea9481d891486000328e847e11861153 SHA512 a0fd24e05a4b72ef64d54204066ef87302c761e412dbab4272c6b50962af9de2b7cd41e60c2df6200f63d00025b24070037d0de8014a0712fe0275cbf51c1a37
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index b51adb0c072b..969fdba5b692 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 8876726a4ddb..73e2510088e8 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,10 +2,6 @@ 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.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208
-DIST nsd-4.3.2.tar.gz 1177939 BLAKE2B 3c1eac9065c5c8aae3b0a98d43cdbc5d757712656efc7ed912b51b91f4b3b84672a15de8476eba40642d766abd9499bbdeaf71aa6e6720a67ac83a1ed0ea274c SHA512 0423aeddc7f60e04718b6ee0954fbdc274576b6ef61472324256e5db696f41e47899b645cbc4d6d8cc2a7dd00190b72f3ef0476c4640dbb80d36ec39f1c9f5c8
-DIST nsd-4.3.3.tar.gz 1181082 BLAKE2B 611027e015f89a6aef0bc9e0b74242e683a1475f5cd2a79dc16a30011989c33a4d3bd21aced24dc6040469a304414b7e775261b097beb007e06c3c025dbf2b9e SHA512 5e7e2037e0939af20af137c913943904e36cf7da517292d40dbbd4f7ebc878b0e97acd7f6cbbaaebbb525a84f6d6ae9e82c34df9c8482075653c4802777a9fa6
-EBUILD nsd-4.2.4.ebuild 3013 BLAKE2B ea358a487f8e18f40a6d5018c04994607c9f7a66e53b31ea70eb24e0386ae15d8e7ac7c0c7196980241420a5de90fd30c980b03f30914febbe725608341fde6a SHA512 52b615e9b4676a35ebf0d3b413ed703c10b65f860adbdc490f9624d31e898dcee34fd01efc8d294b83a517ac54ddd713ab010fb296ade398a1ce4257f0054d01
-EBUILD nsd-4.3.2.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
-EBUILD nsd-4.3.3.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
+DIST nsd-4.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7
+EBUILD nsd-4.3.4.ebuild 3109 BLAKE2B 7af915c66086aefe78f666fc2aaa4df0bc8dfd99e58f1290baff441348cd69ef7fb377c0dc4ab0b1d1b9f456bf8eef2aff1813570affc3d4b6d2b833d904d294 SHA512 1db683c09d190c652c9ca9435e19d72f0ea881929b905938d54a8972da4c2584f19759a484fe0d6355be6c5428a4a1c387de902f562c5b9106908f06f97dff51
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.2.4.ebuild b/net-dns/nsd/nsd-4.2.4.ebuild
deleted file mode 100644
index fa42a2b9d37c..000000000000
--- a/net-dns/nsd/nsd-4.2.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 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 libressl"
-
-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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	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
-	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.2.ebuild b/net-dns/nsd/nsd-4.3.2.ebuild
deleted file mode 100644
index b6ca20a489b4..000000000000
--- a/net-dns/nsd/nsd-4.3.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 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 libressl"
-
-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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	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
-	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.3.ebuild b/net-dns/nsd/nsd-4.3.3.ebuild
deleted file mode 100644
index b6ca20a489b4..000000000000
--- a/net-dns/nsd/nsd-4.3.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 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 libressl"
-
-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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	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
-	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.4.ebuild b/net-dns/nsd/nsd-4.3.4.ebuild
new file mode 100644
index 000000000000..1b91a3af2521
--- /dev/null
+++ b/net-dns/nsd/nsd-4.3.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 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 libressl"
+
+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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	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/unbound/Manifest b/net-dns/unbound/Manifest
index 1272aaac8b59..f189ab432992 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -10,8 +10,10 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85
 DIST unbound-1.11.0.tar.gz 5900967 BLAKE2B 3119bbcd78fa19c610937215abc64abcc1ca96ba42b6753a1e36fef501f68971ac2ee0cb9bde377e0b257c57f505aeac2315a6bf031626874d30967b0a5eb46a SHA512 511e787c5f9647286b07028702a8909390e0e6eafe7224459d5f1eee8a8dfb09c71e33f291e30851dc57411123b91dfe0e124787109a7e4afdf6f3b02768e7cd
 DIST unbound-1.12.0.tar.gz 5918399 BLAKE2B b3dccecb1fd019f36e47c62583348a375f5eed7c84094c48def1ff9e73dc283911a2a9b318c8a4be45f5cd4bfb17f26722a9b900aa1980f49790cc55f6412d1d SHA512 90d99bc65e9ba62e50a7809dbf1e98889d0fc9fd50cf3cc99b726c67bcaeda0c2bc176d09f84771adb9796833b595591462f96e949d6969a47d6898d8fae3479
+DIST unbound-1.13.0.tar.gz 5950063 BLAKE2B 742eed33845079452a942837a64e80f89ec7ec73459d0045c70ff83d3ba982fae6bade9feb56ef6faa9fca4859222ea00ac587c65c8ad722bef4a6b66a276ade SHA512 d4f3c5a7df5d46f8b1ee32b61e68bdc0d63030820d236ecc51bc3ac356d15248acb9a5e0b6009e1936b03b751e8dd05a071a95ab239fdbbbb308442a59642ad5
 EBUILD unbound-1.10.1-r1.ebuild 5424 BLAKE2B 85fe1509a5c82edf8985ce6cfa80325db99959566a7f63b9407d3c19311d420e98cfb29674538325740b485b48351a2e7621f6afdeb13c4f3152bff8c880b996 SHA512 8d65dadb63f9a70ee72e7cbadfc45a5921d4ec886540d01cab588696b0bbf7b30d502bcef1c0ae38d0e554979ca9cbe90bb7444ed00e87defb687640f9ea0546
 EBUILD unbound-1.11.0.ebuild 6003 BLAKE2B 5e92333ca334d085b994fd9dcfc4b9eb97c0355b130472dd434b6a892bcde8439ae33f4413f8aa5e9e6867891750e152c28892a88f9d88e5848f20ebcee459b0 SHA512 4d6061372950b54091b0fae9c1e2d8eb93b75a60a081d0f8431239457bd5311bdb78109f55e08779c50cab4a8bc0f07281f95d51b8b1dd83f4eac03b40b6e2b7
-EBUILD unbound-1.12.0-r1.ebuild 6077 BLAKE2B a5ceec5a6ddab8e9ea44e15d1e0bb8bd59886f7ca2acb94b4b9c4776fa703332d5bfbbaff9fdda2bc0666116400b03ed7ed2d6846018f1765a61821c23229efd SHA512 165f5e8fa81ae7792f50255e8f94c56808b0c6e50cd0c50a273a806378a09c00a1ae47a2c7ac2003b64b754f47e68e0c111e939e59fde26baf861f624f7b4912
+EBUILD unbound-1.12.0-r1.ebuild 6075 BLAKE2B 06c59fcad9b6351fdca6d0f7f5e71a2802005ade6c9f285a8a0b52a3158084638c698831c9b61158582f48223e22b48eddc300780dad2e7c8cee8f78887d1f91 SHA512 422b16aadcd2b8f38f03cd2fe8c22dff94bac532ad837bc1f81c1c2a3cddafccacc7fca70b41f7debb8ece6a04660a8f1e4b78a2ae18180e8ea4f475e8c21335
 EBUILD unbound-1.12.0.ebuild 6008 BLAKE2B dd27e2b8d4d1c320af8e268ae5f0d9f95d26782137bfb11deebe44533904da8716d894bfacdcd3bbd187c0d1d52d9e6a57a330f75ced2cb3d1b802f705bc352e SHA512 df2940e7037f61717bc8c53a6ce386d189b4bffbb4a8881074798718087ab78e10e5c840070f629432f2ca328727b585ba2695703f9572ba5913fe8ad461d415
+EBUILD unbound-1.13.0.ebuild 6075 BLAKE2B 06c59fcad9b6351fdca6d0f7f5e71a2802005ade6c9f285a8a0b52a3158084638c698831c9b61158582f48223e22b48eddc300780dad2e7c8cee8f78887d1f91 SHA512 422b16aadcd2b8f38f03cd2fe8c22dff94bac532ad837bc1f81c1c2a3cddafccacc7fca70b41f7debb8ece6a04660a8f1e4b78a2ae18180e8ea4f475e8c21335
 MISC metadata.xml 1444 BLAKE2B ff1a69e8795fc834ba6b365ee389743bc8d2a2e82375a07c757ad6fcf5cad4cbfec321bba6ce4f8e505414a5cdce09e8257f97eb1fe199bc1fb911a769f7a6b5 SHA512 a96d5847589f861d2d3e7a416e5af0dafc0940a60f997456bf6a3a9c09e3e2910a8fe9474474e81b907cd9093525125539ad93345f84dbf6d10454a3aa5cbf4f
diff --git a/net-dns/unbound/unbound-1.12.0-r1.ebuild b/net-dns/unbound/unbound-1.12.0-r1.ebuild
index bd4fc88d4d23..b899f7ff0e35 100644
--- a/net-dns/unbound/unbound-1.12.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.12.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/net-dns/unbound/unbound-1.13.0.ebuild b/net-dns/unbound/unbound-1.13.0.ebuild
new file mode 100644
index 000000000000..b899f7ff0e35
--- /dev/null
+++ b/net-dns/unbound/unbound-1.13.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	http2? ( net-libs/nghttp2 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		$(use_with http2 libnghttp2) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/net-dns/valtz/Manifest b/net-dns/valtz/Manifest
index c7c7eb9835d9..1b2f948ca8da 100644
--- a/net-dns/valtz/Manifest
+++ b/net-dns/valtz/Manifest
@@ -1,8 +1,3 @@
-AUX add-support-for-srv-records.patch 2565 BLAKE2B 8e858bbb93991ccdb033318dec6c81c391181ea7c43044ff3f660995b114a7592c23099306e67eeb99bed05f6ec04bcab7153512b45c8031175f24a85f6a82b2 SHA512 6c4616f1df43530f1ccebd900ac19bac6b8f217dfebfa81b6eaf25afa0dbd96c616a5e7b859a326eb903d82f7d165997a695c21c8a457be467fc51d92bc40f0b
-AUX allow-underscores-in-records.patch 1561 BLAKE2B 7aba9fc4ca4f0b25d1bed1f7dbe524073b1b16b701a4c3d7830fd20e40af1983284a640a7c4ad913e9d8b2b27a864225989b0a8e7e9ec55c5d56841e65d837a3 SHA512 c23aaadab40863710b0ff9de964ab639c4dec2ef5aec0bf2fb402e7631436081012e80302aac5dbc81611b127fc2a6b549b7bb433d0220f012a7ae39fa0a0381
-AUX fix-generic-records-support.patch 1165 BLAKE2B e164ea03315bbbb0d9641f66a37c22a97a4f8e05f4dae86af542619b3299ad764417a40718e944bf10e6119419fad29beff55b947b00e601f86a5297cc2826fa SHA512 0613180930e526feeffa4367d1bf3e0050d2dcffe2181464b9084a1223ec4482c23890868aa761ae1a046da67b16f61761026fd2194c44bdaf6c4c5c556e3e62
-DIST valtz-0.7.tgz 10638 BLAKE2B f6c8c476f523bc72531dd6537a7ed096b4fe15122db8ac8398b6ce325e8d61aecd3ef496c6102127bb8df4c8e0651201826ed4ccf79fd47616b6e083967412c4 SHA512 173e9f04399f8011b565ddfa7ad542c87af03da1b829d40b616271a993a282a1a3f54fb434db4837fb9ee4c3eb66a39f70ebf5ff5f13aff9c6fccfeabb3a3df7
 DIST valtz-0.8.tar.xz 9644 BLAKE2B f5a102931fdd58e9ac85ff09f93243f76268cf3fd7c8cd3853b463115d292250293ca17e430ce93d0e7e5b78d90805126e24538b2f10bbf314a9ca0dbfd54d9f SHA512 87ad87445fb68b962b43e1d4cd08f155bdd3fe83480134dc141371bec87a2facce7f45381df655921e2875bb77c24bfb184487d8055f18a3acff50d8f4fa5c71
-EBUILD valtz-0.7-r3.ebuild 575 BLAKE2B 7fd7cdd50df24786611af4da7dcc86e7bcbf1fcce6c31de44092cac87aeff92406d52aa75aa61393a9c9b69d4277452edc1f52ab82d56262a893747678f7ca38 SHA512 aaca95ea3315239811cc6cc31d078af6195364a018e663b3f247829f73f3962bf8e55a4b63469349ab45e33d47295d15a64b5f6eae4982a694a39e2338bec96f
-EBUILD valtz-0.8.ebuild 448 BLAKE2B 9cf16ba539e2abd6dc932b31c548e694285d36c0862d4e549b882ed773c18508965e09d1dd3b2cc5a09377e58c029355b10802827aefdb1980268a42aeb430d4 SHA512 cdec3924b6a7a5ded8c8d4936bdff2c0981f9ea1042a0c411fb7b357f3c783a71d5170b82b5b0af2e5a5f659ed58e44a0fae1e85dad4d2a7088315d875dae0e6
+EBUILD valtz-0.8.ebuild 446 BLAKE2B 70a2047599863922f2c63a816fdda78b07df3c01354f45c2c53dd076a1956a71c3ec0438feeafdbd32be612f452e601149e2a882cdd48eccb2705e5f353cbfbc SHA512 cd3cfbcbc4ee5bb7658878ba010e6f8e5ea6e779932d3a2b43944befc0c373ca8483ae08d0b7e59251470545985ebb2d292f115cd7182b7caa4979f3cc7b63b7
 MISC metadata.xml 425 BLAKE2B 4d19148fc299036fffdd0c0c5b2dbbd35ee256071c36fad39a3595a95cc560466e10d680cf720c6b2a51d7304d21d734b7039c3fbc74f304cc9d5c8293ece42e SHA512 028d54f6c591f211acc6ae3605158053516e17424db39e34b8cf01706619421f65efbbb422e0bdfad88be4b1f539672782ad754201499ae3a40deb00c05c0ab4
diff --git a/net-dns/valtz/files/add-support-for-srv-records.patch b/net-dns/valtz/files/add-support-for-srv-records.patch
deleted file mode 100644
index f8b9435c2ba8..000000000000
--- a/net-dns/valtz/files/add-support-for-srv-records.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 9d29c28941ca629e223d0d4f20a833f10375d331 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 5 Dec 2019 10:28:40 -0500
-Subject: [PATCH 2/3] Add support for SRV records.
-
-There is a patch for djbdns that adds support for SRV records to both
-tinydns-data and axfr-get:
-
-  From: Michael Handler <handler@sub-rosa.com>
-  To: dns@list.cr.yp.to
-  Subject: tinydns-data SRV & axfr-get SRV/PTR patches
-  Date: Thu, 14 Sep 2000 20:37:50 -040
-
-Many distributions carry the patch, but valtz rejects the SRV records
-because it doesn't recognize the "S" indicator or know how to validate
-the port, weight, or priority fields.
-
-This commit adds support for the new record type, and adds validation
-routines for the three new fields. All of them are the same: ports,
-weights, and priorities are all integers between 0 and 65536.
----
- valtz | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
- mode change 100644 => 100755 valtz
-
-diff --git a/valtz b/valtz
-old mode 100644
-new mode 100755
-index eebda76..92aaa40
---- a/valtz
-+++ b/valtz
-@@ -100,6 +100,9 @@ my %token_name = (
-     'min' => 'Minimum time',
-     'n' => 'Record type number',
-     'rdata' => 'Resource data',
-+    'port' => 'Port',
-+    'priority' => 'Priority',
-+    'weight' => 'Weight'
- );
- 
- my %record_type = (
-@@ -114,6 +117,7 @@ my %record_type = (
-     "'" => 'TXT',
-     '^' => 'PTR',
-     'C' => 'CNAME',
-+    'S' => 'SRV',
-     'Z' => 'SOA',
-     ':' => 'GENERIC'
- );
-@@ -131,6 +135,8 @@ my %line_type = (
-     "'" => [ 'TXT', 'fqdn:s:ttl:timestamp:lo', 'fqdn:s' ],
-     '^' => [ 'PTR', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
-     'C' => [ 'CNAME', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
-+    'S' => [ 'SRV', 'fqdn:ip:x:port:weight:priority:ttl:timestamp:lo',
-+	     'fqdn:x:port' ],
-     'Z' => [ 'SOA', 'fqdn:mname:rname:ser:ref:ret:exp:min:ttl:timestamp:lo',
-             'fqdn:mname:rname' ],
-     ':' => [ 'GENERIC', 'fqdn:n:rdata:ttl:timestamp:lo', 'fqdn:n:rdata' ]
-@@ -340,6 +346,21 @@ my %token_validator = (
-         # TODO : Validation needed? 
-         my $result = 0;
-         return $result;
-+     }],
-+    'port' => [ 21, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-+    }],
-+    'priority' => [ 22, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-+    }],
-+    'weight' => [ 23, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-     }],
- 
- 
--- 
-2.23.0
-
diff --git a/net-dns/valtz/files/allow-underscores-in-records.patch b/net-dns/valtz/files/allow-underscores-in-records.patch
deleted file mode 100644
index b76b231e6f15..000000000000
--- a/net-dns/valtz/files/allow-underscores-in-records.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7c5df8ad5c18a9f8b9440dbd1ae4faacf55b452a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 5 Dec 2019 10:34:54 -0500
-Subject: [PATCH 1/3] Allow underscore characters in FQDNs and pointers.
-
-Modern DNS records can contain underscores for a number of reasons. In
-particular, DKIM records involve a "_domainkey" part,
-
-  https://tools.ietf.org/html/rfc6376
-
-that is rejected by the current "fqdn" and "p" validation routines.
-Moreover, any SRV records will have a service name prefixed with an
-underscore:
-
-  https://tools.ietf.org/html/rfc2782
-
-To recognize these tokens as valid, this commit expands the "fqdn" and
-"p" regular expressions to allow underscores as the first character in
-each component of an FQDN.
----
- valtz | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/valtz b/valtz
-index c68c120..eebda76 100644
---- a/valtz
-+++ b/valtz
-@@ -202,7 +202,7 @@ my %token_validator = (
-         # check all parts
-         for my $hostpart (split /\./, $s)
-         {
--            return 1005 unless $hostpart =~ /^[-a-z0-9]+$/i;
-+            return 1005 unless $hostpart =~ /^_?[-a-z0-9]+$/i;
-             return 1006 if $hostpart =~ /^-/;
-             return 1007 if $hostpart =~ /-$/;
-         }
-@@ -268,7 +268,7 @@ my %token_validator = (
-         # check all parts
-         for (split /\./, $s)
-         {
--            return 1005 unless /^[-[a-z0-9]+$/i;
-+            return 1005 unless /^_?[-[a-z0-9]+$/i;
-             return 1006 if /^-/;
-             return 1007 if /-$/;
-         }
--- 
-2.23.0
-
diff --git a/net-dns/valtz/files/fix-generic-records-support.patch b/net-dns/valtz/files/fix-generic-records-support.patch
deleted file mode 100644
index b266340a471b..000000000000
--- a/net-dns/valtz/files/fix-generic-records-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-mjo: cherry-picked from https://github.com/wKovacs64/valtz
-
-From 422cc33cf0da52d10c271a75cda271d5963da4eb Mon Sep 17 00:00:00 2001
-From: wKovacs64 <justin.r.hall@gmail.com>
-Date: Tue, 16 Dec 2014 17:13:17 -0700
-Subject: [PATCH] Fix support for generic records
-
----
- valtz | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/valtz b/valtz
-index e9b831f..c68c120 100644
---- a/valtz
-+++ b/valtz
-@@ -75,7 +75,7 @@ my %validation_msg = (
-     1007 => 'parts must not end with the - character',
-     1008 => 'integer out of bounds',
-     1009 => 'must have at least three labels to be valid as mail address',
--    1010 => 'must not 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
-+    1010 => 'must not be 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
- );
- 
- # NOTE : ONLY translate the right-hand part
-@@ -331,7 +331,7 @@ my %token_validator = (
-         my ($type, $s) = @_;
-         my $result = validate_integer($s, 65535);
-     
--        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s=252);
-+        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s==252);
- 
-         return $result;
-     }],
diff --git a/net-dns/valtz/valtz-0.7-r3.ebuild b/net-dns/valtz/valtz-0.7-r3.ebuild
deleted file mode 100644
index 131ff011aed8..000000000000
--- a/net-dns/valtz/valtz-0.7-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Validation tool for tinydns-data zone files"
-SRC_URI="https://x42.com/software/valtz/${PN}.tgz -> ${P}.tgz"
-HOMEPAGE="https://x42.com/software/valtz/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=( "${FILESDIR}/fix-generic-records-support.patch"
-		  "${FILESDIR}/allow-underscores-in-records.patch"
-		  "${FILESDIR}/add-support-for-srv-records.patch" )
-
-src_install() {
-	dobin valtz
-	dodoc README CHANGES
-}
diff --git a/net-dns/valtz/valtz-0.8.ebuild b/net-dns/valtz/valtz-0.8.ebuild
index b98620fc1489..66aaf7aaee85 100644
--- a/net-dns/valtz/valtz-0.8.ebuild
+++ b/net-dns/valtz/valtz-0.8.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://michael.orlitzky.com/code/valtz.xhtml"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
-- 
cgit v1.2.3