gentoo resync : 08.01.2021

17 files changed, 239 insertions, 28 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6bf0daf0c24d..bd19ab18614d 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 5563681feed0..e956f1c25e1d 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,7 +1,7 @@
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
 DIST bind-9.16.7.tar.xz 3241476 BLAKE2B ed11be4cb11cf0b77dfefd4284bdbe2d0e8dfd4c8b46e2966f3f0afc60a5df2ff3545a10209ede65f55f7d5dab3ed10945b98908c1b6bf35723c89c6d940a001 SHA512 176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768
 DIST bind-9.16.8.tar.xz 3253744 BLAKE2B 013c61d7298f334aae0165fa0ddaf4eb8fc22021b161f3a53843b4860456c133f1f33316387fcf2d7267a992844de44467eaec70c8064c77f9baef00f37fb98f SHA512 803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7
-EBUILD bind-tools-9.16.6.ebuild 3467 BLAKE2B 3735dad4b92725c8d76967cb1632f32af04254489fbb1184fb1457cb7a01825439503636ebebbb8199fc555947dd213a5cbfe0c2fc5aa86494810a63a6a9c220 SHA512 e70f6d3fffee5cabecfb45213773d5e2506e1ffdff6d25fa08568e3566c628f73dc83e2a4f4eeeae446f289b53a7bbbfc78cde938da4c257658a79f5ba31f520
-EBUILD bind-tools-9.16.7.ebuild 3474 BLAKE2B 2739fbec818922cc5e15e0bc10b9b08625814eb67083f9d07b0c967f69dc28d0fee4f84ea0352a10471bfecf5bf0070648cc4deea6c1219675feb12cde7b13b9 SHA512 050cc5eeffb6dd5ee81f1007a99e88fc457f833f648b743a568c4ae77d0d98a08d58e5a5b8362f7fc858fc92d41f7a822854997e53229226a28a30d0346311f5
-EBUILD bind-tools-9.16.8.ebuild 3474 BLAKE2B 2739fbec818922cc5e15e0bc10b9b08625814eb67083f9d07b0c967f69dc28d0fee4f84ea0352a10471bfecf5bf0070648cc4deea6c1219675feb12cde7b13b9 SHA512 050cc5eeffb6dd5ee81f1007a99e88fc457f833f648b743a568c4ae77d0d98a08d58e5a5b8362f7fc858fc92d41f7a822854997e53229226a28a30d0346311f5
+EBUILD bind-tools-9.16.6.ebuild 3456 BLAKE2B 577787845f7cd50c9e13b9d61ed0635ab504f58c26ccdc04639793f9aee427369baa57e44d10fe23454f3cfa072abba1156ad2042827d1e93bbd05cebcdb50e8 SHA512 735208c923d7f2c6d751318138a0ba7f95692073cc41ebb9f875cc6c96faa6a9a37fd38b43376b8c015a3dcaa9f7d81146bb3e36ce69722282048717f48a2e10
+EBUILD bind-tools-9.16.7.ebuild 3463 BLAKE2B 07d1e5e6668b942085d7d2c3a45ef81c6fa974a6f7e384dfb1c354b97c6b575ccf0b82c4bee3ef457b24298c74045b6ad782a8d6dc0c5dd5237b522db013c7d2 SHA512 d1a444d02b76802bfe6b6f33db0415c311f9a94cc60d6e9d1744235744711fcba7540b153784e873bc9df8b36437f775527a82ad886c281e52403e99f7bb8473
+EBUILD bind-tools-9.16.8.ebuild 3463 BLAKE2B 07d1e5e6668b942085d7d2c3a45ef81c6fa974a6f7e384dfb1c354b97c6b575ccf0b82c4bee3ef457b24298c74045b6ad782a8d6dc0c5dd5237b522db013c7d2 SHA512 d1a444d02b76802bfe6b6f33db0415c311f9a94cc60d6e9d1744235744711fcba7540b153784e873bc9df8b36437f775527a82ad886c281e52403e99f7bb8473
 MISC metadata.xml 533 BLAKE2B d04998d5522ccca610384cf5d46f955831d4fdd9da02266680aed6ed680bdd1bd92262fb0c31f6b0c27b15f1b987058c13260d43bb4313b23e5bd288e5f812e9 SHA512 ba16d092633db22a6f419ef4dfdacf3a1c3037dcbe764bbf525f5708f74a1d6857de5cb8fd740dc7309f085360dc3222f949476fd3e2ebb6a8dbce4fb6c08ab4
diff --git a/net-dns/bind-tools/bind-tools-9.16.6.ebuild b/net-dns/bind-tools/bind-tools-9.16.6.ebuild
index 7789763f7bea..2020b8a84d1e 100644
--- a/net-dns/bind-tools/bind-tools-9.16.6.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 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 ~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-tools/bind-tools-9.16.7.ebuild b/net-dns/bind-tools/bind-tools-9.16.7.ebuild
index f365183f1078..f983773f1fac 100644
--- a/net-dns/bind-tools/bind-tools-9.16.7.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 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 ~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-tools/bind-tools-9.16.8.ebuild b/net-dns/bind-tools/bind-tools-9.16.8.ebuild
index f365183f1078..f983773f1fac 100644
--- a/net-dns/bind-tools/bind-tools-9.16.8.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 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 ~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/c-ares/Manifest b/net-dns/c-ares/Manifest
index 2b5b5b25eb5e..a7fde86a6ee9 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,4 +1,4 @@
 AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb449bb011fb3567bfdd601dd7e598e72bf70ffb209ddaf23cb3a2b06f2bc38ff34e1a6bec7cbfafd2d25516f1a24780ace SHA512 53a9c126183c811b1f68c12014e4123d250447925ded472ff1fb6b57d254730206becd4182692ad5958b14ba0b929a2713df6988c0306872b046aa49bd70e743
 DIST c-ares-1.17.1.tar.gz 1518701 BLAKE2B 31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905 SHA512 b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00
-EBUILD c-ares-1.17.1.ebuild 920 BLAKE2B 472f65af10a750d9dc573074180e83fafc7efd24664a99be19fa7fba9e3a2d87509fbbf383132fbe9a78120435d7ed24da65c908246227859301367c3a65cce2 SHA512 fc1b6473028bccecbdca5f51dcfe6a57f6e9f42601d721bbc3f84c3f4faaa0adf2ea14eceea34c199a5c8df458cab0a614d877e79b2e77425adf2c843dcec127
+EBUILD c-ares-1.17.1.ebuild 909 BLAKE2B 5511694315d6dcc195d7a34458eeaa405aeb5e3b24ab38cd62ec040109ce62929caec0e9203cc3b52f66a505098374b1eeef68dee49647f145eb6049ccabd2fa SHA512 a7555b7a7a21847396ac98dfde618ef96548b4ac2a197515dbf2135bc15d569e3f5e369482bf4dcb1adf6b2cec425d633e35a53e40a4da481a51271fdedf16fc
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.17.1.ebuild b/net-dns/c-ares/c-ares-1.17.1.ebuild
index 25041cd6d09c..4d7c73e9bc7a 100644
--- a/net-dns/c-ares/c-ares-1.17.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 10dcbc5ca9b0..96aff66e9f31 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,10 +1,13 @@
 AUX config-full-paths-r11.patch 3971 BLAKE2B f0d819a673bf50516331f305f46c90c89bc0a527f00b47db109ce567fa91121ea012ee820804a66bc5e70a53ba113a5eb2e394551beddf65200e0f2fe6b5fd6d SHA512 8fa35ff68c8b9cbc760bfd8e3f72b0e7ab4818b9d01f94ccfc91fc677281352641b219281632750b2c44ec1848d8a32b40e5e08d47ac94e0e4e87f1b23cdde1c
+AUX dnscrypt-proxy-2.0.45-config-full-paths.patch 4260 BLAKE2B 04eca789643722cef51198228ae7a35d75dc66bc1f882ccb5919330789105272bfd1d61e31ae2276fb6d94b05777096138f23026262c26436ae4ab2f2376e2ec SHA512 9e4991cecfd11b07d3a83fbe5c885a89e917ae92e335d261c96ed0b086bf04d051ff5179037999b91cd773e7d9f58f5f04aea85958e496c314694da37ff151ca
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
 AUX dnscrypt-proxy.initd 667 BLAKE2B fba1075bd738fc86b50f37bc25e3ef7f54416d5d85cf3e6d088be0707164007b1ff9c01ac2b0a583724f726cde41a96cd77c8beab11082dbc7b5c03a05c8cf95 SHA512 89677b8718c1a45a6d8b1a0501dc5c4ff8c02793181ac84316fe5488807726bc66b40849c2f91da817862997628b3456926f5efc6ede9c25bf3f5e6533fb88ee
 AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc3349602861eae8c8747e8cd811440df48f9029da514cd43a4d32a5f001ad6385354c754d0ea36c4a227a5c1f980 SHA512 11769c47ecd44169dd3aab26574a710c07e74f465417081b283f3f2f8b7f64ef77a24359555bc6b94144d38481661bac6087a7f79190bfb67c593e700b2202e5
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
 DIST dnscrypt-proxy-2.0.44.tar.gz 2279842 BLAKE2B 90f156914dd29ab5baa2eb02ed2992583999a6688d09a532f8c7c1ec6d285bd39893f66726da928f295056fd66cd756f4332f1ed21284ffa3d357ce355a08625 SHA512 009e2b669c1d6f6cd6b41f5e04d08735587f420dacdea8d422a3c12a62614c1ce1963deebca3af1f956070abd9ff5df9182cb27e31fa0fac8a95478739445801
+DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a
 EBUILD dnscrypt-proxy-2.0.44.ebuild 2842 BLAKE2B df98833edc111d3b2ee8304eddbf5ca002ee4f787ad09985f0b8e1f5edb5d2b27ef2f457aaa481198a8c42267e700892a7a910552a4ee7b333726a217768d755 SHA512 db0f3e0abb5cfbc76493c57ec29d6833c360f1a9a929ababc9a95e25c48ccd2a7ded9874177e14d1f078729d58ee23136122034644e6cbebc1485ff5df93b4f9
-EBUILD dnscrypt-proxy-9999.ebuild 2838 BLAKE2B e163d4d89bd9d66036ea6f454439a55f6b9bbf1fd859b0410c508880c063243a1b2e24f129ab94b06c79a0395d6bfa5705bd0e59169e66c15b6177f36652c3a4 SHA512 8e12277cf798a6aba9dd55ac8f35a9218a13b2ca4b06cf91e3255e6b09ef5be14209559f64574fb4454af455d152227ec7ce981bf4c3cad8fe1d045c99105af5
+EBUILD dnscrypt-proxy-2.0.45.ebuild 2861 BLAKE2B 330be9e73c0f3f1e252c4622d23ad5aa3b3d443033bdcedf2904834d89866035dd83171de451c8cb30617702ccb349bb6403b44c13b9dd919bf5c8b048fd687f SHA512 6271c007f6611b87afb9be9b57a89b817b32c2ff4e46788284a6c629f03306fc3fb59391b33780ceda8a0b068747b3f23eb8892f3f4b70b69a92c8ef323e3090
+EBUILD dnscrypt-proxy-9999.ebuild 2861 BLAKE2B 330be9e73c0f3f1e252c4622d23ad5aa3b3d443033bdcedf2904834d89866035dd83171de451c8cb30617702ccb349bb6403b44c13b9dd919bf5c8b048fd687f SHA512 6271c007f6611b87afb9be9b57a89b817b32c2ff4e46788284a6c629f03306fc3fb59391b33780ceda8a0b068747b3f23eb8892f3f4b70b69a92c8ef323e3090
 MISC metadata.xml 618 BLAKE2B 5289dcd30374f9bedf43f71df91f80ca017c12474e22bcab3f5cd763e80e65174503c7d02bc4313ed927b0cc28dd8531526ce1435f56a929e45ed9c87f5f634a SHA512 78edb67c2f21c0b00eeff5d70298b187b7a0ac41845c10e2524da0d3b3e5127958f62796d53ec79e1d4565d46d7dd8b94e42753451c75f81687bacd0be5d00d5
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
new file mode 100644
index 000000000000..43359636f250
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 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}/${PN}-2.0.45-config-full-paths.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-{allowed,blocked}-{ips.txt,names.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blocklist/."
+
+	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 4f7ddaa4a1b8..43359636f250 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
@@ -23,7 +23,6 @@ SLOT="0"
 IUSE="pie"
 
 BDEPEND=">=dev-lang/go-1.13"
-
 RDEPEND="
 	acct-group/dnscrypt-proxy
 	acct-user/dnscrypt-proxy
@@ -31,7 +30,9 @@ RDEPEND="
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
-PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.45-config-full-paths.patch"
+)
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
@@ -51,13 +52,13 @@ src_install() {
 
 	insinto /etc/dnscrypt-proxy
 	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{allowed,blocked}-{ips.txt,names.txt}
 	doins example-{cloaking-rules.txt,forwarding-rules.txt}
 
 	popd >/dev/null || die
 
 	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blacklists/."
+	doins -r "utils/generate-domains-blocklist/."
 
 	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
new file mode 100644
index 000000000000..a871990deb9f
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
@@ -0,0 +1,101 @@
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -157,7 +157,7 @@ keepalive = 30
+ ## This file is different from other log files, and will not be
+ ## automatically rotated by the application.
+ 
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+ 
+ 
+ ## When using a log file, only keep logs from the most recent launch.
+@@ -438,7 +438,7 @@ cache_neg_max_ttl = 600
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+   ## Can be set to /dev/stdout in order to log to the standard output.
+ 
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -464,7 +464,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+ 
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -499,7 +499,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked-names.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -527,7 +527,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked-ips.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -555,7 +555,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging allowed queries
+ 
+-  # log_file = 'allowed-names.log'
++  # log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -583,7 +583,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging allowed queries
+ 
+-  # log_file = 'allowed-ips.log'
++  # log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+ 
+@@ -654,7 +654,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'public-resolvers']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://download.dnscrypt.net/resolvers-list/v3/public-resolvers.md']
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -663,7 +663,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'relays']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/relays.md']
+-  cache_file = 'relays.md'
++  cache_file = '/var/cache/dnscrypt-proxy/relays.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -673,7 +673,7 @@ cache_neg_max_ttl = 600
+   # [sources.quad9-resolvers]
+   # urls = ['https://www.quad9.net/quad9-resolvers.md']
+   # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+-  # cache_file = 'quad9-resolvers.md'
++  # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md'
+   # prefix = 'quad9-'
+ 
+   ## Another example source, with resolvers censoring some websites not appropriate for children
+@@ -681,7 +681,7 @@ cache_neg_max_ttl = 600
+ 
+   #  [sources.'parental-control']
+   #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md']
+-  #  cache_file = 'parental-control.md'
++  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+ 
diff --git a/net-dns/dnswalk/Manifest b/net-dns/dnswalk/Manifest
index 785797cd093f..a57cd6a67567 100644
--- a/net-dns/dnswalk/Manifest
+++ b/net-dns/dnswalk/Manifest
@@ -1,4 +1,4 @@
 AUX dnswalk-2.0.2-portable-shebang.patch 192 BLAKE2B 699c23b223a0e4d0d735f50cac6e72af4e9b40bbfddb0989934a31e599b20ee9f277d9f32319ad01eaf9abdc1b0a30f80a8e994f15d536d4050c0fa9aa2e0d5d SHA512 15a04b32aadf85fc1cd42780b2d9bd9bf72f86c4912cfdbb6847a85dda9d5cdf5d0696da813cd98742171bd661a3e9447b1f133953f4b17ea33ccb4d81b9173b
 DIST dnswalk-2.0.2.tar.gz 27015 BLAKE2B fa7b357b8075b9f5bc2afc97764eaf5e6c07d9fb67f4f10cb89010d3bad1e550d3b13ef013669323ff5259c3784e3fdb2c03f1e2c5cab86388e96f25210002be SHA512 23e5408149ae65f69dbb6d0ecaf5b10233e2279a502f6e19f0dacde0e270ed4eed0aea72f8c12dd636228e99b0b115a335bb8327a0628ad1f36dae5f5572712c
-EBUILD dnswalk-2.0.2.ebuild 609 BLAKE2B 8f715c2d0821db8e9801ac01a89877b1e2cff7f161a700cd1a6b440da9306fb718b7b26d08135b7e13ea5b2f68a9fac2a7ed642396041f3682d3489f3f9c86fd SHA512 841c2bffaa3f51736f3c084ff313e8dd6af5bf1e1567d39a0355b697ec56102dd0db846c34d162f320389dc991b9877b387c3fde9290d4819952f7c7e7c4ab17
+EBUILD dnswalk-2.0.2.ebuild 598 BLAKE2B 4db388d84401f78cca1ed53706000dd0c5f565945c51300254981bf480e23ebe4b00ca3f265afd7763fae02a871b26f1f7b9dbd7d61853b50ec960fe0fcdc640 SHA512 40c011e9c160e42ed1d147e5058df6e6dbcc95b21fa27a5d51955c9a5aa0e57562530ca6bb81e4b005a67665b152ccd78a9f9f93413441023660e45a89b459f0
 MISC metadata.xml 244 BLAKE2B 3a3cdd078803168e1273361193fbc714041b6988b4fff2b933542a9cb3f302f3db3014d679b758bce39aefdfd22dd62d201bd4a638ba4bf52bc99679acac00dd SHA512 9e02e3ec7cc7cdf87fd3970fd60703bc661263fe067e173c782ed6fffd1ddd84f68c55a021a6657d6a8d1f0c2320fa6283d729954f214a8a88c5a725683baab1
diff --git a/net-dns/dnswalk/dnswalk-2.0.2.ebuild b/net-dns/dnswalk/dnswalk-2.0.2.ebuild
index 8114b78757d5..586828a9aac9 100644
--- a/net-dns/dnswalk/dnswalk-2.0.2.ebuild
+++ b/net-dns/dnswalk/dnswalk-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dnswalk/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-perl/Net-DNS-0.12"
 
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 00b52c8553db..c94631b963eb 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,4 +1,4 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
 DIST libidn-1.36.tar.gz 4557804 BLAKE2B 562ea97cba7970e3f3bd1557ba9e25e4180cca1b5cb8f66539f7830baf195cd36dc513c50e2475829af42d420e3d3b73a1c002acb06579c8b8b3879dcc8f95b2 SHA512 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad
-EBUILD libidn-1.36.ebuild 2614 BLAKE2B 7492eeb18058fa5a41ad8cc27c5bb70925160a7c381c26b5dfd1cfebed4d751741245dc767cce11fe6c60abd911bb16cc1dc9a51503f432741512d07d0653608 SHA512 0b14c4c20a74404dc9c95bf86af126aff63bc664b129c660c42d96059b7c3cbf16b887e3018ec4ed4179620b6f35e25fea235066d7b418154135347f44820fd8
+EBUILD libidn-1.36.ebuild 2603 BLAKE2B 9895e398b68afdd76a4f154a2966771bbb22f3d2226fcf57321927036b7e0120676fdfd2eefbe5fbbe3c3ffa6a77b72c641de66aed75a43dbab74faa203f4664 SHA512 87680ffd0f5314f2c2f5ba4daeb9dbb8bb6eac47a7c4dc2756a854a6587b16bb46f2b3ef364c8e3de57541b9f276d47415653ea9d872ea14e912de98ac08ef09
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild
index b3342236e0c1..d4c9153ac03a 100644
--- a/net-dns/libidn/libidn-1.36.ebuild
+++ b/net-dns/libidn/libidn-1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index bb877da4192c..4b2ea8b1b049 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,3 +1,3 @@
 DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
-EBUILD libidn2-2.3.0.ebuild 1313 BLAKE2B d70d573a6eda17f028d0da53368cf062129596dffad5f8b9ddac6be976ea304ffce36765d221e11b7d34551cad7afdebb8b4afa8c295ff237f10ce070b66d0ee SHA512 74db85a1f9de09ed60c58d919e57cf6fe01aa1be7dfe224f6eb6ac43dc395cd1d1a93f7fe485f44253c990f5c84c9d8bb41833ac52efe8264c0fbbf2488c9c6e
+EBUILD libidn2-2.3.0.ebuild 1302 BLAKE2B 4a822648295579f5a67e8f334c2b41cac08ea9263b56c7c5c4da1e70d2e1a458c5aa576e56820d989f03c443e0f4036cec7be53ced93e34c1cc9d495617f213d SHA512 6f98c4fdb672fea49b39e660c403e1aad7338d05ca800b97d65a58f6b40fc175230032fc088ad6b7892ef15489ded8a0d4263ae66e406a91e952e6c7eadfe672
 MISC metadata.xml 461 BLAKE2B 5529fce3c73a3d581d04cca1f25cbf1c552eadea79f068ceb8f379d4cf1e2adaaa827705193d894fa7c208902d8fcab66855222ce223734904a346395f72081a SHA512 ade0286770074952c4baac2c2b13bccc64918049e1c6283a12b0698164c539108e7e025c3cd82fd9b7d4c538db3a668363797fd46e92b86b2eb46c128dff7ba3
diff --git a/net-dns/libidn2/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
index 0d1dca813c83..381ffbc6392e 100644
--- a/net-dns/libidn2/libidn2-2.3.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="