gentoo resync : 11.08.2021

12 files changed, 65 insertions, 321 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index f094f2e8ba2a..d43eaa9bf028 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2174112d0e9e..dd7d7061a214 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,5 +12,5 @@ DIST bind-9.16.15.tar.xz 5025688 BLAKE2B 8b0723d46f812793f5a52b1ddacf21fe28e183e
 DIST bind-9.16.18.tar.xz 5023512 BLAKE2B 7766c1e6ab30ae42f0ba49d96fe0e2675e79aa01c48569d3cf5c122944319fbb88299a193ce06cc0aa67f6085fd80e29472fc7adc845e4bbb7ff6896dae87ed6 SHA512 6ba2f14324ebdc66d2a6d60e929fb47e170dd7662cf4b18ef3ad9da30a61b43c7d5539e931c483ab36e63ae0398aeed255fd672489fb332dccf182df9aa102f9
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.15-r2.ebuild 11016 BLAKE2B 3709d824ac8ada3ad5cb246cab344a8f657503e6fea99f1b5f309e2ef519756c366dea3dc444b46c6686749c7c9477b6da6cedcb65d1aa87edd6fbce2fa2a3af SHA512 dd16ca87cc5e379ce441173e1a20b3a2f88fcf8f884ee2cd14bf0c353ef758ca668351dcb59def7e1c84e368caf8fb884abce0fbec6f0327f07a29caaa3687c1
-EBUILD bind-9.16.18.ebuild 10967 BLAKE2B 4a206574ca2b2e2a92d05e8adfa23d6c67e507f0785b150ebde12fb7291f5592fe208af702b548428630dad97d29cce9fc92ad7a2642749e49be62fb3a72143b SHA512 f79efa884c0d9d441dc22ea6a969b9063350c1865df7595c4a7e54b831abc0effca4c925f1fb69ddc95c0ee44fe064cbb971a6db1e569abcf4efb5df3ee895df
+EBUILD bind-9.16.18.ebuild 10974 BLAKE2B 042fca55d17c4cb7ec7b0a0ba54318858de0a89cbbcccae13c13655f96ecec54d3206a9559253abe45bd65365b3a636e8cbff218cf6a191920c284ac42ab0873 SHA512 b5aae1a3435486da93c2835c342345d8109a7dea5130cf091d0b40641aa73b64a5a09a5026df72541ab76dbd8616c972ec2059d7410ef2a1c0b0f2c3e843de6a
 MISC metadata.xml 973 BLAKE2B 9e2cd4d34c8cd9f6bc860c667d2440e7916dfa7ca343e578d7c089b3f45db3b1fbdd79d14ccf1af7fc25115316c42304dc635f1aec78d47eee1fec5c1a09aa43 SHA512 87ee75e39604d9839f849763f2b1675e6d13835dc482bcecd729e6c8416ef90d76edd8e5c5ec87b9e4eb0aa416fb7dc74143bc29cbce02ac3a83eaaa5a88f012
diff --git a/net-dns/bind/bind-9.16.18.ebuild b/net-dns/bind/bind-9.16.18.ebuild
index 1dd3551c955e..692748decccb 100644
--- a/net-dns/bind/bind-9.16.18.ebuild
+++ b/net-dns/bind/bind-9.16.18.ebuild
@@ -12,7 +12,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-r1 autotools toolchain-funcs flag-o-matic  db-use systemd tmpfiles
 
@@ -33,7 +33,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 xml +zlib"
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 050ef35ea486..9938aee0f1a8 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,3 +1,5 @@
 DIST c-ares-1.17.1.tar.gz 1518701 BLAKE2B 31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905 SHA512 b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00
+DIST c-ares-1.17.2.tar.gz 1538276 BLAKE2B c6f5ad65ca75f8467b624daf3caaee2f35d6e4714ce46ebe1bbf79447feecf8615915b00fa5e7bd1e97c6232864e06c53a792fbadf36a5399883529769273e24 SHA512 f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8
 EBUILD c-ares-1.17.1.ebuild 903 BLAKE2B d917ecb20945f9625b9a559d3020afb1884a552163dba9fa68283456a42a838d2255624d036e3e593906ac3fc4572ce97ac1b2b06d5751ae8c5370f79ba54104 SHA512 60a88a0d054ee7d63c0015b9918684bcaaf3dd0add0a35aacdd6539406f4fdc1df254913b25c6f93e70512071643be3bb3febc352d49913ae37a7a3fd6594e62
+EBUILD c-ares-1.17.2.ebuild 1325 BLAKE2B 145b23f252ca78baa87c71d9fb9de23a7e4575fb688fc5322117843e937706f70615e6ed3bddbd33b76056ec524f58ccb33fddcb128142001fdd260f8a964f27 SHA512 cdcf66336a4f3c6824ee80110d316d956b9d2c613df244213168bc2256b3cafbe7750c86a00ead3051cea8853f6bd19bc8a6b690d265131f230d40c1d418c29c
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.17.2.ebuild b/net-dns/c-ares/c-ares-1.17.2.ebuild
new file mode 100644
index 000000000000..4db3832180f7
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.17.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.haxx.se/"
+SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
+
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+multilib_src_configure() {
+	# Needed for running unit tests only
+	# Violates sandbox and tests pass fine without
+	ax_cv_uts_namespace=no \
+	ax_cv_user_namespace=no \
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-nonblocking \
+		--enable-symbol-hiding \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+multilib_src_test() {
+	cd "${BUILD_DIR}"/test || die
+
+	# We're skipping the "real" network tests with the filter
+	# see https://github.com/c-ares/c-ares/tree/main/test
+	./arestest --gtest_filter=-*Live* || die "arestest failed!"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index cbe13afde0b5..719b9bd66621 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -4,5 +4,5 @@ AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9
 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
-EBUILD dnsmasq-2.85.ebuild 4655 BLAKE2B ee0df2583a57fc499f5e9846522064c496967a25168bfcb945cd04b3b8131a5230dead8009898cb632bfa05898be1c4eab358f6025c85359c4db556d9fbdf4b8 SHA512 3424bff3bb3993c9ed8146ec8075d58c27289981c8a85dfa978529b579e5a0d438c80af6d12a0bb8d921a064fabc58f52994b24d6af18335009e95e2dbb4323c
+EBUILD dnsmasq-2.85.ebuild 4662 BLAKE2B 00d035ccdec6d3b15059c2ba6dcbcf6557eb12ccbb5d568f521e43f399fee9a84953d0081c03b4d6e7108f8acfa1e2be252cfc75d005d080a0d1fae4aed331b2 SHA512 ffc524a54141bd7aca4b9b19a3f583d0d7c27f88e1792a45e6736a24a211575682888fce4785232d4e1245e9fe88b9925fc7ce02f559696b97fd6b2c940e0adf
 MISC metadata.xml 1355 BLAKE2B 4441a99669977dd0a5464b4de4f0a46a1a69aea4438916dcf5e55db529b8ca05c1f652af58d0dae4c7dd7542f0748515929f493a328dd8c19a2e436d39351eec SHA512 e2fbb896d5842833cefd014e80ba20bed7f0560479f8fbf05d87dfe6ae09780c648eb588caca2e1b558c27e085e842c09784e7942903e4ab57d1fdcda26b830f
diff --git a/net-dns/dnsmasq/dnsmasq-2.85.ebuild b/net-dns/dnsmasq/dnsmasq-2.85.ebuild
index d1c269b7660c..dd3f481e3cd9 100644
--- a/net-dns/dnsmasq/dnsmasq-2.85.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.85.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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"
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index fe462a6d7284..c7f80665e83a 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,12 +1,6 @@
 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-2.9.8.tar.xz 1194284 BLAKE2B c4329e5b2fc499851112d008af10c1a73bbe50cd07a4b5af984e99f389606b6f11c0b321dc26c14f872eb7cc70a99290a033f9aa9ff23a2b3694427605ffc704 SHA512 8104c3bdef2db4a79d6cd0fa4a30be1aa6edfa01363b97738d873445198cd031b4f5ab581d1a5277de49a8a042bb5340334be0579ceefa4b614e34c2cd454904
-DIST knot-3.0.4.tar.xz 1347928 BLAKE2B c97df0c04dbd6b96d2f2805a2bbb07bc3fd0ac64160619a55fdf93ac02e6d3f797dfae43ac8bc79450c59c88e0a521911517577ea19d67bb41186cfcd07dd743 SHA512 d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac
-DIST knot-3.0.6.tar.xz 1333296 BLAKE2B 74ee1133dbf954234c4b07a29986cb91363256f3450b3d270f6d458d723e89bd1f7434881aa51632f02c369a16ca461e8ab892c34a2cf2ed612aa9040c91d535 SHA512 f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0
-DIST knot-3.0.7.tar.xz 1334788 BLAKE2B 0ac740b25912ae84714e078963880c27082f8d0e668f0df3b04a6a8a3588d0ffaf0ded9f6e3dd64cf9bc0b08673219e32ac3ffb86f64b9ea97cb61ab9cb545d4 SHA512 89e17cd2bc5a07b05ccd11cfd58481078eff4076a537d1623ed575c1ab87eac87ce949c12dc35eb15dc7e4358a405c19a6660b4da9abc230077a251792f196bd
-EBUILD knot-2.9.8.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
-EBUILD knot-3.0.4.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
-EBUILD knot-3.0.6.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
-EBUILD knot-3.0.7.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
+DIST knot-3.1.1.tar.xz 1402352 BLAKE2B d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff SHA512 44c2973025e752f73ebd6bc78dad5c48c1c1432b62ec3b6d75b5876af4dd21aeed94f78523ef85cd6a986ff27789143a0a67450819c0b75ffa627d06b98e1b0b
+EBUILD knot-3.1.1.ebuild 1960 BLAKE2B 9ef73f3a96942f80ad9ffc0d4522fab355e4e341b990bca04ad9b2be33fb02cb074a8504194075ec2886e0cb2840c1788b197384c2aa9094ffc763cd5f5f0373 SHA512 abd011f2f5dc355b87ec74aa111f795378008154b881c899229ae9761086e88d922fabfde28cf702e116ac5967cc45a79e2423d03811eea2a32f3ce71d3bf9de
 MISC metadata.xml 1707 BLAKE2B 6eeedcb9dea44ad97afe8ed57bc529ea23bfa93c72163c566cc527a0284addbaea3f2fed4804853c8fb0431f38691356eae305c32f7e4a1256ef634894ce2a44 SHA512 e555e86949c2671b21e7e62a7aa346417f36ca9953fa45c5a4d1a0a4d46aec8bb4dde6c07121e1f5ebe12116756f3f7daf27455305b9158577f060c6237d047a
diff --git a/net-dns/knot/knot-2.9.8.ebuild b/net-dns/knot/knot-2.9.8.ebuild
deleted file mode 100644
index 2cc9e9753dfc..000000000000
--- a/net-dns/knot/knot-2.9.8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 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-3.0.6.ebuild b/net-dns/knot/knot-3.0.6.ebuild
deleted file mode 100644
index ff2ab85cf4eb..000000000000
--- a/net-dns/knot/knot-3.0.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 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-3.0.7.ebuild b/net-dns/knot/knot-3.0.7.ebuild
deleted file mode 100644
index ff2ab85cf4eb..000000000000
--- a/net-dns/knot/knot-3.0.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 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-3.0.4.ebuild b/net-dns/knot/knot-3.1.1.ebuild
index ff2ab85cf4eb..b4082a371f4a 100644
--- a/net-dns/knot/knot-3.0.4.ebuild
+++ b/net-dns/knot/knot-3.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd
+inherit flag-o-matic systemd
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="https://www.knot-dns.cz/"
@@ -11,7 +11,7 @@ SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 KNOT_MODULES=(
 	"+cookies"
@@ -73,6 +73,10 @@ src_configure() {
 		my_conf+=("$(use_with ${u} module-${u})")
 	done
 
+	if use riscv; then
+		append-libs -latomic
+	fi
+
 	econf "${my_conf[@]}"
 }