16 files changed, 42 insertions, 301 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fb501879f3e3..c8567727b917 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1e02819cd81a..86195f6fbf24 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,10 +2,8 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 AUX glib-2.74.1-gnome-keyring-cpu.patch 3930 BLAKE2B 3da62efaa538e4685475b730626b9d76777874908340a55244e83cd70eaf6b731b5c363155b12db20c6fcf3a7692db047ca6cba65ac03f6c7f2b894af7da2ee8 SHA512 662d12afab80fb3d4af854d0ad1b477cfd27194ea86cbf5ad254a2997381d4eb327554a25d8a397b948c38011aa85d026d8ee477ce959553d292330fa01dd318
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
-DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
 EBUILD glib-2.72.3.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
 EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6
-EBUILD glib-2.74.2.ebuild 10204 BLAKE2B 99dc7514e59c7e7241ba5ca9eff5a77165bbfffaec685be34693287692562d6ad3decd8c0c98ee9458b951b55d98f4f3e16d30e72565377f6e1cb257dd8557d4 SHA512 4eca5a10d7a04028ca059b833b5d2941d8ceae13a5a92278aa699a5d751c33e7038a08b7b7e3085bf1509a9d9e3b9553f91e463ef4e28d66e4f75d764ce73530
-EBUILD glib-2.74.3.ebuild 10204 BLAKE2B 99dc7514e59c7e7241ba5ca9eff5a77165bbfffaec685be34693287692562d6ad3decd8c0c98ee9458b951b55d98f4f3e16d30e72565377f6e1cb257dd8557d4 SHA512 4eca5a10d7a04028ca059b833b5d2941d8ceae13a5a92278aa699a5d751c33e7038a08b7b7e3085bf1509a9d9e3b9553f91e463ef4e28d66e4f75d764ce73530
+EBUILD glib-2.74.3-r1.ebuild 10215 BLAKE2B b1ec264b5e77c633dc44348a27df0e5fcb6dc7d2fd01f2f37245f3033de46b176d7a1cc8992c17d39e91a497d7e3126d9e2231cfae1424544b64a2b26adde9fa SHA512 49b67bd553b6aecc82545a191add65276dff5aebf06915b5ad43baccd287d97ab3aa68f2cb280a0fc5f3079d70e9c2181d38ac725e4f1114c75f79048e07d637
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/glib-2.74.2.ebuild b/dev-libs/glib/glib-2.74.3-r1.ebuild
index c62ece284c75..7585636eb1ea 100644
--- a/dev-libs/glib/glib-2.74.2.ebuild
+++ b/dev-libs/glib/glib-2.74.3-r1.ebuild
@@ -30,7 +30,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
 	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
diff --git a/dev-libs/glib/glib-2.74.3.ebuild b/dev-libs/glib/glib-2.74.3.ebuild
deleted file mode 100644
index c62ece284c75..000000000000
--- a/dev-libs/glib/glib-2.74.3.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-		-Dmultiarch=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	export TZ=UTC
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/libchdr/Manifest b/dev-libs/libchdr/Manifest
index eb97894fcda2..ee3fddc0b020 100644
--- a/dev-libs/libchdr/Manifest
+++ b/dev-libs/libchdr/Manifest
@@ -1,3 +1,5 @@
 DIST libchdr-0_p20220917.tar.gz 1748223 BLAKE2B edb42f85d402955a82b79d62e3d47e614b01719ae641c7ed993ba479fb9762a7c66267212bb52d41a5fb175d11482ea7814dc120b0100e5c9210012274184d7f SHA512 acde5dd87b9e61862fa6da81cee715a14c2f350ce5167f85ccdeecc259aaa93ae500e403962b60a332f6a4dee3dc71031d23e2778650ac2702e02c8cc24f1431
+DIST libchdr-0_p20221129.tar.gz 1748187 BLAKE2B bc2f03d558e0f208ae3c51a53b2bbf630fb4cc502c18d83b31f184cf2c2f59e06dbb88c5399e01fb5f2436643a5095256bd31501a1531a043537a05c45c27be3 SHA512 4a72dcb376c451b74389650e121de06daae7cf0b293d7d66a8f7acf1b4f83355a2467a2d77e0953331ee5fffa243f713efb0878bb509384715e9c42a567a9b90
 EBUILD libchdr-0_p20220917.ebuild 601 BLAKE2B fd00f055d1a29a818e85dfdea86e180d26efdb8bf58da719ba1a18d9bdf51d93027041175673a3b7bb1691d1785a2df2056d54ac0d6935348bf3511ad43ce530 SHA512 6bd6b97b311a6e1231ca4e863128fabc0dd20f0ac54fcc500d3e05dd0433188780e161de2ad509e300b37e006ac2c41df1a9b4dccf8f80a6556b4ef3818470a4
+EBUILD libchdr-0_p20221129.ebuild 601 BLAKE2B 001f0c6be7d3a791170039f596fee04db2fea5d6e70e9688890ec5ed096affb1e7bcb1dd10e14a1689b3595441773696ba1aa024106f6ea3106e2df9a279ee77 SHA512 3aa39756cc6cfa74f739b4d7c5f5b5ea71c2ddedde8d69bc737ef25612459256ee02182da3067e31b58a27a0d3d5195d5918c864664933d846552854819cf58b
 MISC metadata.xml 327 BLAKE2B 20c6d3bc61e288afbfd5b0d7d6bb641dc2214d9221b1c2b69a69de676042994bca2878c855b92fea7b5aca60e6dc687c55f0e79f4db13d579332a3d15991e211 SHA512 31e8175f36df91d1bc81a2351a99deba53cb57cb08e6e0e5ad65e17c53cd1cb1b1565b943f2c881bd3e11df45c6ea518f3eaf86335e10d816078161bb23d284b
diff --git a/dev-libs/libchdr/libchdr-0_p20221129.ebuild b/dev-libs/libchdr/libchdr-0_p20221129.ebuild
new file mode 100644
index 000000000000..243e27033a4e
--- /dev/null
+++ b/dev-libs/libchdr/libchdr-0_p20221129.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+HASH_CHDR=a20e04c12c0c20048bf771da6df7aa2e51f5e0cb
+
+DESCRIPTION="Standalone library for reading MAME's CHDv1-v5 formats"
+HOMEPAGE="https://github.com/rtissera/libchdr/"
+SRC_URI="https://github.com/rtissera/libchdr/archive/${HASH_CHDR}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${HASH_CHDR}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SYSTEM_ZLIB=yes
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index d7fa70df430c..baa58efcbb92 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -10,7 +10,7 @@ DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAK
 DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
 EBUILD libclc-15.0.3.ebuild 1411 BLAKE2B 22c88236e222cf2e547b25bb19e971fc7df4416cb686dbcff6086a60c023c4b11ea44242bd1f65ce68fc760199ffb985c3635022c74d05df5ef8e25f07f28e2a SHA512 20d96c75fb7916cfd6ab2c9480d0833da81036c4104bfd922eac93e76ef44225b0e27c9fc20aa6bb10c2f7e609a52e8d752b447e41ad1a9ed51715d6e8c9d8eb
-EBUILD libclc-15.0.5.ebuild 1669 BLAKE2B 8ab5c9ad7381e2aeafe2a41efcaea056bf8d3c73b17f12cb72a305b2f9bc914d0098d5fe49146b91c342d90efa57d99b17d509d2b3a00bf5ee6f27b304ac8e5f SHA512 6a3012c9ac885802c1d2ca5fd962890ab919f5715ea68442303ad8c7af9213af8dd0006b97e902cccc5fcc06ffb67d19033473715e4467243c1dcaaa55f2071f
+EBUILD libclc-15.0.5.ebuild 1667 BLAKE2B 0c2b3a2a781f1a177214e1da430f2180188ab1d9cbe0001009016fd7cf4aa72391de4bba2c4a9f4c8b275462818a24c4a29861fecb6a235d6c0fac10220144d5 SHA512 a06a0ee32ff783980d6b93e52a4c0b9e92315d05b03443f24121a3170edad5a5a63508617942e5890913d09c90e5fbbc7371c4f0b32c9ab18057a0a8b5d20e3b
 EBUILD libclc-15.0.6.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8b1835859e3a07debc3f4d17081b4b8f34d7adba7666b8c106b455a68b1ad41604d44d36b9ffc63ed40e1d5b99b0f8e SHA512 cf3d643b19823e6c0ec33122ea33b21da8300ac8b7476e906002ed7ef3e0501db2874d97c58e32ec71a524fc1278b29098f521cc0d6ca8076211305ab61a981a
 EBUILD libclc-15.0.6.ebuild 1669 BLAKE2B 8ab5c9ad7381e2aeafe2a41efcaea056bf8d3c73b17f12cb72a305b2f9bc914d0098d5fe49146b91c342d90efa57d99b17d509d2b3a00bf5ee6f27b304ac8e5f SHA512 6a3012c9ac885802c1d2ca5fd962890ab919f5715ea68442303ad8c7af9213af8dd0006b97e902cccc5fcc06ffb67d19033473715e4467243c1dcaaa55f2071f
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
diff --git a/dev-libs/libclc/libclc-15.0.5.ebuild b/dev-libs/libclc/libclc-15.0.5.ebuild
index 3a0f83d5a902..5ab51a5e86cf 100644
--- a/dev-libs/libclc/libclc-15.0.5.ebuild
+++ b/dev-libs/libclc/libclc-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=15
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index ec0fb354cb45..f409b9ccccf9 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.12.1.tar.xz 446476 BLAKE2B 3b73c50b5e0bdf6dac001c7e34338ece2ba796af711d8f6f9c2928f93a8f41ee484e067c3cb02878de49d631de87229d4b1a377123e385af5997e11f7c556510 SHA512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4
 DIST libevdev-1.13.0.tar.xz 451328 BLAKE2B 07b15bf46ca3b01d9a93da8d93fd60b2f1eb95961f0f202a321030e145528453375f1e4fa3458adac3f3346cc26642538251b35002f18f9802799e4732d39f3e SHA512 f30f14c44ef4d4829625aa4c28f10555f333905486f9d39c18cd3ca35e87128a0c24c1bc18ca37b6bf98bc8f7fad27e1bc68678a58e6e6fff3b8d99502ac6905
 EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B b39700425b4711359fb8e0f05f5473420ce3ad87eacd8cbeaf40c605c2c8a5853df8b60f137dbed41db5f9c401b2336835bf78af074676891c97f2461434e563 SHA512 f86f50f39388d35606ead66f16594f2bcf3c4de27649cc956b11f59bb61636b593f44aede81c4cda16b854c9d128874071df69e4afa573e87679c7bd450e9ab9
-EBUILD libevdev-1.13.0.ebuild 1126 BLAKE2B 17109657108aafe69b7860011b190ae4e96929cc099407492d8b6715c0906d29a4c0dd9b1f6665de1be67989070485688818aade691d3edcc84aa378c85cc7cf SHA512 9422f785b5f4d812e3aed29858d324b3d9ce81bd552d85738f2fad8752fe83c91b9912d07e4e1b35d2c48885ff285a3d6a48c90bf3145d23327753e9f9a9faa1
+EBUILD libevdev-1.13.0.ebuild 1125 BLAKE2B 88dc6ad19cdbc1a1d4fce09da2194c471fe7885d5de845f5a6203af76c9ee95be5f0b5a970ea23a9c56ac48e177c94546d0b40254049c030c36d8dbfee30c401 SHA512 616d80172f3bbc681680fd5b42f909390e3b680d4d39ff3090e40e57f178bf5da808416fd94ecb0eef8025affd99427d0294768ccaaea6aff503134b157fe5c0
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B dde6bf4c9c7fd7ff688237ec8a793d9d2303a0e78178cb79839ec0332e7a1ad3a3e139ca285b92bf55e7aef054953d58e4c8b360b99adf7af04cf36783019281 SHA512 26c9e626570a80ba6e0ba5b59932830fd4cc7817f0f2dc0f7bd6c8635c71dd1fd9f923623b4bf9d39e3f64d882187fceb4fbe4be46468589c2f85e80b857bf8c
 MISC metadata.xml 339 BLAKE2B 17485a5a6202c366cf975f0c34aeb9521d5190f2ada003bdcae8c3e561740b3b43809b177baa2cab87de46e2f234b48df5bfa6c8df5dc2674f95e6206f0e4398 SHA512 26ff955c224a24cd58bf4eed14d99a0b7cf1b078e0d93bbd115a9193656180f112cb0f27bc6d35b2ff2e062a58775fc4b4310d6ffeee322b39963143f079b3b8
diff --git a/dev-libs/libevdev/libevdev-1.13.0.ebuild b/dev-libs/libevdev/libevdev-1.13.0.ebuild
index 3ea94b0d8b89..a905f916ece4 100644
--- a/dev-libs/libevdev/libevdev-1.13.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.13.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${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
 
 LICENSE="MIT"
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index ce482b460097..aa65e8f9e7d3 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -3,6 +3,6 @@ DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
 DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
 DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
-EBUILD libintl-0.21.1.ebuild 2771 BLAKE2B 7225cb200a9cd4c4ac0940cc56e411e2c3a6ed35c09b3a660a8f139a4c653041165911aac2647cb196124f04b6a7ec61f3e882837a7eff0a494971d219fcb167 SHA512 aa13e37e6c844861939c238c38c99cf79f9cc9280c900da67a127961905ab9c578177d8b09c4f73a821cebe90fbe9b355a5807833c1c1269560478a6f2348d13
+EBUILD libintl-0.21.1.ebuild 2769 BLAKE2B 186e5c51991920dfed079ee3be3ab0d975c6706d33d10198b20afbcc41e5e02c74c8266e35ada082062e059e81a6856d519a9381c05ef49573b38b6748eb24f1 SHA512 08d3510710471ccc8d32a3236ba9e688bd691d6faac64a496c4acaf64a07185a29562f7dd123242eb1ca17eb63ccfc2c1fc8b2599c52cea7f991d98969db5e35
 EBUILD libintl-0.21.ebuild 2306 BLAKE2B 60a9ddab1a16c75d69c68469a519bb15a2da78915584b034e619765f9b8dfd9d566702dff32b9f796860ce69feb58252ed53ee96c44af4740ae5f04d4d36075d SHA512 3e3135769c793b7077c188f1122e15a19cbb1f8d92ab734549dae85e2cb5c52b3457db814674a802f85a9c885aed9fcdc8ee00cb7143bcd3f8d3e09078835be5
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild
index 398827d1353d..c96124d7a3b9 100644
--- a/dev-libs/libintl/libintl-0.21.1.ebuild
+++ b/dev-libs/libintl/libintl-0.21.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/modsecurity/Manifest b/dev-libs/modsecurity/Manifest
index ebb36667f6da..4fd9d09d5c98 100644
--- a/dev-libs/modsecurity/Manifest
+++ b/dev-libs/modsecurity/Manifest
@@ -1,5 +1,5 @@
 DIST modsecurity-v3.0.7.tar.gz 3333372 BLAKE2B f391e2057b95a26a16efaa5f9d86acdd030b2f32d3da3ebac4e5eccdae7c9c6453bdb6b4e2d7f49ce189760d5c5de7d656aa5796fe2723e2e6f5493c93420913 SHA512 d8caf5946b598b16c4481938f22c1116595286811cfdb01d95db95ab061f7045751f2aa98e515df239bceb3f1a6dce2ecd5b24c954bddc27997fa64e9e429730
 DIST modsecurity-v3.0.8.tar.gz 3336288 BLAKE2B de15124362f23c86a6dcee15dd847fcf703a378a57ebd4826a6304fed33b34f4791c7aa80abd42cbe5932063c1ca59f755345e3810dcbc296e2b6a758e0c580b SHA512 8113358548aea19a18de183922e979fd7ce9daad289c6894bda458176f17da63fb45160a2a86d97730c90191c881b232b1c9c6ab9209c3988b4390e49e086117
 EBUILD modsecurity-3.0.7.ebuild 1940 BLAKE2B 0e1b1b024e4e1be46d22f1515834cb6f764c55ed2f26f4fcb17bd35d8427092a82606603994dac978382f99f9d898578c77efa86f0f7c7076cde312be35f96f0 SHA512 f31dac3be38f46f8bff64dc4413283bd9577b9354d5fa528b80b197e03efe369bb6d8a93288a54a97da170ca5e14fbd199ad055de926a56e40f39ec3a581a039
-EBUILD modsecurity-3.0.8.ebuild 1475 BLAKE2B 0e35aa739a333b8f21e545ca22583acfe2d4145bf72faf8ceedd1b71b0b4029367e26cebf481490fbd62fbb363f42b82d16355a4f4ae97f780b8fc47da6b8bb7 SHA512 e17fdb14a0f33ff7ec1fb3d8c40c5835245415fbd9ce391cdb7621c14b67cabbb85ab645f9e7d112704519a9c33a60463c54af9612752ea960605f9e93299f5f
+EBUILD modsecurity-3.0.8.ebuild 1471 BLAKE2B 319d98a2631dfd4ac9870db77033bfb8c6b8b8320cc062c1632aebf6f085aa47974dc5f31a4eaef923b0aa6623b8fb64314147d2a69bd3dbb07e1fd15f03ec1e SHA512 50b3e66c5160689d20b52223a45cbebaaa2820474ada5b0c4bfef3348f352f7b1bd15b1c903d8cc2202bdd1f447fed9cf67a1c6159967e3c65292e08c2703994
 MISC metadata.xml 1019 BLAKE2B 0873fbb1c328dea3378abbe280dc7adacf389a9f1085614057e328ca7258afb4553c2a37bb527eb80b995d69e428ac7fcb3306e65a84c0e3d17acb6ace270b0b SHA512 549b1dc80684fff950148598807b866ab9400c619d2ecb32f2e7f90f8f298dd47daadd4c33f76af40983ed22ffbbb017c110253d810bab931344dd6f80d8f2ce
diff --git a/dev-libs/modsecurity/modsecurity-3.0.8.ebuild b/dev-libs/modsecurity/modsecurity-3.0.8.ebuild
index b7405d95da91..fcfe19f0dd73 100644
--- a/dev-libs/modsecurity/modsecurity-3.0.8.ebuild
+++ b/dev-libs/modsecurity/modsecurity-3.0.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="doc fuzzyhash geoip geoip2 json lmdb lua pcre2"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 88f2cbbb1ce8..3eee20438d8a 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -3,7 +3,7 @@ DIST wayland-protocols-1.27.tar.xz 82604 BLAKE2B ae1c19dffcf255c88e6d646f321ec19
 DIST wayland-protocols-1.28.tar.xz 84116 BLAKE2B 2b911b471ea61e34da5f0c8eb1bc67e0786261411123bffb02bfcea4e0c5e85b2ca1e8cf3f8f55fc92aae0365c30caed42e3c6037df46ce581f27952f6e38a24 SHA512 092454c6a7e5cc47729de49e9061fb91dfdc5610859e17c495642806ca14dcfb3850a5d3a7459ddb70b2adb08d2590d4b0f92c3a97600e48598682d59adb102f
 DIST wayland-protocols-1.30.tar.xz 84776 BLAKE2B 059a40c839c5775851fb31f3f4637e11dce091b1758a5eb0c375ae40c3b745321cdc549d26456edc1bf66cd7d013d370c3df8c0de64f867b899571a73e2a4233 SHA512 e1e5648387e821c190058b390d7120c06c2767b644caf2644f05a280e0fe300b677545fbb9537839d8bc569a0cc7fb51190963421281e2557d1680767899b743
 EBUILD wayland-protocols-1.26.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
-EBUILD wayland-protocols-1.27.ebuild 788 BLAKE2B 7df6163dad4264aab0d511bb0dcf541032cbbf7993d5338041c9dfb71cd364ee03eeb423ddc7d1ae8695b493b6dcc1837816b387bdd60818056e037b9069d403 SHA512 5733455c98725d2f2b41097fddc0445da544b8d11e2d7475cc84345fcf9aa3645ab29eff33ff4037bb416297364ab435dd39c7f632c739956242ca20d66dc9e6
+EBUILD wayland-protocols-1.27.ebuild 787 BLAKE2B 1d063b98a704a967d3244ed2d961a961a6d5a9cba4bef6ee72726ffa191436184508b7170ad3b2c58b0cb506c725c56120f6fcc09110a92b1f1923ba8a1fdb34 SHA512 70b75ce3f5bf94590f8e731a1a4358134cf7a934e0327fb475fae590a1c889a60d1c37f1480e1f1c36d6d8b3399309d7a4de1825be978c3797c4d8f237a9dc1d
 EBUILD wayland-protocols-1.28.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-1.30.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-9999.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
index 30ccbe230c18..a4add7336933 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${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
 
 LICENSE="MIT"