Merge updates from master

28 files changed, 29 insertions, 29 deletions

diff --git a/app-misc/fastfetch/fastfetch-2.14.0.ebuild b/app-misc/fastfetch/fastfetch-2.14.0.ebuild
index c3888b1ec46e..cc4ad4e0d110 100644
--- a/app-misc/fastfetch/fastfetch-2.14.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.14.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT nvidia-gpu? ( NVIDIA-NVLM )"
diff --git a/dev-python/autopep8/autopep8-2.2.0.ebuild b/dev-python/autopep8/autopep8-2.2.0.ebuild
index 814d492a2374..73d52b9a7621 100644
--- a/dev-python/autopep8/autopep8-2.2.0.ebuild
+++ b/dev-python/autopep8/autopep8-2.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pycodestyle-2.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bandit/bandit-1.7.9.ebuild b/dev-python/bandit/bandit-1.7.9.ebuild
index 608a06da92cc..27c35a502ccb 100644
--- a/dev-python/bandit/bandit-1.7.9.ebuild
+++ b/dev-python/bandit/bandit-1.7.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bitstring/bitstring-4.2.3.ebuild b/dev-python/bitstring/bitstring-4.2.3.ebuild
index 97dbbc65dd53..e46f6fbc091a 100644
--- a/dev-python/bitstring/bitstring-4.2.3.ebuild
+++ b/dev-python/bitstring/bitstring-4.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/bitarray-3[${PYTHON_USEDEP}]
diff --git a/dev-python/gfloat/gfloat-0.3.ebuild b/dev-python/gfloat/gfloat-0.3.ebuild
index 56f083094ba8..c9033464d655 100644
--- a/dev-python/gfloat/gfloat-0.3.ebuild
+++ b/dev-python/gfloat/gfloat-0.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/irc/irc-20.4.1.ebuild b/dev-python/irc/irc-20.4.1.ebuild
index 400bc95df40c..b24c5740eeaa 100644
--- a/dev-python/irc/irc-20.4.1.ebuild
+++ b/dev-python/irc/irc-20.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/isort/isort-5.13.2.ebuild b/dev-python/isort/isort-5.13.2.ebuild
index f17443c55098..51f0b4b4c9d3 100644
--- a/dev-python/isort/isort-5.13.2.ebuild
+++ b/dev-python/isort/isort-5.13.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ml-dtypes/ml-dtypes-0.4.0.ebuild b/dev-python/ml-dtypes/ml-dtypes-0.4.0.ebuild
index 15e33fafcb33..6f7b13bbe97c 100644
--- a/dev-python/ml-dtypes/ml-dtypes-0.4.0.ebuild
+++ b/dev-python/ml-dtypes/ml-dtypes-0.4.0.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND="
 	dev-python/numpy:=[${PYTHON_USEDEP}]
diff --git a/dev-python/more-itertools/more-itertools-10.3.0.ebuild b/dev-python/more-itertools/more-itertools-10.3.0.ebuild
index 2190b92689f0..36b8551dc13b 100644
--- a/dev-python/more-itertools/more-itertools-10.3.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-10.3.0.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 ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/packaging/packaging-24.1.ebuild b/dev-python/packaging/packaging-24.1.ebuild
index a6e85ecec9d1..cf4d60443386 100644
--- a/dev-python/packaging/packaging-24.1.ebuild
+++ b/dev-python/packaging/packaging-24.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/setuptools-67
diff --git a/dev-python/pillow/pillow-10.3.0.ebuild b/dev-python/pillow/pillow-10.3.0.ebuild
index cb13d5f02390..c1d84827dc09 100644
--- a/dev-python/pillow/pillow-10.3.0.ebuild
+++ b/dev-python/pillow/pillow-10.3.0.ebuild
@@ -82,8 +82,8 @@ python_configure_all() {
 		[build_ext]
 		debug = True
 		disable_platform_guessing = True
-		vendor_raqm = False
-		vendor_fribidi = False
+		$(usex truetype "vendor_raqm = False" "") # BUG 935124
+		$(usex truetype "vendor_fribidi = False" "") # ditto
 		$(usepil truetype)_freetype = True
 		$(usepil jpeg)_jpeg = True
 		$(usepil jpeg2k)_jpeg2000 = True
diff --git a/dev-python/pydantic/pydantic-2.7.4.ebuild b/dev-python/pydantic/pydantic-2.7.4.ebuild
index 218f72127865..bc7a01e837fd 100644
--- a/dev-python/pydantic/pydantic-2.7.4.ebuild
+++ b/dev-python/pydantic/pydantic-2.7.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pygobject/pygobject-3.46.0-r1.ebuild b/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
index 9a8e8d1e54b4..d59a73b1027e 100644
--- a/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
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 b9908512857e..2f5192a8b9d9 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/pyscard/pyscard-2.0.10.ebuild b/dev-python/pyscard/pyscard-2.0.10.ebuild
index 2efc6e371faa..1f96c83efad6 100644
--- a/dev-python/pyscard/pyscard-2.0.10.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.10.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	sys-apps/pcsc-lite
diff --git a/dev-python/pyspnego/pyspnego-0.11.0.ebuild b/dev-python/pyspnego/pyspnego-0.11.0.ebuild
index d4c182cc408c..a5e53956766c 100644
--- a/dev-python/pyspnego/pyspnego-0.11.0.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-box/python-box-7.2.0.ebuild b/dev-python/python-box/python-box-7.2.0.ebuild
index 2fc0ece6b850..5ac6f4364422 100644
--- a/dev-python/python-box/python-box-7.2.0.ebuild
+++ b/dev-python/python-box/python-box-7.2.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild b/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild
index 8337c5513f42..5341abab0579 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 d6633a79d195..87ead56b5edc 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/requests-kerberos/requests-kerberos-0.15.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.15.0.ebuild
index be95e387254b..ccc0c64945de 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.15.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.15.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.3.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.3.0.ebuild
index 67b5cdcb1cba..9968200c6ee3 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.3.0.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-2024.6.0.ebuild b/dev-python/xarray/xarray-2024.6.0.ebuild
index 94e04ad80a78..98af8b931662 100644
--- a/dev-python/xarray/xarray-2024.6.0.ebuild
+++ b/dev-python/xarray/xarray-2024.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="big-endian"
 
 RDEPEND="
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild
index 1ac7d65ad79e..89e572ed45b3 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/www-servers/pshs/pshs-0.4.3.ebuild b/www-servers/pshs/pshs-0.4.3.ebuild
index 8fbc89f3a612..7eff5a6ba2cc 100644
--- a/www-servers/pshs/pshs-0.4.3.ebuild
+++ b/www-servers/pshs/pshs-0.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+magic qrcode ssl upnp"
 
 DEPEND="
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 3ee6b6ab3346..c03e4a7a84f0 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-session/xfce4-session-4.18.4.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.4.ebuild
index e77114fbad86..35c05e6b57a6 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.18.4.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-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 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls policykit +xscreensaver"
 
 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 56983c14a30b..98aae658cfb3 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}
 
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.6.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.6.ebuild
index 19d8ace1378b..09e312ead419 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.6.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="X wayland"
 REQUIRED_USE="|| ( X wayland )"