gentoo auto-resync : 08:12:2024 - 02:07:28

14 files changed, 11 insertions, 545 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 151f7f89983b..9f081e40b098 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index cc72b6071b52..d132ef3c490a 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -9,19 +9,13 @@ AUX 7.4-008-always-disable-unused-CLI-arguments-warning-for-feature-probe.patch
 DIST bpftool-7.4.0.tar.gz 472915 BLAKE2B ae7b6bc6cb742712981ba8972bcecccc63d440b2a77c5a14f91ba5106c013774313d65fd3f42b843ba4027ab17cf9d44d256270f7f8ad11907714f16f3149078 SHA512 08a3095b37a9b897400f2be7dbb9de10d129ae4eef193d03955fdf84017cd3a5d7419e856aa68a425e609419868e8b1dd5409b4f218cc24feeb059c1898cdff4
 DIST bpftool-libbpf-v7.5.0-sources.tar.gz 1510032 BLAKE2B cc9beac4034317f89ae3c1088d1b1a1948778bcdb51d7ed7f566e4e5ab720c1128ca467d51d0bc3ffe7b1f69800249362baef5dfaf858275050f96b744fdbca6 SHA512 db12c305b77fea3689dbc1ce94527f0f21fa9de21fcdb36385e3fe492137335bb393f90e456c06601495ccc984230a531c432709db6514b545e0aeeda7ca3c99
 DIST libbpf-1.4.7.tar.gz 1016441 BLAKE2B 10be52c7e97b2f08edd33cb263c4737bb52edfd2226f0c5b86d4f95b584b81f8f6b1ede469e9ad6c231e55b6d6b9a038160662606c3f30dc79b1336aaaa90e74 SHA512 f09ff28ac75b0d0c1bfe7d233aee6a00e5c21f185646b2afe11b7bd048d74962f893237437dd81a762768f9235b9f2a2a33cb297201b2aa3e98f7c6f58e5b365
-DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
-DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea
 DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
 DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
-DIST patch-6.10.3.xz 252260 BLAKE2B 65acf62ff3e326d5ebb9f47067b626a25295fde2057531cf43e537601c42b0110419c0d6eee8c7c24e5d6d88ecf30e9b76d516efb925c91817504c52780b4df1 SHA512 28ad0de2086ca4b59637f8a7c69c6f5436b53235bf52c9ee18f428748c773780c54606a5c96d71614cadd49c707a8bb11843a7393da078e15d7f554244bfb9ca
-DIST patch-6.11.2.xz 229032 BLAKE2B 43393fdde341b4058ff75b1fb02174ce9cfdb03063de93f86cf3bb61e9faabb0cd4ba52bc2f6fae4898454d18379fb2da9743be6987eb4326fbadf459a695c46 SHA512 a75a5b8b08d3c4f90329d0c18c1b3f08d8eca81c07bfb1966a34a84b2743ebdcabda39d7189b7681ee6e60dbf4d2ac996d3f6bc13a14eb4fea3b4eca9b4ea56a
 DIST patch-6.8.2.xz 247244 BLAKE2B a85078230548543c38550a5546689d0b44a54208cdad591ab34e10dec9348ce2f74e45bf85f373b14977d40556067e2e2c17ac4b6791fbb8aaba98feccd3cdac SHA512 a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5
 DIST patch-6.9.2.xz 16184 BLAKE2B 8a37e96c253b55b57c86f1654f2ea8bf65af96b1b38213e90032cb918bb8eea992d6ddbfa6a6774a229ab2e2288ab57bdb6cbad6e7e393c123f24850e06847c9 SHA512 a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec
 EBUILD bpftool-6.8.2.ebuild 3101 BLAKE2B b032c5133f13d0a2f789a08fa054bd5d88cc729026974189d20b9d91f6295fdbad39056acc1223e78923b6201d91799c8cb833948135bccf25b84b4c25f00d5d SHA512 1efcf7572c1aa378394f38d2b939752aaf3215f92ffa227c493d0e3e9c8f945bcca82f759487386cd62e9c5996400395a944962f61af20fc62f8a206b57740d5
 EBUILD bpftool-6.9.2.ebuild 3125 BLAKE2B a8395a94a01d8fe758246cc158713ca30f928aa4051380f6fbb4a285f7a16a223db02b199b422242adca3df4032d79daa20b9420f3a4543aeefca128e41ddfad SHA512 3931abd489a3cbb7aaaf4ea8fd004a45c4a27c8a645fb7eb5088fab3186ebc59b61d58e4b0704dd1c264eee50a95288ad1824af0aff482da306c282465d3013b
 EBUILD bpftool-7.4.0.ebuild 3990 BLAKE2B 1c04497a5db8e30039f40be14e79ba7b475ca846e892fbda5e03fea5c5f66606b7d59ff7fcc453d50846bcb8ed436905bd1809c3c41d0637e69eeb98a176ed33 SHA512 2a48bbc95cfb04ec934d0e0d73ce21923bdec52061b4632c8a0c651ed28c5377b4beccf2509794fa78128ce320442186afbb9dc86e348c6fb96885954f019a7e
-EBUILD bpftool-7.5.0-r1.ebuild 3405 BLAKE2B 74da665bc8e3ddd5ea372590455345ea6e75348500eefe7117926d313d8d4c75579e31635b8b67761ffe1ad3284788dfd19f524709f2a951b1f9790a41ea3b1e SHA512 a228790899d82206d7378d24aaf02257b6fb540983ea83157eb7a0ef4c09d420c57257849830c8352df4a1f55f482fad9490813d8657e6b512bbe28b46958429
-EBUILD bpftool-7.5.0-r2.ebuild 3692 BLAKE2B 96f5e8a3d432141f2222e84bb7855e99dcfbec79dae69730fc59c43844dce96c0b062a0a5795148309f3da3fbe794c0ce4e58037a2d5d715708d60a4b16ad86f SHA512 e8238e2c69c00a0f398e31b22cb0433f424246725c3f5be779ba52abf0b838540cbf54c8b52ab545ce462d71294e11ec085a36ccc614efaab776a4a0c04d2421
 EBUILD bpftool-7.5.0.ebuild 3945 BLAKE2B 6870891e5cfaf22dfddf5620f1b7b622bb7941934660d58c29925bef697784ba32bcbd1ae8f77971077cbd93d882997bd5d462e387c513eac73b723d4bfb8712 SHA512 6ca7a8fe3ac636cce31c6ac0e85025c8ad4796fb1e280bcac7f07304b9e5c51bd134b3caf82a455c72a85312c56791112486b5466e496d44d4b7444a1ff1286b
 EBUILD bpftool-9999.ebuild 3945 BLAKE2B 6870891e5cfaf22dfddf5620f1b7b622bb7941934660d58c29925bef697784ba32bcbd1ae8f77971077cbd93d882997bd5d462e387c513eac73b723d4bfb8712 SHA512 6ca7a8fe3ac636cce31c6ac0e85025c8ad4796fb1e280bcac7f07304b9e5c51bd134b3caf82a455c72a85312c56791112486b5466e496d44d4b7444a1ff1286b
 MISC metadata.xml 856 BLAKE2B aa5413aa7645457d3d11552042225a3c4e6672c1dcb3dc24740228664b505ddf6deb37fc692fe1fe23d052a4222b92db4cc5d6930a2adbb036f3fc4f4143e74b SHA512 48418c805ae145ef025d5811342b503563121b8f44a97215a9f3f0eed7824bf54e5e5d1918a277826f60f23e74d6d07da70dd924a69cbd6c7f1505191c592010
diff --git a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
deleted file mode 100644
index 57daaf8bbca5..000000000000
--- a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-# Use LINUX_VERSION to specify the full kernel version triple (x.y.z)
-LINUX_VERSION=6.10.3
-LINUX_VER=$(ver_cut 1-2 ${LINUX_VERSION})
-LINUX_V="${LINUX_VERSION:0:1}.x"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LINUX_PATCH="patch-${LINUX_VERSION}.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="caps llvm"
-
-RDEPEND="
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-	llvm? ( sys-devel/llvm:= )
-	!llvm? ( sys-libs/binutils-libs:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	app-arch/tar
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		'arch/*/include/*' 'arch/*/lib/*' 'arch/*/tools/*' 'include/*'
-		'kernel/bpf/*' 'lib/*' 'scripts/*' 'tools/arch/*' 'tools/bpf/*'
-		'tools/build/*' 'tools/include/*' 'tools/lib/*' 'tools/perf/*'
-		'tools/scripts/*'
-	)
-
-	# We expect the tar implementation to support the -j and --wildcards option
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
-		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
-		eend $? || die "filterdiff failed"
-		test -s ${P}.patch || die "patch is empty?!"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	# Use rst2man or rst2man.py depending on which one exists (#930076)
-	type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-
-	# remove -Werror (bug 887981)
-	sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" \
-		prefix="${EPREFIX}"/usr \
-		bash_compdir="$(get_bashcompdir)" \
-		feature-libcap="$(usex caps 1 0)" \
-		feature-llvm="$(usex llvm 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/bpftool/bpftool-7.5.0-r2.ebuild b/dev-util/bpftool/bpftool-7.5.0-r2.ebuild
deleted file mode 100644
index 6e0b552e64f8..000000000000
--- a/dev-util/bpftool/bpftool-7.5.0-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 estack linux-info llvm-r1 optfeature python-any-r1 toolchain-funcs
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-# Use LINUX_VERSION to specify the full kernel version triple (x.y.z)
-LINUX_VERSION=6.11.2
-LINUX_VER=$(ver_cut 1-2 ${LINUX_VERSION})
-LINUX_V="${LINUX_VERSION:0:1}.x"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-if [[ ${LINUX_VERSION} == *.*.* ]] ; then
-	LINUX_PATCH="patch-${LINUX_VERSION}.xz"
-	SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-fi
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="caps llvm"
-
-RDEPEND="
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-	llvm? ( $(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}') )
-	!llvm? ( sys-libs/binutils-libs:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	app-arch/tar
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use llvm && llvm-r1_pkg_setup
-}
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		'arch/*/include/*' 'arch/*/lib/*' 'arch/*/tools/*' 'include/*'
-		'kernel/bpf/*' 'lib/*' 'scripts/*' 'tools/arch/*' 'tools/bpf/*'
-		'tools/build/*' 'tools/include/*' 'tools/lib/*' 'tools/perf/*'
-		'tools/scripts/*'
-	)
-
-	# We expect the tar implementation to support the -j and --wildcards option
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
-		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
-		eend $? || die "filterdiff failed"
-		test -s ${P}.patch || die "patch is empty?!"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	# Use rst2man or rst2man.py depending on which one exists (#930076)
-	type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-
-	# remove -Werror (bug 887981)
-	sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die
-
-	# fix up python shebangs (bug 940781)
-	python_fix_shebang "${S_K}"/scripts/bpf_doc.py
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" \
-		prefix="${EPREFIX}"/usr \
-		bash_compdir="$(get_bashcompdir)" \
-		feature-libcap="$(usex caps 1 0)" \
-		feature-llvm="$(usex llvm 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 398113f5a098..e95609b0e632 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,9 +1,7 @@
 DIST diffoscope-279.tar.bz2 3146297 BLAKE2B 7dc1c2a8362db6c012be04aa2562a04079707502d6f61e4ee0093fe46042ad122fe73d1faaf81e6b565d369ba3ec83f6056c4ef62a6fe4649ed376d0404b2864 SHA512 564e731847cbc68a6d8612f543d9d40575c4e9240acc7ec405310878c9288566a5c6dd4aa87e2517db5ef1abcc4ab6e29d3002ee5cce281200d9381de103243b
-DIST diffoscope-282.tar.bz2 3149915 BLAKE2B 32378adc17210054f5d8adb0e3396f16bbab214c83a138cc0b732085bdec3d0215e5329bcf8c9044e055556e3d04002253b52130590f1e7dc7cfaaefafcc9296 SHA512 5f049054b03940bb97a95cf60a1f7510ed3fbe1b14494f15edc872ecfc1f76a219f8255a4e7a574d9fecf47b75500c8f794c72bc508137e9051c451ba9bbb346
 DIST diffoscope-283.tar.bz2 3149385 BLAKE2B e50e4c31912c7bb0acaa3152c869937a9f4cbbcb0860775c58bbde13808ffcd0183032f7b444b2fb4d6cea83f943ac15f36a648a0f9fcbaaae5cfde098232d97 SHA512 e0c6ddd7b687b93dafdab81408d285b385efb3e2dd5c78c378943f03054e6ca59a18b6be7879023b54a571b18c5ada2722773626553761f245460abd239faef9
 DIST diffoscope-284.tar.bz2 3149578 BLAKE2B 4969e394a32d076101d59c0ca730d4e3515e1f3c60031705aed7c043ea031442829435e20de9723117ab73a08b6eef81d97eb8f92f225eb7d9c702bc0060c1ca SHA512 c3a6e02340873e71a4b75412848d9878f3e63c4db14f1ed128744feff2240d688336bcd83b121dcfa8c12e332cb00fdfe0ae347cd5a88e4ec29b3591263e3f65
 EBUILD diffoscope-279.ebuild 3937 BLAKE2B 871b83f282b260bd18d683aeea4675bbcb5cff7c2d38dbc68e4fd8eb270383eab67ca235d0b5b7beccfe4fa738937596399183cf9e374dc9120376f1667e72af SHA512 bb55ed1b7724538586c9dd7897f77d625c0df353f0f0b967994c4e826fcdc89b6f47586f0fef9a83d14acf8a3f2bbe22d86a6c96048d0d9b54f9a3197db4f095
-EBUILD diffoscope-282.ebuild 3938 BLAKE2B 6a930eb3db0cb8beb05c36e53dc8e271423171ed2ea645a759bfa126adc14f798ef78e4cf75602e43a2c3c71cd7d7b8f5b411415a525059e883066c560d18758 SHA512 e4223a0d547c80bfc7052aa5fafb62b103bc3f95472c4c6d5768067d5f32155d0e55cfc3702898603584c59d98bb921c5a6b48eadb0967798d907dbc588261c0
 EBUILD diffoscope-283.ebuild 3938 BLAKE2B 6a930eb3db0cb8beb05c36e53dc8e271423171ed2ea645a759bfa126adc14f798ef78e4cf75602e43a2c3c71cd7d7b8f5b411415a525059e883066c560d18758 SHA512 e4223a0d547c80bfc7052aa5fafb62b103bc3f95472c4c6d5768067d5f32155d0e55cfc3702898603584c59d98bb921c5a6b48eadb0967798d907dbc588261c0
 EBUILD diffoscope-284.ebuild 3938 BLAKE2B 6a930eb3db0cb8beb05c36e53dc8e271423171ed2ea645a759bfa126adc14f798ef78e4cf75602e43a2c3c71cd7d7b8f5b411415a525059e883066c560d18758 SHA512 e4223a0d547c80bfc7052aa5fafb62b103bc3f95472c4c6d5768067d5f32155d0e55cfc3702898603584c59d98bb921c5a6b48eadb0967798d907dbc588261c0
 MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d
diff --git a/dev-util/diffoscope/diffoscope-282.ebuild b/dev-util/diffoscope/diffoscope-282.ebuild
deleted file mode 100644
index f7fae2952726..000000000000
--- a/dev-util/diffoscope/diffoscope-282.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-# We could use pypi, but upstream provide distribution tarballs, so let's use those.
-# TODO: verify-sig
-SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/python-tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-alternatives/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/pypdf[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( virtual/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
-	test? (
-		app-arch/p7zip
-		app-text/docx2txt
-		app-text/html2text
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-
-	# Fails on (unreleased) LLVM 16 with minor difference
-	#tests/comparators/test_macho.py::test_llvm_diff
-	#tests/comparators/test_elf.py::test_libmix_differences
-)
-
-distutils_enable_tests pytest
-
-src_test() {
-	case $(tc-get-ptr-size) in
-		4)
-			EPYTEST_IGNORE+=(
-				# Needs fixing in Perl itself (bug #934443)
-				tests/comparators/test_epub.py
-				tests/comparators/test_zip.py
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils-r1_src_test
-}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 8933ea687d5c..c37a93954dfb 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -9,7 +9,7 @@ DIST jenkins-bin-2.479.war 95988810 BLAKE2B 830a544c502fd77289d870dcd9ce7bff2606
 DIST jenkins-bin-2.487.war 96349804 BLAKE2B ce2eaf2962e09bccdc29f7f018f7fab92e69580ac520604c9f42b43d080535ee0b93215cec20eda8e19bbd7c4a406619913554e6a436df30b1752172f74a08b1 SHA512 d6bb81200d2273b391b316119178f0ac042271bff680b1345e07a10f6ced3677923101081c02349700bff96a2dc4c70c9e60d6188c0904fec68053209003b31f
 EBUILD jenkins-bin-2.462.3.ebuild 1110 BLAKE2B 4795a7cc3d264a58203137db6ae1dce152443e10f4eaa82c6b7dc7bf97072780475f4dbcf4b4cc6a11ff7ef5fa1bda39f1e33df4611c74d0c3c9bb6f04953504 SHA512 1daa1584f3dabef20daf5af68be768967bdaefdbe19f9f58055b01bc532319164e07d149633f1e634cd51e199104e3e11a27e5d330996ec7fcee8c4b691c0ede
 EBUILD jenkins-bin-2.479.1.ebuild 1112 BLAKE2B ccccdd80bfdfaf2ca35aceae3e0e2e9adc4431e2a384208bd4154552e78aaf4d93deb7a43bd465d52b166f70168f30e49b4dead81e60d23a73c3583ae335bdc2 SHA512 cb26ff43f33a772e2a9627cacbd90a98af43158ac862d57dde6de3a6e9beb044afac3944944c99d578061efcc0bf37f5b09924356e969ff6eb9eb04c0772ffb3
-EBUILD jenkins-bin-2.479.2.ebuild 1112 BLAKE2B ccccdd80bfdfaf2ca35aceae3e0e2e9adc4431e2a384208bd4154552e78aaf4d93deb7a43bd465d52b166f70168f30e49b4dead81e60d23a73c3583ae335bdc2 SHA512 cb26ff43f33a772e2a9627cacbd90a98af43158ac862d57dde6de3a6e9beb044afac3944944c99d578061efcc0bf37f5b09924356e969ff6eb9eb04c0772ffb3
+EBUILD jenkins-bin-2.479.2.ebuild 1111 BLAKE2B 21b67eb284e96fa9fe373148f37b5f903153fb650cfeb5977eb48eae2a79afcc435220b53b13d5a45d318d443847651e7e67cef0bbf261f624e283e27fd94afd SHA512 b093078b41eeb05e67218ba7cd48cf5035426511ffb9612eff3c89e7eb1262e655509991c3cc1ed97dc43fd374a76ef97184d990deb84d1f15d9ecd592d4b93a
 EBUILD jenkins-bin-2.479.ebuild 1105 BLAKE2B 934685728f175c28dbaafaf1aa4378b32e47f4a078efa610560d9718b5eac4e316f101ffb316a9e83a831c1e23a37222bfa78cfe62b8c1b3826fd099eb9a3572 SHA512 c7226d78c5f8859751df4190d58dd11282c93cb299006491056e12618cc0d8dfe4ac5f959c1ca3ea4529c17c5ac5010960d8cb40a6f27365a50d55cdd795638e
 EBUILD jenkins-bin-2.487.ebuild 1105 BLAKE2B 934685728f175c28dbaafaf1aa4378b32e47f4a078efa610560d9718b5eac4e316f101ffb316a9e83a831c1e23a37222bfa78cfe62b8c1b3826fd099eb9a3572 SHA512 c7226d78c5f8859751df4190d58dd11282c93cb299006491056e12618cc0d8dfe4ac5f959c1ca3ea4529c17c5ac5010960d8cb40a6f27365a50d55cdd795638e
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.479.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.479.2.ebuild
index 52f625f58d2a..b7ec9e7cf1ed 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.479.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.479.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="lts"
 
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux"
 
 DEPEND="acct-group/jenkins
 	acct-user/jenkins"
diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest
index f230f4dbf6e4..cede95f4050f 100644
--- a/dev-util/pkgcruft/Manifest
+++ b/dev-util/pkgcruft/Manifest
@@ -1,10 +1,6 @@
-DIST pkgcruft-0.0.1.tar.xz 30144864 BLAKE2B af309ac7199640e1ee058ba9206c09ce7a054016f515d99763c40399ed8487807c908f5a5fbabc187ee88f2690cbdaa91c8b374732949b1e03334418140de65b SHA512 d02c91b7683f930eff99fa0cca01f7008c6a8808c25439a880928dc1a680f99a72f76a571bf3ec48f17a1ab337007679384993325b53a9efad1ff4ce59b382cd
-DIST pkgcruft-0.0.2.tar.xz 24861352 BLAKE2B d3e206d97c8e877727a8a659a0d59ee6a62f5a817b74143a2e68861e21023439f0b3dcf9f218da98cabe02c156949a1d1adf1a28ff3daff90da3b581458e42dc SHA512 9734413f2142b01c22ecb708ebc63109c0ce09d00e96ba4ce7d3e34e5e02699a1061bfb852e33654e834a7c403d575470b3e8715dc31184557be0b6f9f8bda1b
-DIST pkgcruft-0.0.3.tar.xz 24564836 BLAKE2B 6219898b0402e34f4d595cee26c2d659572009fb1367ede64885a98af523bac5cb1f82e49f809e82dc03a19363c135ac273ee237516505ff46b860968d88df58 SHA512 f593bd621c0caee469d89af12983e222ca5d191b0c64e3516eaa0ad6d6459a8cb89b75f5cdcfe7e44960c2518a3d3b69a7ba58f730d14f9d986e398ea16ba1a5
 DIST pkgcruft-0.0.4.tar.xz 24507420 BLAKE2B 89e127bd6f22686c4e0335817ed050bf3edcd8b0247a372531ab5daf020e526721d6e10080c8e1230026d87762e769535187d30a9ff86bbfe4c2f1865a322324 SHA512 464eef7c19313e97eac59367e286181c441e04a76deaa75f551b3866da5dcdb7bfa7703552143b6b32afee5beac85df72af48fe627f8a3838cb823f672f50d84
-EBUILD pkgcruft-0.0.1-r1.ebuild 1115 BLAKE2B 5167bcdd152a16f00343d798ffab1f8adc77be12c3bca000034f88be1397eed38caa772528ddf57c61fc8444867c3ccb216b20acd4c7bf645cc06937e60fc430 SHA512 dd0ff50cffe5121f4308c4a2074817999ef0f69a57d7d20725deed83f61800751eda49ecc548b86c0ccdebca7ec0dd3219b169b5849341ab71471e26957be48b
-EBUILD pkgcruft-0.0.2-r1.ebuild 1137 BLAKE2B c23b4cc154672507230d05b53eb112f2e48928f59d44d14777bbc7b175029391fb6113dc7d0e29e284c734a3bafbd6cc5105815f63de6f9b93f30f23483447b0 SHA512 25780993629d7d8a458768d2b01d3c068925ee658d7e5bc90763ecc27efe79c1a6de4994b9eaebc89af796a6db16cc9f14d18cc542ede2e8abfc015dfc1922b1
-EBUILD pkgcruft-0.0.3-r1.ebuild 1134 BLAKE2B aa64819880d1810ac4e101afff3b663ffa39c861a278cba839bf0ff601a27f53dd8ba460da7c1849b06b15a14126052aea13e31dc0136b5def8d6b737808611a SHA512 a733fac8f69e6740739aedc29b90964d8e6769995b1eb9bc50dc7b0c20df8f7a766f842ba76892bd50b2a4e9db3cd9eafeb1dfeda2cffacd260a28d39b6ed48e
+DIST pkgcruft-0.0.6.tar.xz 24528884 BLAKE2B 88b476920661076dbe70bd0ba0fd84d355dc77d579496702c43f8e55384ea6dce3fe305ef861ecc5c4bcd4e1046d8b672ce1ca0dbc83c7560191c1818761e63a SHA512 f978e1d398c00580990a8026ea6cec5d32825e2e0e831ea059462a3a808899b7a94064bcc91ee6901f55d1085641ccb96211603cac3a30e32a8567706f339fd1
 EBUILD pkgcruft-0.0.4.ebuild 1246 BLAKE2B cd7c672f5ba1bacee55cb5a989dc4093a94d4a7349ae7cfd038f6e0b1ed334be9ca8bb188269bdd93de386517490c1da394cc57c35026c973ab9320f5154e9d4 SHA512 4a4fcead2bd0a2b7bc0a93a410185cb8a2f70ed5ed48dfa2a4d3a6f88b32d5ea52300c902ef3b54d19572ae1757ea1a5bf61012987caa4f6043977a5cdd687ff
+EBUILD pkgcruft-0.0.6.ebuild 1246 BLAKE2B cd7c672f5ba1bacee55cb5a989dc4093a94d4a7349ae7cfd038f6e0b1ed334be9ca8bb188269bdd93de386517490c1da394cc57c35026c973ab9320f5154e9d4 SHA512 4a4fcead2bd0a2b7bc0a93a410185cb8a2f70ed5ed48dfa2a4d3a6f88b32d5ea52300c902ef3b54d19572ae1757ea1a5bf61012987caa4f6043977a5cdd687ff
 EBUILD pkgcruft-9999.ebuild 1246 BLAKE2B cd7c672f5ba1bacee55cb5a989dc4093a94d4a7349ae7cfd038f6e0b1ed334be9ca8bb188269bdd93de386517490c1da394cc57c35026c973ab9320f5154e9d4 SHA512 4a4fcead2bd0a2b7bc0a93a410185cb8a2f70ed5ed48dfa2a4d3a6f88b32d5ea52300c902ef3b54d19572ae1757ea1a5bf61012987caa4f6043977a5cdd687ff
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.1-r1.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.1-r1.ebuild
deleted file mode 100644
index c4eb2eda15b1..000000000000
--- a/dev-util/pkgcruft/pkgcruft-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=" "
-
-inherit cargo edo toolchain-funcs
-
-DESCRIPTION="QA library and tools based on pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/${PN}
-else
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
-"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	sys-devel/clang
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_FLAGS_IGNORED="usr/bin/pkgcruft"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	# For scallop building bash
-	tc-export AR CC
-
-	cargo_src_compile
-}
-
-src_test() {
-	edo ${CARGO} nextest run $(usev !debug '--release') --color always --all-features --tests
-}
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.2-r1.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.2-r1.ebuild
deleted file mode 100644
index 7863fdc15c04..000000000000
--- a/dev-util/pkgcruft/pkgcruft-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=" "
-RUST_MIN_VER="1.76.0"
-
-inherit cargo edo toolchain-funcs
-
-DESCRIPTION="QA library and tools based on pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/${PN}
-else
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
-"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	sys-devel/clang
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_FLAGS_IGNORED="usr/bin/pkgcruft"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	# For scallop building bash
-	tc-export AR CC
-
-	cargo_src_compile
-}
-
-src_test() {
-	edo ${CARGO} nextest run $(usev !debug '--release') --color always --all-features --tests
-}
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.3-r1.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
index 79a063178dbe..093d941ef7b2 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.3-r1.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 CRATES=" "
-RUST_MIN_VER="1.76.0"
+RUST_MIN_VER="1.80.0"
 
-inherit cargo edo toolchain-funcs
+inherit cargo edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -52,6 +52,9 @@ src_compile() {
 	# For scallop building bash
 	tc-export AR CC
 
+	# scallop uses modified bash-5.2 which relies on unprotoyped functions
+	append-cflags -std=gnu17
+
 	cargo_src_compile
 }
 
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index db619595f5cb..19603951bc91 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -17,6 +17,6 @@ EBUILD spirv-llvm-translator-17.0.4-r1.ebuild 1364 BLAKE2B 438956644de8f439172a8
 EBUILD spirv-llvm-translator-18.1.4.ebuild 1443 BLAKE2B 81a213c306d14277bd71b21e21ee806b957ea19a873f877275d1c81ec322e20c23e2d577418364a913dc1efe67e1002ed2c76cd16c52058f5223b8910af741a0 SHA512 cd588bc8eb05ab0bbcb54b0edce5cd53bc7b5e9da873897591017feb903cca6152abe78799fb21f257219fe737fa3eec01c6aba93751391c739d045aa5f55a3b
 EBUILD spirv-llvm-translator-18.1.6.ebuild 1446 BLAKE2B c6ba1d1876abc6d5eb5466aae1da25168fbc914283b88ef90a9d32fa05ab1d938f752e1fe643de6e932dc46b6a91203fbc79ae84f5489ccba689f0b81bfc63a4 SHA512 8da04df1a765300c894f0d3d7c75e7a78ffe6798ba7990f284501def153e6a8674103c7c587dc0ccded32eb17d8e25e2bf3aadb8620f7a3341dfd075c72ff854
 EBUILD spirv-llvm-translator-18.1.7.ebuild 1446 BLAKE2B c6ba1d1876abc6d5eb5466aae1da25168fbc914283b88ef90a9d32fa05ab1d938f752e1fe643de6e932dc46b6a91203fbc79ae84f5489ccba689f0b81bfc63a4 SHA512 8da04df1a765300c894f0d3d7c75e7a78ffe6798ba7990f284501def153e6a8674103c7c587dc0ccded32eb17d8e25e2bf3aadb8620f7a3341dfd075c72ff854
-EBUILD spirv-llvm-translator-19.1.1.ebuild 1446 BLAKE2B 529248c50bb68a7011a1ef47f5673d560cd89f3e8a36b3fc2ca8eead54a1b4208b7f312730a79d5032f449f64d55fe0b34332639afc4bbdd1045154f04a75c80 SHA512 91d302e70a233fff66a963a34bd875032844dca38069fbdf1fe6e6fcdd8b673a13cc13ae14e9b17bceab46a20792d89a16cdecd5f4b840d422da3b06e6ee6d7f
+EBUILD spirv-llvm-translator-19.1.1.ebuild 1445 BLAKE2B 283c979f2ce510d11de1b1bc99f0cf6c7dd3539c05f1c8badabb08e5d6c98106eadb697519c39c62a2ce0ace43b732448a412030df3888f5f961699ed512d04f SHA512 fb1a6852fb62439e0b775edad8dc58e77fb471c0d70c82a56b3d841ba18761757f845d4512b2ab840a993b318bb250de4ab89dd75a55c9a74bb335927a7110c1
 EBUILD spirv-llvm-translator-19.1.2.ebuild 1446 BLAKE2B 529248c50bb68a7011a1ef47f5673d560cd89f3e8a36b3fc2ca8eead54a1b4208b7f312730a79d5032f449f64d55fe0b34332639afc4bbdd1045154f04a75c80 SHA512 91d302e70a233fff66a963a34bd875032844dca38069fbdf1fe6e6fcdd8b673a13cc13ae14e9b17bceab46a20792d89a16cdecd5f4b840d422da3b06e6ee6d7f
 MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.1.ebuild
index 69a16f04bd1d..163bb244b19b 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"