diff --git a/app-arch/arj/arj-3.10.22_p28.ebuild b/app-arch/arj/arj-3.10.22_p28.ebuild
index 797d6c1d673f4..24be6a00756aa 100644
--- a/app-arch/arj/arj-3.10.22_p28.ebuild
+++ b/app-arch/arj/arj-3.10.22_p28.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	# get order of patches from series file. otherwise the order is wrong :/
diff --git a/app-arch/mt-st/mt-st-1.8.ebuild b/app-arch/mt-st/mt-st-1.8.ebuild
index a1526dbe4f5a7..d99506dcb0835 100644
--- a/app-arch/mt-st/mt-st-1.8.ebuild
+++ b/app-arch/mt-st/mt-st-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/iustin/mt-st/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/swtpm/swtpm-0.10.0-r1.ebuild b/app-crypt/swtpm/swtpm-0.10.0-r1.ebuild
index 99daf56aa9851..e77e0987da6e6 100644
--- a/app-crypt/swtpm/swtpm-0.10.0-r1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="fuse seccomp test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-editors/moe/moe-1.15.ebuild b/app-editors/moe/moe-1.15.ebuild
index c2f3097b3e776..0fc0ae40772ea 100644
--- a/app-editors/moe/moe-1.15.ebuild
+++ b/app-editors/moe/moe-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/app-misc/ddcutil/ddcutil-2.2.0.ebuild b/app-misc/ddcutil/ddcutil-2.2.0.ebuild
index a01dd47a1dd64..54b25b2963187 100644
--- a/app-misc/ddcutil/ddcutil-2.2.0.ebuild
+++ b/app-misc/ddcutil/ddcutil-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0/5"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="usb-monitor user-permissions video_cards_nvidia X"
 
 # In 2.2.0, DRM seems fairly embedded and non-optional even if the
diff --git a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild
index 3936ef9c2dff2..c35100b01af81 100644
--- a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild
+++ b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild
@@ -36,7 +36,7 @@ fi
 # it must be GPL-3+ too.
 LICENSE="GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 
 DEPEND=">=app-shells/bash-${MANGLED_PV}:${MANGLED_PV}"
 RDEPEND="${DEPEND}"
diff --git a/app-shells/fzf/fzf-0.60.3.ebuild b/app-shells/fzf/fzf-0.60.3.ebuild
index 2037f417dd898..d0c311655a7cc 100644
--- a/app-shells/fzf/fzf-0.60.3.ebuild
+++ b/app-shells/fzf/fzf-0.60.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" https://github.com/Oddegamra/gentoo-ebuilds/releases/download/${P}/${
 
 LICENSE="MIT BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/app-shells/ksh/ksh-1.0.10.ebuild b/app-shells/ksh/ksh-1.0.10.ebuild
index b46e71427b01b..b40b9db963979 100644
--- a/app-shells/ksh/ksh-1.0.10.ebuild
+++ b/app-shells/ksh/ksh-1.0.10.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ksh93/ksh"
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	MY_PV=$(ver_rs 3 - 4 .)
 	SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/unrtf/unrtf-0.21.10-r1.ebuild b/app-text/unrtf/unrtf-0.21.10-r1.ebuild
index 24aa0d0f12cd5..feb1dab1c4def 100644
--- a/app-text/unrtf/unrtf-0.21.10-r1.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.21.10-use-_GNU_SOURCE.patch
diff --git a/dev-cpp/catch/catch-1.12.2-r2.ebuild b/dev-cpp/catch/catch-1.12.2-r2.ebuild
index d2044848fd4b2..ce811fae448d4 100644
--- a/dev-cpp/catch/catch-1.12.2-r2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
index b63aaef021235..18c2d4fd6f15b 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/bemenu/bemenu-0.6.21.ebuild b/dev-libs/bemenu/bemenu-0.6.21.ebuild
index 746781ce8257c..20c6f32d5efba 100644
--- a/dev-libs/bemenu/bemenu-0.6.21.ebuild
+++ b/dev-libs/bemenu/bemenu-0.6.21.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git"
 else
 	SRC_URI="https://github.com/Cloudef/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/dev-libs/libspt/libspt-1.1-r5.ebuild b/dev-libs/libspt/libspt-1.1-r5.ebuild
index 7d9528b5db21e..e7a09189c1b06 100644
--- a/dev-libs/libspt/libspt-1.1-r5.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="suid"
 RESTRICT="test"
 
diff --git a/dev-libs/libxls/libxls-1.6.3.ebuild b/dev-libs/libxls/libxls-1.6.3.ebuild
index 2a64f1d16b38d..cbcbf59af1abe 100644
--- a/dev-libs/libxls/libxls-1.6.3.ebuild
+++ b/dev-libs/libxls/libxls-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-ruby/mkmf-lite/mkmf-lite-0.7.3.ebuild b/dev-ruby/mkmf-lite/mkmf-lite-0.7.3.ebuild
index 49367b7089819..622003d4308c3 100644
--- a/dev-ruby/mkmf-lite/mkmf-lite-0.7.3.ebuild
+++ b/dev-ruby/mkmf-lite/mkmf-lite-0.7.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/djberg96/mkmf-lite"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 ruby_add_rdepend "
 	=dev-ruby/memoist-0.16* >=dev-ruby/memoist-0.16.2
diff --git a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild b/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild
index 9c43f6e2d1ca5..68e43c87eb76e 100644
--- a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild
@@ -18,7 +18,7 @@ else
 	"
 	S="${WORKDIR}"/${P%%_p*}
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-vcs/bfg/bfg-1.14.0.ebuild b/dev-vcs/bfg/bfg-1.14.0.ebuild
index f0d12847f2f81..7d6ce17a73d43 100644
--- a/dev-vcs/bfg/bfg-1.14.0.ebuild
+++ b/dev-vcs/bfg/bfg-1.14.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 BDEPEND="app-arch/unzip"
diff --git a/dev-vcs/repo/repo-2.53.ebuild b/dev-vcs/repo/repo-2.53.ebuild
index 0e45323baa767..36cde58b238d0 100644
--- a/dev-vcs/repo/repo-2.53.ebuild
+++ b/dev-vcs/repo/repo-2.53.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/git-${P}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.9.1.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.9.1.ebuild
index 3c1385e2ef955..4667567b74540 100644
--- a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.9.1.ebuild
+++ b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wmww/${PN}"
 else
 	SRC_URI="https://github.com/wmww/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Library to create desktop components for Wayland using the Layer Shell protocol"
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 5254f4b0dbd8c..d92a6e75efb7c 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,6 +1,6 @@
 DIST knot-resolver-5.7.4.tar.xz 1931124 BLAKE2B 670bd0bac1417fde0f7b6a02797e49e22af081e55b63c23e1fcd8dee369f21b7a2a8997fe641f69e7f0de5cbc7960307f32c939eb85c260fb2de015542dfce1e SHA512 5d8ea5b5b0cba5a1058aaa6e04573c838895d6b2c204e8d09c9ad898fb074c52ef7589afdad164b007edf151167d31fd0f940466edfeec597f96e5bc1cd72171
 DIST knot-resolver-5.7.4.tar.xz.asc 833 BLAKE2B 6432bc23ff779998eb351d57db34bcd9e41ea928fa5d83463122012d8adad16edec7afbcbfb0f0b41789c7797c895216b793ced2d6a01d69fdc3b0f2d12879cb SHA512 d34a0e1fd8be372c325199ace5bb6f20b2b395a4fb5a6f6f4c2c89f29741ecfd36234900b0e836c174df831716012589231551b13426a6728e37aba6c74c197f
-DIST knot-resolver-6.0.10.tar.xz 2138660 BLAKE2B 9a80e76272b4cb7a30b75b832627529dfbdec7114ef25a576c9a590221e21ef17efef23ec328783f2b687e8f2e0d0cee5b54048a37a0d08a35004ba3e510e14c SHA512 63d5c7a45ca52f02616ac6374625ccddd631cd71a5b6ebc99498e0c28f581eefef1dd5bbb0d8676f1ec53c2023f2b28cebc432e981c51b6166b4b3b1d8443704
-DIST knot-resolver-6.0.10.tar.xz.asc 833 BLAKE2B 5bd7baba40d6577764b3f0d985a2ee7edaff99ce7fc1cd89f42488504c657f1be2a5bf7267eaed225281be6f8154fb21c92ab7ee1d34b844b3001b7ad391d5b6 SHA512 26b8faffe10529559ec9081a567d6c740a9c61f81edf766ea1c32b01129edf9a4049a2844df0c27cb0fd5008e299d6431b099b0a09ac5624f24155d8b1a3b53f
-DIST knot-resolver-6.0.11.tar.xz 2139448 BLAKE2B 0d96790ce3ecb85d9466d90683de77d46f75d360f032ae94d18a7b493eedb58c86f6274a5de2eaed4eca792b3ef6ff673120c3a7526e9167d404b8dd0ccd20f3 SHA512 7a3dd8e925a8ba44c66d00175fd689b4daddacde8ffb96712c3770dbaf1c54a2cb90dda340fe674dc11e1222fdd3e4112aa3df72270f422b4c8d2c60f9af9cea
-DIST knot-resolver-6.0.11.tar.xz.asc 833 BLAKE2B 3e959798699c1dc0698cdb6e0c8509ba8a3287eab485511b18e01cc80e906149095ca9a537b3b4c45969c338022b61afd6377f106506b59f969fdf44d5e729be SHA512 cf6b034a9ad0daf118c18179dea1c32c9de604581735d89127c9c0fe80122a6159b49ec6176bee0955114d12f8ad20e29958a841c9b6464551e3def69d2e3932
+DIST knot-resolver-5.7.5.tar.xz 1924960 BLAKE2B cad47756832b34399ea0437ef041ddbfeef10645004ad48ea1ca7cf8fca380b443eb20e345418ebe5dc1566f8f19ee400a1819077bda4d9d2b7949b36a6fb4df SHA512 b9ade76accf60c7eee173cfff18e1881e79bcd63d85ef583973244bf37f40c4c57fed00d840c61643b65b82b1f93f85480c4f10334416cab87fae3da46918fc3
+DIST knot-resolver-5.7.5.tar.xz.asc 833 BLAKE2B 675b91253c5ae72db9e1ef6513a681538967f72b6b7a91f2159b42e7581b398a0a90df7e75da0e6818f1a20549a23677ab34722bbcf762cad019d4c211221f1e SHA512 df06eb244fa051a5f71385424b2da2479203019c6824344ec2226bc4851a3eb12eb3bb0f6f5a3e5ccce8c5875b6867924fa46b6939545cb35b24ef799f9ef6b0
+DIST knot-resolver-6.0.12.tar.xz 2144940 BLAKE2B 72a8592591ba7ca8ee8b57eae105096125a71f7d4a7e1b096962683f66cc608f65ad5743ee2213b0b898983c52cf9b7d651088929b56db952871bb8b03607283 SHA512 2941de1d05258a627fa859de826487e940cd0c90befa5d2a678e0bf3111c048cb558cfe1258711417bec71a6f0d6e38aa40c1ba6743f3279862684109634d6dc
+DIST knot-resolver-6.0.12.tar.xz.asc 833 BLAKE2B ffb7758c151485fe65e8ad636767943b1280d4a02d5889fbc22247fcfe1d3d53969e369cff6d0d2a438ed241f96ec2c97d792fc7d07af3f51ec252eb20357c42 SHA512 1adafdb6ffcf8d2bcb0a6b6ed2a39eb8be237954280f8845fef62dc32dfa64f5101400db94d8ecad30c27c8ca21945414b8c4c4ec0db88ba8be679e99c60947e
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.5.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.5.ebuild
new file mode 100644
index 0000000000000..e66af078929d2
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.7.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit lua-single meson optfeature tmpfiles verify-sig
+
+DESCRIPTION="A scaleable caching DNS resolver"
+HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
+SRC_URI="
+	https://knot-resolver.nic.cz/release/${P}.tar.xz
+	verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc )
+"
+
+LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="caps dnstap jemalloc kresc nghttp2 systemd test xdp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	acct-group/knot-resolver
+	acct-user/knot-resolver
+	dev-db/lmdb:=
+	dev-libs/libuv:=
+	net-dns/knot:=[xdp?]
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	jemalloc? ( dev-libs/jemalloc:= )
+	kresc? ( dev-libs/libedit )
+	nghttp2? ( net-libs/nghttp2:= )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.3-docdir.patch
+	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
+	"${FILESDIR}"/${PN}-5.7.4-libsystemd.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var # double lib
+		# https://bugs.gentoo.org/870019
+		-Dauto_features=disabled
+		-Ddoc=disabled
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dopenssl=disabled
+		-Dmalloc=$(usex jemalloc jemalloc disabled)
+		-Dsystemd_files=enabled
+		$(meson_feature caps capng)
+		$(meson_feature dnstap)
+		$(meson_feature kresc client)
+		$(meson_feature nghttp2)
+		$(meson_feature systemd)
+		$(meson_feature test unit_tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	fowners -R ${PN}: /etc/${PN}
+
+	newinitd "${FILESDIR}"/kresd.initd-r2 kresd
+	newconfd "${FILESDIR}"/kresd.confd-r1 kresd
+	newinitd "${FILESDIR}"/kres-cache-gc.initd kres-cache-gc
+}
+
+pkg_postinst() {
+	tmpfiles_process knot-resolver.conf
+	optfeature_header "This package is recommended with Knot Resolver:"
+	optfeature "asynchronous execution, especially with policy module" dev-lua/cqueues
+	elog ""
+	optfeature_header "Other packages may also be useful:"
+	optfeature "legacy doh and webmgmt (metrics, tracking)" dev-lua/lua-http
+	optfeature "server map with geoIP database (webmgmt)" dev-lua/lua-mmdb
+}
diff --git a/net-dns/knot-resolver/knot-resolver-6.0.11.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.11.ebuild
deleted file mode 100644
index c7cbc691b42ae..0000000000000
--- a/net-dns/knot-resolver/knot-resolver-6.0.11.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-DISTUTILS_EXT=1
-DISTUTILS_OPTIONAL=1
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 lua-single meson optfeature tmpfiles verify-sig
-
-DESCRIPTION="A scaleable caching DNS resolver"
-HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
-
-SRC_URI="
-	https://knot-resolver.nic.cz/release/${P}.tar.xz
-	verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc )
-"
-
-LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="caps dnstap jemalloc +manager nghttp2 systemd test xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	manager? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	${LUA_DEPS}
-	acct-group/knot-resolver
-	acct-user/knot-resolver
-	dev-db/lmdb:=
-	dev-libs/libuv:=
-	>=net-dns/knot-3.3:=[xdp?]
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	jemalloc? ( dev-libs/jemalloc:= )
-	manager? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-admin/supervisor[${PYTHON_USEDEP}]
-			dev-python/aiohttp[${PYTHON_USEDEP}]
-			dev-python/jinja2[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/typing-extensions[${PYTHON_USEDEP}]
-		')
-	)
-	nghttp2? ( net-libs/nghttp2:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-util/cmocka
-		manager? (
-			$(python_gen_cond_dep '
-				dev-python/pyparsing[${PYTHON_USEDEP}]
-				dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-				dev-python/tomli[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	manager? (
-		${DISTUTILS_DEPS}
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.3-docdir.patch
-	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
-	"${FILESDIR}"/${PN}-6.0.9-libsystemd.patch
-	"${FILESDIR}"/${PN}-6.0.9-config-example.patch
-	"${FILESDIR}"/${PN}-6.0.9-pytest_tomli.patch
-	# to be removed at next release 6.0.12
-	"${FILESDIR}"/${PN}-6.0.11-abs_path_socket.patch
-)
-
-pkg_setup() {
-	lua-single_pkg_setup
-	use manager && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	use manager && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var # double lib
-		# https://bugs.gentoo.org/870019
-		-Dauto_features=disabled
-		# post-install tests
-		-Dconfig_tests=disabled
-		-Ddoc=disabled
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		-Dinstall_kresd_conf=enabled
-		-Dopenssl=disabled
-		-Dmalloc=$(usex jemalloc jemalloc disabled)
-		-Dsystemd_files=enabled
-		$(meson_feature caps capng)
-		$(meson_feature dnstap)
-		$(meson_feature nghttp2)
-		$(meson_feature systemd)
-		$(meson_feature systemd systemd_legacy_units)
-		$(meson_feature test unit_tests)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-	use manager && distutils-r1_src_compile
-}
-
-src_test() {
-	meson_src_test
-	use manager && distutils-r1_src_test
-}
-
-python_test() {
-	epytest tests/manager
-}
-
-src_install() {
-	meson_src_install
-	if use manager; then
-		distutils-r1_src_install
-		newinitd "${FILESDIR}"/knot-resolver.initd knot-resolver
-		newconfd "${FILESDIR}"/knot-resolver.confd knot-resolver
-	else
-		rm "${ED}"/usr/lib/systemd/system/knot-resolver.service || die
-	fi
-	fowners -R ${PN}: /etc/${PN}
-	newinitd "${FILESDIR}"/kresd.initd-r2 kresd
-	newconfd "${FILESDIR}"/kresd.confd-r1 kresd
-	newinitd "${FILESDIR}"/kres-cache-gc.initd kres-cache-gc
-}
-
-pkg_postinst() {
-	tmpfiles_process knot-resolver.conf
-	if use manager; then
-		elog "You choose the new way, called the manager, to start Knot Resolver:"
-		use systemd && elog "	systemctl start knot-resolver.service"
-		use !systemd && elog "	/etc/init.d/knot-resolver start"
-		elog "Configuration file: /etc/knot-resolver/config.yaml"
-		elog ""
-		elog "The older way, without the manager, is still available:"
-	else
-		elog "You choose the older way, without the manager, to start Knot Resolver:"
-	fi
-	use systemd && elog "	systemctl start kresd@N.service"
-	use !systemd && elog "	/etc/init.d/kresd start"
-	elog "Configuration file: /etc/knot-resolver/kresd.conf"
-	elog "Optional garbage collector: /etc/init.d/kres-cache-gc"
-	elog ""
-	use !manager && elog "The new way is available with the useflag manager."
-	elog ""
-
-	optfeature_header "This package is recommended with Knot Resolver:"
-	optfeature "asynchronous execution, especially with policy module" dev-lua/cqueues
-	elog ""
-	optfeature_header "Other packages may also be useful:"
-	use manager && optfeature "Prometheus metrics (need manager)" dev-python/prometheus-client
-	use manager && optfeature "auto-reload TLS certificate files (need manager)" dev-python/watchdog
-	optfeature "legacy doh and webmgmt (metrics, tracking)" dev-lua/lua-http
-	optfeature "server map with geoIP database (webmgmt)" dev-lua/lua-mmdb
-}
diff --git a/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.12.ebuild
similarity index 97%
rename from net-dns/knot-resolver/knot-resolver-6.0.10.ebuild
rename to net-dns/knot-resolver/knot-resolver-6.0.12.ebuild
index 8ae140b0c8cd9..6ec43c7c0ad61 100644
--- a/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-6.0.12.ebuild
@@ -8,13 +8,12 @@ DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit distutils-r1 lua-single meson optfeature tmpfiles verify-sig
 
 DESCRIPTION="A scaleable caching DNS resolver"
 HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
-
 SRC_URI="
 	https://knot-resolver.nic.cz/release/${P}.tar.xz
 	verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc )
@@ -177,7 +176,7 @@ pkg_postinst() {
 	elog ""
 	optfeature_header "Other packages may also be useful:"
 	use manager && optfeature "Prometheus metrics (need manager)" dev-python/prometheus-client
-	use manager && optfeature "auto-reload TLS certificate files (need manager)" dev-python/watchdog
+	use manager && optfeature "auto-reload TLS certificate files and RPZ files (need manager)" dev-python/watchdog
 	optfeature "legacy doh and webmgmt (metrics, tracking)" dev-lua/lua-http
 	optfeature "server map with geoIP database (webmgmt)" dev-lua/lua-mmdb
 }
diff --git a/net-im/pidgin/pidgin-2.14.14-r1.ebuild b/net-im/pidgin/pidgin-2.14.14-r1.ebuild
index 63f92915ef7a7..17227d0f0995c 100644
--- a/net-im/pidgin/pidgin-2.14.14-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gui idn
 meanwhile ncurses networkmanager nls perl prediction python sasl spell tcl
 test tk v4l +xscreensaver zephyr zeroconf"
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.33.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.33.ebuild
index 84da6cbf5c6a1..8a901ee156d14 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.33.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.33.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://iroffer.net/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http +memsave ruby ssl +telnet upnp"
 
 REQUIRED_USE="
diff --git a/net-libs/neon/neon-0.34.0.ebuild b/net-libs/neon/neon-0.34.0.ebuild
index 253dca5475661..f46d8b032d115 100644
--- a/net-libs/neon/neon-0.34.0.ebuild
+++ b/net-libs/neon/neon-0.34.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+" # manpages+tests, core project
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+expat gnutls kerberos libproxy nls pkcs11 ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/zsync/zsync-0.6.2-r5.ebuild b/net-misc/zsync/zsync-0.6.2-r5.ebuild
index 904b1e31f304f..b0700d5bee86c 100644
--- a/net-misc/zsync/zsync-0.6.2-r5.ebuild
+++ b/net-misc/zsync/zsync-0.6.2-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ppc64 x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
diff --git a/net-nntp/tin/tin-2.6.4.ebuild b/net-nntp/tin/tin-2.6.4.ebuild
index 353e138e330db..5f0bed54e0c9a 100644
--- a/net-nntp/tin/tin-2.6.4.ebuild
+++ b/net-nntp/tin/tin-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
 
 RDEPEND="
diff --git a/net-wireless/iw/iw-6.9.ebuild b/net-wireless/iw/iw-6.9.ebuild
index 973ed4b8434fb..4001f3beaece3 100644
--- a/net-wireless/iw/iw-6.9.ebuild
+++ b/net-wireless/iw/iw-6.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-libs/libnl:="
 RDEPEND="
diff --git a/net-wireless/kismet/kismet-2023.07.1-r1.ebuild b/net-wireless/kismet/kismet-2023.07.1-r1.ebuild
index 0f20214c45d85..f8146baf6f9d1 100644
--- a/net-wireless/kismet/kismet-2023.07.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2023.07.1-r1.ebuild
@@ -32,7 +32,7 @@ else
 		"${FILESDIR}"/0001-configure.ac-bashism-fix-critical-existence-failure-.patch
 	)
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc ~x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20250220.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20250220.ebuild
index 54ee87dc20cc4..d855bcf8e2090 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20250220.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20250220.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 REQUIRED_USE="kernel_linux"
 
 pkg_pretend() {
diff --git a/sci-visualization/gwyddion/gwyddion-2.67.ebuild b/sci-visualization/gwyddion/gwyddion-2.67.ebuild
index c96a611bb31da..b14f64f7338b9 100644
--- a/sci-visualization/gwyddion/gwyddion-2.67.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.67.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
 
 RDEPEND="
diff --git a/x11-misc/xosview/xosview-1.24.ebuild b/x11-misc/xosview/xosview-1.24.ebuild
index 052c49a37e935..7ad0046533c5c 100644
--- a/x11-misc/xosview/xosview-1.24.ebuild
+++ b/x11-misc/xosview/xosview-1.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.6.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.6.ebuild
index 51264577630cf..ba11eb77dc69a 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.7.6.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-terms/xterm/xterm-397.ebuild b/x11-terms/xterm/xterm-397.ebuild
index ac23208f75384..9ccff557c75ff 100644
--- a/x11-terms/xterm/xterm-397.ebuild
+++ b/x11-terms/xterm/xterm-397.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="