gentoo resync : 05.12.2021

3 files changed, 3 insertions, 111 deletions

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 3decb9ac8f7a..498af9c09d61 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,10 +1,8 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
-DIST knot-3.1.1.tar.xz 1402352 BLAKE2B d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff SHA512 44c2973025e752f73ebd6bc78dad5c48c1c1432b62ec3b6d75b5876af4dd21aeed94f78523ef85cd6a986ff27789143a0a67450819c0b75ffa627d06b98e1b0b
-DIST knot-3.1.2.tar.xz 1406684 BLAKE2B a849bf651357e462c5a0afb16e42bcd85bb310980c83b4c642bcf99ddfd17a59e5f5fd5f9fd58b21bcac2e287c57351b3b09cf3f4054ef51243b5226bf0bcc88 SHA512 e72f249f6291980cc69f90dca54cd8ba3ffbc617a1e69e441a48bdcbf46afb9fc202bbb1f88a93887fd264ddb59ad42ff6765c9bd0c1fa4789f035a902a3907a
 DIST knot-3.1.3.tar.xz 1407576 BLAKE2B 03cde89e32ac2440e721157db1af9b9cbb40ad2d8d813b0d8bc26fe1feb28f59055a3cbe287d50adb13f5190ce3ed532521189997d03b4fe9e4264f309032e23 SHA512 537013e914c3f00615a384c92da06c40bb33871e7dbd28e987280d62d91df42026774cfe0596ac72a218dafa650d8d600b1d831dd0a5c28a9fd796c5cd799838
-EBUILD knot-3.1.1.ebuild 1960 BLAKE2B 9ef73f3a96942f80ad9ffc0d4522fab355e4e341b990bca04ad9b2be33fb02cb074a8504194075ec2886e0cb2840c1788b197384c2aa9094ffc763cd5f5f0373 SHA512 abd011f2f5dc355b87ec74aa111f795378008154b881c899229ae9761086e88d922fabfde28cf702e116ac5967cc45a79e2423d03811eea2a32f3ce71d3bf9de
-EBUILD knot-3.1.2.ebuild 1960 BLAKE2B 9ef73f3a96942f80ad9ffc0d4522fab355e4e341b990bca04ad9b2be33fb02cb074a8504194075ec2886e0cb2840c1788b197384c2aa9094ffc763cd5f5f0373 SHA512 abd011f2f5dc355b87ec74aa111f795378008154b881c899229ae9761086e88d922fabfde28cf702e116ac5967cc45a79e2423d03811eea2a32f3ce71d3bf9de
+DIST knot-3.1.4.tar.xz 1408656 BLAKE2B 637371e5cc9aa0b880fda96d1d61f9e168cc96c244551b17381a1641a8b6ace7cac7ac6b7cf40fb2e86ac8f606be8d1342e548e5cadd64770610b2a5aa35f1f0 SHA512 307667a12b989fee443832d4642fc927231f38f0331439c8c7196c489d196245eca368d96a36fe49639b773f652f7cb80bf0c16bc1ad107e11b47b70e1f04060
 EBUILD knot-3.1.3.ebuild 1960 BLAKE2B ddc73a188149520aa83f0f4ab09e2530d970a75a3ad43fca967f641dd584d6c2b5c9bc054a959a9117ad243ff5f8f1986f2a39b23aec7172b5f05ce19f8bcaba SHA512 f5ff45b173fea526541effe6be9a75fe3b9963c088e5ef220bd8195063e024c564e551f6a24bcdad5c96bd784fab97ff5c76793ba062f83b6adfac0c859543f4
+EBUILD knot-3.1.4.ebuild 1960 BLAKE2B ddc73a188149520aa83f0f4ab09e2530d970a75a3ad43fca967f641dd584d6c2b5c9bc054a959a9117ad243ff5f8f1986f2a39b23aec7172b5f05ce19f8bcaba SHA512 f5ff45b173fea526541effe6be9a75fe3b9963c088e5ef220bd8195063e024c564e551f6a24bcdad5c96bd784fab97ff5c76793ba062f83b6adfac0c859543f4
 MISC metadata.xml 1708 BLAKE2B ff4a36469ebff05b5cceb5c07b1aa7d2d2a81850e7f091dd74db3ee4566a54cd8928190800df21952bc21afc4bc4de6c4a36dcdb807e489a36588a27c6e9fa20 SHA512 50f3a9709a5e38e0968a2daf78f5799ea73d4f424375e8a3e03150b0d38f6cf5e2e35bca629256c1f48b03ab70eb270408f811880484761fa4fa2fc2b10b2e68
diff --git a/net-dns/knot/knot-3.1.2.ebuild b/net-dns/knot/knot-3.1.2.ebuild
deleted file mode 100644
index b4082a371f4a..000000000000
--- a/net-dns/knot/knot-3.1.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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 ~riscv ~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
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	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-3.1.1.ebuild b/net-dns/knot/knot-3.1.4.ebuild
index b4082a371f4a..4b7058faa52a 100644
--- a/net-dns/knot/knot-3.1.1.ebuild
+++ b/net-dns/knot/knot-3.1.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd