diff --git a/app-arch/libdeflate/libdeflate-1.23.ebuild b/app-arch/libdeflate/libdeflate-1.23.ebuild
index afa79c48ed7de..c836fc20f6935 100644
--- a/app-arch/libdeflate/libdeflate-1.23.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.23.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
 else
 	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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"
 fi
 
 LICENSE="MIT"
diff --git a/app-arch/snappy/snappy-1.2.1.ebuild b/app-arch/snappy/snappy-1.2.1.ebuild
index e3024ec065d19..28f5fe3ea2ae7 100644
--- a/app-arch/snappy/snappy-1.2.1.ebuild
+++ b/app-arch/snappy/snappy-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # ABI may be broken without a new SONAME. Please use abidiff on bumps.
 SLOT="0/1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-47.2.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-47.2.ebuild
index 756f5e6001caa..b6bb5356a4d3e 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-47.2.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-47.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/gnome-text-editor-${PV/_/.}"
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
 
 IUSE="+editorconfig spell"
 
diff --git a/app-text/libspelling/libspelling-0.4.6.ebuild b/app-text/libspelling/libspelling-0.4.6.ebuild
index c297188cb6a9d..cffb61169585e 100644
--- a/app-text/libspelling/libspelling-0.4.6.ebuild
+++ b/app-text/libspelling/libspelling-0.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gtk-doc sysprof vala"
 
 RDEPEND="
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
index cb780cd9e37c9..5f35a98762e5f 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild
index 7cc25001376aa..6e31354568cc0 100644
--- a/dev-cpp/glog/glog-0.6.0.ebuild
+++ b/dev-cpp/glog/glog-0.6.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/tcl/tcl-8.6.15.ebuild b/dev-lang/tcl/tcl-8.6.15.ebuild
index f9caee6586a6c..737e31343388f 100644
--- a/dev-lang/tcl/tcl-8.6.15.ebuild
+++ b/dev-lang/tcl/tcl-8.6.15.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk Spencer-99"
 SLOT="0/8.6"
-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"
+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"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tk/tk-8.6.15.ebuild b/dev-lang/tk/tk-8.6.15.ebuild
index 63b4f20a99a94..87d39b9548c68 100644
--- a/dev-lang/tk/tk-8.6.15.ebuild
+++ b/dev-lang/tk/tk-8.6.15.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-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="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild
index c878ac17bed85..627008fb260e3 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static-libs"
 
 BDEPEND="
diff --git a/dev-libs/re2/re2-2024.07.02.ebuild b/dev-libs/re2/re2-2024.07.02.ebuild
index 766cb2a878e24..b158ce3ded3a0 100644
--- a/dev-libs/re2/re2-2024.07.02.ebuild
+++ b/dev-libs/re2/re2-2024.07.02.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD"
 # NOTE: Follow SONAME variable in CMakeLists.txt
 SONAME="11"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="icu test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/stb/stb-20240201-r1.ebuild b/dev-libs/stb/stb-20240201-r1.ebuild
index 90235023a14ad..375166ee6ad4b 100644
--- a/dev-libs/stb/stb-20240201-r1.ebuild
+++ b/dev-libs/stb/stb-20240201-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${CHECKSUM}"
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86"
 
 src_prepare() {
 	default
diff --git a/dev-tcltk/bwidget/bwidget-1.9.16.ebuild b/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
index 6caad553f4fa5..6e034548e6827 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/tcllib/BWidget/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/itcl/itcl-4.3.1.ebuild b/dev-tcltk/itcl/itcl-4.3.1.ebuild
index f0d0f1757e79e..c5a7326957c30 100644
--- a/dev-tcltk/itcl/itcl-4.3.1.ebuild
+++ b/dev-tcltk/itcl/itcl-4.3.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=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MYP}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-tcltk/itk/itk-4.1.0-r1.ebuild b/dev-tcltk/itk/itk-4.1.0-r1.ebuild
index 3e2de8fd5e82e..472a6d0cfc1b7 100644
--- a/dev-tcltk/itk/itk-4.1.0-r1.ebuild
+++ b/dev-tcltk/itk/itk-4.1.0-r1.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=8
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/tcl3d/tcl3d-0.9.5.ebuild b/dev-tcltk/tcl3d/tcl3d-0.9.5.ebuild
index fad7e583aa735..2356b5a3826e4 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.9.5.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tcl3d.org/download/distributions/${P}.7z"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="sdl truetype"
 
 RDEPEND="dev-lang/tcl:0=
diff --git a/dev-tcltk/tclx/tclx-8.6.3.ebuild b/dev-tcltk/tclx/tclx-8.6.3.ebuild
index 0edf1d83ba8c5..07f5353e5bc7b 100644
--- a/dev-tcltk/tclx/tclx-8.6.3.ebuild
+++ b/dev-tcltk/tclx/tclx-8.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="threads"
 
 DEPEND="dev-lang/tcl:0="
diff --git a/dev-tcltk/thread/thread-2.8.9.ebuild b/dev-tcltk/thread/thread-2.8.9.ebuild
index 0a0394b80c61e..41927c665fe0f 100644
--- a/dev-tcltk/thread/thread-2.8.9.ebuild
+++ b/dev-tcltk/thread/thread-2.8.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 S="${WORKDIR}"/${PN}-${MY_P}
 LICENSE="BSD"
 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"
 
 DEPEND="dev-lang/tcl:0=[threads]"
 RDEPEND="${DEPEND}"
diff --git a/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild b/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild
index 91f0d8e0487ed..c27a433b6fc46 100644
--- a/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild
+++ b/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/petasis/tkdnd/archive/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug threads X"
 
 DEPEND="
diff --git a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
index 8083519e00a41..3f428bc5c03f0 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="
diff --git a/dev-util/sysprof-capture/sysprof-capture-47.2.ebuild b/dev-util/sysprof-capture/sysprof-capture-47.2.ebuild
index 637c5a06f3cee..24b308d6b635e 100644
--- a/dev-util/sysprof-capture/sysprof-capture-47.2.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-47.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-util/tkdiff/tkdiff-5.7.ebuild b/dev-util/tkdiff/tkdiff-5.7.ebuild
index fc95e2027f338..4917d30b19cfc 100644
--- a/dev-util/tkdiff/tkdiff-5.7.ebuild
+++ b/dev-util/tkdiff/tkdiff-5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-lang/tk"
 DEPEND="${RDEPEND}"
diff --git a/mail-mta/postfix/postfix-3.10.1.ebuild b/mail-mta/postfix/postfix-3.10.1.ebuild
index fd2e1b939c4cd..ae2c98660ed6f 100644
--- a/mail-mta/postfix/postfix-3.10.1.ebuild
+++ b/mail-mta/postfix/postfix-3.10.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_SRC}"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86"
 
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"
 
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
index 715a8f6278049..3aec135731241 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P2}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/media-libs/lerc/lerc-4.0.0.ebuild b/media-libs/lerc/lerc-4.0.0.ebuild
index ef2452ea1f3e1..50fd28c5f8741 100644
--- a/media-libs/lerc/lerc-4.0.0.ebuild
+++ b/media-libs/lerc/lerc-4.0.0.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/Esri/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0/4"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
diff --git a/media-libs/libxmp/libxmp-4.6.1.ebuild b/media-libs/libxmp/libxmp-4.6.1.ebuild
index 8cef43b4ee398..e2584860a9b19 100644
--- a/media-libs/libxmp/libxmp-4.6.1.ebuild
+++ b/media-libs/libxmp/libxmp-4.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libxmp/libxmp/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="MIT 0BSD public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 src_prepare() {
 	default
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild
index a3820c07baadb..ee85a6bf615ad 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86"
 IUSE="flac fluidsynth gme midi mod modplug mp3 opus playtools stb timidity tremor vorbis +wav wavpack xmp"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/tiff/tiff-4.7.0-r1.ebuild b/media-libs/tiff/tiff-4.7.0-r1.ebuild
index ea991edf37716..9abfb2d4146c6 100644
--- a/media-libs/tiff/tiff-4.7.0-r1.ebuild
+++ b/media-libs/tiff/tiff-4.7.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0/6"
 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"
+	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
 IUSE="+cxx jbig jpeg lerc libdeflate lzma opengl static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild b/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
index 2a2398e9247c3..ed45b3277e41e 100644
--- a/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="sound"
 
diff --git a/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild b/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild
index dd7fb4434d51e..d1df3b52a2eca 100644
--- a/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild
+++ b/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://github.com/sys4/${PN}/releases/download/v${PV/_/-}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-libs/nghttp2/nghttp2-1.65.0-r1.ebuild b/net-libs/nghttp2/nghttp2-1.65.0-r1.ebuild
index 9f6a317734dc5..0313be0701d48 100644
--- a/net-libs/nghttp2/nghttp2-1.65.0-r1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.65.0-r1.ebuild
@@ -17,7 +17,7 @@ else
 	inherit autotools
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild b/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild
index 175e47477ab49..7ef62f198116c 100644
--- a/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-misc/gensio/gensio-2.8.5.ebuild b/net-misc/gensio/gensio-2.8.5.ebuild
index 4c99bbb19dcb3..64ebec972f257 100644
--- a/net-misc/gensio/gensio-2.8.5.ebuild
+++ b/net-misc/gensio/gensio-2.8.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug tcpd"
 
 DEPEND="
diff --git a/net-misc/ser2net/ser2net-4.6.2.ebuild b/net-misc/ser2net/ser2net-4.6.2.ebuild
index fe4b25abfbdd2..f2bd6b8d6cdab 100644
--- a/net-misc/ser2net/ser2net-4.6.2.ebuild
+++ b/net-misc/ser2net/ser2net-4.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="pam"
 
 DEPEND="
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 05de59a9c1cca..64833bbc47737 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1 +1,2 @@
 DIST nvme-cli-2.11.gh.tar.gz 1023249 BLAKE2B c60765aaf8343adb29b2b042223accdd1ac4b132eaab77eec777c7aaf8f135d03b227ca915ef49ef9c67bec1dc89d43b782c38683c0d5e8fde8c997d17bd7347 SHA512 33de20ad990a3b87fef46fa486832edde41907223aa6b8a47606e605b360745fd7e2054226bf93a59b2a09c6bc04d0b684e4b3bb27c3fc0e6110c64a558cadc0
+DIST nvme-cli-2.12.gh.tar.gz 1079884 BLAKE2B ad08ce7c477cebdbb68efd707de851e9b7187cc6bd4ce4980f9a6f33a02c65d0ae6702e4f38f135db22acadf10bc26b87064ac2c9e09c820837c47ca32b0f093 SHA512 569a60302e4ce71713906417f34a8922b4788d77220a01f2f11dd12fc787ac6590c00588353cbbba292640688995fcefee4ab28c274bedcc02a2e3439c258938
diff --git a/sys-apps/nvme-cli/nvme-cli-2.12.ebuild b/sys-apps/nvme-cli/nvme-cli-2.12.ebuild
new file mode 100644
index 0000000000000..60930cb40a584
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-2.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd udev
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+json pdc"
+
+RDEPEND="
+	>=sys-libs/libnvme-1.12:=[json?]
+	json? ( dev-libs/json-c:= )
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dversion-tag="${PV}"
+		-Ddocs=all
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dsystemddir="$(systemd_get_systemunitdir)"
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		$(meson_feature json json-c)
+		$(meson_use pdc pdc-enabled)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index 59fd69b7f85cf..d7e7b12c1b256 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -1 +1,2 @@
 DIST libnvme-1.11.1.gh.tar.gz 740327 BLAKE2B eb9a731ce4886e7a76170d4be916e850548710dbbc135bbe94c5ff0c2f3da5e2cb162a6c8ea857d6b9b609ffafba34487cd3419fc4981e9e549419c2bb757568 SHA512 8720f2907a3d13af44fb3deec883cd6eb247d5861c4459b5fe0e67ff9ecfb565462a5faf39d43e08b5284f3e8ca8e72d41b333984beaa45d3287b1a258f3e59d
+DIST libnvme-1.12.gh.tar.gz 775030 BLAKE2B b6c9da012c39ec0b5ce671f498fd55b904ea9f0c34f8358eed166e08f9ef12c760707aa693a0123267cfb256812650f0afb5d017f4c8a940b61e18f9998d8b9e SHA512 6681f476c36d077d1481336ca66327cfed9b910e75309334a1eb1fa8ccfba7982d96c7b3ae5d587f306923247a716c5d70f4b71c26716e6be6020b470f9c1077
diff --git a/sys-libs/libnvme/libnvme-1.12.ebuild b/sys-libs/libnvme/libnvme-1.12.ebuild
new file mode 100644
index 0000000000000..ca09ee7616889
--- /dev/null
+++ b/sys-libs/libnvme/libnvme-1.12.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
+inherit python-r1 meson
+
+DESCRIPTION="C Library for NVM Express on Linux"
+HOMEPAGE="https://github.com/linux-nvme/libnvme"
+SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="dbus +json keyutils python ssl test uring"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	json? ( dev-libs/json-c:= )
+	keyutils? ( sys-apps/keyutils:= )
+	dbus? ( sys-apps/dbus:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( >=dev-libs/openssl-1.1:= )
+	uring? ( sys-libs/liburing:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dpython=disabled
+		$(meson_use test tests)
+		$(meson_feature json json-c)
+		$(meson_feature dbus libdbus)
+		$(meson_feature keyutils)
+		$(meson_feature ssl openssl)
+		$(meson_feature uring liburing)
+	)
+	meson_src_configure
+}
+
+python_compile() {
+	local emesonargs=(
+		-Dpython=enabled
+	)
+	meson_src_configure --reconfigure
+	meson_src_compile
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl python_compile
+	fi
+}
+
+python_install() {
+	meson_src_install
+	use python && python_optimize
+}
+
+src_install() {
+	use python && python_foreach_impl python_install
+
+	meson_src_install
+}
diff --git a/sys-libs/libnvme/metadata.xml b/sys-libs/libnvme/metadata.xml
index b8882391c6fcd..5b2185449d58e 100644
--- a/sys-libs/libnvme/metadata.xml
+++ b/sys-libs/libnvme/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
 		<flag name="keyutils">Add support for <pkg>sys-apps/keyutils</pkg></flag>
 		<flag name="uuid">UUID support via <pkg>sys-apps/util-linux</pkg></flag>
+		<flag name="uring">uring support via <pkg>sys-libs/liburing</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">linux-nvme/libnvme</remote-id>
diff --git a/xfce-base/thunar-volman/thunar-volman-4.20.0.ebuild b/xfce-base/thunar-volman/thunar-volman-4.20.0.ebuild
index affdb74c68347..0b0bc12614fc3 100644
--- a/xfce-base/thunar-volman/thunar-volman-4.20.0.ebuild
+++ b/xfce-base/thunar-volman/thunar-volman-4.20.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 # CC for tvm-burn-cd.svg
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="libnotify"
 
 DEPEND="
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.20.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.20.3.ebuild
index 8385b25c2eeac..1eb54ba4de7f9 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.20.3.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.20.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+dbusmenu introspection vala wayland X"
 REQUIRED_USE="
 	|| ( wayland X )
diff --git a/xfce-base/xfwm4/xfwm4-4.20.0.ebuild b/xfce-base/xfwm4/xfwm4-4.20.0.ebuild
index 9e9bfd0e105d4..03cc366a672ed 100644
--- a/xfce-base/xfwm4/xfwm4-4.20.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.4.0.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.4.0.ebuild
index 1132b5281ddc0..ceaf9167080db 100644
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.4.0.ebuild
+++ b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.4.0.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=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/equeim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.11.2.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.11.2.ebuild
index 18c31604b6c8e..e845ae8ca7e47 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.11.2.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.11.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0:2
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.5.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.5.ebuild
index df05a33a24849..82a57d17a9f69 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.5.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
 REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"