diff --git a/app-admin/syslog-ng/syslog-ng-4.9.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.9.0.ebuild
index 2e45b4ecd8254..d7d6d4e726e4e 100644
--- a/app-admin/syslog-ng/syslog-ng-4.9.0.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb mqtt pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
diff --git a/app-arch/lrzip/lrzip-0.651-r1.ebuild b/app-arch/lrzip/lrzip-0.651-r1.ebuild
index 5ddc0fd4ea427..b9ac58b12fbfc 100644
--- a/app-arch/lrzip/lrzip-0.651-r1.ebuild
+++ b/app-arch/lrzip/lrzip-0.651-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="app-arch/bzip2
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index c843458821aa9..f6a3bf2e2d8f0 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -18,6 +18,8 @@ DIST meson-1.8.4.tar.gz 2336961 BLAKE2B fd574be17f1dde56fed13e18151cddc3265b4175
 DIST meson-1.8.4.tar.gz.asc 833 BLAKE2B 33fea09355be6f3df1c9f82daf2c92cbebd79846f82039e697f390db4811ade49edaeb942a4d1da8cb95238cff400e4ef1a76e141189acf10bc5da70e3fb3c44 SHA512 e0e6474a020e320d940d8de1843b491d1906c38bca304168324cae333c5635c70b210ef14e1d31ada2a31e7d3b8e5ae4a8563373230f40c52c2cac017359fd29
 DIST meson-1.9.0.tar.gz 2366082 BLAKE2B 54cef087a9629087e67a0d75422d08370e86273a202d9e054d160a4ae52b7b1ad612a2a2c8e72a00a8e29bd5857375bedca5935cd74a560950c6b45a48d69f19 SHA512 62e633e07e7e8be1bf4f62f9e5a2df9535750fc0047ee5c21b17bc851d190cc0cf8e6696614692091013dc72e68aa23d2c1fe04500e146f56876591250474d04
 DIST meson-1.9.0.tar.gz.asc 833 BLAKE2B 3054c5f24b264fd5471b4094e6a37cfa4cad3567b8eda69d4b7a6c0e5486c95199b683c1b5b9ed1be44fd0eacaca1afb9dd95fd363a23753fdd0f71f194e9793 SHA512 7f2ce856cf16004ebdef1ce294e7efc44f644691cac2f704625b4a56b270d4b2db54564bef9f4c90360c1ec738e54b948aba336e1feb70dca2daf0e500f2b627
+DIST meson-1.9.1.tar.gz 5083044 BLAKE2B a4d1894636ee61fa0101153f07d53717d34ba9de620b69becf669e06dc09a85874b4c5d619a509347c97e4112502a431affecccc5faf96464b072b5563247b9e SHA512 e5a167ff035f1494d6b1df7d3bf6feb37aa6421222fd27bfbebb36de4c7c3083e327679b82b7d9d3d4a2cc4dc2a3babb7cbf03358e4a2784d47eb34502014a1c
+DIST meson-1.9.1.tar.gz.asc 992 BLAKE2B 5271c87e19da0f0776c01b1f9f71eef0540e532a9397dbbff3c09c9b3b7698b8ea650f46c8b7edab8e5fd72c1fce4445d556c310770cc23c8275ebf8f06241f6 SHA512 a621781134e4793ea557fd1487895b65a38de23b676a7b6d8d7ac779abcdf768bdf09f933ea7ecedee0cd78fa62ab6319a9108cdf39ffa2e5695cddf183fb903
 DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca
 DIST meson-reference-1.5.2.3 341110 BLAKE2B 0d588b796f7f2da2dcb0e7822acde6a9a461930da4bfead3cf9148fa0fac18cd0ccbc6e891f555c973836f1c16b4eae299908a838a0b6843293de8815d30fc23 SHA512 64715ce2113e362e7d67179fe13566bc8f84ce7f4e6d795b836f42455a871173fee06e3e969e2996022d7e6c9b4b5379587a4c0c3d97b4bca527fb8902d3547f
 DIST meson-reference-1.6.1.3 343730 BLAKE2B 55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7 SHA512 553cdcd86a7a600cda05ac970cc285c4c50017d1e7d2925645d7f19a62b34c2f079673cafecf4111aa102afbe9d8e4d56f166d1d9940b740eeec0bb99d6cbc0d
@@ -25,3 +27,4 @@ DIST meson-reference-1.7.2.3 344764 BLAKE2B 82de9a7a01c2f1b45a2b3432deb4713af3cf
 DIST meson-reference-1.8.3.3 345855 BLAKE2B c8825ba7b72b36866ebfa8cdf63362f2d38673315378ea213c438057f5dafa36b9e729e8c415a29715c1da4fe72733a4a6a2cdbee4b7df57e5eb97f50152491b SHA512 3085c10cfc08ce4f0edad7129ce4d9a0bf75c6522309e344ba14e27c34d46c3da25ebb46260de28caef4a6c8134857d63297ded26f1296639a8a097e62a1801c
 DIST meson-reference-1.8.4.3 345964 BLAKE2B a2840cfabe319cb244ad46bb3b72b7e19bcaf3bfbd0f804c3982a191f795284cc4d35ee00266bf069dd95c0fa99fdb565343007aed75a7a0859ad85528422667 SHA512 95385faa364103c9f38b497f6e021d81c0e08048863a046b5c9030d11f7554f8237d405fe04d2145513e3685a13c71b167f29a8727d0f8cb0ca591076e0b39b9
 DIST meson-reference-1.9.0.3 347286 BLAKE2B 1fb96870791e7bdaefed5c9a0e807d412e922e965690ef2f8820075a27c2d20d7b8057f0f3b7b009dcc5f20cb7ba7ee778d2df6e4eac583cda58625d58fe9266 SHA512 6e0e127c988b6269c13ba901ce7bbedab135d81a0b4bcd8528a01371d9f74964381c446c2fa35876953ad0199866a0016b1e39f315b054b91499fc00597a9c5d
+DIST meson-reference-1.9.1.3 347286 BLAKE2B cae2e9a97bcb7fc6894723156280306ea0fb35d9cbe68d31785ac0678b17b8a4bdfdf2362834b9daf3c01e0ff8dd67c0f1d384595ef4e93858064bdad3e46840 SHA512 d79a772f4fdd55309acda104087d0bbdc707e8fd2816b516daf0b8d1c034892ddb0bec9a383d6f65184e9509a358e2a8b392a484b65ab9d26c0e68a02fd6db95
diff --git a/dev-build/meson/meson-1.9.1.ebuild b/dev-build/meson/meson-1.9.1.ebuild
new file mode 100644
index 0000000000000..f18b9192131ea
--- /dev/null
+++ b/dev-build/meson/meson-1.9.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 2016-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit ninja-utils git-r3
+
+	BDEPEND="
+		${NINJA_DEPEND}
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	"
+
+else
+	inherit verify-sig
+
+	MY_PV=${PV/_/}
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+		verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc )
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3
+	"
+	# Releases may be signed by those listed in Releasing.md. Jussi
+	# remains the default release manager.
+	# https://github.com/mesonbuild/meson/commit/c2d795735fa1c46c54d6aed4d4a30f36a1f853cb
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eschwartz sec-keys/openpgp-keys-jpakkane )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eschwartz.asc
+	#VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test test-full"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test-full? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		app-alternatives/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+		dev-build/cmake
+	)
+	test-full? (
+		|| ( dev-lang/rust dev-lang/rust-bin )
+		dev-lang/nasm
+		>=dev-lang/pypy-3
+		dev-lang/vala
+		dev-python/cython
+		virtual/fortran
+		virtual/jdk
+
+		app-text/doxygen
+		dev-cpp/gtest
+		dev-libs/protobuf
+		dev-util/bindgen
+		dev-util/gtk-doc
+		dev-util/itstool
+		llvm-core/llvm
+		media-libs/libsdl2
+		media-libs/libwmf
+		net-libs/libpcap
+		sci-libs/hdf5[fortran]
+		sci-libs/netcdf
+		sys-cluster/openmpi[fortran]
+		sys-devel/bison
+		sys-devel/flex
+
+		dev-qt/linguist-tools:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtdeclarative:6
+		dev-qt/qttools:6
+		dev-util/gdbus-codegen
+		x11-libs/gtk+:3
+
+		dev-libs/wayland
+		dev-util/wayland-scanner
+	)
+"
+RDEPEND="
+	!<dev-build/muon-0.2.0-r2[man(-)]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+}
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+		-e 's/test_env_cflags_ldflags/_&/'
+		-e 's/test_c_link_args_and_env/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# clippy-driver fails, but only when run via portage.
+		#
+		#   error[E0463]: can't find crate for `std`
+		#   error: requires `sized` lang_item
+		-e 's/test_rust_clippy/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_check_deps() {
+	if [[ ${PV} = *9999* ]]; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+python_configure_all() {
+	if [[ ${PV} = *9999* ]]; then
+		# We use the unsafe_yaml loader because strictyaml is not packaged. In
+		# theory they produce the same results, but pyyaml is faster and
+		# without safety checks.
+		edo ./meson.py setup \
+			--prefix "${EPREFIX}/usr" \
+			-Dhtml=false \
+			-Dunsafe_yaml=true \
+			docs/ docs/builddir
+	fi
+}
+
+python_compile_all() {
+	if [[ ${PV} = *9999* ]]; then
+		eninja -C docs/builddir
+	fi
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# meson has its own tests for LTO support. We don't need to verify that
+		# all tests work when they happen to use it. And in particular, this
+		# breaks rust.
+		filter-lto
+
+		# remove unwanted python_wrapper_setup contents
+		# We actually do want to non-error if python2 is installed and tested.
+		remove="${T}/${EPYTHON}/bin:"
+		PATH=${PATH/${remove}/}
+
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	dozshcomp data/shell-completions/zsh/_meson
+	dobashcomp data/shell-completions/bash/meson
+
+	if [[ ${PV} = *9999* ]]; then
+		DESTDIR="${ED}" eninja -C docs/builddir install
+	else
+		newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3
+	fi
+}
diff --git a/dev-cpp/asio/asio-1.34.2.ebuild b/dev-cpp/asio/asio-1.34.2.ebuild
index d4a5cc138b886..6168f882f0f28 100644
--- a/dev-cpp/asio/asio-1.34.2.ebuild
+++ b/dev-cpp/asio/asio-1.34.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/benchmark/benchmark-1.9.2.ebuild b/dev-cpp/benchmark/benchmark-1.9.2.ebuild
index 28c135ecb91a9..1a98535ec9243 100644
--- a/dev-cpp/benchmark/benchmark-1.9.2.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.9.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/google/benchmark/"
 SRC_URI="https://github.com/google/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc debug libpfm test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libbpf/libbpf-1.6.2.ebuild b/dev-libs/libbpf/libbpf-1.6.2.ebuild
index 51d78aca57103..433994497ed91 100644
--- a/dev-libs/libbpf/libbpf-1.6.2.ebuild
+++ b/dev-libs/libbpf/libbpf-1.6.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/protobuf/protobuf-31.1.ebuild b/dev-libs/protobuf/protobuf-31.1.ebuild
index 913fb7035d9f9..f8def6a5e89d5 100644
--- a/dev-libs/protobuf/protobuf-31.1.ebuild
+++ b/dev-libs/protobuf/protobuf-31.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 63133d2a85ce6..978278ba39b3d 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1 +1,2 @@
 DIST menhir-20240715.tar.bz2 1245971 BLAKE2B b5f1a1fb234dd53e1d3f77b095e2721f8d2af354a3aa36da2b993dc9f699767bb7c98aae13316ff3405b8bcf80f9ba3addc824ace59f5548613f0f93d105adf7 SHA512 b18da35517702dbdab0d9f5819ad711f61f2ed13ec9e51db71b92fa2d6604cbf28aa6d684c36a41364324694ebbc5dc6aaed4dbb3779c14b399e49ded6fd5db6
+DIST menhir-20250912.tar.bz2 1280672 BLAKE2B 53f3f88286a77093b34275ada55ba22ce31cd0db2981299a9ffc313415c1d345fa89694f29c522f8150e1c80ae0694c63beaaf331d8c6854f69430e7edf3c4b8 SHA512 bb1f93177ddea862a4b13eb344e81614291c3933d89cb39d11a8a59b1f842f2ea712bb4936c19e08ade42ad2c268e4bd76061457a56cc538cf3c5a6377f2ba97
diff --git a/dev-ml/menhir/menhir-20250912.ebuild b/dev-ml/menhir/menhir-20250912.ebuild
new file mode 100644
index 0000000000000..dc7b31cdc8173
--- /dev/null
+++ b/dev-ml/menhir/menhir-20250912.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+src_install() {
+	dune_src_install menhir
+	dune_src_install menhirLib
+	dune_src_install menhirSdk
+}
diff --git a/dev-util/bpftool/bpftool-7.6.0.ebuild b/dev-util/bpftool/bpftool-7.6.0.ebuild
index 51b8821494617..03ef64de24cb2 100644
--- a/dev-util/bpftool/bpftool-7.6.0.ebuild
+++ b/dev-util/bpftool/bpftool-7.6.0.ebuild
@@ -36,7 +36,7 @@ else
 		S="${WORKDIR}/bpftool-libbpf-v${PV}-sources"
 	fi
 
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="|| ( GPL-2 BSD-2 )"
diff --git a/gui-libs/libdecor/libdecor-0.2.3.ebuild b/gui-libs/libdecor/libdecor-0.2.3.ebuild
index a8584deafd5ea..d02f95f89498c 100644
--- a/gui-libs/libdecor/libdecor-0.2.3.ebuild
+++ b/gui-libs/libdecor/libdecor-0.2.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"
-	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
 LICENSE="MIT"
 SLOT="0"
diff --git a/gui-libs/libgedit-gtksourceview/libgedit-gtksourceview-299.4.0-r1.ebuild b/gui-libs/libgedit-gtksourceview/libgedit-gtksourceview-299.4.0-r1.ebuild
index 3dafeb833e115..886aba8266773 100644
--- a/gui-libs/libgedit-gtksourceview/libgedit-gtksourceview-299.4.0-r1.ebuild
+++ b/gui-libs/libgedit-gtksourceview/libgedit-gtksourceview-299.4.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview"
 
 LICENSE="LGPL-2.1+"
 SLOT="300"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="gtk-doc test"
 
diff --git a/media-libs/zimg/zimg-3.0.4.ebuild b/media-libs/zimg/zimg-3.0.4.ebuild
deleted file mode 100644
index 32d4c9b898d4b..0000000000000
--- a/media-libs/zimg/zimg-3.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-inherit autotools multilib-minimal
-
-DESCRIPTION="Scaling, colorspace conversion, and dithering library"
-HOMEPAGE="https://github.com/sekrit-twc/zimg"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-DEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}/system-gtest.patch"
-	"${FILESDIR}/backport-e29571f-issue-175.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit-test)
-}
diff --git a/net-misc/passt/passt-2025.06.11.ebuild b/net-misc/passt/passt-2025.06.11.ebuild
index a941cda9b2659..cb3b7da3e161e 100644
--- a/net-misc/passt/passt-2025.06.11.ebuild
+++ b/net-misc/passt/passt-2025.06.11.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="~amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="BSD GPL-2+"
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 9bb41301441d3..c736f280f002d 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,4 @@
-DIST qbittorrent-5.0.3.tar.xz 4548636 BLAKE2B 8aa605fc0815486d5a2df8dc7f9478cdc1d78c4b98ce666ac103db87ac8935a155398228c3c60f02b20766f7c31338de69466116dc8a16b89f5c0b2b25a9426f SHA512 7537d622d66055b83595e06d19d9705f3ecea189c6d8e7107c808e372d63445de2fe49f7e3cfeb5916781fe83a2a5c591514d5e3d4c049115bf78bcc9d5607a8
-DIST qbittorrent-5.0.3.tar.xz.asc 849 BLAKE2B 1fab6ee6dd98f0cb401f8e5e2dd6e7167ddc3e5f457dde34d25cfb8d81e471ed36fb8511981e87cef5f8d5fac4b8a1460fc59a6f708c0e4ffccda997054af675 SHA512 4d3406108e78d299d8115b7170ed7e337c01f88158b81c259116e01173ce0e9e3870c23e4dde421da1132c41aeb35786ce6c77a1261a61426914a5f1780589e3
-DIST qbittorrent-5.0.4.tar.xz 4555524 BLAKE2B d9351c99078a400dbbe5f6e3fce44d552336d44e6bf3ee576cb1244952d9a52d499c7fd7d5bb828f5d9963e5da1ccd0c30e114e7f6efae521c3c67f3f259ed3f SHA512 6d026c1dc5fdee81b15d1cc542626a459650bbb2340d4774cabcdfc3feed4294f92c556d6d2f26009ccc4492d181d6d553cb6cb6fa5a1123650434dcc6b8cb65
-DIST qbittorrent-5.0.4.tar.xz.asc 849 BLAKE2B 9f41ededb1af2580b43aaf6402beb95094325686a7898d75579b5c1a92ef09d0822a6d2468d01e2248923784b97a2bc6e0c4341eef6d2444df935aaea2315215 SHA512 ad2d3647080b69579d898f0aea1666f9ae54df911137ce7477caa89c940e3f8963470c76ab60ef6e43072a1116627a36fae9e9fdf0018b5b02e5edb476143e7b
 DIST qbittorrent-5.0.5.tar.xz 4561340 BLAKE2B 445f47b689c0166b2a16bbf35bcfaada4d35fd95f9bbb12cbbe1546fdc18d637df5cc571d73d29a311c19ec312c02126de6433508750aa02aad7be7846717dea SHA512 bb6c75d317bbb01929e874acee98b56ac5c8ab91a331f792227c8df3de08f2b10ed815ec480d8a76b5721f0fba5cbed36dfe37423ee24c5868539eaf91c579ea
 DIST qbittorrent-5.0.5.tar.xz.asc 849 BLAKE2B 56f913de4bc8a6138621b4a38132e791be70aa8449371977aa08aad2b401c5729870f76977382f83b9d5a6c82b02facffc7ab261ad23d3486c8c320564b9828f SHA512 d74abaa1914bbc2aee358c801d6f9ce04c2a79a3ac1c9eb9715681c728060c9786e33315583f38cee219f3398dff399e12a2b62aba63437bbe4659590839de88
+DIST qbittorrent-5.1.2.tar.xz 4631900 BLAKE2B 5cf21619c29878f1cecc08d66df27289c8f8541fe03bc4593384394921ad13891fc89f5846a9828b927ea08b51c0123d17d02952fee0b5ddac6dd259a9b0030b SHA512 8817c0136892373257b4c89983121af1d2c33ab93b248678949775c3b0e5e6b299cefd1ad3c7ab9b88c56a618ee3837a984872f781bb4ace9769c92a42908cab
+DIST qbittorrent-5.1.2.tar.xz.asc 849 BLAKE2B 2d023dd2dc922da973f26094349c2262e8f29227b615debc4a8f04c511bb513bfa56c0ac78e8e351e5b6c5f1a003c29d3a1860cd31e7d3dcbb006367b41e7d3e SHA512 69be899ed521da551ebcf0961c494ae828d2143fea9bc253f17ed81df61c4989124a8b231226c83c433314059e292ee3bf58422d861166eaa4272597bb8643c6
diff --git a/net-p2p/qbittorrent/qbittorrent-5.0.3.ebuild b/net-p2p/qbittorrent/qbittorrent-5.0.3.ebuild
deleted file mode 100644
index e6f156bb99e58..0000000000000
--- a/net-p2p/qbittorrent/qbittorrent-5.0.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo multibuild optfeature systemd verify-sig xdg
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
-		verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
-	"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
-fi
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="+dbus +gui systemd test webui"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( gui webui )
-	dbus? ( gui )
-"
-
-RDEPEND="
-	>=dev-libs/openssl-3.0.2:=
-	>=net-libs/libtorrent-rasterbar-1.2.19:=
-	>=sys-libs/zlib-1.2.11
-	>=dev-qt/qtbase-6.5:6[network,ssl,sql,sqlite,xml]
-	gui? (
-		>=dev-qt/qtbase-6.5:6[dbus?,gui,widgets]
-		>=dev-qt/qtsvg-6.5:6
-	)
-	webui? (
-		acct-group/qbittorrent
-		acct-user/qbittorrent
-	)
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-libs/boost-1.76
-"
-BDEPEND+="
-	>=dev-qt/qttools-6.5:6[linguist]
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use gui && MULTIBUILD_VARIANTS+=( gui )
-	use webui && MULTIBUILD_VARIANTS+=( nogui )
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			# musl lacks execinfo.h
-			-DSTACKTRACE=$(usex !elibc_musl)
-			# More verbose build logs are preferable for bug reports
-			-DVERBOSE_CONFIGURE=ON
-			-DWEBUI=$(usex webui)
-			-DTESTING=$(usex test)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then
-			# We do this in multibuild, see bug #839531 for why.
-			# Fedora has to do the same thing.
-			mycmakeargs+=(
-				-DGUI=ON
-				-DDBUS=$(usex dbus)
-				-DSYSTEMD=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DGUI=OFF
-				-DDBUS=OFF
-			)
-
-			use systemd && mycmakeargs+=(
-				# The systemd service calls qbittorrent-nox, which is only
-				# installed when GUI=OFF.
-				-DSYSTEMD=ON
-				-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
-			)
-		fi
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	my_src_test() {
-		# cmake does not detect tests by default, if you use enable_testing
-		# in a subdirectory instead of the root CMakeLists.txt
-		cd "${BUILD_DIR}"/test || die
-		edo ctest .
-	}
-
-	multibuild_foreach_variant my_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-	einstalldocs
-
-	if use webui; then
-		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "I2P anonymyzing network support" net-vpn/i2pd net-vpn/i2p
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-5.0.4.ebuild b/net-p2p/qbittorrent/qbittorrent-5.1.2.ebuild
similarity index 78%
rename from net-p2p/qbittorrent/qbittorrent-5.0.4.ebuild
rename to net-p2p/qbittorrent/qbittorrent-5.1.2.ebuild
index 6d695e1dc02c7..a4af32da4fe53 100644
--- a/net-p2p/qbittorrent/qbittorrent-5.0.4.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-5.1.2.ebuild
@@ -16,7 +16,7 @@ else
 		https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
 		verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
 	"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
@@ -24,7 +24,7 @@ fi
 
 LICENSE="GPL-2+-with-openssl-exception GPL-3+-with-openssl-exception"
 SLOT="0"
-IUSE="+dbus +gui systemd test webui"
+IUSE="+dbus +gui test webui"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	|| ( gui webui )
@@ -33,9 +33,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/openssl-3.0.2:=
-	>=net-libs/libtorrent-rasterbar-1.2.19:=
-	>=sys-libs/zlib-1.2.11
 	>=dev-qt/qtbase-6.5:6[network,ssl,sql,sqlite,xml]
+	>=net-libs/libtorrent-rasterbar-2.0.10:=
+	>=sys-libs/zlib-1.2.11
 	gui? (
 		>=dev-qt/qtbase-6.5:6[dbus?,gui,widgets]
 		>=dev-qt/qtsvg-6.5:6
@@ -56,28 +56,24 @@ BDEPEND+="
 
 DOCS=( AUTHORS Changelog {CONTRIBUTING,README}.md )
 
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use gui && MULTIBUILD_VARIANTS+=( gui )
-	use webui && MULTIBUILD_VARIANTS+=( nogui )
-
-	cmake_src_prepare
-}
-
 src_configure() {
+	MULTIBUILD_VARIANTS=(
+		$(usev gui)
+		$(usev webui nogui)
+	)
+
 	my_src_configure() {
 		local mycmakeargs=(
-			# musl lacks execinfo.h
-			-DSTACKTRACE=$(usex !elibc_musl)
-			# More verbose build logs are preferable for bug reports
-			-DVERBOSE_CONFIGURE=ON
-			-DWEBUI=$(usex webui)
+			-DVERBOSE_CONFIGURE=ON # for bug reports
+			-DSTACKTRACE=$(usex !elibc_musl) # musl lacks execinfo.h
 			-DTESTING=$(usex test)
+			-DWEBUI=$(usex webui)
 		)
 
+		# upstream supports building just gui or nogui
+		# so we build the project twice (see #839531 for details)
+		# Fedora does the same: https://src.fedoraproject.org/rpms/qbittorrent
 		if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then
-			# We do this in multibuild, see bug #839531 for why.
-			# Fedora has to do the same thing.
 			mycmakeargs+=(
 				-DGUI=ON
 				-DDBUS=$(usex dbus)
@@ -87,11 +83,7 @@ src_configure() {
 			mycmakeargs+=(
 				-DGUI=OFF
 				-DDBUS=OFF
-			)
-
-			use systemd && mycmakeargs+=(
-				# The systemd service calls qbittorrent-nox, which is only
-				# installed when GUI=OFF.
+				# The systemd service calls qbittorrent-nox, built only when GUI=OFF.
 				-DSYSTEMD=ON
 				-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
 			)
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index dfdb78a223641..a4af32da4fe53 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="GPL-2+-with-openssl-exception GPL-3+-with-openssl-exception"
 SLOT="0"
-IUSE="+dbus +gui systemd test webui"
+IUSE="+dbus +gui test webui"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	|| ( gui webui )
@@ -33,9 +33,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/openssl-3.0.2:=
-	>=net-libs/libtorrent-rasterbar-1.2.19:=
-	>=sys-libs/zlib-1.2.11
 	>=dev-qt/qtbase-6.5:6[network,ssl,sql,sqlite,xml]
+	>=net-libs/libtorrent-rasterbar-2.0.10:=
+	>=sys-libs/zlib-1.2.11
 	gui? (
 		>=dev-qt/qtbase-6.5:6[dbus?,gui,widgets]
 		>=dev-qt/qtsvg-6.5:6
@@ -56,28 +56,24 @@ BDEPEND+="
 
 DOCS=( AUTHORS Changelog {CONTRIBUTING,README}.md )
 
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use gui && MULTIBUILD_VARIANTS+=( gui )
-	use webui && MULTIBUILD_VARIANTS+=( nogui )
-
-	cmake_src_prepare
-}
-
 src_configure() {
+	MULTIBUILD_VARIANTS=(
+		$(usev gui)
+		$(usev webui nogui)
+	)
+
 	my_src_configure() {
 		local mycmakeargs=(
-			# musl lacks execinfo.h
-			-DSTACKTRACE=$(usex !elibc_musl)
-			# More verbose build logs are preferable for bug reports
-			-DVERBOSE_CONFIGURE=ON
-			-DWEBUI=$(usex webui)
+			-DVERBOSE_CONFIGURE=ON # for bug reports
+			-DSTACKTRACE=$(usex !elibc_musl) # musl lacks execinfo.h
 			-DTESTING=$(usex test)
+			-DWEBUI=$(usex webui)
 		)
 
+		# upstream supports building just gui or nogui
+		# so we build the project twice (see #839531 for details)
+		# Fedora does the same: https://src.fedoraproject.org/rpms/qbittorrent
 		if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then
-			# We do this in multibuild, see bug #839531 for why.
-			# Fedora has to do the same thing.
 			mycmakeargs+=(
 				-DGUI=ON
 				-DDBUS=$(usex dbus)
@@ -87,11 +83,7 @@ src_configure() {
 			mycmakeargs+=(
 				-DGUI=OFF
 				-DDBUS=OFF
-			)
-
-			use systemd && mycmakeargs+=(
-				# The systemd service calls qbittorrent-nox, which is only
-				# installed when GUI=OFF.
+				# The systemd service calls qbittorrent-nox, built only when GUI=OFF.
 				-DSYSTEMD=ON
 				-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
 			)
diff --git a/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild
index 2c1aa9581be09..4733ff57c9984 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-block/zram-init/zram-init-12.2.1.ebuild b/sys-block/zram-init/zram-init-12.2.1.ebuild
index e29c4fde055e6..e31f82338aa7a 100644
--- a/sys-block/zram-init/zram-init-12.2.1.ebuild
+++ b/sys-block/zram-init/zram-init-12.2.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
 else
 	SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"