From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1459354-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 949F2158020
	for <garchives@archives.gentoo.org>; Tue, 22 Nov 2022 18:41:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D8F39E09AD;
	Tue, 22 Nov 2022 18:41:14 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id B2EC4E09AD
	for <gentoo-commits@lists.gentoo.org>; Tue, 22 Nov 2022 18:41:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id B3912340EBE
	for <gentoo-commits@lists.gentoo.org>; Tue, 22 Nov 2022 18:41:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BA2521
	for <gentoo-commits@lists.gentoo.org>; Tue, 22 Nov 2022 18:41:12 +0000 (UTC)
From: "John Helmert III" <ajak@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" <ajak@gentoo.org>
Message-ID: <1669142457.be530e587fe23ead7b643f547a3d5e3be5623c32.ajak@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/unbound/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-dns/unbound/Manifest net-dns/unbound/unbound-1.13.1-r3.ebuild net-dns/unbound/unbound-1.13.2-r1.ebuild net-dns/unbound/unbound-1.15.0.ebuild net-dns/unbound/unbound-1.16.0.ebuild
X-VCS-Directories: net-dns/unbound/
X-VCS-Committer: ajak
X-VCS-Committer-Name: John Helmert III
X-VCS-Revision: be530e587fe23ead7b643f547a3d5e3be5623c32
X-VCS-Branch: master
Date: Tue, 22 Nov 2022 18:41:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c31abe66-e1ee-4d8c-afcb-48ac63a255c3
X-Archives-Hash: 61f1004f47d5095e5444450d566b1e9c

commit:     be530e587fe23ead7b643f547a3d5e3be5623c32
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 18:38:32 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 18:40:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be530e58

net-dns/unbound: drop 1.13.1-r3, 1.13.2-r1, 1.15.0, 1.16.0

Bug: https://bugs.gentoo.org/872209
Bug: https://bugs.gentoo.org/866881
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 net-dns/unbound/Manifest                 |   6 -
 net-dns/unbound/unbound-1.13.1-r3.ebuild | 208 ------------------------------
 net-dns/unbound/unbound-1.13.2-r1.ebuild | 210 ------------------------------
 net-dns/unbound/unbound-1.15.0.ebuild    | 213 -------------------------------
 net-dns/unbound/unbound-1.16.0.ebuild    | 213 -------------------------------
 5 files changed, 850 deletions(-)

diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 4b2b2c898f1d..7c9893120384 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,8 +1,2 @@
-DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c
-DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a SHA512 1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a
-DIST unbound-1.15.0.tar.gz 6163470 BLAKE2B e67756fb28aac784431484e5f834cbe3864a0ec021a8c9eb3124a6d5732fea99a073815a624210e43e50b3b59ce943c5cc6a4e5e1c743b91f5803e2dcf5c9870 SHA512 c5dab305694c14f64e05080700bb52f6e6bf5b76f15e1fde34e35c932cb3ffed0de2c03b570cf4bfe18165cb10e82e67ee9b12c6583295380f88c2c03800cc1f
-DIST unbound-1.15.0.tar.gz.asc 833 BLAKE2B 166cbb1caf14fb4a4375d609c740e7305ed4ee19c1e307caf1e780eb3f53e86db2d34b3f21e1d0c5f1496eac9211ce795c085ab9944f66f9a2f54d08479254db SHA512 123818a855689ee3d402fd8f4b5a4646c08d5602e4544ce872d132c4c0de4a79c9efcc2d49324bf58ab06521f02deef795d89bdf632eee758e6ec36b408ea54a
-DIST unbound-1.16.0.tar.gz 6188349 BLAKE2B 62d002e66a24d60a973c620855d9d33e2833f78bf45d9176081646683fe6f371564a40fb637e4b276c556e3b46eb57ff49ee6a7300e9a9e24cb09f4b8dd31695 SHA512 134679c0baad6738541295fcfbf8cc701c647b5d5cd00f87e50394bc7b5b74b7326ed2fc42f3282cae8094b4980c1e580d7b748b7151642c9060c449b644715f
-DIST unbound-1.16.0.tar.gz.asc 833 BLAKE2B 63a1ab490128d7af3bfff787893f30ec6be2cce99436faaaae9142e391f46e587e3e7262fdf00a599f82f41bb7a27035c99c0e80a39d56e34c0e22bb227241ec SHA512 1b7640df051bf9f37e261c4e7fa3b3343982f608c529553985eeb9444688ba9e751f45ad666ab13b783beff24806eef14e9833090a4aea249e1fa5023e3c0432
 DIST unbound-1.16.3.tar.gz 6204330 BLAKE2B b97deade78ab903363e06ff9d71b9895c754378ec276bb17556de62c48a88af5fbabd26f97fb47313d1e631fe75dee245aa38fbf42a865ac3e764882a1124a51 SHA512 ef5cda926dd1082a750615d8687bccd756869c66e9f24f984fda4c6613f94f3e4884db328b8d7b490777a75d3e616dcb61c5258e7777923c0590e6fabacd207c
 DIST unbound-1.16.3.tar.gz.asc 833 BLAKE2B 2009dac660405b11725c046099cf9bd2f6ccea0bda8936530228b6ab3ceebfadd119b5d91ff1c86845d54444104f578597a574daed80a5e6e677c8f7d68b789b SHA512 b106f080d877e479d944a7ebe24a380f4c40c38308733f43f8a60d4e7aedc6597e6daa4a1428f596e705c9c75e6ee7b4187dbbc5750a9c406f59d76d4f1b4a8d

diff --git a/net-dns/unbound/unbound-1.13.1-r3.ebuild b/net-dns/unbound/unbound-1.13.1-r3.ebuild
deleted file mode 100644
index 899aeefb9daf..000000000000
--- a/net-dns/unbound/unbound-1.13.1-r3.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{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 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}]
-	>=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? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		|| (
-			net-libs/ldns[examples(-)]
-			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.2-r1.ebuild b/net-dns/unbound/unbound-1.13.2-r1.ebuild
deleted file mode 100644
index 52208581e7b2..000000000000
--- a/net-dns/unbound/unbound-1.13.2-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-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 python redis selinux static-libs systemd test +tfo 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}]
-	>=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? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="virtual/pkgconfig
-	python? ( dev-lang/swig )
-	test? (
-		|| (
-			net-libs/ldns[examples(-)]
-			net-dns/ldns-utils[examples(-)]
-		)
-		dev-util/splint
-		app-text/wdiff
-	)
-"
-
-DEPEND="${CDEPEND}"
-
-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) \
-		$(use_enable tfo tfo-client) \
-		$(use_enable tfo tfo-server) \
-		--disable-flto \
-		--disable-rpath \
-		--enable-event-api \
-		--enable-ipsecmod \
-		--with-libevent="${ESYSROOT}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${ESYSROOT}"/usr \
-		--with-libexpat="${ESYSROOT}"/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.15.0.ebuild b/net-dns/unbound/unbound-1.15.0.ebuild
deleted file mode 100644
index cc22906be8b7..000000000000
--- a/net-dns/unbound/unbound-1.15.0.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
-
-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
-	verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc
-
-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 python redis selinux static-libs systemd test +tfo 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}]
-	>=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? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="virtual/pkgconfig
-	python? ( dev-lang/swig )
-	test? (
-		|| (
-			net-libs/ldns[examples(-)]
-			net-dns/ldns-utils[examples(-)]
-		)
-		dev-util/splint
-		app-text/wdiff
-	)
-	verify-sig? ( sec-keys/openpgp-keys-unbound )
-"
-
-DEPEND="${CDEPEND}"
-
-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) \
-		$(use_enable tfo tfo-client) \
-		$(use_enable tfo tfo-server) \
-		--disable-flto \
-		--disable-rpath \
-		--enable-event-api \
-		--enable-ipsecmod \
-		--with-libevent="${ESYSROOT}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${ESYSROOT}"/usr \
-		--with-libexpat="${ESYSROOT}"/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.16.0.ebuild b/net-dns/unbound/unbound-1.16.0.ebuild
deleted file mode 100644
index 19f4bd7f6852..000000000000
--- a/net-dns/unbound/unbound-1.16.0.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
-
-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
-	verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc
-
-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 python redis selinux static-libs systemd test +tfo 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}]
-	>=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? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="virtual/pkgconfig
-	python? ( dev-lang/swig )
-	test? (
-		|| (
-			net-libs/ldns[examples(-)]
-			net-dns/ldns-utils[examples(-)]
-		)
-		dev-util/splint
-		app-text/wdiff
-	)
-	verify-sig? ( sec-keys/openpgp-keys-unbound )
-"
-
-DEPEND="${CDEPEND}"
-
-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 \
-		$(multilib_native_use_enable debug) \
-		$(multilib_native_use_enable gost) \
-		$(multilib_native_use_enable dnscrypt) \
-		$(multilib_native_use_enable dnstap) \
-		$(multilib_native_use_enable ecdsa) \
-		$(multilib_native_use_enable ecs subnet) \
-		$(multilib_native_use_enable redis cachedb) \
-		$(multilib_native_use_enable static-libs static) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_with python pythonmodule) \
-		$(multilib_native_use_with python pyunbound) \
-		$(multilib_native_use_with threads pthreads) \
-		$(multilib_native_use_with http2 libnghttp2) \
-		$(multilib_native_use_enable tfo tfo-client) \
-		$(multilib_native_use_enable tfo tfo-server) \
-		--disable-flto \
-		--disable-rpath \
-		--enable-event-api \
-		--enable-ipsecmod \
-		--with-libevent="${ESYSROOT}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${ESYSROOT}"/usr \
-		--with-libexpat="${ESYSROOT}"/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
-}