gentoo resync : 13.06.2020

37 files changed, 574 insertions, 581 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0d87b0896893..7e85887d84b6 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 9f6070035d4c..0848afe1f375 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -5,7 +5,7 @@ DIST bind-9.14.9.tar.gz 6296339 BLAKE2B 65496ab94a83ddd1c519df4519373aa77858c6d6
 DIST bind-9.16.1.tar.xz 4541768 BLAKE2B 4a2697c5317b2e186e57ef6613bdaedddb0f371c5a3d6a18b93c8e20de553eaa4d81d567e49b5ea395506e1d8aee729dcfa10896ed6dc8fee268d9ed5c7670d8 SHA512 9a1e8987f312b09a16c2ee0fd1d1eb8e4951b8dbcf3c0d51a1a1fb179a261028239ab2bebc3e559592cc766de57a26ba37b27621a0c5e1711d36c2416f0a0c26
 DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
 EBUILD bind-tools-9.14.11.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22
-EBUILD bind-tools-9.14.12.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22
+EBUILD bind-tools-9.14.12.ebuild 3127 BLAKE2B 5ab77ad3a5136ea2a8c85925668c3a6003f22aa8041c0ccd67d0e1d0136842920664bda50f5288e2c23b92ba3147a7102899d95148e19b2ec1f19f7ef37e266f SHA512 e242937b73c752db8eed6d6d04001f0a13f4270e42407213c9f4e511d1d9732997a06bc61fa14494e5d8e4c6726cbdeb3d4655408a9cb5f06f24deaf1bda3b9d
 EBUILD bind-tools-9.14.8.ebuild 3123 BLAKE2B b835f6a2f94f61506b32c27d20d3971141f2f4edbd0a57aa77900375cfbbce52337aeda9fbc042daabc884117bf946b5ea8b7c2b656ef016d52faaab119eff58 SHA512 fa4804481455dd2852284ac0c9f0c50f3348b8a786ac4b45b441265c023d72c61f6a9ad6b2a5627376a4e8eaeed8c8c5d521098f6186c73a2b955aba50010d05
 EBUILD bind-tools-9.14.9.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22
 EBUILD bind-tools-9.16.1.ebuild 3149 BLAKE2B 447f8836c020b27c6a11715572ba0cd1038207e2bf2cd01e34bf00a2dd9403f8108892bc1bd899376979c64d8803af280acc5ac6e35f6f4b8033f32c118ba903 SHA512 ffdce682e5cf47da43ad16e705c2282397b1d9ab0bca22d810d818b129532c68d8b8baf4de1db1bc3dc6b2fcbf987ed49938bc93eb7d88775602b2921703d85d
diff --git a/net-dns/bind-tools/bind-tools-9.14.12.ebuild b/net-dns/bind-tools/bind-tools-9.14.12.ebuild
index b4e1f595e910..7a8291d3f9d9 100644
--- a/net-dns/bind-tools/bind-tools-9.14.12.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index a1105e058a2a..b767b383741b 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -16,7 +16,7 @@ DIST bind-9.16.1.tar.xz 4541768 BLAKE2B 4a2697c5317b2e186e57ef6613bdaedddb0f371c
 DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.14.11.ebuild 11360 BLAKE2B de639a334f5f44e73d24fb3fc7cbfe08d9990e64f4efcd03ad6da2ade7adb9480c1538f572cdcd080533d57eb85d33c375cc262004946f1b4ff7959b516ccdb3 SHA512 ba89c0de1b98c6e2334caaecf5c7eb99e7fc8e1b96568ad75274d0015b574d58390b451b06f77cfe4eb657b6a7b7b78cedc3da7283257c6785fc231753d4f50b
-EBUILD bind-9.14.12.ebuild 11356 BLAKE2B 4fcb1bd8548e6745f4ae1ec33f8252ffd006ee5a1673ee1edc36aef4f37ff74831051e3f135c4d5dbe8c7f1a6ba58bc7420525700302ae3f45f23ca13110ff64 SHA512 78559c54841a5735e74715a1283b46de349d079be7685133d6802daf297916a873705d607826a1149d4f0e39c833978d64a8b4aa8359e40441b618d1a9c2a4a8
+EBUILD bind-9.14.12.ebuild 11353 BLAKE2B 4e903fb198bc5b8d3acb82e02c682cc6875ac71641597612ced97fd93c21eae640f3c5df273faceeb9289b11d10e4755c6b2a3335335681e49f93d2b66c676aa SHA512 bbc546aab84cb92aab7d44623874edd54957faee195d1a6af4eeed020b7e79c2cb5e37b8f32f664952770b5132f4f22337d826bae8d08c332c2f9d3bc3d254c7
 EBUILD bind-9.14.8.ebuild 11353 BLAKE2B ad192b5823ca915511b4a12325b3585ad6cd518f4d969b22fd91222628215b112f504d3df5c5ce9b0d3e7c6136b9153f8e7c6d4f5398a6c80660c373d6e61aa0 SHA512 df8f92513d2d53a3977ee2b270273a79ecff104ed21ec70309a5141d81611c2ab15e0504a4f23bd3ea122caa0a92d53257373b6f265873b2dee8783f61ee2df1
 EBUILD bind-9.14.9.ebuild 11360 BLAKE2B de639a334f5f44e73d24fb3fc7cbfe08d9990e64f4efcd03ad6da2ade7adb9480c1538f572cdcd080533d57eb85d33c375cc262004946f1b4ff7959b516ccdb3 SHA512 ba89c0de1b98c6e2334caaecf5c7eb99e7fc8e1b96568ad75274d0015b574d58390b451b06f77cfe4eb657b6a7b7b78cedc3da7283257c6785fc231753d4f50b
 EBUILD bind-9.16.1.ebuild 11358 BLAKE2B a6cd6c275843327119193e86a708b4debac55d42984fa320364b6c0b9e2934b881c0a05b5fe2b70e84a9b41922688a2c61af185754817718c11dde2269de67ca SHA512 801bab9fbbd0693459085f3135219ea6f1bc74af5cff6fc2790281e94818658b6d10c53d45a15382979e592dd1487126c40d48b635a32af7dcae51bdbba01dcb
diff --git a/net-dns/bind/bind-9.14.12.ebuild b/net-dns/bind/bind-9.14.12.ebuild
index 49e92059321e..963cbddd176f 100644
--- a/net-dns/bind/bind-9.14.12.ebuild
+++ b/net-dns/bind/bind-9.14.12.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 93ba72f4dc82..620955289280 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -6,7 +6,11 @@ AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc334
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
 DIST dnscrypt-proxy-2.0.41.tar.gz 2323421 BLAKE2B 572a0ad15df6c40d1738b296972584f5d8fe382ca3c0a05b4fc74e986e767a058227dda2127c843127bc0b90e8b7bbe17a5eaee42175f0b77e21160ac63f7a88 SHA512 26be163daa03633f2d76f1121fb1987e0155613bd84cbb2aad2ba0eedbd35ec0b393d1c1a0aaba47968b3a08bd0273ad929a164695ce35d2ebe05ce3b5f5dfd1
 DIST dnscrypt-proxy-2.0.42.tar.gz 2324442 BLAKE2B 8444eca1fc2bfc6029c1848bbeb77697b9b9c228c1bd0d17ed357b73667524c7052b33410a92847743533c3712f749fd93dbac46a81da48dae367e2a515cad8c SHA512 093b07ee8eb44c1264e6ea4b60ad32e0221b1b02c1d61f142b1fbf37dc5181533cc3c5d6e7468d0f7488611de4620947684269da9f08f21da0aa501ba70be711
-EBUILD dnscrypt-proxy-2.0.41.ebuild 2716 BLAKE2B d3339c8c26e08c9da0cfbda56d8c5b38dd0aab07f5a532a789619fd1efbefcdfa5a358d6a33e72f223f30c593fb497a1d443f20016cd465da3ad098c81050732 SHA512 34377d011df80e4c7f25c12a7883974d85f0208f1ecd9ad6de4015cae1df8f0dc2d7adf1c1106cdd9ee44644835b7a91cbbe1bf979d70f5ebdc41ab5f97b1204
-EBUILD dnscrypt-proxy-2.0.42.ebuild 2720 BLAKE2B 90ec901731f488b7254176d8ef8e1de893a308bdd5f6cc7e86444372eb0b2a91e1d5c189890f1547e0676e2a3e0cbf974e67573d6f70c1e26ad1c5205eda01bb SHA512 68341d67b2c7d6fa9a3e514b812be3126488441ff60eeefa391183b12b8e1c636f344d13032f39cc74d5d75c108f43caf6cdc578dd55971dc49f3afaf04a98e4
-EBUILD dnscrypt-proxy-9999.ebuild 2716 BLAKE2B d3339c8c26e08c9da0cfbda56d8c5b38dd0aab07f5a532a789619fd1efbefcdfa5a358d6a33e72f223f30c593fb497a1d443f20016cd465da3ad098c81050732 SHA512 34377d011df80e4c7f25c12a7883974d85f0208f1ecd9ad6de4015cae1df8f0dc2d7adf1c1106cdd9ee44644835b7a91cbbe1bf979d70f5ebdc41ab5f97b1204
+DIST dnscrypt-proxy-2.0.43.tar.gz 2279744 BLAKE2B f06892bc14da2be2e97dfb5d233420cf3726e359ccd0658d4309981291a12a7cac7a7592d11717a9466144bd5cb9d9a4e1b6ba8877a8b5c539783749588a10a1 SHA512 a1d14756d6be6450683a44adae197aa582df2556dda588debdadd0903b5993a4dc579880479f138ec3690045aeab833a19f23b2555a403930d26d4a5bc90ed5f
+DIST dnscrypt-proxy-2.0.44.tar.gz 2279842 BLAKE2B 90f156914dd29ab5baa2eb02ed2992583999a6688d09a532f8c7c1ec6d285bd39893f66726da928f295056fd66cd756f4332f1ed21284ffa3d357ce355a08625 SHA512 009e2b669c1d6f6cd6b41f5e04d08735587f420dacdea8d422a3c12a62614c1ce1963deebca3af1f956070abd9ff5df9182cb27e31fa0fac8a95478739445801
+EBUILD dnscrypt-proxy-2.0.41.ebuild 2838 BLAKE2B e163d4d89bd9d66036ea6f454439a55f6b9bbf1fd859b0410c508880c063243a1b2e24f129ab94b06c79a0395d6bfa5705bd0e59169e66c15b6177f36652c3a4 SHA512 8e12277cf798a6aba9dd55ac8f35a9218a13b2ca4b06cf91e3255e6b09ef5be14209559f64574fb4454af455d152227ec7ce981bf4c3cad8fe1d045c99105af5
+EBUILD dnscrypt-proxy-2.0.42.ebuild 2842 BLAKE2B df98833edc111d3b2ee8304eddbf5ca002ee4f787ad09985f0b8e1f5edb5d2b27ef2f457aaa481198a8c42267e700892a7a910552a4ee7b333726a217768d755 SHA512 db0f3e0abb5cfbc76493c57ec29d6833c360f1a9a929ababc9a95e25c48ccd2a7ded9874177e14d1f078729d58ee23136122034644e6cbebc1485ff5df93b4f9
+EBUILD dnscrypt-proxy-2.0.43.ebuild 2845 BLAKE2B 0ccc6dff79fa94a1d4551a6f96247d19bc2a416297ccd6bdf40d0f6ef82e96d6878f52a78af405f1c936a1d9b6ff77c0f329ca815080a5ddbc35da80f01c8503 SHA512 be46f29a4efdf62a62b6293f1aa2b420ce52c6adeb9dbad219257f2cbfb146a35fa185acd6f4b9af90405565d5bfb2b39f970d12d6921795431bc477174e6df0
+EBUILD dnscrypt-proxy-2.0.44.ebuild 2845 BLAKE2B 0ccc6dff79fa94a1d4551a6f96247d19bc2a416297ccd6bdf40d0f6ef82e96d6878f52a78af405f1c936a1d9b6ff77c0f329ca815080a5ddbc35da80f01c8503 SHA512 be46f29a4efdf62a62b6293f1aa2b420ce52c6adeb9dbad219257f2cbfb146a35fa185acd6f4b9af90405565d5bfb2b39f970d12d6921795431bc477174e6df0
+EBUILD dnscrypt-proxy-9999.ebuild 2838 BLAKE2B e163d4d89bd9d66036ea6f454439a55f6b9bbf1fd859b0410c508880c063243a1b2e24f129ab94b06c79a0395d6bfa5705bd0e59169e66c15b6177f36652c3a4 SHA512 8e12277cf798a6aba9dd55ac8f35a9218a13b2ca4b06cf91e3255e6b09ef5be14209559f64574fb4454af455d152227ec7ce981bf4c3cad8fe1d045c99105af5
 MISC metadata.xml 847 BLAKE2B a75805eb34aff94fa0e786397fce79a516f230ecd0e6dd62f10b7f917ee55bbc771c120e11495df5c6e11847f84b33e999628ca6da1ad57fbfa43a18f629897b SHA512 acd053787fb7a0e2c89c7f70fc7e24eccc945b9eb3083276b3683685674d995650f252d00400ee064e6d548855aa389b66d2d652dc5e0c787cb8a1248490c358
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
index 7bc0187ab8ce..4f7ddaa4a1b8 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
@@ -39,6 +39,11 @@ src_compile() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	cd "${PN}" || die
+	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+}
+
 src_install() {
 	pushd "${PN}" >/dev/null || die
 
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
index 2a13bf212258..a0456c6a5fc3 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
@@ -39,6 +39,11 @@ src_compile() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	cd "${PN}" || die
+	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+}
+
 src_install() {
 	pushd "${PN}" >/dev/null || die
 
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.43.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.43.ebuild
new file mode 100644
index 000000000000..bfc4fef8eb03
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.43.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/DNSCrypt/${PN}"
+
+inherit fcaps go-module systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="pie"
+
+BDEPEND=">=dev-lang/go-1.13"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
+PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
+	popd >/dev/null || die
+}
+
+src_test() {
+	cd "${PN}" || die
+	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
new file mode 100644
index 000000000000..bfc4fef8eb03
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/DNSCrypt/${PN}"
+
+inherit fcaps go-module systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="pie"
+
+BDEPEND=">=dev-lang/go-1.13"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
+PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
+	popd >/dev/null || die
+}
+
+src_test() {
+	cd "${PN}" || die
+	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 7bc0187ab8ce..4f7ddaa4a1b8 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -39,6 +39,11 @@ src_compile() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	cd "${PN}" || die
+	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+}
+
 src_install() {
 	pushd "${PN}" >/dev/null || die
 
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 34703f24ba14..e07826308cad 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,9 +2,7 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.8.5.tar.xz 1209076 BLAKE2B 7454499745caa04a9454f023bed0ce6d8ccc54fc2c264aada72a842c39b056a91caee908eb1b036fe77b97d8cea4f03b9afcd084a69846a2632e717f7c3591fd SHA512 f45e62816ddc1f534e724d2fa71831100efc01b415ec2ea8301d02cf44d8f104a248deccdb706ebad6853404aee2a209c2bf51b07076aa69340af6812e5a79de
-DIST knot-2.9.2.tar.xz 1181860 BLAKE2B 4c4a54624cc0c107517596efb3d4a4dc205dac488e293b594e93f8e73b1face3c0ac4ca94d5def68576f7b801540468a355e5b4bd06d7992edc3bce122952fd3 SHA512 7e09cd6e587342b0a213f7a108704fff7535d02dd47d662e60b96ae5d75d9745d659131622253f964deb1607f28d172d1d46dc3b5f61e2f6c70e5002e746da68
-DIST knot-2.9.3.tar.xz 1214512 BLAKE2B a4545ba32827a1866046fd42a5819963607d5d7d1fd1e73b17b08dca9c3aeb3b8ecbad67ef3293f4a417ac2b25c7540e299cf914d90d6a659bcc58f809f178c7 SHA512 69186b0d83ab548e46a7eed2703b1c3e29de36123c39a7ca461a8728488433bcc27dd5564ff3cb55d8490d4515098cebdd72aa732742fb0b9fceaca27f456e08
+DIST knot-2.9.5.tar.xz 1190872 BLAKE2B 4c60972676efb2e6cef5431ab688ffff9eeda4fe5f9a02bba10fbfced50c1edc9e15b9cea9e018428f3d075ab241128748fa1f777e6fc9de0dbdca1033c8d92a SHA512 6bfd6a720eb512983f934c3bf853ac310391805a102546ed18b3e805d10339837569e970e0e51f64e9d938bc362c8f9d01acb15ca4dca0a66dea9deb6b59cc73
 EBUILD knot-2.8.5.ebuild 1887 BLAKE2B 7eb58953ff6217a867692a88112fadfbccab09822786c9bcc5a3b049f9ad300d7406edca1122c326a2127811dc8af7c74de0625174ff1968645e91cf54c9ecc4 SHA512 c9e51d696c0e0d50b5b40ac76cd950eb7ca21a7a679f1655440d7a77af46aeec59697d12a84b8becf0f0de1a1a4e425bc4af4e51331a83e9fd724aab92b467bb
-EBUILD knot-2.9.2.ebuild 1892 BLAKE2B bda8c5a9320f1cc5de5149a1435501595b50f7d39734a81106c7712c6bfb479afe3807d01849aab4cb0515859caa27a92baf24fe7ffea5cd7aba726ff85dd570 SHA512 5db2d53e35f7d4d644fde4aac1ecb6254ca654973181fbc16c5b0f670f8f812c8700f119d4344acba73bc30a48f4fa652a7b760a95b91a2af6ad5b9f96aeda3a
-EBUILD knot-2.9.3.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
+EBUILD knot-2.9.5.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.9.2.ebuild b/net-dns/knot/knot-2.9.2.ebuild
deleted file mode 100644
index 832d155aba2c..000000000000
--- a/net-dns/knot/knot-2.9.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable utils utilities)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-dns/knot/knot-2.9.3.ebuild b/net-dns/knot/knot-2.9.5.ebuild
index 2cc9e9753dfc..2cc9e9753dfc 100644
--- a/net-dns/knot/knot-2.9.3.ebuild
+++ b/net-dns/knot/knot-2.9.5.ebuild
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 6b55666194a5..21960c2e4677 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -18,9 +18,9 @@ DIST opendnssec-1.4.12.tar.gz 1036392 BLAKE2B 3bfbcfe91d7da7c2e4b1c5439f7d55e156
 DIST opendnssec-1.4.8.2.tar.gz 1043171 BLAKE2B 20b1fa0d97b776223314937061cd42f4fe0a924e58a159fd0399d23058e2b0fd44d55049947de26c36aade5b5599527fc03f09eeef4e20f8c9beee40dfbcd7fb SHA512 7f2e10b425f60947aca40c61509b07ddc4363105cc882b518ffa816437299d6f881411cb38325f27b3a34c2005953988b39c945362866dd0f1f7c6ef973bfa06
 DIST opendnssec-2.0.1.tar.gz 1101523 BLAKE2B 0446efd04e73e00d204c53164c3c6aaecb9f37014a110ee85d7e7b1728d225aafcf9e6ef31a7dd29cdf2e875e7b653ab6e8178cece65c47a1c5b027facc16130 SHA512 aa12818f92688e087acaff8a6771d2a7da733e04d9e821967d313c7ff880a1056f470b11988eba1e7aad606418c3a4587f654163d74f68e3f61943c74d86d052
 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-1.3.18-r1.ebuild 5717 BLAKE2B a0367f5c05d1211c7ab393dde80fc3f96c40dacb8ba6494507878eb871fc89541a74f07cd5aec1406ebce7d7e386097ad2bce5ba2fec691e6a087348d033d3ba SHA512 012d731bf038501ee3bbe6efe115fdbdd278bc912128d209c4d777d9b3a56b46e4357a91524d617836e88abe716f1d17b7ed35114ff84585b306343e3aed5075
-EBUILD opendnssec-1.4.12-r1.ebuild 5804 BLAKE2B 24230a7e63a77b1f77f921d85608c85fd924235e2a996dbbd0b24b50eeb22cefeeff3a3f8c15b1d604f77355f5b3fe52e0d3c03fce693f00cfe7b94f9a7535d9 SHA512 b833b447452d048e3ce0b5619fb4969fceb80d2ceb168c5e3cca06bd30b0395edd745de2de558cdcf7beb86ebfce84691db9868f32f3583d706701072e18707a
-EBUILD opendnssec-1.4.8.2.ebuild 5854 BLAKE2B bd33ae903129a4cc06053d00840f848c1cc02c52040ed95b0137671ea9b03067eec5b8dc6edd89ade59c8ddf2f83928edbe62577f83b78511fa0aa2521ee9662 SHA512 a66894f5e6439658027c00298690c855603d1e97b17f3e06e461fde9efcab3b9dc10a285b55c435a85ad17de01202529b01a2ae5fcf052e9e103f86bcd8f2ac2
-EBUILD opendnssec-2.0.1-r1.ebuild 6787 BLAKE2B 203de779bc74c2273598ab37e0faa1a9a9dcc3a7ea00697b3c88180b90db9b9d09891442793ba9401aa1a3f5bf22b02f40a99a29496a5b8aeb2e6aa7149ccab5 SHA512 3a91fe2a31c58225de3ae786fbd3697ee4935e3ebd8949d066c41a14998f577dc9afbae758eb890d94960ba7912ba5ce4d9fefea1702c0687dec30cab1204283
-EBUILD opendnssec-2.0.3-r1.ebuild 6759 BLAKE2B 59e2fbd023d0c57480743fdcdbfdca29e3080bc726f8fd472f4dbae876e6e5738ec0d9b58194177fee23406aac8477dbf5726fa94a9f286f274826cd353e1603 SHA512 e34deebce92b6c3057e36a88cd46efef5141a3903a36df39e052fa64323559d1cf9ea32d85dc209613b7b6c6536c592678ae78310274cbbce08d2a1aaea3ecc7
+EBUILD opendnssec-1.3.18-r1.ebuild 5719 BLAKE2B 33ed406b2fb2bfdcd7a33a67971ceed4986958b8016259693379726604342ef930ce9626e962125a02b315bc0fc2b07ab31cbd88c09060b3b08b48f51ffd5652 SHA512 098d741ffe09e814ce0697d6d9b824080efcb08548c932b8e1a78fa905c4e680fa193304cf51e75563c70cd939597fb30e858d90eeea5984b15a0810d4fd6e22
+EBUILD opendnssec-1.4.12-r1.ebuild 5806 BLAKE2B 96d15804c15759d8f5c6caa8284d583e30308cb6fa24d9d36b177d8505bb816ab6d899ddd82225c1102a4ac58b1f98110f53cb6bdf7c40255532dbf91cf8959e SHA512 67c7c4afec19bb5f2c22498fcb385c4ce1042fa1e98b3b12bd183d8999531facf1d878c1f0800d22d19f67e09259b2545c0738e609885178f8a294020517861d
+EBUILD opendnssec-1.4.8.2.ebuild 5856 BLAKE2B b9b4bf8e9d94743c7bd4189889e3071aeaacb71915749b542b59d28a86260affd402bbcd2b2f88896a791237bcc358e0bdc72f4e068e61b048bf98ec03e3cd74 SHA512 e9f000c17e6bb9bdcd66bc38e2b7c21ff3dce0da7dcda07e2062ccd64416cc563577cc6856bb279d575eb74896e89527a895fc825fcd2cda8431c8e14c372633
+EBUILD opendnssec-2.0.1-r1.ebuild 6789 BLAKE2B 996d5f5d1335513084428339fd2ccb9482a1901b5940bf77bfd19bda36f6b99a4dd40f0d35cbe4d90f7e5b9ca37566b6f65e5aed21174618a1e477f97cc0de6c SHA512 982583cba1c39f9591d710bb4dbb7cf5b53c4b7b9a073b01416097bf7b604a94582f564bf60b7e8d4de588300bcb77d826f7cb3a9987475a94901f3b67d1d7e1
+EBUILD opendnssec-2.0.3-r1.ebuild 6761 BLAKE2B 67105b5333460bf466ac4620a7efb093423321b5878e715475e0232ac9a74ff51534a75b4417abc6a26a46027c31585ff60cfe92eed03b0300a2fb5e3cf0363b SHA512 dc199e6aaa506090c25ba9ea9538cda922f67dcb509a3e6ddf6ddbc9d15300d0d5166720ca53b10be49f99a13c90a9f1aef7429a1c0e26b039cbdac28f5bcad6
 MISC metadata.xml 906 BLAKE2B 87ce475aaab1ed562daa0c2102e206f32abc25b9fd77932bd6a33e5f31990864dd0da48e48e7165debc10ae0653f6bed364c12a52df48dd448e29590bf6f7141 SHA512 9cddc6b15c7a959cb885bc639c19e166ee202dd4b45db50c9bbb3b61fe9e84311f023a3d34cfc44e689cf81df092211fa4cb88427fb143c113bdfc1e7897112e
diff --git a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild b/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
index c29c6bf1ac7b..a37fb6fc331a 100644
--- a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
index 61d2ca9f1014..7204fc6a5df8 100644
--- a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools eutils multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
index 271869383a54..fa23c0bf555a 100644
--- a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
index 4802edd1581e..b93dc8f5ab2b 100644
--- a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools eutils multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
index 71ed1ff5e73b..3108c7a8a9c4 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index c43062dbe923..7ef070f95ccf 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,5 +1,7 @@
+DIST openresolv-3.10.0.tar.xz 20296 BLAKE2B 2e4fc22aebeb345fcdcc5395603a183a978e2ea24a4b419d76ab41e5179b640e3a317d5f1ef36bc6901d933b20daaca615489c785a41d76a89abc938c20e2723 SHA512 f28fc43887f18f6cbdcdabbb48777fc704ed653e77f34caf349b5c4e5f5f6e7686242ea9f2617f2f65d40d14c794ce28cffee0ec5e5c7b8a19566f3bd72e9ec5
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
 DIST openresolv-3.9.2.tar.xz 20200 BLAKE2B 25cb56fd85114c3866207a3bf83d1295eb135f1746f141d8cb8f0fb18cdd96e184ad3fbb47d1f65ce4193b57da61e918ca4306a502eaba650ca438589be9a29b SHA512 2f88ccbb53c6e830eeb7dd53666ee72b9fa30f38324766e1d1734896bc9b7f531e42e234c882b921c79604a3bde2877db2681bab9dd8c590f02779da908d0649
+EBUILD openresolv-3.10.0.ebuild 1054 BLAKE2B 5ecfe2dac83e3d5c2c67fb38b587b8a4ae8136ae34749d1b415a9cf9fc8c321ecc377bca0d0d7a505763172a05f54e5cecabf5446257613c6aece551dc2b0d9e SHA512 b2a96a4732e06b595269021706de9299ff8a3805fe21b7f0f3957b68c1cf7f0d1386375153ec560b13cc0340e3cc20dc0c438fac6e67e5a8b13d91c55b530760
 EBUILD openresolv-3.9.0.ebuild 1052 BLAKE2B 5b1b3b1092bf55ccc00bc044f228262ce3db17f161a57e238065dd3cbfeb7450209344fd2fbcb100297d4d7d84089933b9667135db82363d3786b637344882ee SHA512 ff94593aa90b87b512152763b998c9ed1a774126a2c9b4075659a70a440c004d30eb83bed0e48bdbd6dbdd757f4595ec52600a6f9fa1cb66140c93042a657572
 EBUILD openresolv-3.9.2.ebuild 1097 BLAKE2B f64842286737d4551140728da7a54090ce14b8bce3f471c07ce38a6bdd5919ff5b47d70816298e28a4491754e23310a5b54d766d96ef6c71065671cfe478d887 SHA512 55cc9dc93231bd98b29c3ec12032266a23cd11fbdef244d558f55c0c9fc49c2e30737cc9ce6bde2f8128050005f7dd049964c6002917af54a702cf4d3b078556
-MISC metadata.xml 259 BLAKE2B a0bbc917de0867f447b7f02307f4f3ae6d6fc0e7afa06db2f6733a560676a4ad07fcbf433dc93070a6e7815d9d3bf48d651ae7222f53f62620d8cdda049af543 SHA512 79d964de6f58ae4a6f1e815620de06753b9d44ba1740c0330b94b8fe5bbff1f7e1e67f21ac30d80a35bd72e9681631b9f1697d896a4bffa066d364690c572838
+MISC metadata.xml 372 BLAKE2B 24db644f62ad2ee508b0eb6a6f521f3e3d2221a749b73ca46cee7f1c97641e8d67ba7ed50da735fd524b20575026e38642529eb5389ccd9358a5d787978d5ace SHA512 2a4d2e73c7a7b33e1c7246da3fc5c3e155de0e6c76928dcda6de4917cfd9bb37880ffa2cc65e7ff7b73d5822a4879d708f842d2a833d7cdbee6c55d4d72184ee
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index e5a933ad81f9..99a0254efabc 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A framework for managing DNS information
-	</longdescription>
+	<maintainer type="person">
+		<email>andreacerisara@gmail.com</email>
+		<name>Andrea Cerisara</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-dns/openresolv/openresolv-3.10.0.ebuild b/net-dns/openresolv/openresolv-3.10.0.ebuild
new file mode 100644
index 000000000000..bfc66b5f7d91
--- /dev/null
+++ b/net-dns/openresolv/openresolv-3.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="https://roy.marples.name/projects/openresolv"
+SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
+
+DOCS=( README.md )
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"
+		--rundir="${EPREFIX}"/var/run
+		--libexecdir="${EPREFIX}"/lib/resolvconf
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_config() {
+	if [[ ${ROOT} != / ]]; then
+		eerror "We cannot configure unless \$ROOT=/"
+		return 1
+	fi
+
+	if [[ -n "$(resolvconf -l)" ]]; then
+		einfo "${PN} already has DNS information"
+	else
+		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
+		resolvconf -a dummy </etc/resolv.conf
+		eend $? || return $?
+		einfo "The dummy interface will disappear when you next reboot"
+	fi
+}
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 43622ccee803..f8985bd515c7 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,16 +1,6 @@
 AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b
-AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
+AUX pdns-recursor-4.3.1-gcc-10.patch 2592 BLAKE2B da68e0311a30ba894cfa82b1140dca85b2547cc0885d9fec6dd0721c38f531777e06d27ede7bdc92996e60bfb621351bab66c1ce19cc923f8fc3b1b44a4bde05 SHA512 16a81afc5a3a7cdac4acee52b30ff61cea97ef1c543fc0858897c2caa19fedd1e71f9787c4674122ee7f96d4130d6b5f37b0cdcc6bcd44d14765845877c02ab4
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e SHA512 9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011
-DIST pdns-recursor-4.1.15.tar.bz2 1252518 BLAKE2B 11eecf1ca69e6855be1cb1a1a6bfefd6b65cf38a6fcfd1e98727fd7813958024b47f974a12fa05cf0a92079a7d14ecb1a6b199a51ba0b4731aa4a1a8b638441a SHA512 d493de78086a88784dbf8b54732faddca7e0dec008cf80a757240f8e1943d230edc4f0ef5a372cb1897be01956bbcfd282a979150901c0df6cc304ccdc6d878d
-DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f SHA512 e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf
-DIST pdns-recursor-4.2.1.tar.bz2 1318022 BLAKE2B 19fba9dae26d27f68ceaf70f15f2fb27ec030fa64d5dfdfe7bf482293ed5aac6b8eb6ed47a75c2b88f4d481794695d66f0ce1cbc71d8eedeabd86d8ce8c382ba SHA512 ebd7ff40def4b5c9398dee5ceae0aaf762982be4124773002b3f603b18cab2a6df667524a268e72268032334ae29d32b42294cbae68dcdc154e08b8a38f75dff
-DIST pdns-recursor-4.3.0.tar.bz2 1349359 BLAKE2B cdb9d38a350ef371c3675185c0f52f416d55338df034ff32a9d9fc85d783de04513555ec96fbc1dd07ecd7214d889cfe6fba80bc6981e66a6b8d4fe6f1da7dfa SHA512 6ba4721f502e1e483d04e8d8cafa35d1cc088c6b3c73120a0cc90ff9c8e8f495a1591e01f0daf30d00f020e3aa06b1cf092ed6b8a0786070c307a6564812c085
 DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397 SHA512 49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8
-EBUILD pdns-recursor-4.1.14.ebuild 1802 BLAKE2B 2943554881f1873014e5712c2baef1ef4bd9e3f0e7061ab576aac0d23c7ae8657a744d257b015532f6c57c3086ec748e3f1faaa4e12f70f626ad7096e7c81511 SHA512 31141369c4c6229c9dd13309d5b0cce47cac7c0ef6d765ff72eb4515691a9742fc510bc80cbd4c71fbf739829e157d29565df0f8240f84a5a1767e021fb484d7
-EBUILD pdns-recursor-4.1.15.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
-EBUILD pdns-recursor-4.2.0.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
-EBUILD pdns-recursor-4.2.1.ebuild 1783 BLAKE2B 85b1dfe2efe41551397d6a1ad8d41ee779f841ca965359a0904902e7d78637fd4308a095034ccbc6d3bf72da6ee4b1efbb04ba082b8527255b599a5edb4a5a15 SHA512 06e83d7bd1d7e048abda6d5d4f9d0f8a3fc0eb86a1e4e14ef5f6c935fceae4542579897fe10c31391d01fae793d1e401e5cc49df484ef89b5a0834437f1d5587
-EBUILD pdns-recursor-4.3.0-r1.ebuild 1788 BLAKE2B fcb244abbc5c831806206768cfc72c5e4455ba2b43ab98156a2fbcedad2651ec821e62e73a0898e5a8963f8370cdeaca025c9584bc5d02d5d637f9ad06ca18ba SHA512 c3e4c7b3042146f8643e520c3abbd92d3d870acb588c12fdd09054f38f163b0df06130e85ff8ae1a254f5c3dadadd8e323294c78928b615623c8c2537f83c41b
-EBUILD pdns-recursor-4.3.1.ebuild 1838 BLAKE2B 389c8d068c0f4113c5b9744d36dd6d391a837b778c5b3e2d407da76ae8bf74712668e10832967f55e7e62816a85a70e031d96d6fd4a028535744056eb7741e1b SHA512 5be2829788177687609fccfd370b5108d85bc2504022bd88e695b362833a9b75870106fa71a8764dd2cee92ee9780f22c466d55ff558503580da6d4efbfd21a0
+EBUILD pdns-recursor-4.3.1.ebuild 1871 BLAKE2B 41b5d33da55a8a0fabfd0d69666ad23a7104f10343d10bc949b269596ed8238f9c9cd3f573a2a026f876046fce42cf7787ac264cf1fe69bd8822c8605a19c544 SHA512 26fca6db80aa43334985e27161a64a893d150f0e746fe0bb834b5341096f0eed79524c432b8b95ad06bce152ef65fcc76b7befc4a2dd100729b7ffa077c0471e
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch
new file mode 100644
index 000000000000..8244a456e643
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch
@@ -0,0 +1,61 @@
+commit b35614ed8b45adba304bcddcb3f2db6cb36b1462
+Author: Sander Hoentjen <shoentjen@antagonist.nl>
+Date:   Mon Dec 16 22:44:43 2019 +0100
+
+    Fix build with gcc-10
+    
+    From an e-mail from Jeff Law <law@redhat.com>:
+    
+    Subject: Minor problem in pdns, dnsdist and pdns-recursor packages in Fedora
+    
+    [ All three packages have embedded copies of the same problematic code
+    and the same patch fixes all three. ]
+    
+    Red Hat's compiler team continues to try and be proactive in identifying
+    issues that will arise as a result of the introduction of a new GCC
+    release into Fedora each spring.
+    
+    You're being contacted because a package you maintain in Fedora is going
+    to fail to build with gcc-10 in the spring.  Yes, I know that's a few
+    months away, but it's far easier to fix this stuff proactively now than
+    wait.
+    
+    Fixing it now also means that your package will continue to be built
+    with testing versions of gcc-10 as we proceed through the development
+    process thus allowing additional issues to be caught early.
+    
+    Your particular package will fail due to an uninstantiated template for
+    AsyncLoader<Request>.  These kinds of problems are relatively common due to
+    changes in the tuning of the inliner for gcc-10:
+    
+    > BUILDSTDERR: /usr/bin/ld: webserver.o: in function `WebServer::serveConnection(std::shared_ptr<Socket>) const':
+    > BUILDSTDERR: /builddir/build/BUILD/pdns-4.2.1/pdns/webserver.cc:373: undefined reference to `YaHTTP::AsyncLoader<YaHTTP::Request>::feed(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)'
+    > BUILDSTDERR: collect2: error: ld returned 1 exit status
+    > BUILDSTDERR: make[3]: *** [Makefile:2751: ixfrdist] Error 1
+    >
+    
+    The attached patch arranges for an instance to be instantiated when
+    compiling reqresp.cpp and is sufficient to fix this problem.  The
+    choice of reqresp.cpp fairly arbitrary IIRC.
+    
+    Ideally you'll with upstream to get this fixed, but a Fedora patch is
+    clearly OK as well.   I'll install the attached fix into Fedora in a
+    week or so if I haven't heard from you.
+    
+    Jeff
+    
+    (cherry picked from commit ffb885e937c27bb1c62dee8f18c58ae0d5d52d39)
+
+diff --git a/ext/yahttp/yahttp/reqresp.cpp b/ext/yahttp/yahttp/reqresp.cpp
+index 686a6c7bd..ca2154f6a 100644
+--- a/ext/yahttp/yahttp/reqresp.cpp
++++ b/ext/yahttp/yahttp/reqresp.cpp
+@@ -2,6 +2,8 @@
+ 
+ namespace YaHTTP {
+ 
++  template class AsyncLoader<Request>;
++
+   bool isspace(char c) {
+     return std::isspace(c) != 0;
+   }
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r1 b/net-dns/pdns-recursor/files/pdns-recursor-r1
deleted file mode 100644
index 57c9df1eaa45..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
-
-PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
-[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run"
-
-name="PowerDNS Recursor"
-description="Recursive name server"
-
-extra_started_commands="ping"
-description_ping="Ping the PowerDNS instance"
-
-command="/usr/sbin/pdns_recursor"
-command_args="--config-dir=${PDNS_CONFIGDIR}"
-command_args_foreground="--daemon=no"
-command_args_background="--daemon=yes"
-yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
-
-pidfile="${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}/pdns_recursor.pid"
-
-control_command="/usr/bin/rec_control"
-control_command_args="${command_args}"
-
-depend() {
-	need net
-}
-
-ping() {
-	ebegin "Pinging ${name}"
-	${control_command} ${control_command_args} ping >/dev/null 2>&1
-	eend $?
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
deleted file mode 100644
index 25a4668601a4..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild
deleted file mode 100644
index 8c6bb86d0ac8..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild
deleted file mode 100644
index 2ae00b46ee1f..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-lua=$(usex luajit luajit lua) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
deleted file mode 100644
index 64c04adb42e3..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-lua=$(usex luajit luajit lua) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
deleted file mode 100644
index fa5437a3d388..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1
-	acct-user/pdns
-	acct-group/pdns"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-lua=$(usex luajit luajit lua) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
index 30eca37b6ed7..378e02c50a60 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}"/${P/_/-}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-boost-1.73.0.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 pkg_setup() {
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 71317fd37402..487a291f83f0 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -11,5 +11,5 @@ EBUILD pdns-4.2.0.ebuild 4725 BLAKE2B 4967ae6d766a7e83086c9d67679871540c103e0d88
 EBUILD pdns-4.2.1-r1.ebuild 4703 BLAKE2B 6e5933de1a9caa359f5c7fa9f79c5695b3169b3508b40761e5b43fe7c8ffa257193d80a1fe0168dc1dec09a5e99c48c6e544ff024567d84b33c0c9d75d7f2755 SHA512 90db22de6743e5fa119dd8fa86d963d04b79bfe82ffba30633d3ca9e2032002e99291b748372cabeb340bee9fb1ae43140ffa53cf19a8dfecb97e724df91428c
 EBUILD pdns-4.2.1.ebuild 4723 BLAKE2B 7a0f4d38be60f150dacc2472d6dd7f8bf35fc882092d85d38fdcd65d158b5957b6f40ca7a9a67bbad98df12ed3dd36cc73bffd76a5cabac332454eec6906f203 SHA512 80f34e578631076bc77397d9aed72aff68ae107ae55c03e6653459c0df9a30b6570b7295707cebf0bf1ae75e9ca673ec9bd1cf843d632954427d29b2466a54a4
 EBUILD pdns-4.2.2.ebuild 4703 BLAKE2B 6e5933de1a9caa359f5c7fa9f79c5695b3169b3508b40761e5b43fe7c8ffa257193d80a1fe0168dc1dec09a5e99c48c6e544ff024567d84b33c0c9d75d7f2755 SHA512 90db22de6743e5fa119dd8fa86d963d04b79bfe82ffba30633d3ca9e2032002e99291b748372cabeb340bee9fb1ae43140ffa53cf19a8dfecb97e724df91428c
-EBUILD pdns-4.3.0.ebuild 4612 BLAKE2B ebc784058f4427b2c41b3373121867a1e1674429e4d342a9dca25ce53b932cd55ccc3c8ffc9e946fd858578b7e5393b4e2cb97653716933c2158b01cc446a54c SHA512 0967c1eff7fbc0e041fcb814c02062d8ea2cf0ad3b632478964e6b572b99602a7a972a70e44b577cfe83b50bda56d233f13a5c910fe6dbb7808c4689df02df5d
+EBUILD pdns-4.3.0.ebuild 4610 BLAKE2B e9780e7d468a487f822c695a9cb590aa687ac1c7cdb40cdab1927ae3f22a273012141bff264320df0cb94060cf474ff2e47b9ff4657c034aa47b0c305032eec0 SHA512 3ba103d2a7ae26e524e56ae7bd01d4f260d9b511eeaf1f46e72c489594a5eb1bcc2ce213f21c0fca518c89841b25ecf0a1a60bc913ff3a60ae8632ef31aaeaf1
 MISC metadata.xml 1383 BLAKE2B fd622facab46aaba7d1e54529574ec0d0531254fcbed8c454bc21438212a9d7f0ce744417b24461e1dc144a3daded8d252d805011b77bc5f396bb59297cf55c4 SHA512 6301ccaa19d82478a7e338cf1ad3b586cbdc4c2b98298bb306e7913399efab4e30305756cc7dcf6df4d81520733f2095c4bf61f65ac83763e38f375c2cc0b2a7
diff --git a/net-dns/pdns/pdns-4.3.0.ebuild b/net-dns/pdns/pdns-4.3.0.ebuild
index e2c22a1c64b6..91ef4052527a 100644
--- a/net-dns/pdns/pdns-4.3.0.ebuild
+++ b/net-dns/pdns/pdns-4.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 1e1fae06b9be..64243029e652 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,3 +1,4 @@
+AUX unbound-1.10.1-find-ar.patch 335 BLAKE2B f32a6a4f0cd48f5847beeeb0771a845f619fde94a1f3fe5d36d08960c4ec866678de556ce016d1cb92408ea82d606c1978702af0999f501e268b7debf039b4c2 SHA512 0af23b308a68c15cacc2debc2aa3e6476c725726f39b422a5ea4ac3122f45a1e1eb73e189dea66ddd721104301c12e3c54e8972161d76764703098ca6da22691
 AUX unbound-1.5.7-trust-anchor-file.patch 847 BLAKE2B ca8f093671264108c1da772e161ddf948cd27cdf4d3b6189023a6a9642ee308ab361befcab923ca61a21c4b151252f409177c8247ca683e63133284bd65efbba SHA512 bfbdd947cb3dda8d1dd009eb476fb2934fca80236e617f1596f308a063c575196e75c67b22bfbd739c06318d3227c9b2838fba0f381f8c73fdf5b7231cd1d746
 AUX unbound-1.6.3-pkg-config.patch 247 BLAKE2B af1a175a3944137fc7f4f4932182df5b278b7d88c4299e7ac5e520107fcfb5180d7e548c70b50794389d2c1406309f88e118acf9e065ab67cbb4c78fc0e4186f SHA512 06d8910ae6065c5a2bb2cc5a1935ae98688148b9c0af09622161b647775de00027ea4a22cb0d6b94f21d329c2d59ee56f67b073ee4042fbd4f78790d0c438ad7
 AUX unbound-anchor.service 263 BLAKE2B 098bdc6e06607e57980e0367496fd9a2fc02ef19611ac4474d703624c92df9c2e86f4dbb116622babcd7975b2e1353f6156d46bcc5639daabef648d670806364 SHA512 c0f8ff2df106d1f05786cf5d69b48cdf69ba2fd42645bf6b7fa2d34d6c3fdd1608fb470c4fb0216164386e8b22977292ae8932c784a6967774e3daae1b8aeb95
@@ -7,5 +8,6 @@ AUX unbound.service 247 BLAKE2B d986319f9b43600d4f6443f50e214efd39fd20be6a7067b5
 AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0bde11bc2a2a994d55670c992b42ea1b4bbee98d04a12f4e7e7517bd0e9caa74d8cac2d1dc0c33274 SHA512 935ab3bd5bc3d3347e44c20482aa19396d243b89f2dbc7bf9f89b16a2559715866e16dfd9f5c4866222d8ee968f158a773475d94629f0ef9fa9b8fd23f0fbc2e
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85
+EBUILD unbound-1.10.1-r1.ebuild 5429 BLAKE2B 4f16093ae3a34a97fd475da9d5094987ae289b203a71a6ca881b7371fe2f3550bc4d126e8b29d93564affd62df6428b1d27737ff71fce4c85122156238cd59f1 SHA512 8fe49aba1ec04421a6f29a4ae72ee3175447ab087503d2b6f3fc3690f5573e9663a376d5166e1252b902e9a0177a3a148b9abab8f874825579e30d77a4b3295b
 EBUILD unbound-1.10.1.ebuild 5390 BLAKE2B ce7620d0f76f8ec2b304cb73e7f875938957f285bdf73741e7c43f3d720853500d0ff857d2ec101bacbd3d8a61e270c42d9aebb4365718b1cc434519b387d48b SHA512 2e9305db63c2889389362ea48938d0cdd66aeb3fc15636004b43ba2a9ab0a2c8ccf934125fc253c89927e24bbe68ce2e21ee2c736835d4fe8eedb560e996d3b3
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/files/unbound-1.10.1-find-ar.patch b/net-dns/unbound/files/unbound-1.10.1-find-ar.patch
new file mode 100644
index 000000000000..c840e30f1ea7
--- /dev/null
+++ b/net-dns/unbound/files/unbound-1.10.1-find-ar.patch
@@ -0,0 +1,11 @@
+--- a/acx_nlnetlabs.m4
++++ b/acx_nlnetlabs.m4
+@@ -535,7 +535,7 @@ AC_CANONICAL_HOST
+ if echo "$host_os" | grep "sunos4" >/dev/null; then
+ 	lt_cv_sys_max_cmd_len=32750;
+ fi
+-AC_PATH_TOOL(AR, ar, [false])
++AC_CHECK_TOOL(AR, ar, [false])
+ if test $AR = false; then
+ 	AC_MSG_ERROR([Cannot find 'ar', please extend PATH to include it])
+ fi
diff --git a/net-dns/unbound/unbound-1.10.1-r1.ebuild b/net-dns/unbound/unbound-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..30c4c5084639
--- /dev/null
+++ b/net-dns/unbound/unbound-1.10.1-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+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 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=">=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] )
+	)
+	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}"/${P}-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	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) \
+		--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
+	# ... 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 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT}/etc/unbound/var"
+	fi
+
+	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 ""
+}