gentoo resync : 31.05.2021

17 files changed, 29 insertions, 547 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 096ec509297a..e4d4dd69d450 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index e2c7cf60c178..b9c396352c14 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -2,5 +2,5 @@ AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d45
 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
 AUX avahi-0.8-disable-avahi-ui-sharp.patch 1397 BLAKE2B b04324648b09fdd69f017d0be068556ed443f888b56a0567c3f9647c80f959ddcaa7d2ee0022d6a9a8d6bdd60673ffe7086ae4f5065a47d7b62f5aa287931306 SHA512 1d824f16fffcc41015b507e8210f4daa127c9915387b0695d2e27a46a2d480783b679735ea1ffdd198f52470300e4ae9cfc731c62496ad6a3d7c8408c3ffd8dd
 DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
-EBUILD avahi-0.8-r3.ebuild 5223 BLAKE2B bc45ca99ac5ba317aa20c23ac301982fd64aa682f9873e7231723a883d09feebfacb90851b46c5afea52feb141ebb1d9eb268aba5bb4d025afac3817ac12cfd9 SHA512 74eda66378f9437f9fe1b793ff3b5bf6d03c9f05bb5fef36811d8a682cc4d5fef8e49d66592f791d3ea589b70e9667244270dbb0c974aff69dbc4ef5e65a532c
+EBUILD avahi-0.8-r4.ebuild 5321 BLAKE2B 7e0ac27b77e71fe48ec8c8b471cde036c5318dfee7f43e34492eb074ad8a0a090c79153956eb5c2e34852d3165c767b658afa4519ca9a5d99b10a6bf2ec92d18 SHA512 db72faabd6760682ed8b8b8f77ea834d997f9e3dd7f6185548f1443a778a2aa4f80bd6687ae60cf1b602f1f6cdba2d6ac1901b8e388801aab75c7bd05e973bdd
 MISC metadata.xml 865 BLAKE2B 59950f0a850c79160f02f7a0d8f5af6a7b1f6813982bdc39244bd435d5f098d79a77fe918dfb6c81ac0d6673f90c70aa7378194f7086c6d6a89cae69590ea667 SHA512 ab1aefa11c59add17cabe4693ff44594ead164cb8d5cb3aa1193f48350bb74ffbb8f7a520d605ed52d3bd83e08d7b3a4a42a59cf55d8336c8fb4db431e8e28f1
diff --git a/net-dns/avahi/avahi-0.8-r3.ebuild b/net-dns/avahi/avahi-0.8-r4.ebuild
index 8c9e10456e2d..ec5bc43d804f 100644
--- a/net-dns/avahi/avahi-0.8-r3.ebuild
+++ b/net-dns/avahi/avahi-0.8-r4.ebuild
@@ -3,12 +3,12 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="gdbm"
-inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd
+inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd
 
 DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
+HOMEPAGE="https://avahi.org/"
 SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -18,6 +18,7 @@ IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kerne
 
 REQUIRED_USE="
 	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
+	bookmarks? ( python )
 	mono? ( dbus )
 	howl-compat? ( dbus )
 	mdnsresponder-compat? ( dbus )
@@ -40,12 +41,11 @@ DEPEND="
 	mono? ( dev-lang/mono )
 	python? (
 		${PYTHON_DEPS}
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-		introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	)
-	bookmarks? (
-		${PYTHON_DEPS}
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] )
+			dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
+		')
 	)
 "
 RDEPEND="
@@ -83,7 +83,7 @@ PATCHES=(
 
 pkg_setup() {
 	use mono && mono-env_pkg_setup
-	use python || use bookmarks && python_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -166,8 +166,10 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+	if ! use bookmarks || ! use python || ! use dbus; then
+		rm -f "${ED}"/usr/bin/avahi-bookmarks || die
+	fi
 
 	# https://github.com/lathiat/avahi/issues/28
 	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
@@ -185,6 +187,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+	use python && python_optimize
+
 	if use autoipd; then
 		insinto /lib/rcscripts/net
 		doins "${FILESDIR}"/autoipd.sh
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 82b56b2c7e03..6beba8441faa 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -10,5 +10,5 @@ AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d950383
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.15.tar.xz 5025688 BLAKE2B 8b0723d46f812793f5a52b1ddacf21fe28e183ef8cd166eadf0af163280021fce7c0a6a560d28dacbc6dd4642e41eb5424b4de2c5ff1049a5cfa5d52e3df5beb SHA512 30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.15.ebuild 11302 BLAKE2B 0e5051b0375ac90020db59cb5ddc6449b0dc01dbf89de03cd3efba1d8627176dd2b88453232f861c2782c0e4a592737fae42aa81b723fb61d510e5d1cf93a992 SHA512 73f7e77233891aa02ed56170a6f412b7f97a0d7f1ad974155d2ef4e1e99ba0814563b310c5910cfd889192e34ba4877974bf69f07850963045820fefdc05701b
-MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
+EBUILD bind-9.16.15.ebuild 10944 BLAKE2B bb8fcb29e3909febd30c7e5a29ec61c597ce3af26ce88cde7e5fa4a3b0aa8c13374fea0c6606c5e52227987138dff9c812dbd3e5a2858981f9b13b39aadfb075 SHA512 44fedc1dc6ac165bc490accdd7e3b81db1a1f9cd7641520846500fdf6eb86d5e9190594790189d1253cc7586b7b0c4284cc8fb00de0f0f06c22937464e6881a3
+MISC metadata.xml 973 BLAKE2B 9e2cd4d34c8cd9f6bc860c667d2440e7916dfa7ca343e578d7c089b3f45db3b1fbdd79d14ccf1af7fc25115316c42304dc635f1aec78d47eee1fec5c1a09aa43 SHA512 87ee75e39604d9839f849763f2b1675e6d13835dc482bcecd729e6c8416ef90d76edd8e5c5ec87b9e4eb0aa416fb7dc74143bc29cbce02ac3a83eaaa5a88f012
diff --git a/net-dns/bind/bind-9.16.15.ebuild b/net-dns/bind/bind-9.16.15.ebuild
index 629ba6fe9814..9fab32caeb82 100644
--- a/net-dns/bind/bind-9.16.15.ebuild
+++ b/net-dns/bind/bind-9.16.15.ebuild
@@ -36,8 +36,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
-json ldap lmdb mysql odbc postgres python selinux static-libs
-urandom xml +zlib"
+json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
@@ -281,16 +280,9 @@ python_install() {
 pkg_postinst() {
 	tmpfiles_process "${FILESDIR}"/named.conf
 
-	if [ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
 		chown root:named /etc/bind/rndc.key || die
 		chmod 0640 /etc/bind/rndc.key || die
 	fi
@@ -363,14 +355,6 @@ pkg_config() {
 	mknod ${CHROOT}/dev/zero c 1 5 || die
 	chmod 0666 ${CHROOT}/dev/zero || die
 
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9 || die
-		chmod 0666 ${CHROOT}/dev/urandom || die
-	else
-		mknod ${CHROOT}/dev/random c 1 8 || die
-		chmod 0666 ${CHROOT}/dev/random || die
-	fi
-
 	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
 		cp -a /etc/bind ${CHROOT}/etc/ || die
 		cp -a /var/bind ${CHROOT}/var/ || die
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index e9cc55bb874b..6bcb4fe262b1 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -18,6 +18,5 @@
 		<flag name="gssapi">Enable gssapi support</flag>
 		<flag name="json">Enable JSON statistics channel</flag>
 		<flag name="lmdb">Enable LMDB support to store configuration for 'addzone' zones</flag>
-		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 659d530f9ae1..cbe13afde0b5 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,13 +1,8 @@
-AUX dnsmasq-2.84-version-string.patch 419 BLAKE2B a33ca6fcf0c52f057e94a716611a8a51708033b5664f6d747f8db25eea1c52524e2caff721a4eb553a42e9f5ebe497975b27c9cb16abf7248a7de32f0f911700 SHA512 b8928513a96a72d1e1aa8a232492dce9dcb589b6d74fa1ebd61018d8ed948769a11d95784adc2dd64278a7656fa2f0a9403e23eb66f7fc32d2eec78987169830
 AUX dnsmasq-init-dhcp-r3 721 BLAKE2B 94a7542419e2c931149edbd5a5167c7fcbe0233e48f3ed854dfe26090b596c4f2549e37d2680bfceb1c6d21f475012f81a2102bde85e7cd609979e555dbcfa3d SHA512 f7a64fb84a7877b5ec629f9ed92419799913b8f2f73594c510aedc083d72c5c1862da7e5aed4485102c3b89ca7217bcca88e7cdde82f5a65d4cd4bb19017c2fe
 AUX dnsmasq-init-r4 613 BLAKE2B 7ea82e879f8770c3f4b764a9044ef585cc6e91de793c56733a6af1d9e138ca6e55813ad1720a70d0a5a61f6815d094574ae04f9761b2e2846c6267c6a4e97780 SHA512 72ae659a62c61495dc575fa590cbf1352c4bd4f374a6e0a56fce9c641c163b882d8b8097d27605d102e47df49eb68c456baf7b11009a7bb7db98e99429bd80a6
 AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9ebba3e2a0987cad2ccf9bb82ac7b1fcd77a81fa6058a3cd3276fb8a8a76e13983628e92be95b39af1 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8
 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
-DIST dnsmasq-2.83.tar.xz 513880 BLAKE2B 16220fd7eac03f3ba70b014ace3c9775a85b31cdbabd7680d88a87697453a54bfec4c553207477f416032e679dbdaf3ca6c8bb56b72ee423540e0bedf0621865 SHA512 1eaade775dc19658afe825407c10456ab954b82034644bb19af2594d737ceae17ff2cee7f1f917e8e8b2dadbfbcb83dd8b842c0693fcac71487a5fade1eb4b05
-DIST dnsmasq-2.84.tar.xz 514216 BLAKE2B 2bca97c16bcf32e0126eb50dc14b82a1f37e1635ebd1dc205e9a92455640fcbb98c093be725768ba9ced84443e451775f8556a164c82967e09e1df4bf7fc901b SHA512 e84bdcdf3cf35f08e8492eb5aa89ee6543233bdb821d01f164783bd6d0913ec01c513e85e2109352c77e77142a1a94bedcd3361f37d7b2a9a5d35a02448e85c6
 DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
-EBUILD dnsmasq-2.83-r101.ebuild 4655 BLAKE2B ee0df2583a57fc499f5e9846522064c496967a25168bfcb945cd04b3b8131a5230dead8009898cb632bfa05898be1c4eab358f6025c85359c4db556d9fbdf4b8 SHA512 3424bff3bb3993c9ed8146ec8075d58c27289981c8a85dfa978529b579e5a0d438c80af6d12a0bb8d921a064fabc58f52994b24d6af18335009e95e2dbb4323c
-EBUILD dnsmasq-2.84-r101.ebuild 4724 BLAKE2B cd611e17b8494a7b6c67474996ac061b1255c4213e5174771c3d5cd1984e748d57beb45a23f8e43c3da0783175f0487bb5c2a7f45bf6501ca7e2e2f012a77386 SHA512 ec8b31735e3e2057bdefb4c8ed2ff562655986abebf9c539bbd4d93077e732a1146050fcc0249110af6087c9245fe1734d983dbc5c24d31dd9364a6add5e0e34
 EBUILD dnsmasq-2.85.ebuild 4655 BLAKE2B ee0df2583a57fc499f5e9846522064c496967a25168bfcb945cd04b3b8131a5230dead8009898cb632bfa05898be1c4eab358f6025c85359c4db556d9fbdf4b8 SHA512 3424bff3bb3993c9ed8146ec8075d58c27289981c8a85dfa978529b579e5a0d438c80af6d12a0bb8d921a064fabc58f52994b24d6af18335009e95e2dbb4323c
 MISC metadata.xml 1355 BLAKE2B 4441a99669977dd0a5464b4de4f0a46a1a69aea4438916dcf5e55db529b8ca05c1f652af58d0dae4c7dd7542f0748515929f493a328dd8c19a2e436d39351eec SHA512 e2fbb896d5842833cefd014e80ba20bed7f0560479f8fbf05d87dfe6ae09780c648eb588caca2e1b558c27e085e842c09784e7942903e4ab57d1fdcda26b830f
diff --git a/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild b/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild
deleted file mode 100644
index d1c269b7660c..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# 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 toolchain-funcs flag-o-matic lua-single systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
-IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp"
-
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
-
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-COMMON_DEPEND="
-	acct-group/dnsmasq
-	acct-user/dnsmasq
-	dbus? ( sys-apps/dbus:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= )
-		libidn2? ( >=net-dns/libidn2-2.0:= )
-	)
-	lua? ( ${LUA_DEPS} )
-	conntrack? ( net-libs/libnetfilter_conntrack:= )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dnssec? (
-		dev-libs/nettle:=[gmp]
-		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dnssec? (
-		!static? ( >=dev-libs/nettle-3.4:=[gmp] )
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="
-	dhcp-tools? ( dhcp )
-	dnssec? ( !nettlehash )
-	lua? (
-		script
-		${LUA_REQUIRED_USE}
-	)
-	libidn2? ( idn )
-"
-
-use_have() {
-	local no_only
-	if [[ ${1} == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	local useflag="${1}"
-	shift
-
-	local uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			printf -- " -DNO_%s" "${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			printf -- " -DHAVE_%s" "${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
-			"in this case the static USE flag does nothing."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \
-		dnsmasq.conf.example || die
-}
-
-src_configure() {
-	COPTS=(
-		$(use_have -n auth-dns auth)
-		$(use_have conntrack)
-		$(use_have dbus)
-		$(use libidn2 || use_have idn)
-		$(use_have libidn2)
-		$(use_have -n inotify)
-		$(use_have -n dhcp dhcp dhcp6)
-		$(use_have -n ipv6 ipv6 dhcp6)
-		$(use_have -n id id)
-		$(use_have lua luascript)
-		$(use_have -n script)
-		$(use_have -n tftp)
-		$(use_have dnssec)
-		$(use_have nettlehash)
-		$(use_have static dnssec_static)
-		$(use_have -n dumpfile)
-	)
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS[*]}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && printf -- "-i18n\n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS[*]}" \
-		DESTDIR="${ED}" \
-		install$(use nls && printf -- "-i18n\n")
-
-	for lingua in "${DM_LINGUAS[@]}"; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${ED}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && \
-		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		keepdir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
-		cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	[[ -f "${T}"/dnsmasq.leases ]] && \
-		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild b/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild
deleted file mode 100644
index 3ca7420ed504..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# 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 toolchain-funcs flag-o-matic lua-single systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
-IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp"
-
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
-
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-COMMON_DEPEND="
-	acct-group/dnsmasq
-	acct-user/dnsmasq
-	dbus? ( sys-apps/dbus:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= )
-		libidn2? ( >=net-dns/libidn2-2.0:= )
-	)
-	lua? ( ${LUA_DEPS} )
-	conntrack? ( net-libs/libnetfilter_conntrack:= )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dnssec? (
-		dev-libs/nettle:=[gmp]
-		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dnssec? (
-		!static? ( >=dev-libs/nettle-3.4:=[gmp] )
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="
-	dhcp-tools? ( dhcp )
-	dnssec? ( !nettlehash )
-	lua? (
-		script
-		${LUA_REQUIRED_USE}
-	)
-	libidn2? ( idn )
-"
-
-PATCHES=(
-	"${FILESDIR}/dnsmasq-2.84-version-string.patch"
-)
-
-use_have() {
-	local no_only
-	if [[ ${1} == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	local useflag="${1}"
-	shift
-
-	local uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			printf -- " -DNO_%s" "${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			printf -- " -DHAVE_%s" "${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
-			"in this case the static USE flag does nothing."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \
-		dnsmasq.conf.example || die
-}
-
-src_configure() {
-	COPTS=(
-		$(use_have -n auth-dns auth)
-		$(use_have conntrack)
-		$(use_have dbus)
-		$(use libidn2 || use_have idn)
-		$(use_have libidn2)
-		$(use_have -n inotify)
-		$(use_have -n dhcp dhcp dhcp6)
-		$(use_have -n ipv6 ipv6 dhcp6)
-		$(use_have -n id id)
-		$(use_have lua luascript)
-		$(use_have -n script)
-		$(use_have -n tftp)
-		$(use_have dnssec)
-		$(use_have nettlehash)
-		$(use_have static dnssec_static)
-		$(use_have -n dumpfile)
-	)
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS[*]}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && printf -- "-i18n\n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS[*]}" \
-		DESTDIR="${ED}" \
-		install$(use nls && printf -- "-i18n\n")
-
-	for lingua in "${DM_LINGUAS[@]}"; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${ED}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && \
-		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		keepdir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
-		cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	[[ -f "${T}"/dnsmasq.leases ]] && \
-		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch b/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch
deleted file mode 100644
index bd37dbbfe751..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/bld/get-version b/bld/get-version
-index e472aab..3bf0b87 100755
---- a/bld/get-version
-+++ b/bld/get-version
-@@ -28,7 +28,7 @@ else
-      vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
- 
-      if [ $? -eq 0 ]; then
--         echo "${vers}" | sort -r | head -n 1 | sed 's/^v//'
-+         echo "${vers}" | sort | head -n 1 | sed 's/^v//'
-      else
-          cat $1/VERSION
-      fi
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index c8bc1f5721de..800bb13c9abb 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -1,3 +1,3 @@
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
-EBUILD idnkit-2.3.ebuild 637 BLAKE2B 90539a6b659a6194942777f1d7bc52f88d3f8ef4f33d98785ae66474be7e29a3b8e59a8b3acb306bf07509d2835b9daa72b89127f204f57918a5dd58a8b41670 SHA512 b732cb49fd3914231f4cdc4d05d958e8b044c59265012872b96123c7838dfce1490d0f304b2436125eec90b0ee43e2e966d2935bf9182d533e6665df699eb1b9
+EBUILD idnkit-2.3.ebuild 641 BLAKE2B c359c79e8156de8bcd811eae4ecc57c8e86734b735760a00edf0b91cac113df0fd49575a866ef32e4de1a5b388108b575edeb57ec37d80e0a878f9df8136ea0a SHA512 5755e67fb535250f6b1898f36a87f3106d31889ccdc00f223067a9e61e6afc8f2376f193dbba9c862e3119ae0ab9475d3ebdd2aeb6e2fe732bcf23cb448e1cb7
 MISC metadata.xml 246 BLAKE2B 053eb1eb0345156eb262d7eb10e70636fda57808641af19b715d4d323f19127491fe53e1dc7028454bc4af3f5ed282acd8d8632617b65c2003382193716510ca SHA512 02003cbc53a83f024e07311dc98a6255bcaa23c879f9b7da1263261e323c678bcb80fb0f9c3025076eafedaa0a85a52a98e963d37a692e8902bb9c6d68b54390
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index ac05ac80ed0f..dc4ea784dae6 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit ltprune
-
 DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
 HOMEPAGE="https://jprs.co.jp/idn/"
 SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
@@ -31,5 +29,5 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index a8570bb28d9f..b5c229403dbf 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -6,5 +6,5 @@ AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b0
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-2.0.3-r1.ebuild 6761 BLAKE2B 67105b5333460bf466ac4620a7efb093423321b5878e715475e0232ac9a74ff51534a75b4417abc6a26a46027c31585ff60cfe92eed03b0300a2fb5e3cf0363b SHA512 dc199e6aaa506090c25ba9ea9538cda922f67dcb509a3e6ddf6ddbc9d15300d0d5166720ca53b10be49f99a13c90a9f1aef7429a1c0e26b039cbdac28f5bcad6
+EBUILD opendnssec-2.0.3-r1.ebuild 6772 BLAKE2B 3504ea046ae454d4b8ef71cc3c59c1a557e64504664b9368676617ca057502cf7cfdf6522482ab3081558307232a744dc3ace782254e253e89cfefa2ee22ee22 SHA512 fcfd24a3da0b1e83ec1d70fef0a6d8c461c2eb020b429460d4e5e45443778485059bfc5cdea2ce30764a4bfd6c12456706135ab7afbe20c6905bce0b249344f6
 MISC metadata.xml 717 BLAKE2B a78c51d08bd665681b9977050e8337fbe95adface07632923e7bfa7f5ca9cbef0443bf8ada06480b862219720d71669220eeeca21d06edf68ba3452667faa861 SHA512 203b2e6d467ecd5832d7a56a9d31d37f6427c6cf3d9ad45d4b18d4b9b3f74ac53dcfb03bea0bd2c68d34a9474992216c198173e65c8f7edc00f61ead434c2b1d
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
index 3108c7a8a9c4..eea0ece708cc 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,8 @@ RDEPEND="
 		dev-perl/DBD-SQLite
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? (
 		app-text/trang
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index ddef5512ea65..5c3b99c70c17 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -1,7 +1,3 @@
-DIST resolv_wrapper-1.1.5.tar.gz 34241 BLAKE2B 7025885731a1defa79ae7a0381ca4394c37508883dc5e19aa9e29b0545cddc1c3f2b5091991a3e1599654e1a64442a6a36760f7725e54d1270c1a5b71bd3fadb SHA512 d11beff60cf935c0c12ac97ae375299ab1cd2e270d09438cf81b5c19dd94b7d430484c44ec9611171b67654d5c0f26afc4aa9d069d61293a956ef8fc59efc7a8
-DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107c53275430b3f5e1e46204265af3501394f72b6119e98ad3382e48f9a8f2511e679b3f4093446beaa11095bfaed340ce SHA512 cc379124c6104ba1330dfc038f04f9b473b71ac81b18889e481fb7812b38e71040ca6bed7bffd6eeaf77abeb8452a4d3308514ec6380811327dc832aa0381be8
 DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
-EBUILD resolv_wrapper-1.1.5.ebuild 658 BLAKE2B d08b85542d7f12ac823968a30608f70a8d288f6967e5180e3e47345bde26caf5f9e97436793752dc82eadeb1566c78852a6a78cd5284f4b9ad962312ebab0969 SHA512 836c969b74b0f5aa9d37500f655d00fa1307c7a21d88b0a2ba90eebe2dd7c89a5b3927ef41d1aa5dba0b9031f7264dee1e488f44919350bef11129a59ed48656
-EBUILD resolv_wrapper-1.1.6.ebuild 664 BLAKE2B decc50a1b1a35010953fb0cfe98c3a35c1968c285f3b20f7a446456b6a834a6ffd02224ff4721eba7a3cc2e95ac8f58ed720cdb5ba35fe974dc2d7ae7d01c615 SHA512 056ff258de0cb3671316834fec593c5ecdf3ec47d72c9141df8dfbb12a0331a850fa5d252cf4f1dde836e895f0f5b6bb2ab10a64dab4d98303a7345a89e914e1
 EBUILD resolv_wrapper-1.1.7.ebuild 796 BLAKE2B 35686f02980eef6f1af1bc299814c2978fef5bb288350aaa1252b8b1a7c41bf291ae4e6ec699583c622e05e9b35b74a98e3cfbb321e558b85f73f00cb7743a87 SHA512 cbc837e7ef8710a227256ac0549d9970322f80335f5db2b421c24d452a26a2b990edb610f8303c4f76a50dcf15990f3824175fa78dec7000673dac4041fa2019
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
deleted file mode 100644
index af49d7654edc..000000000000
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
-HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake_src_configure
-}
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild
deleted file mode 100644
index 98ba5d7cdd3d..000000000000
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
-HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake_src_configure
-}