gentoo resync : 09.03.2018

24 files changed, 39 insertions, 171 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 8b7855ee3690..95d58fe75e81 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index dee8e9c31ff2..c92110abe651 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -20,6 +20,6 @@ EBUILD avahi-0.6.31-r11.ebuild 6261 BLAKE2B a11de83cced8adec29e5a3df8ad09fc2dd16
 EBUILD avahi-0.6.32-r1.ebuild 5732 BLAKE2B 6b17c7e9d223e288e309ef3f51326bff5d3e895e12a1db585f0fe3a086ba0a80bfaccb0d9ef79b769200fe985be92826efb64eb071ca93c79d82a4addde91b98 SHA512 d26256a031d5d7ce6cf58ff4c98d5a88ed93498d0383e1a425e88bc9f1de4ee18c0b2ab6e987163b5a27acc807199c8f91276e449dc6d951607c1dfddfaa74c4
 EBUILD avahi-0.6.32-r2.ebuild 5971 BLAKE2B 97aa22378ee9791dddb866a097b4c1fe69152e90939d67b1a95c890488b297dcf80e2df1f4435af0d69f798c9fc7d6365329ff481b6f24af50dbe37dcf2fe1d5 SHA512 e25666354328ba52955b938d4cfd1d0ff661cd6c536fddfc8cfc84afdaaebdafc8091bd99d17d737e79242c45b858df23a3cfbed8cf0c5491bb70ff7ed192b93
 EBUILD avahi-0.6.32.ebuild 5584 BLAKE2B 48672b141bd86b76838acae05f4d6e3f4fffeb686e42e058b8b8c3c771568df7ca12bee6a215079729d585d6415c30146787e73aeb1b84abafbff5da00ec9b48 SHA512 031b6ea7962717de7f984c78a2814312610b86ce391a2474117b34b2e8c542a6de49b75998c99639f866f415b878ed58f807a12ea713d3b1d15ef0657013e4a0
-EBUILD avahi-0.7-r1.ebuild 5127 BLAKE2B 873f9ca40c59f8a440ad04093d48ce0f8c53ceeba5f3701fadb33212bda3edbdfa8e5f7848cc8d3e24194149c68011f3bcf003c8b534e425ff16f46c06f6ea92 SHA512 dbe9b1359ef656725c32984418f579df29325b2589ae2861ed0232bf16f0559176895f5906b1d9afbc509865f1b6167236d56caaf68675d041cf2aeea797b618
+EBUILD avahi-0.7-r1.ebuild 5139 BLAKE2B f0c336b37322a3fd4dbbc5ecc0c447b93d3582f13ebc69f16145ee04f68c365782a230d0d4afa5cf04559e5c0d488d108b1803ed24300b17be4c7d6ad13c7a1f SHA512 ade9fa20e4a4bdb2796b37ae620caffd3b53e94473a3b8591bc3464c07a4cfa8b698c03711a544dfa7bfe40ee5c36b7b4b8d798dc83b1e1411dee3763d157e5d
 EBUILD avahi-0.7.ebuild 5190 BLAKE2B 5cc2cd2b1d708c191709ce60835afa9cc852ba5f3be833873001ea98fcdc8da4d8494ba34500b51196261af1d52d9e69dc369fd9e9aab0c6d337dabb4a18ee4c SHA512 3beb6fec1a10514958fec6cfa02515fd818e39426190a86fbac4705ad4534a9c74cb96b64305daf757cd790b5b55c513a8dd40b67554f20d5e16baeb1f5526e1
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.7-r1.ebuild b/net-dns/avahi/avahi-0.7-r1.ebuild
index e2e1bdb100b0..12c8716dfc96 100644
--- a/net-dns/avahi/avahi-0.7-r1.ebuild
+++ b/net-dns/avahi/avahi-0.7-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 
 REQUIRED_USE="
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 6b65d27285da..d1a28e61a737 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -2,6 +2,6 @@ AUX bind-tools-9.11.0_p5-dyndb-dlopen.patch 2932 BLAKE2B ec9b7d84b5f0ccb29ed8bdf
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 BLAKE2B 3f65aaf584ced53a098cd9536eb4e8fd243b50ef0845be3008066fa0b45915f4e2db585d3f64896782e7bf94362235fc31c1f869169d92996cdaf081935a4047 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc
 DIST bind-9.11.1-P3.tar.gz 9749095 BLAKE2B 1b68b57b9aed1a5210464e9c47a4e0569f1932076c042a7096dc04f69b45da9df8b2d56ec0f1f0d0fb136e7f61a39b3cb20d1912075f3a4138cbdf47f859cf0a SHA512 bf92ce1e07e5c84cc42b413bdbd3ad97f37712a6dc330dc10182992d948b7a393d5446efa188379b39020c34d810cebe2a7acccc9b8aa6bb564e1f3e6be42e96
 DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
-EBUILD bind-tools-9.11.1_p3.ebuild 3188 BLAKE2B b312b7c843926fd4efc2c72faed439f3b83008db49d79a556741989361e5c7c2781b2cec328d117f19f9b60a85a10e305e7849d7117da4327bc159ed458ab48c SHA512 7915e28f89343b3aa70b7855bb241b336c6c5181cd1d1d552cd7e52540fe945bca3dcfaa1b0b7651c6c9e6dd0ce5fa42e52a2cb493e60ce948a14a682c57cbbd
-EBUILD bind-tools-9.11.2_p1.ebuild 3148 BLAKE2B 152a5881c21b9e12aeac1ee23193a9ae85a4cae69300dce4c110bf1981c2011f89ba866a871db52a079f1c29d90915e2780b895cde0f1c25a613901777aa0c56 SHA512 f1d3bc4d8843489cfb985e85119854a0b4ff2e4a1843b29993065c66df4394b360ea00986b561b86cd76eb820441eda5c34c1cdd07896fa0aa38979710bf48f6
+EBUILD bind-tools-9.11.1_p3.ebuild 3193 BLAKE2B 6bede003d92acf5b5c24c753fc719c6b5a8459c34547f257d3584cdc518322b1fa3ca7a7ef8e0bdc1cd80f0fbebdb082b3d99564dae3b319b7d8181da2fe6f7e SHA512 5379303af22a228a3682f32f49c18d740bf533d7a1d58e1643e22a0c15540b4d66bcd8c3efe6d8d1675606745cc0e7679948ea0136084c8a42d7bf373b6f797f
+EBUILD bind-tools-9.11.2_p1.ebuild 3152 BLAKE2B 05df2606277342f16953fbcb8f4c17b759a2830f79db7f2833cacb0adf9320459a0e6ed4da804c79dd63e141e96c9edb3a5d9ef4a21a52b4ea9a546c86ee052b SHA512 fc4c51f2033db8c015b0eb32cf3a4a4f6154e8d984778a1118a27467e81f472334cd02ed62b561346f073ad42ed9b012a1d672a7cdd2a6164ea188f5f1e18306
 MISC metadata.xml 513 BLAKE2B bfb78568f9c2b262000c297e06791ddee8455c24a29e0fc822e272ed7d1cc3b90cd106f4faf3eff1da3824aca8dbe359b7fb3f767d72a967464edc649728066e SHA512 5c817f1afce4f096d912de9f0cd82b92e2b97f86db24de5eae8aa1a877c78e1800582b4615666c43f139049e179dbc30134692d7039517f97cf53ba9a2dcbd4d
diff --git a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
index c89e19f2d774..5b4f37aef119 100644
--- a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
@@ -29,7 +29,7 @@ CDEPEND="
 	)
 	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
 	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/idnkit )
+	idn? ( <net-dns/idnkit-2:= )
 	gssapi? ( virtual/krb5 )
 	readline? ( sys-libs/readline:0= )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
index 07f0efd7eab8..8f27cb6d7738 100644
--- a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
@@ -29,7 +29,7 @@ CDEPEND="
 	)
 	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
 	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/idnkit )
+	idn? ( <net-dns/idnkit-2:= )
 	gssapi? ( virtual/krb5 )
 	readline? ( sys-libs/readline:0= )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2c9a8573e0ac..11694f9b1204 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,5 +12,5 @@ DIST bind-9.11.1-P3.tar.gz 9749095 BLAKE2B 1b68b57b9aed1a5210464e9c47a4e0569f193
 DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.11.1_p3.ebuild 12500 BLAKE2B 2c1f6df537c01239c7f08421f76bb3a57b24215703c67833f86415c06cdc0ad8bc78bba68cc56fe3658456c4ade80e2a9a4f225f701f09764d4b20fb8515b029 SHA512 618cf728933b41521cf50c0e6c3d40f596d8fe4ca3c0f1725051e8f3d05800e9ff9e9b67c35719086c723e37efca22f0d42ff40eaab989557b14a9fd772d3d5d
-EBUILD bind-9.11.2_p1.ebuild 12449 BLAKE2B afdcc7ce85497d5c8e918a437f26d43c3fdc4ec1870a8421c1732ae1b8962bfd2650489a811d49edacc906329c7127327ffe9fba8a34e8f03c2fa3aeb2cea21c SHA512 c9e6ded9457fa4eac11990c632275e2b6b0fd358cca4ce8c7fd0e0b866926500bd2b3cffbf31b0e95ec8402d7ff8df638d0bfd7c5df397dd8ef023fa4be3230b
+EBUILD bind-9.11.2_p1.ebuild 12448 BLAKE2B 590ac8000916f37e9f16187727a985671e32ab7f5c7f9d9e211d574108e1b95e5bf3d6881e96a80be2d9baa50e9b3e3f7d97870c93b473f2c272493b43c201df SHA512 92b8f01ad596dfda51a0e90a25ef5e9ec2662173b292a140ac1506ceac39dc4df3eed6870b65aa802b305d581a0c2fc32c7e8ce5c24e545d10e6e475ed9afa74
 MISC metadata.xml 1085 BLAKE2B 2de8c47ab09298e6d526d2b3d19fcdde83aa7975918acabca68243f690c90ed2a656073b047c7d032b53acad70a8a08b3d95c0e1ce143d28cb9ac2729b0b738e SHA512 a04b103703aaebc79738193b378f94df74461e918bf8fa7a99459e42b41b59a1b294113040cf5892d77b4c7c31b1448d9869b53cd2a9fb2f885ab1a1a6ba2f3b
diff --git a/net-dns/bind/bind-9.11.2_p1.ebuild b/net-dns/bind/bind-9.11.2_p1.ebuild
index 60c845661d8d..541a4744b78c 100644
--- a/net-dns/bind/bind-9.11.2_p1.ebuild
+++ b/net-dns/bind/bind-9.11.2_p1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~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 filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 972eb0bd024c..303f15ec8d8b 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,4 +1,4 @@
-AUX config-full-paths-r2.patch 2896 BLAKE2B 9a81c08a094e4700c6b1effddcbb80ec98460761c0ffaaacd2053458df0197da7bd59a941c2fbd104ccb577d9e86f7ef8a818bdd6fce4c2fc590755052839ac3 SHA512 1a3cf4b3e6b0cc27ee292a50e56ca6e425277d684885005471a7f04b5f9114a9644ff2fbccea2721afd534582ae96571be93b3b8eae892d2a8e40c1574c144ef
+AUX config-full-paths-r3.patch 2896 BLAKE2B 6777ce33d475e5a5fd07f37f4ed7390301114819058b7ca407a0e53f2b5e1c2207eec4860d8c60a6b0b81cc72dd0da864f25d7507ccb13000e347467683fce2f SHA512 1e1672755110233a1629bb762dc637ace4c2719975582742d40eb3831c288294b5561cb2b3b99c5948c43f2a8e142ecba869838b79d4411b33f17413b57f4532
 AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
 AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
 AUX dnscrypt-proxy.confd-r2 119 BLAKE2B 00c216f87133aaf606c9c753ba5eb3d400363406abb4c25bd8f203aec8b8fe3e5c621deb4dea4f2db801c26ec92b3af609cc5a7bb954181641c1deeefa3aafcb SHA512 b144cd8f67b6ff06156841cf619ab4cd94855104f00fb1877c83308b6bf4d8addfd59ab1134c51855465a6daabbcd445550976c9d956d0795fa09f3b0482ac80
@@ -8,9 +8,7 @@ AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589a
 AUX dnscrypt-proxy.service-r2 581 BLAKE2B 1d873041005135b5ca01aa2b24f373056a4281604a8e69675912d86ec7de34c318c899a1628bcd758019c8c105179d231630dd6aad520ab5a8e86fe64b8592b7 SHA512 40552beb4f640881bbad0cf0c40406e5c1e4ec236b4e1d89a88af4eef888f91c8170732273990bc4041c39e742516664651cc89f7686fba941697a148b9345d4
 AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-DIST dnscrypt-proxy-2.0.0.tar.gz 725490 BLAKE2B d4c116f81d304b9b3a883ba6b414e2fef810f50ecea9a9175246d02f2755c3e11c9940fed0dfc221e419820e001abc74e4bf4478abb2222b548461ad09f3f57d SHA512 c87420c09fc45496901b0c21ae972283f05c508b07249450de504ba5e287128c2c5e0f772b181ddb2f6478cb6d66e72617e3b0679f47f3b15dde80c92d2ef7ba
-DIST dnscrypt-proxy-2.0.4.tar.gz 727969 BLAKE2B 80f29fbc150f8731dce0ab0af8f4282264b19fade73846f972bd0e762bfe4ebd1a0f014fb6fad860623377c833c099f1d50d8ab7ccd8cecb7e210a422d96ea99 SHA512 ba8f419c85b3ccd0bdd930404c3781f1cadf58dcacb30bf35c3be0933887a6dc910496424cb3847ef2630b8205794cef03d980ac82605faca38c6bfd58b213be
+DIST dnscrypt-proxy-2.0.6.tar.gz 744263 BLAKE2B c24acf7fbdf007b58e674f4c01db5bc3ea84d974c902086840f64c890bd72a64828283400e5f1f9c5d5f1c6a0e8233a366c33db3e3cdbec2e942a6d973091fb8 SHA512 f581b3663d5162ebd3fa5971c1af96e192b644e806578899ec37b86dceb3823fbfe1102cc8748cba361f3d000c4e952133e2dc92b94c6276819e37e07af6f0e5
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.0.ebuild 2443 BLAKE2B feac451a5a8d24cb959a2d354b5cf2176cb34bc8c4ceaf89b060aa693a541fc281f81873018fad3b87fd5a321fdaa5b59d4874ce5b338482fad05d6b925b5cb9 SHA512 9a3d7f347be49204bd2893be27a7ceb558a469b8dd941543a4891b1e70bdbf268fa504cac2e74fa17e61c092b0c1f13a40ee292a5f4c4132d2cec9dcf39baeda
-EBUILD dnscrypt-proxy-2.0.4.ebuild 2443 BLAKE2B feac451a5a8d24cb959a2d354b5cf2176cb34bc8c4ceaf89b060aa693a541fc281f81873018fad3b87fd5a321fdaa5b59d4874ce5b338482fad05d6b925b5cb9 SHA512 9a3d7f347be49204bd2893be27a7ceb558a469b8dd941543a4891b1e70bdbf268fa504cac2e74fa17e61c092b0c1f13a40ee292a5f4c4132d2cec9dcf39baeda
+EBUILD dnscrypt-proxy-2.0.6.ebuild 2443 BLAKE2B 3f42eb9b904b44ee32232ef49f31255852d1b8553e039b873268e603a3084679c2c685b0467a26b82c35316dcb2593e5257db4903f389ec89ce0e655a1d3e3cf SHA512 25cb83b6fcd2216b633aa71cc41b079bebf001c6e27117bbe8b8b5ac2d26aed3b04747115efcdfeb843ecc7b8cdf1b24f3bc364613c13e055d078220c71d1734
 MISC metadata.xml 967 BLAKE2B f423ce552f42f2f3cdcbe71a711104c34eb90b7cf75b6d60b324b1ce239cc34d13845971b9808b9ad19e3bd76c89d1bb3b2a5c3d53d33afafff7fa7009a01427 SHA512 7c2bab8a27a9bc8d8401867a2ec6e84928cf7520422604282e88db4dcba4003d675a457ce0225f67f7385baede7953b2d531b2ab68d7e6b016f1e7c5e0e5fdfd
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild
deleted file mode 100644
index 5e497f135323..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/jedisct1/${PN}"
-
-inherit fcaps golang-build systemd user
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r2.patch )
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_compile() {
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/" || die
-	golang-build_src_compile
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,cloaking-rules.txt,forwarding-rules.txt}
-
-	insinto "/usr/share/dnscrypt-proxy"
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
-	systemd_newunit "${FILESDIR}"/${PN}.service-r2 dnscrypt-proxy.service
-	systemd_dounit systemd/dnscrypt-proxy.socket
-
-	keepdir /var/log/dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
-		ewarn "please either change port to > 1024, configure to run ${PN} as root"
-		ewarn "or re-enable 'filecaps'"
-		ewarn
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v} == 1.* ]] ; then
-			elog "Version 2.x.x is a complete rewrite of ${PN}"
-			elog "please clean up old config/log files"
-			elog
-		fi
-	done
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "To use systemd socket activation with ${PN} you must"
-		elog "set listen_addresses setting to \"[]\" in the config file"
-		elog "Edit ${PN}.socket if you need to change port and address"
-		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/jedisct1/${PN}/wiki"
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild
index 5e497f135323..4176fce8ebbc 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r2.patch )
+PATCHES=( "${FILESDIR}"/config-full-paths-r3.patch )
 
 pkg_setup() {
 	enewgroup dnscrypt
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
index b693f1abbb32..c7fd7705d9ee 100644
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
@@ -1,6 +1,6 @@
---- dnscrypt-proxy-2.0.0/dnscrypt-proxy/example-dnscrypt-proxy.toml	2018-02-06 10:33:58.000000000 -0800
-+++ dnscrypt-proxy-2.0.0/dnscrypt-proxy/dnscrypt-proxy.toml	2018-02-09 19:15:00.105927884 -0800
-@@ -85,7 +85,7 @@
+--- dnscrypt-proxy-2.0.6/dnscrypt-proxy/example-dnscrypt-proxy.toml	2018-03-03 13:43:28.733466923 -0800
++++ dnscrypt-proxy-2.0.6/dnscrypt-proxy/dnscrypt-proxy.toml	2018-03-03 13:46:19.666853492 -0800
+@@ -86,7 +86,7 @@
  
  ## log file for the application
  
@@ -9,7 +9,7 @@
  
  
  ## Use the system logger (syslog on Unix, Event Log on Windows)
-@@ -140,7 +140,7 @@
+@@ -153,7 +153,7 @@
  ## example.com 9.9.9.9
  ## example.net 9.9.9.9,8.8.8.8
  
@@ -18,7 +18,7 @@
  
  
  
-@@ -156,7 +156,7 @@
+@@ -169,7 +169,7 @@
  ## example.com     10.1.1.1
  ## www.google.com  forcesafesearch.google.com
  
@@ -27,7 +27,7 @@
  
  
  
-@@ -200,7 +200,7 @@
+@@ -213,7 +213,7 @@
  
    ## Path to the query log file (absolute, or relative to the same directory as the executable file)
  
@@ -36,7 +36,7 @@
  
  
    ## Query log format (currently supported: tsv and ltsv)
-@@ -226,7 +226,7 @@
+@@ -239,7 +239,7 @@
  
    ## Path to the query log file (absolute, or relative to the same directory as the executable file)
  
@@ -45,7 +45,7 @@
  
  
    ## Query log format (currently supported: tsv and ltsv)
-@@ -255,12 +255,12 @@
+@@ -268,12 +268,12 @@
  
    ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
  
@@ -60,7 +60,7 @@
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
-@@ -283,12 +283,12 @@
+@@ -296,12 +296,12 @@
  
    ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
  
@@ -75,7 +75,7 @@
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
-@@ -357,7 +357,7 @@
+@@ -371,7 +371,7 @@
  
    [sources.'public-resolvers']
    url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
@@ -84,7 +84,7 @@
    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
    refresh_delay = 72
    prefix = ''
-@@ -367,7 +367,7 @@
+@@ -381,7 +381,7 @@
  
    #  [sources.'parental-control']
    #  url = 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md'
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index f15968aa382f..a90143971d0c 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -1,8 +1,7 @@
 AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec6081192090afa4438e83df7bf02dc5ae047c4597153649aa0d4b1f658a37809687d91602d2ce61bf8cc7b3e878ed21b993 SHA512 1c405d1b72d678394284936d9130450b366f7a53bdf586fb6d4331b72c2d6672a19f2322a7f284067259ed0c0dd973865d9b117ae6c15cc8a1d41c734ef0a4ce
 AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
-AUX idnkit-2.3-log_h.patch 734 BLAKE2B 696ebd7daeca2c3ff3c5103c54a0bb566a62e5eaba669bc35be2891cb100fc24b532fdb6309ba90c5a2261e1b6cbd522d9e8b535c4dfa96053d151f5a938cc35 SHA512 96e61794c0dbd9b36f65d367930c326722ff362d2335e3b734a205e957031ea4d3cb8c60f0feccb9b646f9cabf045b7d340366b32bf6ea52d7a753867f71935b
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
 EBUILD idnkit-1.0-r2.ebuild 1058 BLAKE2B 11b1bd1d8baa95dfa3483fe482938a37871cb347bcff34943554a7c490af71fba29a457acb8dd5f97237ec8685599c6e187a3c088db4d32d218a09d2ee2972f1 SHA512 03a7a1c838acf7c90bec72ecbdd6901bc97cbc9d8ed85c6180329f2672f7e4a0cdd941d64384fbddc6697e5976f849f3f5cd428e347df47f969431bd4db00270
-EBUILD idnkit-2.3.ebuild 677 BLAKE2B d29b3a45d31ae32c7f4a7c7c1429f9ada5c773cd6a8f25a31ca8eebd7ecb3cb74039bcfb70503f8ac66a9fd99a4082cf3f954293290097b34b4694acff76ef60 SHA512 0d5c735a42161587ccd56a2917b0647d153ca72a7eee712cd070f27c31c80ae02d8fc8722ff0a49ceedf2c24b08c7f9746b5e593b10a081bd3f799a846d3df44
+EBUILD idnkit-2.3.ebuild 628 BLAKE2B b0cf5e2cd4a27b504426899ca89cfd71d2f4556912e97e361c5c48d3548b81401e23f08f6bb7da626b7dab15b34dc982c643b77b1c1d9e0348a5c6ef1c847fed SHA512 66a21b3b8bbb5997decf4ab8b0218db8165e31f59ca36d2310bc33c08485a5e8d91885ca48d1889b38d7d7e87a4d453598e28fd991cf3f3322c68e875b108ec7
 MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
diff --git a/net-dns/idnkit/files/idnkit-2.3-log_h.patch b/net-dns/idnkit/files/idnkit-2.3-log_h.patch
deleted file mode 100644
index 975ea0b58dbf..000000000000
--- a/net-dns/idnkit/files/idnkit-2.3-log_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-net-dns/bind-tools uses idn/log.h
-
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -1,6 +1,7 @@
- nobase_include_HEADERS = \
- 	idn/api.h \
- 	idn/export.h \
-+	idn/log.h \
- 	idn/res.h \
- 	idn/resconf.h \
- 	idn/result.h
-@@ -22,7 +23,6 @@
- 	idn/langlocalmap.h \
- 	idn/localconverter.h \
- 	idn/localencoding.h \
--	idn/log.h \
- 	idn/logmacro.h \
- 	idn/lowercasemap.h \
- 	idn/maplist.h \
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -226,6 +226,7 @@
- nobase_include_HEADERS = \
-	idn/api.h \
-	idn/export.h \
-+	idn/log.h \
-	idn/res.h \
-	idn/resconf.h \
-	idn/result.h
-@@ -247,7 +248,6 @@
-	idn/langlocalmap.h \
-	idn/localconverter.h \
-	idn/localencoding.h \
--	idn/log.h \
-	idn/logmacro.h \
-	idn/lowercasemap.h \
-	idn/maplist.h \
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index 6935a9252545..69306f66fb59 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -18,9 +18,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-log_h.patch
-)
 
 src_configure() {
 	econf \
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 3eab02ce7615..cbebd212fef9 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -3,6 +3,6 @@ AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e4230
 AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
 EBUILD libidn-1.33-r1.ebuild 2973 BLAKE2B c34576f6c0104090b1c2a1602028d60ef6199973e13209b28e434fc69fa2a47980ba2132a2ab0265b0a96f40044ee4b0a9d3fb577534485ab8c9ff7ee1dc5f03 SHA512 b77bb63c075538a59ccdbefd9ccdbd4059ada9efc899482d9b793a10f81ef6f582f9aada266cc4537f3c403b0b3dcacd50f7896a271a283f0c90b3729e0bc9ef
-EBUILD libidn-1.33-r2.ebuild 3016 BLAKE2B 856649300e21d5ddcc9603f88c210023599e259f7c0f921a1d0165942cc1ee85f6438d703f6f38522991647c0ef8cee9cf38aecd4500c4d016437bf86a5165f0 SHA512 c7f629930aa5e3b5498f527bde3e2a1e777fb599cf21467b3d3b91e55ca7306d850dd0d96f1a0e74d0e333ddd5a266ac03f4be2b0ab5f483f6d92ec7f930159f
+EBUILD libidn-1.33-r2.ebuild 3013 BLAKE2B 7c33035055d9f52c67c5a14409f38c9d44b7aeb98f33df54a1489efa169b8fd079e0a52e77fee885befd09e5cad3b75cd5bc95481bf11a4bb98d1b8beade8dd6 SHA512 4fbbd2aca9cd638fcd8b25f13ed2811438a8f4e8ce2b577a1fabe93b231d3a3a67ab1f4e390ba7eae4d101e5f51d0c49e6f318dc3152084a95c61d61f2c8a0e1
 EBUILD libidn-1.33.ebuild 2793 BLAKE2B 0d451ba20b772d3343503a122c92a5de5f98a67e3e95246adb2220f03ec9a96b887704c0bfd40fab0eecec3839f43705e00c19949fe7760a187b4d0a49b7b71f SHA512 56ea6fce689533f562410a2a3e15328873c76c6b1e231a3272162ea7c786369fec86e0332785d0170b81632126c75c2adbf880da7e9ee9152eb4548eb3b0ca5d
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
index 321a24435451..e98daa3439ac 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -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"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 4396f2c7c7fe..73c086eabc78 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -16,10 +16,10 @@ DIST unbound-1.6.7.tar.gz 5466931 BLAKE2B 57a051d5ac6d7fbc3d51613305651987670d0f
 DIST unbound-1.6.8.tar.gz 5467536 BLAKE2B 06caffbd905c339b3d0667382114bb3e5d5da90988402c8f488f789f9bf6ab87377e6a26aa083a7e9ba3d023f37d3eeba1e069adf8a8a266b23fb8361aeb6e26 SHA512 653d88d5dbc8cf25f7261e4a9869b6591843c7ff27b5d63f979a94505daafbbb61e05d46bedd2d01230355d5f08dd9fe14ed04c5c7340f3f27581b61ad6edfa3
 EBUILD unbound-1.5.1-r2.ebuild 3427 BLAKE2B 193c35ecb00ae6303e6ab97852f79dffdf2bef64ce0b7c6e961370eb87d9506569e8aadfa6386624ce121162380b24fde713b36865b18bf228aacb3651defde8 SHA512 d3630f81fd44b40f5deb155473dc5835cc68e444be26afd0207fa734f285b566694b92dc073185cb24c9588a0ca5cb9ebf9c9268c2725c24a6c61d7ca73d1bcf
 EBUILD unbound-1.5.10.ebuild 3465 BLAKE2B 765d3f8f6a987a22195a235e515fb4fd29005a8e2b8d2eeadc9328993ba41d95655db10e1f8426b449311b08516b8dbd4abae382bf6d9b2f3608716c7f57f30c SHA512 28fb9da2c9bf08fbdd8e440c7c0f61da5ef25f7ca179b18e7c189e5c23f70dea295e1dd9b0fa289c75f5a4ee24ed9e1b3248f62fb0dc05d78068f22c00d100a7
-EBUILD unbound-1.6.3.ebuild 3669 BLAKE2B b56cdd1dd673807593d2b8b99a96c4ae43333b69cb66cf30e73dba3c51e0b21df130da9fdcd35d458afff547960a27c690d13075c43a950d986b8f16e0ea88f5 SHA512 d7d1035bab213ff950883ecac04f7c3ff972b6f83465a2c09afba1339ef1e74e560cb9cc818800d02a79462d2b857832596bc80b2088b5db9083f82a9032a5a6
-EBUILD unbound-1.6.4.ebuild 3669 BLAKE2B b56cdd1dd673807593d2b8b99a96c4ae43333b69cb66cf30e73dba3c51e0b21df130da9fdcd35d458afff547960a27c690d13075c43a950d986b8f16e0ea88f5 SHA512 d7d1035bab213ff950883ecac04f7c3ff972b6f83465a2c09afba1339ef1e74e560cb9cc818800d02a79462d2b857832596bc80b2088b5db9083f82a9032a5a6
-EBUILD unbound-1.6.6.ebuild 3676 BLAKE2B 3e37f5afa3fea70e86648fe5e32a5c38e89b77c5c9a0126c2fe831cda94bc8de52b2493def4bd6500c3e970827a4a3c14a63e1704cd10d7a3bdd5a808f5bc3b1 SHA512 112962ccdb8e60f8fb195061e607c449416355bcc5524a7bd6df2964d5a1508d4ddd7f5969b9f2b2e3b0acefc4fa7b6f687ef634cbcf24dc416cecfd9964dc7d
-EBUILD unbound-1.6.7.ebuild 3676 BLAKE2B 3e37f5afa3fea70e86648fe5e32a5c38e89b77c5c9a0126c2fe831cda94bc8de52b2493def4bd6500c3e970827a4a3c14a63e1704cd10d7a3bdd5a808f5bc3b1 SHA512 112962ccdb8e60f8fb195061e607c449416355bcc5524a7bd6df2964d5a1508d4ddd7f5969b9f2b2e3b0acefc4fa7b6f687ef634cbcf24dc416cecfd9964dc7d
-EBUILD unbound-1.6.8-r2.ebuild 4794 BLAKE2B 86d59f910c269b40e5ffaff2c5bac08e29318d883d762079dd5d02361aab2ac2d955806285e426f27a1b44001a9f7bb09a37b16a49923ca24cbc8655bd9a392c SHA512 9f0edded5e7e009f003ab99d53ecd3df92983e97b90c1d586cc44e002b1433bdb64acaddf9c849a08c7ec7eaaf52cd1e830f1fa2d0db31332a322827edad5b4c
-EBUILD unbound-1.6.8.ebuild 3676 BLAKE2B 568771ffa57f6ec9711aafe2ba7e808772d898a3476a5d11c0aaeb40538e37a5a7d3a4b091a206b5828605162a59f33dfe50b6c0b4840794f655090c1a1bb641 SHA512 403febbc597a6beccce1eb4394df04dcbbec1c65cd1b8e4c444e53ace5fd6b3cf87dfaa1cf69c11203e3cdcb7c99de7d43f36a202188e4e6c58b4f8650d109ae
+EBUILD unbound-1.6.3.ebuild 3689 BLAKE2B 8bdfd0f5b48ed66d7eb167e187cac4c64c3c0a044f0523662f253514717a273671fa15e6e931ec03f3ea16a6f2f727701811f41a10ecd49326a9c855f694a2d1 SHA512 15d464ec999b6c98e05d5904e52af977036c2c7ea2bf1d54cebf05f6841f8c28adda1b5d6fa9f344d12ea8417f512a1f0c0487aad62627a7761e97e71f3b018c
+EBUILD unbound-1.6.4.ebuild 3689 BLAKE2B 8bdfd0f5b48ed66d7eb167e187cac4c64c3c0a044f0523662f253514717a273671fa15e6e931ec03f3ea16a6f2f727701811f41a10ecd49326a9c855f694a2d1 SHA512 15d464ec999b6c98e05d5904e52af977036c2c7ea2bf1d54cebf05f6841f8c28adda1b5d6fa9f344d12ea8417f512a1f0c0487aad62627a7761e97e71f3b018c
+EBUILD unbound-1.6.6.ebuild 3696 BLAKE2B 224feff7eaac4169dcd877ce794df745a5e67c73b8c3df2e4f15036de9003a67aea5233bda8289c1ac1d5f36bcc9fa6aef4adc6e20afb968041756a349f2ddae SHA512 8cfa83700c737afd168d4998de69eea199a3c695bd038315afb16a1aa8e3f141b2c7aa364a8efb0952179dc79b6a42ac43fb148394ae7c96e2bb29f72f070970
+EBUILD unbound-1.6.7.ebuild 3696 BLAKE2B 224feff7eaac4169dcd877ce794df745a5e67c73b8c3df2e4f15036de9003a67aea5233bda8289c1ac1d5f36bcc9fa6aef4adc6e20afb968041756a349f2ddae SHA512 8cfa83700c737afd168d4998de69eea199a3c695bd038315afb16a1aa8e3f141b2c7aa364a8efb0952179dc79b6a42ac43fb148394ae7c96e2bb29f72f070970
+EBUILD unbound-1.6.8-r2.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
+EBUILD unbound-1.6.8.ebuild 3696 BLAKE2B 2b520948c09e02bba9a1685e25a46b94280d9ef65fc69091b0a6a33b176b8538033d3347aa828e6bb66df85383d1b33f343085f52b3a1e3150e6aa1bf8808c37 SHA512 06c2a8cc24f9ef503eacfcc0a6dd19c63651163dc7b6523f75360f6902deb8f74b616d370c3f93b4633cc823a93be7dc833d8427c70c1b5530cf96a77b056ee9
 MISC metadata.xml 1008 BLAKE2B 1852e514f97f9305848144ae0f9aaf8fb49546cd9afcd873ab67dcefee0503d5047809dc8c650006ccdb236c9ba9ff02cc5ecf726d61c25e17167409f91d3fb1 SHA512 f6654d6d254a4d51a8c454c542f1fbbff16bfeaa1cb681f110b9ae99a4231cdb7c073a5d42faba71168079330f9e01781df7a5b3e1bd70d771c874a5bbe9742a
diff --git a/net-dns/unbound/unbound-1.6.3.ebuild b/net-dns/unbound/unbound-1.6.3.ebuild
index 7b72e64ed4e6..0eccb3d9a8d0 100644
--- a/net-dns/unbound/unbound-1.6.3.ebuild
+++ b/net-dns/unbound/unbound-1.6.3.ebuild
@@ -26,7 +26,7 @@ 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 )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
diff --git a/net-dns/unbound/unbound-1.6.4.ebuild b/net-dns/unbound/unbound-1.6.4.ebuild
index 7b72e64ed4e6..0eccb3d9a8d0 100644
--- a/net-dns/unbound/unbound-1.6.4.ebuild
+++ b/net-dns/unbound/unbound-1.6.4.ebuild
@@ -26,7 +26,7 @@ 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 )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
diff --git a/net-dns/unbound/unbound-1.6.6.ebuild b/net-dns/unbound/unbound-1.6.6.ebuild
index 983c471e4d59..122b95bc275d 100644
--- a/net-dns/unbound/unbound-1.6.6.ebuild
+++ b/net-dns/unbound/unbound-1.6.6.ebuild
@@ -26,7 +26,7 @@ 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 )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
diff --git a/net-dns/unbound/unbound-1.6.7.ebuild b/net-dns/unbound/unbound-1.6.7.ebuild
index 983c471e4d59..122b95bc275d 100644
--- a/net-dns/unbound/unbound-1.6.7.ebuild
+++ b/net-dns/unbound/unbound-1.6.7.ebuild
@@ -26,7 +26,7 @@ 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 )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
diff --git a/net-dns/unbound/unbound-1.6.8-r2.ebuild b/net-dns/unbound/unbound-1.6.8-r2.ebuild
index 8fda5205f209..9edf230ed88d 100644
--- a/net-dns/unbound/unbound-1.6.8-r2.ebuild
+++ b/net-dns/unbound/unbound-1.6.8-r2.ebuild
@@ -26,7 +26,7 @@ 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 )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
diff --git a/net-dns/unbound/unbound-1.6.8.ebuild b/net-dns/unbound/unbound-1.6.8.ebuild
index 47b29fd1f46c..4006dee6f049 100644
--- a/net-dns/unbound/unbound-1.6.8.ebuild
+++ b/net-dns/unbound/unbound-1.6.8.ebuild
@@ -26,7 +26,7 @@ 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 )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]