gentoo resync : 13.06.2020

9 files changed, 64 insertions, 441 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 43622ccee803..f8985bd515c7 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,16 +1,6 @@
 AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b
-AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
+AUX pdns-recursor-4.3.1-gcc-10.patch 2592 BLAKE2B da68e0311a30ba894cfa82b1140dca85b2547cc0885d9fec6dd0721c38f531777e06d27ede7bdc92996e60bfb621351bab66c1ce19cc923f8fc3b1b44a4bde05 SHA512 16a81afc5a3a7cdac4acee52b30ff61cea97ef1c543fc0858897c2caa19fedd1e71f9787c4674122ee7f96d4130d6b5f37b0cdcc6bcd44d14765845877c02ab4
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e SHA512 9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011
-DIST pdns-recursor-4.1.15.tar.bz2 1252518 BLAKE2B 11eecf1ca69e6855be1cb1a1a6bfefd6b65cf38a6fcfd1e98727fd7813958024b47f974a12fa05cf0a92079a7d14ecb1a6b199a51ba0b4731aa4a1a8b638441a SHA512 d493de78086a88784dbf8b54732faddca7e0dec008cf80a757240f8e1943d230edc4f0ef5a372cb1897be01956bbcfd282a979150901c0df6cc304ccdc6d878d
-DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f SHA512 e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf
-DIST pdns-recursor-4.2.1.tar.bz2 1318022 BLAKE2B 19fba9dae26d27f68ceaf70f15f2fb27ec030fa64d5dfdfe7bf482293ed5aac6b8eb6ed47a75c2b88f4d481794695d66f0ce1cbc71d8eedeabd86d8ce8c382ba SHA512 ebd7ff40def4b5c9398dee5ceae0aaf762982be4124773002b3f603b18cab2a6df667524a268e72268032334ae29d32b42294cbae68dcdc154e08b8a38f75dff
-DIST pdns-recursor-4.3.0.tar.bz2 1349359 BLAKE2B cdb9d38a350ef371c3675185c0f52f416d55338df034ff32a9d9fc85d783de04513555ec96fbc1dd07ecd7214d889cfe6fba80bc6981e66a6b8d4fe6f1da7dfa SHA512 6ba4721f502e1e483d04e8d8cafa35d1cc088c6b3c73120a0cc90ff9c8e8f495a1591e01f0daf30d00f020e3aa06b1cf092ed6b8a0786070c307a6564812c085
 DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397 SHA512 49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8
-EBUILD pdns-recursor-4.1.14.ebuild 1802 BLAKE2B 2943554881f1873014e5712c2baef1ef4bd9e3f0e7061ab576aac0d23c7ae8657a744d257b015532f6c57c3086ec748e3f1faaa4e12f70f626ad7096e7c81511 SHA512 31141369c4c6229c9dd13309d5b0cce47cac7c0ef6d765ff72eb4515691a9742fc510bc80cbd4c71fbf739829e157d29565df0f8240f84a5a1767e021fb484d7
-EBUILD pdns-recursor-4.1.15.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
-EBUILD pdns-recursor-4.2.0.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
-EBUILD pdns-recursor-4.2.1.ebuild 1783 BLAKE2B 85b1dfe2efe41551397d6a1ad8d41ee779f841ca965359a0904902e7d78637fd4308a095034ccbc6d3bf72da6ee4b1efbb04ba082b8527255b599a5edb4a5a15 SHA512 06e83d7bd1d7e048abda6d5d4f9d0f8a3fc0eb86a1e4e14ef5f6c935fceae4542579897fe10c31391d01fae793d1e401e5cc49df484ef89b5a0834437f1d5587
-EBUILD pdns-recursor-4.3.0-r1.ebuild 1788 BLAKE2B fcb244abbc5c831806206768cfc72c5e4455ba2b43ab98156a2fbcedad2651ec821e62e73a0898e5a8963f8370cdeaca025c9584bc5d02d5d637f9ad06ca18ba SHA512 c3e4c7b3042146f8643e520c3abbd92d3d870acb588c12fdd09054f38f163b0df06130e85ff8ae1a254f5c3dadadd8e323294c78928b615623c8c2537f83c41b
-EBUILD pdns-recursor-4.3.1.ebuild 1838 BLAKE2B 389c8d068c0f4113c5b9744d36dd6d391a837b778c5b3e2d407da76ae8bf74712668e10832967f55e7e62816a85a70e031d96d6fd4a028535744056eb7741e1b SHA512 5be2829788177687609fccfd370b5108d85bc2504022bd88e695b362833a9b75870106fa71a8764dd2cee92ee9780f22c466d55ff558503580da6d4efbfd21a0
+EBUILD pdns-recursor-4.3.1.ebuild 1871 BLAKE2B 41b5d33da55a8a0fabfd0d69666ad23a7104f10343d10bc949b269596ed8238f9c9cd3f573a2a026f876046fce42cf7787ac264cf1fe69bd8822c8605a19c544 SHA512 26fca6db80aa43334985e27161a64a893d150f0e746fe0bb834b5341096f0eed79524c432b8b95ad06bce152ef65fcc76b7befc4a2dd100729b7ffa077c0471e
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch
new file mode 100644
index 000000000000..8244a456e643
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch
@@ -0,0 +1,61 @@
+commit b35614ed8b45adba304bcddcb3f2db6cb36b1462
+Author: Sander Hoentjen <shoentjen@antagonist.nl>
+Date:   Mon Dec 16 22:44:43 2019 +0100
+
+    Fix build with gcc-10
+    
+    From an e-mail from Jeff Law <law@redhat.com>:
+    
+    Subject: Minor problem in pdns, dnsdist and pdns-recursor packages in Fedora
+    
+    [ All three packages have embedded copies of the same problematic code
+    and the same patch fixes all three. ]
+    
+    Red Hat's compiler team continues to try and be proactive in identifying
+    issues that will arise as a result of the introduction of a new GCC
+    release into Fedora each spring.
+    
+    You're being contacted because a package you maintain in Fedora is going
+    to fail to build with gcc-10 in the spring.  Yes, I know that's a few
+    months away, but it's far easier to fix this stuff proactively now than
+    wait.
+    
+    Fixing it now also means that your package will continue to be built
+    with testing versions of gcc-10 as we proceed through the development
+    process thus allowing additional issues to be caught early.
+    
+    Your particular package will fail due to an uninstantiated template for
+    AsyncLoader<Request>.  These kinds of problems are relatively common due to
+    changes in the tuning of the inliner for gcc-10:
+    
+    > BUILDSTDERR: /usr/bin/ld: webserver.o: in function `WebServer::serveConnection(std::shared_ptr<Socket>) const':
+    > BUILDSTDERR: /builddir/build/BUILD/pdns-4.2.1/pdns/webserver.cc:373: undefined reference to `YaHTTP::AsyncLoader<YaHTTP::Request>::feed(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)'
+    > BUILDSTDERR: collect2: error: ld returned 1 exit status
+    > BUILDSTDERR: make[3]: *** [Makefile:2751: ixfrdist] Error 1
+    >
+    
+    The attached patch arranges for an instance to be instantiated when
+    compiling reqresp.cpp and is sufficient to fix this problem.  The
+    choice of reqresp.cpp fairly arbitrary IIRC.
+    
+    Ideally you'll with upstream to get this fixed, but a Fedora patch is
+    clearly OK as well.   I'll install the attached fix into Fedora in a
+    week or so if I haven't heard from you.
+    
+    Jeff
+    
+    (cherry picked from commit ffb885e937c27bb1c62dee8f18c58ae0d5d52d39)
+
+diff --git a/ext/yahttp/yahttp/reqresp.cpp b/ext/yahttp/yahttp/reqresp.cpp
+index 686a6c7bd..ca2154f6a 100644
+--- a/ext/yahttp/yahttp/reqresp.cpp
++++ b/ext/yahttp/yahttp/reqresp.cpp
+@@ -2,6 +2,8 @@
+ 
+ namespace YaHTTP {
+ 
++  template class AsyncLoader<Request>;
++
+   bool isspace(char c) {
+     return std::isspace(c) != 0;
+   }
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r1 b/net-dns/pdns-recursor/files/pdns-recursor-r1
deleted file mode 100644
index 57c9df1eaa45..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
-
-PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
-[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run"
-
-name="PowerDNS Recursor"
-description="Recursive name server"
-
-extra_started_commands="ping"
-description_ping="Ping the PowerDNS instance"
-
-command="/usr/sbin/pdns_recursor"
-command_args="--config-dir=${PDNS_CONFIGDIR}"
-command_args_foreground="--daemon=no"
-command_args_background="--daemon=yes"
-yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
-
-pidfile="${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}/pdns_recursor.pid"
-
-control_command="/usr/bin/rec_control"
-control_command_args="${command_args}"
-
-depend() {
-	need net
-}
-
-ping() {
-	ebegin "Pinging ${name}"
-	${control_command} ${control_command_args} ping >/dev/null 2>&1
-	eend $?
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
deleted file mode 100644
index 25a4668601a4..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild
deleted file mode 100644
index 8c6bb86d0ac8..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild
deleted file mode 100644
index 2ae00b46ee1f..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-lua=$(usex luajit luajit lua) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
deleted file mode 100644
index 64c04adb42e3..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-lua=$(usex luajit luajit lua) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
deleted file mode 100644
index fa5437a3d388..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1
-	acct-user/pdns
-	acct-group/pdns"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-lua=$(usex luajit luajit lua) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
index 30eca37b6ed7..378e02c50a60 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}"/${P/_/-}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-boost-1.73.0.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 pkg_setup() {