Merge updates from master

24 files changed, 25 insertions, 25 deletions

diff --git a/app-admin/consul/consul-1.18.1.ebuild b/app-admin/consul/consul-1.18.1.ebuild
index b54c5f6b26e6..08991b0221e7 100644
--- a/app-admin/consul/consul-1.18.1.ebuild
+++ b/app-admin/consul/consul-1.18.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BUSL-1.1 MPL-2.0"
 LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
 RESTRICT="test"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND="dev-go/gox"
 COMMON_DEPEND="
diff --git a/app-admin/vault/vault-1.15.6.ebuild b/app-admin/vault/vault-1.15.6.ebuild
index 2a8f84f25ca1..0d3c950161cf 100644
--- a/app-admin/vault/vault-1.15.6.ebuild
+++ b/app-admin/vault/vault-1.15.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="+webui"
 
 BDEPEND="
diff --git a/app-arch/libarchive/libarchive-3.7.3.ebuild b/app-arch/libarchive/libarchive-3.7.3.ebuild
index 073f78ef0d2c..7c609d3a3f58 100644
--- a/app-arch/libarchive/libarchive-3.7.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-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"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
diff --git a/app-containers/conmon/conmon-2.1.10.ebuild b/app-containers/conmon/conmon-2.1.10.ebuild
index c41813b997a1..4d6bb39f0c18 100644
--- a/app-containers/conmon/conmon-2.1.10.ebuild
+++ b/app-containers/conmon/conmon-2.1.10.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/conmon.git"
 else
 	SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-image/containers-image-5.30.0.ebuild b/app-containers/containers-image/containers-image-5.30.0.ebuild
index 9d755c4cf4ad..55f43b3dd19e 100644
--- a/app-containers/containers-image/containers-image-5.30.0.ebuild
+++ b/app-containers/containers-image/containers-image-5.30.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-storage/containers-storage-1.53.0.ebuild b/app-containers/containers-storage/containers-storage-1.53.0.ebuild
index 7161e2aa1c52..fd439a2d4c23 100644
--- a/app-containers/containers-storage/containers-storage-1.53.0.ebuild
+++ b/app-containers/containers-storage/containers-storage-1.53.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/netavark/netavark-1.10.3.ebuild b/app-containers/netavark/netavark-1.10.3.ebuild
index a18be8dea54d..172ea539d2f4 100644
--- a/app-containers/netavark/netavark-1.10.3.ebuild
+++ b/app-containers/netavark/netavark-1.10.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/netavark.git"
 else
 	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/snapd/snapd-2.61.ebuild b/app-containers/snapd/snapd-2.61.ebuild
index 7bd5d8f6f6e3..3acdd26301ec 100644
--- a/app-containers/snapd/snapd-2.61.ebuild
+++ b/app-containers/snapd/snapd-2.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="http://snapcraft.io/"
 
 SRC_URI="https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz -> ${P}.tar.xz"
 MY_PV=${PV}
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
diff --git a/app-misc/mc/mc-4.8.30-r2.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild
index 7970a6b0d148..3c52e9a0e0ba 100644
--- a/app-misc/mc/mc-4.8.30-r2.ebuild
+++ b/app-misc/mc/mc-4.8.30-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
diff --git a/dev-db/etcd/etcd-3.5.12.ebuild b/dev-db/etcd/etcd-3.5.12.ebuild
index 926be7cb76f3..e61a29b82bd5 100644
--- a/dev-db/etcd/etcd-3.5.12.ebuild
+++ b/dev-db/etcd/etcd-3.5.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
+KEYWORDS="amd64 ~loong ~riscv"
 IUSE="doc +server"
 
 COMMON_DEPEND="server? (
diff --git a/dev-debug/gdb/gdb-14.2.ebuild b/dev-debug/gdb/gdb-14.2.ebuild
index 2a82d9e78706..7f31a2c3d39a 100644
--- a/dev-debug/gdb/gdb-14.2.ebuild
+++ b/dev-debug/gdb/gdb-14.2.ebuild
@@ -74,7 +74,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="cet debuginfod guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r4.ebuild b/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r4.ebuild
index b95271f62c77..73e66310e5a3 100644
--- a/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r4.ebuild
+++ b/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r4.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Raw IP packets manipulation Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
 
 RDEPEND="net-libs/libpcap"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/aiohttp/aiohttp-3.9.5.ebuild b/dev-python/aiohttp/aiohttp-3.9.5.ebuild
index 66766e3f32bb..028d600247e0 100644
--- a/dev-python/aiohttp/aiohttp-3.9.5.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.9.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 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"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index 0ff6f3bbb94f..b23eeacddd90 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/ostree/ostree-2024.3.ebuild b/dev-util/ostree/ostree-2024.3.ebuild
index afe1ebc5584e..096a4912c6f8 100644
--- a/dev-util/ostree/ostree-2024.3.ebuild
+++ b/dev-util/ostree/ostree-2024.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="
diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild
index 5f7c2066c802..4f7b98fedf5f 100644
--- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.6.2.ebuild
@@ -181,7 +181,7 @@ LICENSE="GPL-2+
 	rust? (
 		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/net-dns/coredns/coredns-1.11.2-r1.ebuild b/net-dns/coredns/coredns-1.11.2-r1.ebuild
index 745049a5ed09..93642e616de2 100644
--- a/net-dns/coredns/coredns-1.11.2-r1.ebuild
+++ b/net-dns/coredns/coredns-1.11.2-r1.ebuild
@@ -16,7 +16,7 @@ else
 	# The v1.11.2 tag went missing upstream, so use a previously fetched copy.
 	SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 # main
diff --git a/net-misc/curl/curl-8.7.1-r3.ebuild b/net-misc/curl/curl-8.7.1-r3.ebuild
index 9b0fa3517f54..a1df53206714 100644
--- a/net-misc/curl/curl-8.7.1-r3.ebuild
+++ b/net-misc/curl/curl-8.7.1-r3.ebuild
@@ -17,7 +17,7 @@ else
 		https://curl.se/download/${P}.tar.xz
 		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
 	"
-	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"
 fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
diff --git a/net-misc/netifrc/netifrc-0.7.8.ebuild b/net-misc/netifrc/netifrc-0.7.8.ebuild
index 40e121512a2c..5357dd17292d 100644
--- a/net-misc/netifrc/netifrc-0.7.8.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="BSD-2 GPL-2"
diff --git a/sys-apps/sysvinit/sysvinit-3.09.ebuild b/sys-apps/sysvinit/sysvinit-3.09.ebuild
index 8dd06efe15bd..ab07a5f84ca9 100644
--- a/sys-apps/sysvinit/sysvinit-3.09.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.09.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_*}"
 LICENSE="GPL-2"
 SLOT="0"
 if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 IUSE="selinux ibm nls static"
 
diff --git a/sys-apps/yarn/yarn-1.22.22.ebuild b/sys-apps/yarn/yarn-1.22.22.ebuild
index 02435ca2eafe..8fa304727616 100644
--- a/sys-apps/yarn/yarn-1.22.22.ebuild
+++ b/sys-apps/yarn/yarn-1.22.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="!dev-util/cmdtest
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
index f5ede1ae6ee4..54c468c0fd7a 100644
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> $
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 
 DEPEND="sys-fs/fuse:3"
 RDEPEND="${DEPEND}"
diff --git a/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild b/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild
index 06032ce23c15..b3cf5fcd0bf4 100644
--- a/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild
+++ b/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild
@@ -152,7 +152,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-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"
 IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/caddy/caddy-2.7.6-r2.ebuild b/www-servers/caddy/caddy-2.7.6-r2.ebuild
index 00c08cad4d9f..a6e09dd0ba77 100644
--- a/www-servers/caddy/caddy-2.7.6-r2.ebuild
+++ b/www-servers/caddy/caddy-2.7.6-r2.ebuild
@@ -17,7 +17,7 @@ else
 		https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz
 		https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz
 "
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 ~arm64 ~loong ~riscv"
 fi
 
 # MAIN