Merge updates from master

12 files changed, 20 insertions, 23 deletions

diff --git a/app-alternatives/ninja/ninja-1.ebuild b/app-alternatives/ninja/ninja-1.ebuild
index bcb516b5373f..419eabab3505 100644
--- a/app-alternatives/ninja/ninja-1.ebuild
+++ b/app-alternatives/ninja/ninja-1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="ninja symlinks"
-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-util/ninja-1.11.1-r3"
 
diff --git a/dev-util/ninja/ninja-1.11.1-r3.ebuild b/dev-util/ninja/ninja-1.11.1-r3.ebuild
index c4874b6be066..0ce6217aa881 100644
--- a/dev-util/ninja/ninja-1.11.1-r3.ebuild
+++ b/dev-util/ninja/ninja-1.11.1-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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
 
 DESCRIPTION="A small build system similar to make"
diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass
index 859938cb3047..8b42c5849522 100644
--- a/eclass/ninja-utils.eclass
+++ b/eclass/ninja-utils.eclass
@@ -55,17 +55,7 @@ _NINJA_UTILS_ECLASS=1
 
 inherit multiprocessing
 
-case "${NINJA}" in
-	ninja)
-		NINJA_DEPEND=">=dev-util/ninja-1.8.2"
-	;;
-	samu)
-		NINJA_DEPEND="dev-util/samurai"
-	;;
-	*)
-		NINJA_DEPEND=""
-	;;
-esac
+NINJA_DEPEND="app-alternatives/ninja"
 
 # @FUNCTION: get_NINJAOPTS
 # @DESCRIPTION:
@@ -84,7 +74,14 @@ get_NINJAOPTS() {
 # by the supplied arguments.  This function dies if ninja fails.  It
 # also supports being called via 'nonfatal'.
 eninja() {
-	[[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}"
+	case "${NINJA}" in
+		ninja|samu)
+			;;
+		*)
+			ewarn "Unknown value '${NINJA}' for \${NINJA}"
+			;;
+	esac
+
 	local v
 	case "${NINJA_VERBOSE}" in
 		OFF) ;;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
index 8ae904f0cb83..f5de31f4424a 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-libs/roc-toolkit/roc-toolkit-0.2.6.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.2.6.ebuild
index f154ee0346a5..f2fd8112d8fa 100644
--- a/media-libs/roc-toolkit/roc-toolkit-0.2.6.ebuild
+++ b/media-libs/roc-toolkit/roc-toolkit-0.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/roc-streaming/roc-toolkit/archive/refs/tags/v${PV}.t
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa llvm-libunwind pulseaudio sox ssl tools test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/vnstat/vnstat-2.11.ebuild b/net-analyzer/vnstat/vnstat-2.11.ebuild
index 00e0e0031488..a5e513112c08 100644
--- a/net-analyzer/vnstat/vnstat-2.11.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.11.ebuild
@@ -24,7 +24,7 @@ else
 		)
 	"
 
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv sparc ~x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
 fi
diff --git a/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.ebuild b/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.ebuild
index 983d36fca412..5143761f8651 100644
--- a/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.ebuild
+++ b/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-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"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sec-keys/openpgp-keys-pv/openpgp-keys-pv-20230926.ebuild b/sec-keys/openpgp-keys-pv/openpgp-keys-pv-20230926.ebuild
index dccec9409ed1..a8b56381cc45 100644
--- a/sec-keys/openpgp-keys-pv/openpgp-keys-pv-20230926.ebuild
+++ b/sec-keys/openpgp-keys-pv/openpgp-keys-pv-20230926.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-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"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/pv/pv-1.8.0.ebuild b/sys-apps/pv/pv-1.8.0.ebuild
index ca01ea55e00a..47594e780d85 100644
--- a/sys-apps/pv/pv-1.8.0.ebuild
+++ b/sys-apps/pv/pv-1.8.0.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-fs/static-dev/static-dev-0.1-r3.ebuild b/sys-fs/static-dev/static-dev-0.1-r3.ebuild
index 0be25176d6fc..701b98dc6e8a 100644
--- a/sys-fs/static-dev/static-dev-0.1-r3.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://bugs.gentoo.org/107875"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IDEPEND="sys-apps/makedev"
 
diff --git a/sys-process/parallel/parallel-20230922.ebuild b/sys-process/parallel/parallel-20230922.ebuild
index 3350230117f2..39c2146ac7b3 100644
--- a/sys-process/parallel/parallel-20230922.ebuild
+++ b/sys-process/parallel/parallel-20230922.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/www-servers/lighttpd/lighttpd-1.4.72.ebuild b/www-servers/lighttpd/lighttpd-1.4.72.ebuild
index 05f1cb6ef18c..e1296f01eab4 100644
--- a/www-servers/lighttpd/lighttpd-1.4.72.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.72.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 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"
 IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite test unwind webdav xattr +zlib zstd"
 RESTRICT="!test? ( test )"