gentoo resync : 08.10.2021

12 files changed, 94 insertions, 65 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 14b585c1fea8..b1eeafe9fca2 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/files/generate-rndc-key.sh b/net-dns/bind/files/generate-rndc-key.sh
index 8314d77cd68c..8314d77cd68c 100644..100755
--- a/net-dns/bind/files/generate-rndc-key.sh
+++ b/net-dns/bind/files/generate-rndc-key.sh
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
index 6af818c2db8a..6af818c2db8a 100644..100755
--- a/net-dns/getdns/files/stubby.initd-r2
+++ b/net-dns/getdns/files/stubby.initd-r2
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 8f6f4482ac4e..e1854896089e 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -4,5 +4,5 @@ DIST libidn-1.37.tar.gz.sig 488 BLAKE2B 449e2222becc9c3714463c9875a625ef017aad9c
 DIST libidn-1.38.tar.gz 2681263 BLAKE2B 92059e87554338a3565ee4b517fa1ba7bd3e9d57d8be7d71aee377220f50b597e529469c6ddc7c9e7c25b9e83c76f652457256dd32249c3e1cd97df8867723a1 SHA512 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419
 DIST libidn-1.38.tar.gz.sig 488 BLAKE2B 3a5a5f3d79f2f01019d71e2b20b7daf264c71ed21ec922733c03ed42e0acd0bb6c2758ca7095b7fc52025d01c784eb539e53408ae663ac2bcdcc8e92ba11f342 SHA512 9caf0f9633f607861e94d6efe30383181db67e6fb437903b6c1ff1758363824afc1b01458f845d2bf11c8f2ec01708ba98da54a43a6e2429978caa0f41166ffe
 EBUILD libidn-1.37.ebuild 2806 BLAKE2B 84db394eee3598c9f893f23427f5e6994db2518de33c230d1db557eaf422b0411ccec7117ed7bbd265d1e7b183918933a9b31a73db874a222a7b67e1f240ea7d SHA512 48aadb15f08f65e09c698d7089be7f874d64eeae9421cbe4b58107115a9bb3178b2652f0a170cede42c0530a10659a2d934ba9a6750c8635daaa4ee0f24f9307
-EBUILD libidn-1.38-r1.ebuild 2756 BLAKE2B 461f0fe166ac8309709793431c77396e88ea4d5b56f17adcbab034b124d3a8cc6f63e1016059f43a257256db39c5b24e518cfaf99d54c13e78586135444baa02 SHA512 d7d31034f1d2f992e55e3e9de60904ea4cdf427a13c0260deec71d1b897a9df83c377a1a44ce64d7cfcd5365277f89280e6733da6c5e6ab72c29a2ec433f9739
+EBUILD libidn-1.38-r1.ebuild 2754 BLAKE2B d74ad077646f3317f8c28d80f805a7e6441b517a5e680775af199f01e5765b9e9724081a90410436a958d7045d1be0cf7a353d32341b3adad66ab0261a1e3ea8 SHA512 f2908e91fd5753cc0fff4e00d563f019c57eb2f27a3fffec23030bc5a6870a44576be058b1912d9583918d0a844b508076167a5084d0a29e77ce24f69490781c
 MISC metadata.xml 348 BLAKE2B 3544235744acafa4218a8f6f4893b4dd0ba39e63c905c92aeffd50b5d6e33f68cbc8e9dc70287a04b0dbda40fcc1d92b158da5e295952553d00272940b23b27b SHA512 245f7bd50af03462e8876c12ff86d3827acee15d767361704eb60f0bda13098191f7259eb16f6b031d3c9cfe32a7819944cf9854bbe4524e1c8d8922130ff04e
diff --git a/net-dns/libidn/libidn-1.38-r1.ebuild b/net-dns/libidn/libidn-1.38-r1.ebuild
index 64a9be86524c..26ee757f4411 100644
--- a/net-dns/libidn/libidn-1.38-r1.ebuild
+++ b/net-dns/libidn/libidn-1.38-r1.ebuild
@@ -13,7 +13,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 ~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"
 
 DEPEND="mono? ( >=dev-lang/mono-0.95 )
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 98b41a0bc074..1cbf7ca1b449 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,4 @@
-DIST libidn2-2.3.1.tar.gz 2188338 BLAKE2B 323840b0d84f41cc746ca9b5a24169a374e95bd4669b96d7b62ac3304f6d78195acef7739628cf7e31cf7b230ffb60f74961c3e22693571fd2fc7cbb35f1ac23 SHA512 4d77a4a79e08a05e46fc14827f987b9e7645ebf5d0c0869eb96f9902c2f6b73ea69fd6f9f97b80a9f07cce84f7aa299834df91485d4e7c16500d31a4b9865fe4
-DIST libidn2-2.3.1.tar.gz.sig 488 BLAKE2B 2e1428ec240964fcdc1dbe96afa69920e5f5439ebf9c58e134832ceab932aef57176744a8fdf76ca29e73650c18406ec894b8e92dd95d52cb712bf7f823ca820 SHA512 2db4bb3a11562634276664fb857306271c6ebc96cf5e90b39b404c3fe47190ec65ce3866cebcfa0c1216d29d7aed8c7907b869e602a722db1cf8f6ab94da9c78
 DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1
 DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0
-EBUILD libidn2-2.3.1.ebuild 1491 BLAKE2B 98c8872036e18f8c2272b31f94e80882e99df7f15953785f8ea50924bba398d1833d475f772ef447298500a273733437e3ac441f4bd9a7d46026609e2a6a7af9 SHA512 fed576edbdce4b3f66d85e2eef741cb307436f8c014c3c324c8ac9905f0941373613b45c17d4d0e03ce4e6d339185b099280f764d8969814dfb4d0121781d5dc
-EBUILD libidn2-2.3.2.ebuild 1492 BLAKE2B 3324296ffdfde99e7c19fb0673d9eb490ea5e57177d77ad204038458d51b4b67c0750aada370400624cc64f99934b4e25a69dbe7994c3ed38ae5e9638dd21548 SHA512 e46277ef8cd27c39e158071bf71637d1123614bd42a12a27832ae7c878ec52c0ee435420d1d3ce4f373e55a2ab6dc31d75005c95637c47e7ca9760ba5a26aad2
+EBUILD libidn2-2.3.2.ebuild 1491 BLAKE2B 98c8872036e18f8c2272b31f94e80882e99df7f15953785f8ea50924bba398d1833d475f772ef447298500a273733437e3ac441f4bd9a7d46026609e2a6a7af9 SHA512 fed576edbdce4b3f66d85e2eef741cb307436f8c014c3c324c8ac9905f0941373613b45c17d4d0e03ce4e6d339185b099280f764d8969814dfb4d0121781d5dc
 MISC metadata.xml 562 BLAKE2B 2c0acdc86f7ed795dd961bb9d1dab56c31cf7c50f458e659f758a1317be25631e8da5326c74c54b78c12d9b788d8ccbfa666c98217c730e4aee9ab3bdb29cdc2 SHA512 b8daf38cbe7670f7172edd2b05be23bd70e419817398d22583199e5f8f997fc395b869a8143ef69cffc3eb9834876bc22b40d89d60b5df1b16cc179606272273
diff --git a/net-dns/libidn2/libidn2-2.3.1.ebuild b/net-dns/libidn2/libidn2-2.3.1.ebuild
deleted file mode 100644
index a0e563e61005..000000000000
--- a/net-dns/libidn2/libidn2-2.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc
-inherit multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-	verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig )
-"
-S="${WORKDIR}"/${P/a/}
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	sys-apps/help2man
-	verify-sig? ( app-crypt/openpgp-keys-libidn )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gcc-warnings \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-dns/libidn2/libidn2-2.3.2.ebuild b/net-dns/libidn2/libidn2-2.3.2.ebuild
index ec08d04961af..a0e563e61005 100644
--- a/net-dns/libidn2/libidn2-2.3.2.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/a/}
 
 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 ~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="
diff --git a/net-dns/nsd/files/nsd.initd-r1 b/net-dns/nsd/files/nsd.initd-r1
index 2a97c6dea708..2a97c6dea708 100644..100755
--- a/net-dns/nsd/files/nsd.initd-r1
+++ b/net-dns/nsd/files/nsd.initd-r1
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index e7d2cf140c3c..f4634fc3b24f 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1,8 @@
 AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
 DIST pdns-recursor-4.4.5.tar.bz2 1400394 BLAKE2B a373d15987860bd6b890e5aa5900f28623ff763a711e527b05c3de950c7fbec186dc5e085100008a8ee89bab24140b0f993357349ec04d968e7f386156cdefbc SHA512 21f4172bb8908cfb53e8d457533a85940b13da6733c2da3972b587e64a0f6d52bfd52b85d5d65769c33dd479ce89b6306bdd105c120ab99b32963e7f0cfbc2e2
+DIST pdns-recursor-4.4.6.tar.bz2 1403882 BLAKE2B 2f860128849cce29131300cbda2f2646c7fbaeeb704a6131933d3bbe205bdf1dddd45f9f79f74345b2dea34e56d145b9ef878c0cd6280ceeb075c196afe53d5e SHA512 0ac897da628fb133bd7cd3932e0a1d362c88c55cb07dc2d5d645f731dc8dbf5d18993967654a60156cba7eaac7869ee10a67987a2a492c0c239de9788188caf4
 DIST pdns-recursor-4.5.5.tar.bz2 1472089 BLAKE2B 408bd0d11b0945de15fe22b290b127a9b7f9f053359a0269fb9e478ae536ed5c4b5ad3b5fa8b15d7786fdd0cdd8721d5a5cb66d46f816105e37ecd9fc9557854 SHA512 7df2e89eea55e870724370753b39d867e2b32fc8bcbdb3efaefa824917b16b9d382817dce7d551dc16d8ad0b0c04b3021cba310b47de969fe54c395eafe7706b
 EBUILD pdns-recursor-4.4.5.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
+EBUILD pdns-recursor-4.4.6.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
 EBUILD pdns-recursor-4.5.5.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
 MISC metadata.xml 1009 BLAKE2B a35c31c4e5478addf07b90464caf1068c7780801f2da35023fb8226e2d64b055378b8020e4dedc9b7795cf8df94500cfd116ebb3196ee27f1ebe83befb453e89 SHA512 2b0ea758d5ab725c1142c9e5abf66fcb7c7fb7916f76a0871e975624de415ba48fbd2a45bcff4afc4cf19bb40f978f1093b4db356e83d8312fda860565d28497
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.6.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.6.ebuild
new file mode 100644
index 000000000000..dc546d8cd6ca
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+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 protobuf snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	dnstap? ( protobuf )"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	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:= )
+	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() {
+	lua-single_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="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(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/totd/files/totd b/net-dns/totd/files/totd
index 79d410acb013..79d410acb013 100644..100755
--- a/net-dns/totd/files/totd
+++ b/net-dns/totd/files/totd