gentoo resync : 18.12.2020

17 files changed, 311 insertions, 18 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c3d9ba5c77b6..d27340895fba 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 88ed59623006..60ad7e17d30d 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -3,6 +3,6 @@ AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e467441
 AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
 DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4
 DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
-EBUILD dnsdist-1.5.0.ebuild 2332 BLAKE2B ba846827f5ef97652808b37c57c014a9a70c8acce6bbbf9609c4655b50d46b0535260bf3edd264b79f4876908833aa98083a02621d3427274c709b7ca20dd81d SHA512 68a5d7b6ab7d9a96fd973afe6346fd172d1f4794d747d040081e22468a3c40cee45d1837e68263aec3a4f46b7ef363c9ab71a048cc5e1acee8295f0900f2119c
-EBUILD dnsdist-1.5.1.ebuild 2332 BLAKE2B ba846827f5ef97652808b37c57c014a9a70c8acce6bbbf9609c4655b50d46b0535260bf3edd264b79f4876908833aa98083a02621d3427274c709b7ca20dd81d SHA512 68a5d7b6ab7d9a96fd973afe6346fd172d1f4794d747d040081e22468a3c40cee45d1837e68263aec3a4f46b7ef363c9ab71a048cc5e1acee8295f0900f2119c
+EBUILD dnsdist-1.5.0.ebuild 2333 BLAKE2B 9c0877f5ab9f0b0093f34d86115dc0ccae80146978bac02ab2fb2b17f666c66ac7198f09d9069072b64e61964d62ea2da0ed0ae3b95732c609c53afbf766610f SHA512 16a8844ed99734d38dae171ba62e13424a61fcc43fc34a041735a27ea54ea20ca1ac0b87d7059a0fb58b130fea7832c8d8b15ef322ee7934663d7feb187bc589
+EBUILD dnsdist-1.5.1.ebuild 2333 BLAKE2B 9c0877f5ab9f0b0093f34d86115dc0ccae80146978bac02ab2fb2b17f666c66ac7198f09d9069072b64e61964d62ea2da0ed0ae3b95732c609c53afbf766610f SHA512 16a8844ed99734d38dae171ba62e13424a61fcc43fc34a041735a27ea54ea20ca1ac0b87d7059a0fb58b130fea7832c8d8b15ef322ee7934663d7feb187bc589
 MISC metadata.xml 1130 BLAKE2B fead1e2f8167ad41c84c3b03ab49d1ebfed6725adf55e4db2b23d099b12e01023742e8fd6e60799946f5a3ba7fb97fe29106efd3eca7dafbb1405e6ff30b97c0 SHA512 b987d96fd24ed1092f1f419c35cedd53502b4013efbfb6bf729dc5c721b96de0b2a701435593d679d452ba390e9f8e136f8658d6758f2b92c3fd02dfd40ec056
diff --git a/net-dns/dnsdist/dnsdist-1.5.0.ebuild b/net-dns/dnsdist/dnsdist-1.5.0.ebuild
index b36be988dc3b..f7f6d3cbc58a 100644
--- a/net-dns/dnsdist/dnsdist-1.5.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.5.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="acct-group/dnsdist
 	doh? ( www-servers/h2o:=[libh2o] )
 	lmdb? ( dev-db/lmdb:= )
 	luajit? ( dev-lang/luajit:= )
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 	regex? ( dev-libs/re2:= )
 	remote-logging? ( >=dev-libs/protobuf-3:= )
 	snmp? ( net-analyzer/net-snmp:= )
diff --git a/net-dns/dnsdist/dnsdist-1.5.1.ebuild b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
index b36be988dc3b..f7f6d3cbc58a 100644
--- a/net-dns/dnsdist/dnsdist-1.5.1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="acct-group/dnsdist
 	doh? ( www-servers/h2o:=[libh2o] )
 	lmdb? ( dev-db/lmdb:= )
 	luajit? ( dev-lang/luajit:= )
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 	regex? ( dev-libs/re2:= )
 	remote-logging? ( >=dev-libs/protobuf-3:= )
 	snmp? ( net-analyzer/net-snmp:= )
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index ba0c64f67d5f..52c7b6b41916 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -5,6 +5,6 @@ AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f900
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.81.tar.xz 510648 BLAKE2B 07861888df11f6e2e02d1b80f4e82a407b558ddb34e016f7bda5cb449ee870db000683264b2e36987ece16d50ab773f239bf12dd3468b9529ae4dccd77ecb8ee SHA512 85550c9782fef9b0710d0e233523ed1fe26e877a8bc53fcea3f7cf1fb17c3a79c46f284a99dab2bdaf6a107ea3f1a71cec476ab6d4e1b936da6591aaef42c88e
 DIST dnsmasq-2.82.tar.xz 509904 BLAKE2B 4df3778b2ec6775a6147f66d53b8dd7068d97872c6e5d3a16716faeb0ca489331560c77d6fa9cc913af0d7e0320a6ef463c690bb9e3fdbd8c266ed273e5a5403 SHA512 faf36efdaa3abe84994e46aea018b0a324218d42814baac056ca635f6d03f1301e7b4d958f92b272a8e3a7ac358f3a4e2606129a217587b471aedb3ce23e903b
-EBUILD dnsmasq-2.81.ebuild 4662 BLAKE2B 09eae0e81f63cfccdc78288c3816f1aa70441730c5bdb8318021bd729fe89f9dff0ba0e2a121bb08cba3be7db617bf575654cb17b9ed87e7f240747837ce63e3 SHA512 92407c5cc1f50619fdb7ab9b84ba502d3da21c7fc47c4b8b736e03c57fc681f75c0e3edac939c7ac772e92a9d39cd07a17e6487d532c81fca1c97b27d965ffc1
-EBUILD dnsmasq-2.82.ebuild 4474 BLAKE2B 61fdf8e296ca108a53b27bbb6b29576714a39c986a4869f3c0b80d5da16f2397b68af6e1542f08c7246f4a43cba0e992fab2af8fe4d90b51a2cc3673de0e228b SHA512 f5d15e6ea01f60915fd0c403977232bfc2d104a435e2376710bf41845765d3e0cdffb0703e5ab859b2302d059d2d14236e46ad4ec310108a91ba16ba1762d657
+EBUILD dnsmasq-2.81.ebuild 4663 BLAKE2B 4b0d4fa5134d3eb840a85ea321a140b5bd1ccacd4cb2b54b8e7905093d0da5358992728807cc67bc381445ce4ec5431cddbd871b01d7c39e888eebe72184b13c SHA512 aa77ab3acb83ea70ed8791597ae6d74d4f38dfdca5d6d4933b696f9bdeddbc39bbd5922c47daae31d74abeba882d2db8ca5e445ad55be3800541c7951ae83dd7
+EBUILD dnsmasq-2.82.ebuild 4475 BLAKE2B fe510eb76bf69b931ef53d0ba03665a0a40a326f2e2cf85848a5bdeced845ce61a9b6027ad0d00446b1c1c5d9d4c42d8a4d642435cff4a11eba97a7378c12f85 SHA512 0bc4d3021cd6d29402ea8039ebd11aff85b84c9ef02562f9af9b42ebfc864d83dce01a8e82aadf22ca194513271446bbdf80b2296d543bb7d4dbc7aaf6783e33
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.81.ebuild b/net-dns/dnsmasq/dnsmasq-2.81.ebuild
index 73c40c738af4..a0ddb04bf45b 100644
--- a/net-dns/dnsmasq/dnsmasq-2.81.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.81.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 		!libidn2? ( net-dns/libidn:0= )
 		libidn2? ( >=net-dns/libidn2-2.0:= )
 	)
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	conntrack? ( net-libs/libnetfilter_conntrack:= )
 	nls? ( sys-devel/gettext )
 "
diff --git a/net-dns/dnsmasq/dnsmasq-2.82.ebuild b/net-dns/dnsmasq/dnsmasq-2.82.ebuild
index 338ba1de1149..3e6ae688eead 100644
--- a/net-dns/dnsmasq/dnsmasq-2.82.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.82.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 		!libidn2? ( net-dns/libidn:0= )
 		libidn2? ( >=net-dns/libidn2-2.0:= )
 	)
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	conntrack? ( net-libs/libnetfilter_conntrack:= )
 	nls? ( sys-devel/gettext )
 "
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 0bfa888c21cf..9b8ae1b4bb7b 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -3,7 +3,9 @@ AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca9
 DIST pdns-recursor-4.3.5.tar.bz2 1341930 BLAKE2B 8f81182cb5283e6b8f459c5d23281d20cba02d22cec8776fdab67d452834b82945f467186c98784519d2c79d9df8438b174fc644fb11d68d04f9f636e51a5551 SHA512 2d39e6016000951c0beca38b26c41664b57c059dee762d7499f34e599ed6c2653af73edb31ba5a8d35f749534f24c0d85b6aedf4c35dc8a05777ffebd1b25851
 DIST pdns-recursor-4.4.0.tar.bz2 1395544 BLAKE2B 3e963a0e481db0d96813d5aa43e231548d765ecf7c18ce777ab3e1fb4b057722b257ec59ae95bf5cb11cb2f9114eb0e087aebecd4b19b96519e9a1e9cf6bb307 SHA512 06ec7788510b656ee8e08e54d989d8789685a3acb8b11172aff5de21bff493227368bbfca8203c56853da97d209facc4d88005b4b565a5986788a1b5f16a9fb6
 DIST pdns-recursor-4.4.1.tar.bz2 1395506 BLAKE2B 20a7b9612d03b96b92bab91b0281b08750221da06c56936c81fb4e1dccf83ca00f73bb7446523cd2a693b2774ee46ab673428cfdb4fc3f1702ef1e690a1112de SHA512 e5bdcf7f9b0095bd7169d605536e45beaa675cb9ac6e58280bf725535f1d3274dd4872418461ca5e216b310472ec08b8153c6da46d6ecf9ce545feb6ab3cd235
-EBUILD pdns-recursor-4.3.5.ebuild 1941 BLAKE2B 29f7cae51b6726ac94e401c5f5b69ffc00e9bc9117f437972229f5f565f82f67db0c0a5898ff01605ba6151e7d62f67b337f374bf2bf949fe18a3f637ec7572a SHA512 c05357a560c132f75b992e522e3375dc9188c84ee984f754633ba7de57fb4ed96b461e101aab46498c73ecc4b9b7163be99f5a1e26aea323a9332972625f4a3e
-EBUILD pdns-recursor-4.4.0.ebuild 1993 BLAKE2B fb5f48241f025472bf31ed9f8a88f932fd6ad99cbc5c319fbbe06a16d948b4bcf7c3789d91250d34f7d985e800636f577a6b62af1f5fad83c19ad87667843c35 SHA512 09aaa3837515a802fc52e94cd25439f594bb27267479e185a99f6ecb5033c146f6856f45aa8d7ad867cdb6a9893c3fc211595c737ee4c54edddd771bc42a0a6c
-EBUILD pdns-recursor-4.4.1.ebuild 1993 BLAKE2B fb5f48241f025472bf31ed9f8a88f932fd6ad99cbc5c319fbbe06a16d948b4bcf7c3789d91250d34f7d985e800636f577a6b62af1f5fad83c19ad87667843c35 SHA512 09aaa3837515a802fc52e94cd25439f594bb27267479e185a99f6ecb5033c146f6856f45aa8d7ad867cdb6a9893c3fc211595c737ee4c54edddd771bc42a0a6c
+DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
+EBUILD pdns-recursor-4.3.5.ebuild 1942 BLAKE2B 449724f1f8a878bb99d85916dc74130f81fff3a5012987004608d8eb70ddc7b48a738b2df418c0533cff6599aa2680f8fad54241593da89888c8a7a911a67756 SHA512 76719385d819d4c4945874d6d0595260042ff26b10770810d3ab5aab3c6622db07e46dbfecb814566f07b7266093a564e32ad9ce28bed856178f1d2050bffeaa
+EBUILD pdns-recursor-4.4.0.ebuild 1994 BLAKE2B 5e8edeeec966fd4b984ce28035b437e63af1964f6e0ca7854de6a931ae177bde6202555a10c440404150a308ed08ddc336bb4b34c729484355520b0e211cbf67 SHA512 284f5b32b41a3e86a5e5bad5dd15c654d6f9bd7fe9822c5cd5e1dd53e92821d455f779565abf0ae4b142c43c17490e333513f1f90295297182471e9e063a61b1
+EBUILD pdns-recursor-4.4.1.ebuild 1994 BLAKE2B 5e8edeeec966fd4b984ce28035b437e63af1964f6e0ca7854de6a931ae177bde6202555a10c440404150a308ed08ddc336bb4b34c729484355520b0e211cbf67 SHA512 284f5b32b41a3e86a5e5bad5dd15c654d6f9bd7fe9822c5cd5e1dd53e92821d455f779565abf0ae4b142c43c17490e333513f1f90295297182471e9e063a61b1
+EBUILD pdns-recursor-4.4.2.ebuild 1994 BLAKE2B 5e8edeeec966fd4b984ce28035b437e63af1964f6e0ca7854de6a931ae177bde6202555a10c440404150a308ed08ddc336bb4b34c729484355520b0e211cbf67 SHA512 284f5b32b41a3e86a5e5bad5dd15c654d6f9bd7fe9822c5cd5e1dd53e92821d455f779565abf0ae4b142c43c17490e333513f1f90295297182471e9e063a61b1
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
index 3859c9821d6b..e4d9f16b0884 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
 REQUIRED_USE="dnstap? ( protobuf )"
 
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:= )
 	protobuf? (
 		dev-libs/protobuf
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild
index 6e6a0b941303..7432ac3c647f 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
 REQUIRED_USE="dnstap? ( protobuf )"
 
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:= )
 	protobuf? (
 		dev-libs/protobuf
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
index 6e6a0b941303..7432ac3c647f 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
 REQUIRED_USE="dnstap? ( protobuf )"
 
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:= )
 	protobuf? (
 		dev-libs/protobuf
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.2.ebuild
new file mode 100644
index 000000000000..7432ac3c647f
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.2.ebuild
@@ -0,0 +1,84 @@
+# 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 dnstap libressl luajit protobuf snmp sodium systemd"
+REQUIRED_USE="dnstap? ( protobuf )"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:0= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	dnstap? ( dev-libs/fstrm )
+	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-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(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/Manifest b/net-dns/pdns/Manifest
index 6e33030dd873..2c1bd5f11ae6 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,5 +2,5 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-4.3.0-boost-1.73-compatibility.patch 2676 BLAKE2B 9b6a5e56915abc80fb354f0bf68732270823fb2b5a2d603bfd0f1a24bb346d44ea137de3e835018327f4216ea3e6288d625493540598e9c15ac719441d01f001 SHA512 306a1c14479b1078a4025efacaa893b2ef3a2f64f7dd5d06a2a18e3a23098f810f8fbb9f443015d6071c1e794a13c75f581b0da78ddd5e4737886a1419cf250c
 AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de
 DIST pdns-4.3.1.tar.bz2 1216876 BLAKE2B 0449835d104ec430329dc88087b489e29f1e1fa0c2a22af8715883a0a80d73f3a4848df207abbf986b946c640c4f1d35a1c8335f13f96a00915e4a40bcbecc9f SHA512 e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e
-EBUILD pdns-4.3.1.ebuild 4617 BLAKE2B 3d3422c4aaafe2ab67c78e4fb48bee96a8892ae31dc2149651457fdde860958ebd58b996a69a639c9902939f4dc490142f4ce2577e83d565fad96d111bf4da7f SHA512 90a6ac58a451ed37989a4b80d4eb3a1268965cfadb9d4a9437b9b0bf08aecad9c09adb8ef2cac5ea3528d09d04e3a789eadd4d808d254668d3549b530203f6cb
+EBUILD pdns-4.3.1.ebuild 4618 BLAKE2B daf71679af4131348fff051d27f68fe8dba4bd71719dba8b5455fa427d2c95b7ed352b1b379a1687dafa33178e6bb25200456f686c0fee8421164863d9e85d0c SHA512 a769ac32e2cad69666b8567e88137f650da24767e2ed6beb9c3a9de9742bebd809bf19c1ef95705ace5dcf0a71cfcc5b345f9f45810320834b9dd55d1c4d2dcb
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/pdns-4.3.1.ebuild b/net-dns/pdns/pdns-4.3.1.ebuild
index edfaa48dfc85..337a7dcde31e 100644
--- a/net-dns/pdns/pdns-4.3.1.ebuild
+++ b/net-dns/pdns/pdns-4.3.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:= )
 	>=dev-libs/boost-1.35:=
-	!luajit? ( dev-lang/lua:= )
+	!luajit? ( dev-lang/lua:0= )
 	luajit? ( dev-lang/luajit:= )
 	lua-records? ( >=net-misc/curl-7.21.3 )
 	mysql? ( dev-db/mysql-connector-c:= )
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index f189ab432992..9042801d716b 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -15,5 +15,6 @@ EBUILD unbound-1.10.1-r1.ebuild 5424 BLAKE2B 85fe1509a5c82edf8985ce6cfa80325db99
 EBUILD unbound-1.11.0.ebuild 6003 BLAKE2B 5e92333ca334d085b994fd9dcfc4b9eb97c0355b130472dd434b6a892bcde8439ae33f4413f8aa5e9e6867891750e152c28892a88f9d88e5848f20ebcee459b0 SHA512 4d6061372950b54091b0fae9c1e2d8eb93b75a60a081d0f8431239457bd5311bdb78109f55e08779c50cab4a8bc0f07281f95d51b8b1dd83f4eac03b40b6e2b7
 EBUILD unbound-1.12.0-r1.ebuild 6075 BLAKE2B 06c59fcad9b6351fdca6d0f7f5e71a2802005ade6c9f285a8a0b52a3158084638c698831c9b61158582f48223e22b48eddc300780dad2e7c8cee8f78887d1f91 SHA512 422b16aadcd2b8f38f03cd2fe8c22dff94bac532ad837bc1f81c1c2a3cddafccacc7fca70b41f7debb8ece6a04660a8f1e4b78a2ae18180e8ea4f475e8c21335
 EBUILD unbound-1.12.0.ebuild 6008 BLAKE2B dd27e2b8d4d1c320af8e268ae5f0d9f95d26782137bfb11deebe44533904da8716d894bfacdcd3bbd187c0d1d52d9e6a57a330f75ced2cb3d1b802f705bc352e SHA512 df2940e7037f61717bc8c53a6ce386d189b4bffbb4a8881074798718087ab78e10e5c840070f629432f2ca328727b585ba2695703f9572ba5913fe8ad461d415
-EBUILD unbound-1.13.0.ebuild 6075 BLAKE2B 06c59fcad9b6351fdca6d0f7f5e71a2802005ade6c9f285a8a0b52a3158084638c698831c9b61158582f48223e22b48eddc300780dad2e7c8cee8f78887d1f91 SHA512 422b16aadcd2b8f38f03cd2fe8c22dff94bac532ad837bc1f81c1c2a3cddafccacc7fca70b41f7debb8ece6a04660a8f1e4b78a2ae18180e8ea4f475e8c21335
+EBUILD unbound-1.13.0-r1.ebuild 6123 BLAKE2B b415d7c63e1354bad6811412a05412e0d848ec18e6ba72bfb92f26f537ec6338f4c8423e899fc26dfa058f083a51810c4af9e34a5f549f0735c130683fdeda7e SHA512 2cd8aa239ec804e9690c59b61be0c3a45303783e4c7944cf498dad204a1c073fd77396172733186f120fa0ff7c2640798262ffcf9c805201e967df0783be589f
+EBUILD unbound-1.13.0.ebuild 6073 BLAKE2B d579436b4f1ec822d0f03fe1278a9ad2ce4286dd6a302c0b9f325274d9360ea6c2fa876ce0ed9b2bf67d4abaa83eec6ac60c0d1844538b99d92116619bbabbfb SHA512 163016e35575a4e5c14866a57da1f6181f53350a7bf895979f9e837ad0d2f8bd72b00b7317ca941fecf5cc0fe8709c3ec9903e458695684bbbc15067c8e6e2cb
 MISC metadata.xml 1444 BLAKE2B ff1a69e8795fc834ba6b365ee389743bc8d2a2e82375a07c757ad6fcf5cad4cbfec321bba6ce4f8e505414a5cdce09e8257f97eb1fe199bc1fb911a769f7a6b5 SHA512 a96d5847589f861d2d3e7a416e5af0dafc0940a60f997456bf6a3a9c09e3e2910a8fe9474474e81b907cd9093525125539ad93345f84dbf6d10454a3aa5cbf4f
diff --git a/net-dns/unbound/unbound-1.13.0-r1.ebuild b/net-dns/unbound/unbound-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..daaba00dd008
--- /dev/null
+++ b/net-dns/unbound/unbound-1.13.0-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	http2? ( net-libs/nghttp2 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		$(use_with http2 libnghttp2) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit contrib/unbound.service
+	systemd_dounit contrib/unbound.socket
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/net-dns/unbound/unbound-1.13.0.ebuild b/net-dns/unbound/unbound-1.13.0.ebuild
index b899f7ff0e35..a63ec2835321 100644
--- a/net-dns/unbound/unbound-1.13.0.ebuild
+++ b/net-dns/unbound/unbound-1.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"