summaryrefslogtreecommitdiff
path: root/net-dns/unbound
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
commitbd4aeefe33e63f613512604e47bfca7b2187697d (patch)
treeadb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-dns/unbound
parent48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
gentoo resync : 03.11.2019
Diffstat (limited to 'net-dns/unbound')
-rw-r--r--net-dns/unbound/Manifest11
-rw-r--r--net-dns/unbound/unbound-1.9.0.ebuild181
-rw-r--r--net-dns/unbound/unbound-1.9.1-r1.ebuild182
-rw-r--r--net-dns/unbound/unbound-1.9.1.ebuild181
-rw-r--r--net-dns/unbound/unbound-1.9.2.ebuild182
-rw-r--r--net-dns/unbound/unbound-1.9.3.ebuild182
-rw-r--r--net-dns/unbound/unbound-1.9.4.ebuild2
7 files changed, 2 insertions, 919 deletions
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 7cb118bfec27..485b8db134c5 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -6,15 +6,6 @@ AUX unbound-r1.initd 3901 BLAKE2B d8db1b5342781566f57d801d077aec20d7911a39d5a453
AUX unbound.service 247 BLAKE2B d986319f9b43600d4f6443f50e214efd39fd20be6a7067b55f98b82cb5d2c12c85b7db2a3c9ced0caf3db303f1ff0fd4eff511dbede3ab101e4b558681872351 SHA512 7904225d0e9fb3ea5b97521ed24f24fcc4db650cfff8523b896ddd9edfccbd61e817775ad0449acf30d02dba5f714d633b60cace6010d472f438df7c22381dfc
AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0bde11bc2a2a994d55670c992b42ea1b4bbee98d04a12f4e7e7517bd0e9caa74d8cac2d1dc0c33274 SHA512 935ab3bd5bc3d3347e44c20482aa19396d243b89f2dbc7bf9f89b16a2559715866e16dfd9f5c4866222d8ee968f158a773475d94629f0ef9fa9b8fd23f0fbc2e
AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
-DIST unbound-1.9.0.tar.gz 5662176 BLAKE2B dff42ca4155df1c364bcfeb37c0f9516e7f167cc59bebd1fcf264db6471ad99804323c59e485662e03ab095932f1ca3fe25693a9ba840e9c0ecad69cf31b1a2d SHA512 7dfa8e078507fc24a2d0938eea590389453bacfcac023f1a41af19350ea1f7b87d0c82d7eead121a11068921292a96865e177274ff27ed8b8868445f80f7baf6
-DIST unbound-1.9.1.tar.gz 5665254 BLAKE2B 68a643cd17139b34e3651e0e72053b0faacf83ae975fff97493c78742ffa7f0d3dbc0028e96e581e125a3591467ec78ae245a718424c2fb32ea7db23ae945f44 SHA512 5dfac7ce3892f73109fdfe0f81863643b1f4c10cee2d4e2d1a28132f1b9ea4d4f89242e4e6348fdadf998f1c75d53577cbf4f719e98faa1342fc3c5de2e8903d
-DIST unbound-1.9.2.tar.gz 5676395 BLAKE2B fa42e6afaf7e7fc98dba35fb6ec4513f7f392194e9124f7a4625c9a51f4b2b58bb63ca40a083b9f3583af3636399df02f92ef7cb0ae10404b7258cddfce82adc SHA512 118f0e53ee2d5cfb53ce1f792ca680cc01b5825bf81575e36bd3b24f3bdbe14e6631401bf1bf85eb2ac2a3fa0ee2ee3eb6a28b245d06d48d9975ce4cc260f764
-DIST unbound-1.9.3.tar.gz 5686017 BLAKE2B f96636f4070e48cc5e3eadfb59e28f2ab2fc95a8c5a78af095743ea6d32149aadc486f8da62ea1b38c856f4ba9c2cf041407dceb33396a47c59a19816d67f8c6 SHA512 21e14dc1577adbe502a262d7fbe9aae0cd389cd9c0b822246beadf00f0ee875e268eeb3ce820433cbb01495d6b182c334b34b63b1bc33b08589a230810ccfe90
DIST unbound-1.9.4.tar.gz 5686242 BLAKE2B de9e553ba6e8c3839b41776052c3b0f83890b5bd9cbdb895fbf1e413169dd4740a9dc354ccc787fa018755acb73e831f1cb2742db65e151d1e01367b35a7b9e5 SHA512 44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c
-EBUILD unbound-1.9.0.ebuild 5371 BLAKE2B 210ca5db8c4fedf546d8caeffda1cf94f6366e9befe55be6c07ba273209ff2b5388509341c4540ee65aeedb3f543e0caa7fbac880121ba86f1426e856167689c SHA512 2f78e2c29c5ed3998260ae8803c0a5e9216f63c9001be4f62613e88899e130258b7a53e0072a621e2d436b6491ed688006cb2e8ccdf6e6426eec34d87d358648
-EBUILD unbound-1.9.1-r1.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
-EBUILD unbound-1.9.1.ebuild 5383 BLAKE2B 2e5777319dab657dea41e1eb2e6e325ed8dc0d5d6c9e7711ee4cd11e043bc9582cb58fcffa26d1264759fed85debfa8f23b21dde1a936730e47d7ecf1ea2eb0f SHA512 1cc7d4b7deef9d75412caee7633e487e22fea793454eb87554401bf8b1efdaf24b67c2d6a463232cddb4cf1ecd8ab90f998623df0c99e9c8434245f27b202975
-EBUILD unbound-1.9.2.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
-EBUILD unbound-1.9.3.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
-EBUILD unbound-1.9.4.ebuild 5402 BLAKE2B 7c36d4ae986ee898568c24a1cda000b656f62501cfdf39a6d60b40061c95fe44dd5c481033bbc3475379b3717f0bfdc16e54ae91282e458f0f5492a30e68aac9 SHA512 232cce930812ecd5c6935c0aeef9cf6604a81ed3af46c62277001475cb260dfa7871684a266daec7f62ab23c9fcf28198912975edaf3249bd796972d8bb295ae
+EBUILD unbound-1.9.4.ebuild 5401 BLAKE2B 66fbfcec284747e356ac67088f4fd126d5dd23828da7c972722a1aa8100bbefbf4bcf41e637ccce43c6477cad3f2b1ed308729d1e3056fd8d355edc7dba44091 SHA512 e3a2a52e443430a214afac126d32a30c578bbbd0451d906f59caf339b39a6570d5c12795d4b66c47060d6f54db381ad09a9add361f6afd16700c019f8689eba5
MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.0.ebuild b/net-dns/unbound/unbound-1.9.0.ebuild
deleted file mode 100644
index 7d08d92eda4e..000000000000
--- a/net-dns/unbound/unbound-1.9.0.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
-
-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 ~hppa ~mips ppc ppc64 x86"
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
- dnstap? (
- dev-libs/fstrm[${MULTILIB_USEDEP}]
- >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
- )
- ecdsa? (
- !libressl? ( dev-libs/openssl:0[-bindist] )
- )
- python? ( ${PYTHON_DEPS} )
- redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
- python? ( dev-lang/swig )
- test? (
- net-dns/ldns-utils[examples]
- dev-util/splint
- app-text/wdiff
- )
- systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
- net-dns/dnssec-root
- selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
- net-dns/dnssec-root"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
- "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup unbound
- enewuser unbound -1 -1 /etc/unbound unbound
- # improve security on existing installs (bug #641042)
- # as well as new installs where unbound homedir has just been created
- if [[ -d "${ROOT}/etc/unbound" ]]; then
- chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
- fi
-
- 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) \
- --disable-flto \
- --disable-rpath \
- --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_all() {
- use python && python_optimize
-
- newinitd "${FILESDIR}"/unbound-r1.initd unbound
- newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
- systemd_dounit "${FILESDIR}"/unbound.service
- systemd_dounit "${FILESDIR}"/unbound.socket
- 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
- # ... 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 0750 /var/lib/${PN}
-
- find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name "*.a" -delete || die
- fi
-}
-
-pkg_postinst() {
- # make var/ writable by unbound
- if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
- chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
- fi
-
- 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 ""
-}
diff --git a/net-dns/unbound/unbound-1.9.1-r1.ebuild b/net-dns/unbound/unbound-1.9.1-r1.ebuild
deleted file mode 100644
index e4d1ceae7af4..000000000000
--- a/net-dns/unbound/unbound-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
-
-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 libressl python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
- dnstap? (
- dev-libs/fstrm[${MULTILIB_USEDEP}]
- >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
- )
- ecdsa? (
- !libressl? ( dev-libs/openssl:0[-bindist] )
- )
- python? ( ${PYTHON_DEPS} )
- redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
- python? ( dev-lang/swig )
- test? (
- net-dns/ldns-utils[examples]
- dev-util/splint
- app-text/wdiff
- )
- systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
- net-dns/dnssec-root
- selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
- net-dns/dnssec-root"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
- "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup unbound
- enewuser unbound -1 -1 /etc/unbound unbound
- # improve security on existing installs (bug #641042)
- # as well as new installs where unbound homedir has just been created
- if [[ -d "${ROOT}/etc/unbound" ]]; then
- chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
- fi
-
- 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) \
- --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_all() {
- use python && python_optimize
-
- newinitd "${FILESDIR}"/unbound-r1.initd unbound
- newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
- systemd_dounit "${FILESDIR}"/unbound.service
- systemd_dounit "${FILESDIR}"/unbound.socket
- 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
- # ... 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 0750 /var/lib/${PN}
-
- find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name "*.a" -delete || die
- fi
-}
-
-pkg_postinst() {
- # make var/ writable by unbound
- if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
- chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
- fi
-
- 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 ""
-}
diff --git a/net-dns/unbound/unbound-1.9.1.ebuild b/net-dns/unbound/unbound-1.9.1.ebuild
deleted file mode 100644
index 8dde19fcab96..000000000000
--- a/net-dns/unbound/unbound-1.9.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
-
-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 libressl python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
- dnstap? (
- dev-libs/fstrm[${MULTILIB_USEDEP}]
- >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
- )
- ecdsa? (
- !libressl? ( dev-libs/openssl:0[-bindist] )
- )
- python? ( ${PYTHON_DEPS} )
- redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
- python? ( dev-lang/swig )
- test? (
- net-dns/ldns-utils[examples]
- dev-util/splint
- app-text/wdiff
- )
- systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
- net-dns/dnssec-root
- selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
- net-dns/dnssec-root"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
- "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup unbound
- enewuser unbound -1 -1 /etc/unbound unbound
- # improve security on existing installs (bug #641042)
- # as well as new installs where unbound homedir has just been created
- if [[ -d "${ROOT}/etc/unbound" ]]; then
- chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
- fi
-
- 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) \
- --disable-flto \
- --disable-rpath \
- --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_all() {
- use python && python_optimize
-
- newinitd "${FILESDIR}"/unbound-r1.initd unbound
- newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
- systemd_dounit "${FILESDIR}"/unbound.service
- systemd_dounit "${FILESDIR}"/unbound.socket
- 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
- # ... 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 0750 /var/lib/${PN}
-
- find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name "*.a" -delete || die
- fi
-}
-
-pkg_postinst() {
- # make var/ writable by unbound
- if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
- chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
- fi
-
- 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 ""
-}
diff --git a/net-dns/unbound/unbound-1.9.2.ebuild b/net-dns/unbound/unbound-1.9.2.ebuild
deleted file mode 100644
index e4d1ceae7af4..000000000000
--- a/net-dns/unbound/unbound-1.9.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
-
-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 libressl python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
- dnstap? (
- dev-libs/fstrm[${MULTILIB_USEDEP}]
- >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
- )
- ecdsa? (
- !libressl? ( dev-libs/openssl:0[-bindist] )
- )
- python? ( ${PYTHON_DEPS} )
- redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
- python? ( dev-lang/swig )
- test? (
- net-dns/ldns-utils[examples]
- dev-util/splint
- app-text/wdiff
- )
- systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
- net-dns/dnssec-root
- selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
- net-dns/dnssec-root"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
- "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup unbound
- enewuser unbound -1 -1 /etc/unbound unbound
- # improve security on existing installs (bug #641042)
- # as well as new installs where unbound homedir has just been created
- if [[ -d "${ROOT}/etc/unbound" ]]; then
- chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
- fi
-
- 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) \
- --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_all() {
- use python && python_optimize
-
- newinitd "${FILESDIR}"/unbound-r1.initd unbound
- newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
- systemd_dounit "${FILESDIR}"/unbound.service
- systemd_dounit "${FILESDIR}"/unbound.socket
- 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
- # ... 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 0750 /var/lib/${PN}
-
- find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name "*.a" -delete || die
- fi
-}
-
-pkg_postinst() {
- # make var/ writable by unbound
- if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
- chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
- fi
-
- 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 ""
-}
diff --git a/net-dns/unbound/unbound-1.9.3.ebuild b/net-dns/unbound/unbound-1.9.3.ebuild
deleted file mode 100644
index e4d1ceae7af4..000000000000
--- a/net-dns/unbound/unbound-1.9.3.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
-
-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 libressl python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
- dnstap? (
- dev-libs/fstrm[${MULTILIB_USEDEP}]
- >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
- )
- ecdsa? (
- !libressl? ( dev-libs/openssl:0[-bindist] )
- )
- python? ( ${PYTHON_DEPS} )
- redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
- python? ( dev-lang/swig )
- test? (
- net-dns/ldns-utils[examples]
- dev-util/splint
- app-text/wdiff
- )
- systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
- net-dns/dnssec-root
- selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
- net-dns/dnssec-root"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
- "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup unbound
- enewuser unbound -1 -1 /etc/unbound unbound
- # improve security on existing installs (bug #641042)
- # as well as new installs where unbound homedir has just been created
- if [[ -d "${ROOT}/etc/unbound" ]]; then
- chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
- fi
-
- 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) \
- --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_all() {
- use python && python_optimize
-
- newinitd "${FILESDIR}"/unbound-r1.initd unbound
- newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
- systemd_dounit "${FILESDIR}"/unbound.service
- systemd_dounit "${FILESDIR}"/unbound.socket
- 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
- # ... 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 0750 /var/lib/${PN}
-
- find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name "*.a" -delete || die
- fi
-}
-
-pkg_postinst() {
- # make var/ writable by unbound
- if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
- chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
- fi
-
- 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 ""
-}
diff --git a/net-dns/unbound/unbound-1.9.4.ebuild b/net-dns/unbound/unbound-1.9.4.ebuild
index 735249132240..9b6df938ec24 100644
--- a/net-dns/unbound/unbound-1.9.4.ebuild
+++ b/net-dns/unbound/unbound-1.9.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"