gentoo auto-resync : 22:10:2023 - 14:44:09

18 files changed, 52 insertions, 219 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fe75edf1a8d6..ca4b60a0a5a5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 747cecbbfd2e..e97fbe2b586d 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -18,6 +18,6 @@ EBUILD coreutils-8.32-r1.ebuild 5971 BLAKE2B df0b4420c70792707eac0b612bc8436ce46
 EBUILD coreutils-9.1-r2.ebuild 7117 BLAKE2B 5db5bc551fc63dfdb56044f31ab7e96d240075c2dbb6e062064922d9e31d8de12f87ce713067e06b91963365e7d7809150558dd6626ceb2da1a0708f64b1f770 SHA512 e3269b4dca6f1468f77aaafd0561833dc11a019463b05709f6485548610fd4040ae274258415b56d4e42d86ef3ad4914d4aced8d8a50c6002b6e95ea1f12e6a3
 EBUILD coreutils-9.3-r2.ebuild 7793 BLAKE2B be5554b0d39de8ebce7918295ae8eba0a8132e0e86cb9ab48664671133198d9b3d68d0c6f9865c2e6865b4cb1e4d931cc79239ba216cddd0d06ee3483f600c1a SHA512 0d582fff70ab30368e363eaf41569fe02b7180e734d88ff4d1345cb0889cc37720c0edc3cc3a7caf685e0aef4b42c208c2c8c12eccd4100999383867d3408993
 EBUILD coreutils-9.3-r3.ebuild 7930 BLAKE2B 8e8c83734bab7265d14fac68375e37a2ee8f5c24179487a38c6d25bd65e8fb0dce0182a94c59a1650b19a48bac5dee13e9fba99baa746650874df368f8717b59 SHA512 044d48420ce3efb2ade8c3dbb699b69434cc82e8983fc67bf7c93ab292a1f6b86d68f3bb64098b4fe129d081e159a1915317f8661a83e5f2a5b58b6ef968be8e
-EBUILD coreutils-9.4.ebuild 7875 BLAKE2B 4bd3ab9febde69444b7fdab8eecc5db1e0fb1038842f1f1c4e7adfc138e584b3b2ee95202e657cb17a1e41e6bf13dfe769875d695b1063ee1ee5823a46ac2bac SHA512 9b6c4a1ff5d3b03f88e2acc31582bbc97672847673dc794b88146ee819b5c180646eebc8aace17ffa3b98c957b5e04cf2a9d8d16c978805718c52dfb80d91c06
+EBUILD coreutils-9.4.ebuild 7874 BLAKE2B cbb6a476e148b0d7e00aebb2b7d207d33870bb0e9dc26a0f7625f08eb100f50ad37af8a872b697672e6fc8f918638604e8ccc722f28624d630837b76c133a32f SHA512 5c6ca672fda4d314a5151b8f9ee7bc3ad238bc9bb097d34d723127e287f91ed2415856af53d7016350b015dd388d313a7146effd269c4b02a43523e009799a9d
 EBUILD coreutils-9999.ebuild 7829 BLAKE2B e6d50cb5a297b2d01b08c308bd22542b283c75cff8e5a8132c4adfd428f98da84c3163a1dc45fbfc56696d17b119b50c9ec5ef67926abae53c437a4beedc2ed4 SHA512 53bd35ef8328510f494b559e806f794e1aabfaad0c6aed0d3791eb05bc975ae9617248ed2b26fbc4c15c408aa7df6a350d5eef962357f0fbd1d67a4c36c7c778
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.4.ebuild b/sys-apps/coreutils/coreutils-9.4.ebuild
index 65deec47eb27..13cd9c708011 100644
--- a/sys-apps/coreutils/coreutils-9.4.ebuild
+++ b/sys-apps/coreutils/coreutils-9.4.ebuild
@@ -33,7 +33,7 @@ else
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 0465798e600b..b55192c93e6a 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -12,5 +12,5 @@ EBUILD ethtool-6.1.ebuild 641 BLAKE2B 30923d70692c4b580e03c17347f104d4b99ee23ebd
 EBUILD ethtool-6.2.ebuild 597 BLAKE2B 9c69f88683d78a567bff9953e758a8fd8a94582d6763cd104432a025137b7f2691a195c82e97d4499ff9194e3e7245f06ce62bff21e946d6b1f946eba394440d SHA512 a2f7a0224e8d6d7b3a2d3a7ab002cdfe7f5c40ce005f07460ecb445aea02f46979ecee1a05e4ff8ab6f0ca2e01e2135f6cd9654fe9f4ee9a9ba207711ce2d178
 EBUILD ethtool-6.3.ebuild 597 BLAKE2B 9c69f88683d78a567bff9953e758a8fd8a94582d6763cd104432a025137b7f2691a195c82e97d4499ff9194e3e7245f06ce62bff21e946d6b1f946eba394440d SHA512 a2f7a0224e8d6d7b3a2d3a7ab002cdfe7f5c40ce005f07460ecb445aea02f46979ecee1a05e4ff8ab6f0ca2e01e2135f6cd9654fe9f4ee9a9ba207711ce2d178
 EBUILD ethtool-6.4.ebuild 597 BLAKE2B 9c69f88683d78a567bff9953e758a8fd8a94582d6763cd104432a025137b7f2691a195c82e97d4499ff9194e3e7245f06ce62bff21e946d6b1f946eba394440d SHA512 a2f7a0224e8d6d7b3a2d3a7ab002cdfe7f5c40ce005f07460ecb445aea02f46979ecee1a05e4ff8ab6f0ca2e01e2135f6cd9654fe9f4ee9a9ba207711ce2d178
-EBUILD ethtool-6.5.ebuild 605 BLAKE2B 5f3dc535aca5067e234b9a3893c6101f78fc9998351a958be068f8aa16a1bcc5d46df9459f061c801a49a79af7390e3a86281dc5f5c130ad8a9c1d9fb44fe9f3 SHA512 40e6f1d78d664fd8f5b0e15269018ae6973dcb8447cef86a49dd0a78c5d5e5eee1d73005141d49082c5735576197d21bc7bd10241d2359050b1d2d056416223f
+EBUILD ethtool-6.5.ebuild 599 BLAKE2B cfd56d5b017e43bb4b011ab345f320eca71f2ebf2fb0a84709ef4e33bee0b1a191e3a9c64488101f23d90ce410346937636fa751b110654071ae2e0b9aee4765 SHA512 31948ca8ca389937a70bd5dcda2458e2a193722884ebab2650f2172656e8b53d41eddba5cb0820bd5eb12640ed2279142186fe605345d846d58577ef75bd4e8c
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-6.5.ebuild b/sys-apps/ethtool/ethtool-6.5.ebuild
index a7eff7664c78..e3678dd17425 100644
--- a/sys-apps/ethtool/ethtool-6.5.ebuild
+++ b/sys-apps/ethtool/ethtool-6.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="+netlink"
 
 RDEPEND="netlink? ( net-libs/libmnl )"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index cc900fd578b7..40b6a1f4e9ac 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,11 +1,10 @@
 AUX fwupd-1.8.13-installed_tests.patch 11799 BLAKE2B 7d1b5e18f27a95aabda2421a9ba2ff98ae68f74fc82b103d199fe57905fbe40d21d88c60f2a0708bd575f6ce013abda848c9d0830f2489fb88ff1810926505db SHA512 3edd59a52310a454a86470feb9b17f627def0362947788c65743e0cbbc4670b94a227080caddc1e7808fc9b63f5e045d4a0638b63ae1ff850f70db9e3b748910
 AUX fwupd-1.9.4-fragile_tests.patch 1571 BLAKE2B b051c32ac4decb4f7eab52b532fe866382ebf203fa47a6a24cd6069a8c231da6a9cc42306a877511a3521f28f52fef4b65cead85bc89118019629f0cebd0d736 SHA512 b80f490ee00e4528adcabfb556a39fbcd581911ad3fa29d416a98b149d955f0cbe8b68089d9f47f569fee76e5f6eb75e05aaebe4d3f5670f2a0f3ef6d172c93a
 AUX fwupd-1.9.5-parallel_build.patch 432 BLAKE2B 584949820b5c6e6840b48fe7ed6128ddf0ea43d9871148d8c68db0f154a7dcec62f77745fe4dd9f4e5472eac57aa6f77e5f2d7738ed215093c1bb819f4beb56b SHA512 13888a32a9af7e5aec26fbe51305b571783a952732a34c2ddcc1c38417664936fb4e6bb85df6fe99f73118b4a5e819e451ee0851e632015d7e852e2afe320607
+AUX fwupd-1.9.6-fragile_tests.patch 1051 BLAKE2B 01ae6cae17b911d055eb820a041329e4347eb26533e372a540f08d6a7ab521118550e97c0ae3762d2532a9131a3ecdcfd719f6c1af6fb4c674688ee170c92581 SHA512 f1f22997477589f5a1fe18c7cca56309a365ff472aee0eaeaa1831a24b878d7301519f46e0b36e70fe5c0729b792fbeaa4430eee43c0169bcdbef8d1171bc107
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
-DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
 DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
-DIST fwupd-1.9.5.tar.xz 3847088 BLAKE2B 0926f97a79d7795f3bd8ea71841a072b8f725800d9b33eaf6fc54c62e67f53e41faa5558979a53b0e83094d8dfd3b3263bc462380498c00484e29500ca6baf8c SHA512 19c152746d4d44f00c5bf3ed36b97249cb0a8fdedab351706a7d4e761fb142d096351555392b535ce976cb9e925505246542525a90319a2560f753a675ff26cf
-EBUILD fwupd-1.8.15.ebuild 4808 BLAKE2B 451d5c21d9fabb66ef4d383af5bb102daa8d443af15f265ed81e4ab9469a13d20b09df6f46bb6d35029402823238be6fe297d41b788bdaf53187b488786791e8 SHA512 4df4dca82cc6e8f923792b651b0f006957af03809a0566674e3f61489e5cff3ecd4ff5c462450fd3c285aea2bacef5597882963113846f2160e4870e5d0d476d
+DIST fwupd-1.9.6.tar.xz 3863452 BLAKE2B 8b54efef5947dc4766a24b8501100f7e24707944b5c9aae3c3fcd88dfce230667507af8816203b0ececa0510485661f5f599c1cdc2285df72683ede4b7a6d15c SHA512 c65d795268e0e36fd2572ce3d4f2fb811412c16d583fa5463bee017a70b5d0f8b1b92460efa977a7d70bb5e3f6b5b02756e795e5f8ab7e7ac7874dc1ab5a0bfb
 EBUILD fwupd-1.9.3.ebuild 5011 BLAKE2B 05c0fba2e7da70aef0c2e1adedf1727a458caf1c0b9094ce0a7f83f8a270b196432addbe7ae812cebc04ed3634c958cb8c5aed525173c370ad795543fe0423d1 SHA512 f7f251b020c0624c1fac209bc7e63334a75c006967295b5fcf91d132e5736bd23dc5bd32ce1127b5ef5d2afa21c80e71afa5e4abf53a64cc8a9ddfe05f6c4076
-EBUILD fwupd-1.9.5.ebuild 5328 BLAKE2B 06e2425753e2004e00a889f5e0fec94eca8431a4a0a57e23adec3180e99763ecae9eee91d081f5d77ef0c9db125b91806f91cde26118432b4863440eedb1784e SHA512 aa7b08b8dd093019834ea7a92922a444307da7131b137bdcee033c8c5e6839c31bf3885a9e568cc59d5c1753377426ff1bc6442406e47b589b2cdcb000d70476
-MISC metadata.xml 1440 BLAKE2B 8900d2afff6f02cc6dde9be36b2dea521ff1df70ef8ace49344b3df153782212547144cab9ceb13a3bcb8a3aaa2278378cee806ebf653ee3f23c3180ea731892 SHA512 8c94dfd783a353e724a6b5f54f556e37c02ef6913e49d76aa6aa0ead9c56297e6c284592774738f8b6950270693b91fd987491c434ac01c1c53053c1bf950343
+EBUILD fwupd-1.9.6.ebuild 5306 BLAKE2B b2df9606b7c594a2706c9fe7ee6bb02db30fb7f68ad006b3f020ac9ac5947454225424beae14ef233100fbdcb77928a64c33a58e8ebd069879799d1cc6a89114 SHA512 77baf0b7bd81ad2c2d4cd1d80e495e9ae10238626dcf75d30ef0b1b61ef7993c6b0cb6fe774e1edc0a9ac3dcbfd680bdeaac49343ca1a6c9a7d473770397a48e
+MISC metadata.xml 1522 BLAKE2B 61d725acff9a4079ef8d5056190eda100d2f2712f387f8d9141c66b37fc64be8df509c3fafb50e0e52b84515633b2bd6e40a1c471a12ef0b3aafa535d0526f52 SHA512 e668b0796899d8d6a83717d769bfc16438fd7ffbf52445d34df370cc3f3aefba21a7edabac22f709a4b70feeeef1bdcb1518cd01ab00c43b10578b1cbd163a42
diff --git a/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch b/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch
new file mode 100644
index 000000000000..cc40dc7c9e01
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch
@@ -0,0 +1,28 @@
+umockdev-based tests appear not to play nicely with the sandbox,
+often they work but on some systems they persistently fail.
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -457,6 +457,11 @@
+   value: true,
+   description: 'enable tests',
+ )
++option('test-full',
++  type: 'boolean',
++  value: false,
++  description: 'enable tests known to be fragile when called from Gentoo ebuilds'
++)
+ option('curl',
+   type: 'feature',
+   description: 'libcurl support',
+--- a/plugins/thunderbolt/meson.build
++++ b/plugins/thunderbolt/meson.build
+@@ -19,7 +19,7 @@
+ plugin_builtins += plugin_builtin_thunderbolt
+ 
+ # we use functions from 2.52 in the tests
+-if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
++if get_option('tests') and get_option('test-full') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
+   env = environment()
+   env.set('G_TEST_SRCDIR', meson.current_source_dir())
+   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
diff --git a/sys-apps/fwupd/fwupd-1.8.15.ebuild b/sys-apps/fwupd/fwupd-1.8.15.ebuild
deleted file mode 100644
index c4692391da4b..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.15.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	fastboot? ( gusb )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	modemmanager? ( gusb )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	test? ( archive gusb )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-	gtk-doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-		')
-		>=dev-util/gi-docgen-2021.1
-	)
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	test? (
-		dev-util/umockdev
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=dev-libs/glib-2.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	net-misc/curl
-	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
-	dell? (
-		>=app-crypt/tpm2-tss-2.0
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.114 )
-	sqlite? ( dev-db/sqlite )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss:= )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
-)
-
-src_prepare() {
-	default
-
-	vala_setup
-
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-
-	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
-		-i docs/meson.build || die
-
-	python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
-	local plugins=(
-		-Dplugin_gpio="enabled"
-		$(meson_feature amt plugin_intel_me)
-		$(meson_feature dell plugin_dell)
-		$(meson_feature fastboot plugin_fastboot)
-		$(meson_feature flashrom plugin_flashrom)
-		$(meson_feature gusb plugin_uf2)
-		$(meson_feature logitech plugin_logitech_bulkcontroller)
-		$(meson_feature modemmanager plugin_modem_manager)
-		$(meson_feature nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_feature synaptics plugin_synaptics_mst)
-		$(meson_feature synaptics plugin_synaptics_rmi)
-		$(meson_feature tpm plugin_tpm)
-		$(meson_feature uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_feature uefi plugin_uefi_pk)
-	)
-	if use ppc64 || use riscv ; then
-		plugins+=( -Dplugin_msr="disabled" )
-	fi
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="disabled"
-		-Dcurl="enabled"
-		-Defi_binary="false"
-		-Dman="true"
-		-Dsupported_build="enabled"
-		-Dudevdir="${EPREFIX}$(get_udevdir)"
-		$(meson_feature archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_feature bluetooth bluez)
-		$(meson_feature cbor)
-		$(meson_feature elogind)
-		$(meson_feature gnutls)
-		$(meson_feature gtk-doc docs)
-		$(meson_feature gusb)
-		$(meson_feature lzma)
-		$(meson_feature introspection)
-		$(meson_feature policykit polkit)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_test() {
-	LC_ALL="C" meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use minimal || udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use minimal || udev_reload
-}
diff --git a/sys-apps/fwupd/fwupd-1.9.5.ebuild b/sys-apps/fwupd/fwupd-1.9.6.ebuild
index b21f1294049f..09477afb6ce6 100644
--- a/sys-apps/fwupd/fwupd-1.9.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.6.ebuild
@@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
-	dell? ( uefi )
 	fastboot? ( gusb )
 	logitech? ( gusb )
 	minimal? ( !introspection )
@@ -31,6 +30,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 BDEPEND="$(vala_depend)
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')
 	>=dev-util/meson-0.60.0
 	virtual/pkgconfig
 	gtk-doc? (
@@ -60,10 +62,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=net-misc/curl-7.62.0
 	archive? ( app-arch/libarchive:= )
 	cbor? ( >=dev-libs/libcbor-0.7.0:= )
-	dell? (
-		>=app-crypt/tpm2-tss-2.0
-		>=sys-libs/libsmbios-2.4.0
-	)
 	elogind? ( >=sys-auth/elogind-211 )
 	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
 	gnutls? ( >=net-libs/gnutls-3.6.0 )
@@ -90,11 +88,11 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	x11-libs/pango[introspection]
+	amdgpu? ( sys-kernel/linux-headers )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.4-fragile_tests.patch
-	"${FILESDIR}"/${PN}-1.9.5-parallel_build.patch
+	"${FILESDIR}"/${PN}-1.9.6-fragile_tests.patch
 )
 
 pkg_pretend() {
@@ -121,8 +119,8 @@ src_prepare() {
 src_configure() {
 	local plugins=(
 		-Dplugin_gpio="enabled"
+		$(meson_feature amdgpu plugin_amdgpu)
 		$(meson_feature amt plugin_intel_me)
-		$(meson_feature dell plugin_dell)
 		$(meson_feature fastboot plugin_fastboot)
 		$(meson_feature flashrom plugin_flashrom)
 		$(meson_feature gusb plugin_uf2)
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 8568986b263b..e4d8831cb829 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
+		<flag name="amdgpu">Build and install AMD dGPU (Navi3x and above) plugin</flag>
 		<flag name="amt">Build and install Intel AMT plugin</flag>
 		<flag name="cbor">Enable CBOR support for coSWID and uSWID via <pkg>dev-libs/libcbor</pkg></flag>
 		<flag name="dell">Enable Dell-specific support</flag>
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index e27f80c170d0..543e75d657f2 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -3,7 +3,7 @@ AUX hdparm-9.65-graceful-lfs.patch 420 BLAKE2B 1caf2a127eeab439554b2cef9c03dbb3c
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.65.tar.gz 140425 BLAKE2B 79b1c16e7807f82a992ed7f22faef57045c56da4a281fbd8db3b8846b193ccc4b42329fa6abbebf8b652fbefb13aa0f18dfa726e802e8e1a45c94f414fb303b9 SHA512 4ffc8902b90cee10d68af8ddb9f3b9454d523ecd49cdaaed254b4d7a999462a8ad5ec1bb5d7684b09fefa41b5941ab533b167dad290003b51c795a633ca88913
-EBUILD hdparm-9.65-r1.ebuild 1009 BLAKE2B d4fdee8b1dbdcd3a40d317b1738e6ff18e6387db5f9c783a707a08fb669a0afde773caa544c8ae3796d6bbc280e6e46e1a1e74f5a68c7d0f72cb2da389860d8d SHA512 c5069dd8d20238342292049ba4ccacfe0e0f97fc05021e350b8cd3306f4b254828de17a479a5379daaabb416735e8a4e35af629f114e1a84fa2dab105e7fcdcc
+EBUILD hdparm-9.65-r1.ebuild 1003 BLAKE2B 888bc62d40eafade1a123bbd7a52ccd8375f9a051ab32107c526b19ce253525b7370a5e48a3361c5fb94d77f5243f53d2d3b4aaaa0886be89e8fbc262ebc7deb SHA512 bc9c1cbe0a4fce832e287e1607d5bcc51ecb4daa7fea43d77af8486f8a080848505ac9a00854f177737ef4440084cc4ecee7c288148541c59828625bc1e91185
 EBUILD hdparm-9.65-r2.ebuild 1087 BLAKE2B afed20b2ae25b64f5d12d2a97111966defbff2421b77961ceea27d4e09b4bd3353411210dc626e93a0a3780634b4fd1054b71ad97877eb440312db7ecc97fbbc SHA512 b39becda9990717d5a73e78b93102272b64b61c68fc857a134a0285f7aac8cd78b1517dfe75987c06ab4a3311cfd18738aeb81781016b8cc398f2015fdb16de5
 EBUILD hdparm-9.65.ebuild 996 BLAKE2B 1c2a9a8af1caa482459c00b63ab37551e712bb576dc3003abdf282cf27d2234fac5a1eab1a974b501b126f920aaacf23d95f05a7e0c3a3bad80230d30b87dd85 SHA512 6bbd130af03a8460186f3e2be15e4a60cfb3ecfe64acc913eb0a8720591c0831029bb9255798d65c70dbb7d4f0779632074051eacf8864419da22b5b298ab3dc
 MISC metadata.xml 334 BLAKE2B 4401fa870e66675b64077c7dc271c1775a3b7148a4c720ac670222d0f61ce634507725e77e5ef2b9efb6d363ca23dc2a884645ab630ffccc8e737b7139e23d47 SHA512 a71c8c705afd12b3609542d13b18697e9c4626c0c41006ccbdacd248c1c621b0fa93a522561494120c0be181d091fc27e466a25af3be25b4f3b4cc14ec5e652a
diff --git a/sys-apps/hdparm/hdparm-9.65-r1.ebuild b/sys-apps/hdparm/hdparm-9.65-r1.ebuild
index 7e814b104e2e..b3abd9a8067c 100644
--- a/sys-apps/hdparm/hdparm-9.65-r1.ebuild
+++ b/sys-apps/hdparm/hdparm-9.65-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 # GPL-2 only
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index d1883565f54e..119ab522d207 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -6,6 +6,6 @@ DIST hwdata-0.375.tar.gz 2367434 BLAKE2B 9fe350d9ba0c38d1b765cb38d3e6f3a969c0d98
 EBUILD hwdata-0.371.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.372.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.373.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
-EBUILD hwdata-0.374.ebuild 702 BLAKE2B 8734f2398aa66f05a6f68ace57d21a1cb515babef49888824257eb354da537d84f396c38a216ec071b6caa5b38a841c4049e3108d2ffd99cdfbc3bff8c64c045 SHA512 6dffe93d4582d6bd7c50d0a57bc6d067693c897dbd33c1ffc75b514065b64fad66d805d26f69d6af927813920b9ad5072f5a6eda118cb0942d66ec78c1a76088
+EBUILD hwdata-0.374.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.375.ebuild 702 BLAKE2B 8734f2398aa66f05a6f68ace57d21a1cb515babef49888824257eb354da537d84f396c38a216ec071b6caa5b38a841c4049e3108d2ffd99cdfbc3bff8c64c045 SHA512 6dffe93d4582d6bd7c50d0a57bc6d067693c897dbd33c1ffc75b514065b64fad66d805d26f69d6af927813920b9ad5072f5a6eda118cb0942d66ec78c1a76088
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.374.ebuild b/sys-apps/hwdata/hwdata-0.374.ebuild
index afddd20d2fd1..b5d599c17b39 100644
--- a/sys-apps/hwdata/hwdata-0.374.ebuild
+++ b/sys-apps/hwdata/hwdata-0.374.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 17604b12d7cd..a7f12d17139c 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -10,6 +10,6 @@ DIST iproute2-6.4.0.tar.xz 922164 BLAKE2B 76369d2a794afd13dba1a34ee9a7425775bb7b
 DIST iproute2-6.5.0.tar.xz 925940 BLAKE2B 537a956c2fb59df25e90d7899a981e5408c5ee029df2bb87461b899ecf8fe4424a1db5d1b1b67a67bdb2555f6cc4aaf099b0544a2c92ffc3843adc3d17defb96 SHA512 615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54
 EBUILD iproute2-6.4.0-r1.ebuild 5921 BLAKE2B fea9fa6c057dd7b94eeb7b4ab84003d2b47aba44a765ee167c5b0d15203050a43c44449a39eeed0d197c78ae5e13f472346a2d8f9c64ce62e38f9ed0239d7ae9 SHA512 433bd2e9e9eb9cbc24aa2dd9a625a3783e96b4b88d2d14b62fa585964316b9f50b295d562aff99d1944f40666a77fcfe1bbce16c97d89c24a9af3a1a5743a95b
 EBUILD iproute2-6.4.0.ebuild 5971 BLAKE2B 8da78bf3483728141a31aaff3a0afe73c305895dd0c3ef8ee85b6e8eb972fdb93097819324f2581ac332ee4431815c17b47702a35212035d1d0411458324be4d SHA512 c0dc2c75933954edeca40023b3157e98e9479646f726996eb9eed54bf96976a9027852bf7fcbc13c5cfca7f4ad072f71d7139b12feb024b40a9449f2b3e565ef
-EBUILD iproute2-6.5.0.ebuild 5858 BLAKE2B 7fc198eb1184b1cc747ef3e46842feeb86624b1ba4609ecab7a50de95443df35608db8c883bb47c179db0ca1d9df194ebf8b2bca6fd4c1a4689b6a56b4e8056b SHA512 02e74d6fdded0e7211299eba40191ac86ae5cc273c50520a94cb76fea5a77ef2c02a27cdec952c4db27efa568396d7b67024d3b69ca64cbccb5c92a1a8986d2c
+EBUILD iproute2-6.5.0.ebuild 5853 BLAKE2B d7d6cc081134548a9b46787dc7739c4bb8eb9362f55c7830b49c2af947f132a65a42519739430f394f2be1e6dfe21dfd55bbc5003dc04dd23aa8221ad440ecac SHA512 6309ed49d766e3431aad1a1a622f5b0024b8534e4c3575eb294499550312a061d407384777a3389c86029dfb4fe34ce8871af740040acacd6862ca1ffc901fc6
 EBUILD iproute2-9999.ebuild 5858 BLAKE2B fbea521bcffa6b84d3881514ede01e215f0788f5568c3e39bac02e3fe49314c19130c9f6e370d8ae333a56ec8d16bffaf7dd9603b088238ca06612e6d51c41e4 SHA512 a8ca91ba1211e853f6140d769dfeec06b1f57758d799783e2b7598cd29a4057f9c9c73ad72051ff2a81365c9d2d1dd45ef86bb4b1d652898f9c965e5058e9229
 MISC metadata.xml 973 BLAKE2B e505f65ebcc30561fe249ede546cbad6289a0be929be6105379c25674e1dbade56fc62fa75839b0485099f13bc175daa55ad8b86f0a346e52907cfa00c4bb3f1 SHA512 a7e201275dd562c097d66083225e74221f81d89a7efac98b7c05cc7c508100a94b9e928854796cfbfbfeb679acfe34fb79026f7d04df8e07f57132ffc64be525
diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index d61eddc9d7ae..463a171c26da 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	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
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index be83b8d5c43d..4a3f178a12a1 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -2,6 +2,6 @@ AUX nawk-20230909-big-endian.patch 1661 BLAKE2B 7d67e8c1df3e67eadc226885959b79f0
 DIST nawk-20220122.tar.gz 1832761 BLAKE2B f704ff9cf5012545ec3adc1887c0d43625d7e38e19589cba91fe31f664e72ccce20dee3f2484067a31af793be16439c1389603fbdb33c119efeafb18559a0d97 SHA512 46ab7936705288c9cd22867ad9f5b080ade67c4b05d674304e0e5cae8ea329420a9a46e3578bf3a014b7066a1185b7506b0f74445bb52aafb1090e7a82a5bf28
 DIST nawk-20230909.tar.gz 1833391 BLAKE2B 1a8dc9805d144953d6ad5d0539847b1d83661a8e2c0e029e13201ee44f5f6a29cf487c4368c8578d01577b99349968415503fb0c2f7f8f37f4a55fb57cec2b07 SHA512 28687dfbd797fb1f758bd356824110602045b7249a41f47e2cda15ac3d256d57260f1fc74119dc30fbb0e909295bd676a52ec24d3b3cc35e417d46a1749f856f
 EBUILD nawk-20220122-r1.ebuild 1223 BLAKE2B 085fb2b121a121d20152056dce2a244c25d380d90d61da7e62028f2d607155dbd050f98417e0c6d2824c3ddf2d9a8c5197c7091159f8baf035a0e73e90d725ec SHA512 bc40324399e6be4ef25b011e264861b88bf776c10cba6538d644ddd46034efc5ab5b7e148187cb1f391e023203b7796503121a7d906817ff569473c40f57aaea
-EBUILD nawk-20230909-r1.ebuild 1305 BLAKE2B 2b32d78724678581cb1ec38a6f9bbb7f4ad5df04bf663c3e66530915a15ca5f30bbbbbd7e8b947b75fee1538bd62bb942ac509b473939bebb8f1634c2f328ea2 SHA512 02ea5fdfb78df7cdb651b08df9433559f097b01eb6ce0da5c9bffd4c0219b46ebc1e6b2bf0c9c03514c6e714be28fa4413360b87a37ae2140afac233318ca686
+EBUILD nawk-20230909-r1.ebuild 1299 BLAKE2B 94a2ad964f376e47587fa2346ea95270ab25ee5eca7f868aaf9f6520f785677f1258d004d9ceeb13ba88402e47d27324f262d06c378db1c73cccc7497d1da85b SHA512 a0257e2e5f0ae39cc142b2dad8fa2e75949083eabd03f07344d957b3605b3fecbe05621dc4eb4339edce20239456a28a2859424b4d8c5053fe1f98f40fbd2220
 EBUILD nawk-20230909.ebuild 1231 BLAKE2B 3c3d13a2e1d58127dce448c3716be61b29c921b80c01fe6554be424aaaf858e54b8b736684483e6bfea21c0053dbdd16466d8c7d49417c6e6c24433eb59da9e7 SHA512 c8be2b47a50c91f1bdb39377e5338f5043f132bc1ce3dd5941fed2901ae09ec7cd30468ba1ed0288376125f0cbf97d834d8b361c302393ff00831efed110c883
 MISC metadata.xml 337 BLAKE2B 39b318d3780c5249fbf02ea024166015bb8d7798da072dbaf95318ce222f9722cf86d04e9a7c8c92c27377f5b6e09e2d8c11906c9d4e1977102ff6611f1ee6fa SHA512 8dd91d8652fa219ac793b361e5ee2bdc5337c4c098a851a1d19bf03cf2eb9a0c5ef7087f2b4ab7f51a0492ee03a7ea471f990a717e20f492dd9a57c1111237f6
diff --git a/sys-apps/nawk/nawk-20230909-r1.ebuild b/sys-apps/nawk/nawk-20230909-r1.ebuild
index aa037df95f05..6c2e916702f0 100644
--- a/sys-apps/nawk/nawk-20230909-r1.ebuild
+++ b/sys-apps/nawk/nawk-20230909-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/awk-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 
 BDEPEND="
 	app-alternatives/yacc