Merge updates from master

20 files changed, 20 insertions, 20 deletions

diff --git a/app-admin/awscli/awscli-1.33.9.ebuild b/app-admin/awscli/awscli-1.33.9.ebuild
index a7a293c4a8e8..1da3fc6b9535 100644
--- a/app-admin/awscli/awscli-1.33.9.ebuild
+++ b/app-admin/awscli/awscli-1.33.9.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y+1).(z+118), sigh
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
diff --git a/dev-python/anyio/anyio-4.4.0-r1.ebuild b/dev-python/anyio/anyio-4.4.0-r1.ebuild
index 089ffcd3b09d..726491ba836b 100644
--- a/dev-python/anyio/anyio-4.4.0-r1.ebuild
+++ b/dev-python/anyio/anyio-4.4.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.34.127.ebuild b/dev-python/boto3/boto3-1.34.127.ebuild
index 2c733040b7a3..51f4c7f3ec96 100644
--- a/dev-python/boto3/boto3-1.34.127.ebuild
+++ b/dev-python/boto3/boto3-1.34.127.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.34.127.ebuild b/dev-python/botocore/botocore-1.34.127.ebuild
index ba6cd2a5d2a2..7a44b043295f 100644
--- a/dev-python/botocore/botocore-1.34.127.ebuild
+++ b/dev-python/botocore/botocore-1.34.127.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/cherrypy-18.10.0.ebuild b/dev-python/cherrypy/cherrypy-18.10.0.ebuild
index fcbfeb62a8d3..ec908dcc10b1 100644
--- a/dev-python/cherrypy/cherrypy-18.10.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.10.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="ssl test"
 
 RDEPEND="
diff --git a/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild b/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild
index b32639b244df..633d2c32567a 100644
--- a/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.2.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.2.ebuild
index 70f94aa414ed..81ef015903dd 100644
--- a/dev-python/jupyterlab/jupyterlab-4.2.2.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.2.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
diff --git a/dev-python/pkginfo/pkginfo-1.11.1.ebuild b/dev-python/pkginfo/pkginfo-1.11.1.ebuild
index 29862ec41210..75b1a4b17110 100644
--- a/dev-python/pkginfo/pkginfo-1.11.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyalsa/pyalsa-1.2.12.ebuild b/dev-python/pyalsa/pyalsa-1.2.12.ebuild
index 203633b7130f..2680511dbd48 100644
--- a/dev-python/pyalsa/pyalsa-1.2.12.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.2.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
 # Needs access to system's alsa configuration/devices
 RESTRICT="test"
 
diff --git a/dev-python/pycxx/pycxx-7.1.8-r1.ebuild b/dev-python/pycxx/pycxx-7.1.8-r1.ebuild
index 264fd7c3eba8..8a1dfcbf2d59 100644
--- a/dev-python/pycxx/pycxx-7.1.8-r1.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.4.ebuild b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.4.ebuild
index 165231b06fe2..b9908512857e 100644
--- a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.4.ebuild
+++ b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.4.ebuild
@@ -143,7 +143,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild b/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild
index 9be8de2241fe..8337c5513f42 100644
--- a/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.9.3-r1.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.9.3-r1.ebuild
index 4ed337475616..d6633a79d195 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.9.3-r1.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.9.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/redis/redis-5.0.6.ebuild b/dev-python/redis/redis-5.0.6.ebuild
index 13bcaada0bb4..615ccc4a50d9 100644
--- a/dev-python/redis/redis-5.0.6.ebuild
+++ b/dev-python/redis/redis-5.0.6.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/responses/responses-0.25.3.ebuild b/dev-python/responses/responses-0.25.3.ebuild
index dc9cf6c58d72..89f223f9c153 100644
--- a/dev-python/responses/responses-0.25.3.ebuild
+++ b/dev-python/responses/responses-0.25.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # tomli backend is optional now, with pyyaml being the new default.
 # However, keeping it unconditional here for backwards compatibility.
diff --git a/dev-python/testtools/testtools-2.7.2.ebuild b/dev-python/testtools/testtools-2.7.2.ebuild
index ff9231e8d803..f9c9a6886024 100644
--- a/dev-python/testtools/testtools-2.7.2.ebuild
+++ b/dev-python/testtools/testtools-2.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wurlitzer/wurlitzer-3.1.1.ebuild b/dev-python/wurlitzer/wurlitzer-3.1.1.ebuild
index 78272e742f37..b7a3878b9be6 100644
--- a/dev-python/wurlitzer/wurlitzer-3.1.1.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-3.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild
index b1a4ad6d75f4..1ac7d65ad79e 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/18"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 BDEPEND="
 	kernel_linux? ( sys-apps/lsb-release )
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.4.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.4.ebuild
index 657e51a279b1..3ee6b6ab3346 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.4.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.6.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.6.ebuild
index bca7a8b05d91..56983c14a30b 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.6.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.18.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}