gentoo resync : 13.06.2020

3 files changed, 2 insertions, 106 deletions

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 34703f24ba14..e07826308cad 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,9 +2,7 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.8.5.tar.xz 1209076 BLAKE2B 7454499745caa04a9454f023bed0ce6d8ccc54fc2c264aada72a842c39b056a91caee908eb1b036fe77b97d8cea4f03b9afcd084a69846a2632e717f7c3591fd SHA512 f45e62816ddc1f534e724d2fa71831100efc01b415ec2ea8301d02cf44d8f104a248deccdb706ebad6853404aee2a209c2bf51b07076aa69340af6812e5a79de
-DIST knot-2.9.2.tar.xz 1181860 BLAKE2B 4c4a54624cc0c107517596efb3d4a4dc205dac488e293b594e93f8e73b1face3c0ac4ca94d5def68576f7b801540468a355e5b4bd06d7992edc3bce122952fd3 SHA512 7e09cd6e587342b0a213f7a108704fff7535d02dd47d662e60b96ae5d75d9745d659131622253f964deb1607f28d172d1d46dc3b5f61e2f6c70e5002e746da68
-DIST knot-2.9.3.tar.xz 1214512 BLAKE2B a4545ba32827a1866046fd42a5819963607d5d7d1fd1e73b17b08dca9c3aeb3b8ecbad67ef3293f4a417ac2b25c7540e299cf914d90d6a659bcc58f809f178c7 SHA512 69186b0d83ab548e46a7eed2703b1c3e29de36123c39a7ca461a8728488433bcc27dd5564ff3cb55d8490d4515098cebdd72aa732742fb0b9fceaca27f456e08
+DIST knot-2.9.5.tar.xz 1190872 BLAKE2B 4c60972676efb2e6cef5431ab688ffff9eeda4fe5f9a02bba10fbfced50c1edc9e15b9cea9e018428f3d075ab241128748fa1f777e6fc9de0dbdca1033c8d92a SHA512 6bfd6a720eb512983f934c3bf853ac310391805a102546ed18b3e805d10339837569e970e0e51f64e9d938bc362c8f9d01acb15ca4dca0a66dea9deb6b59cc73
 EBUILD knot-2.8.5.ebuild 1887 BLAKE2B 7eb58953ff6217a867692a88112fadfbccab09822786c9bcc5a3b049f9ad300d7406edca1122c326a2127811dc8af7c74de0625174ff1968645e91cf54c9ecc4 SHA512 c9e51d696c0e0d50b5b40ac76cd950eb7ca21a7a679f1655440d7a77af46aeec59697d12a84b8becf0f0de1a1a4e425bc4af4e51331a83e9fd724aab92b467bb
-EBUILD knot-2.9.2.ebuild 1892 BLAKE2B bda8c5a9320f1cc5de5149a1435501595b50f7d39734a81106c7712c6bfb479afe3807d01849aab4cb0515859caa27a92baf24fe7ffea5cd7aba726ff85dd570 SHA512 5db2d53e35f7d4d644fde4aac1ecb6254ca654973181fbc16c5b0f670f8f812c8700f119d4344acba73bc30a48f4fa652a7b760a95b91a2af6ad5b9f96aeda3a
-EBUILD knot-2.9.3.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
+EBUILD knot-2.9.5.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.9.2.ebuild b/net-dns/knot/knot-2.9.2.ebuild
deleted file mode 100644
index 832d155aba2c..000000000000
--- a/net-dns/knot/knot-2.9.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable utils utilities)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-dns/knot/knot-2.9.3.ebuild b/net-dns/knot/knot-2.9.5.ebuild
index 2cc9e9753dfc..2cc9e9753dfc 100644
--- a/net-dns/knot/knot-2.9.3.ebuild
+++ b/net-dns/knot/knot-2.9.5.ebuild