17 files changed, 319 insertions, 11 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 173f552cfa1d..1cea36127fca 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/d-spy/Manifest b/dev-util/d-spy/Manifest
new file mode 100644
index 000000000000..70732cd97857
--- /dev/null
+++ b/dev-util/d-spy/Manifest
@@ -0,0 +1,3 @@
+DIST d-spy-1.4.0.tar.xz 215428 BLAKE2B 8641ebc77c2829f77ef563773da242deb512fc9c85ba4c3c16a4c5ff27fb5e61e55c71abc265abcf8d3c4a0c85704af52e0651d63e1b90a8e4b570d9ecb0f357 SHA512 748ba922ff77bfb6a186e155b5f83d833f7c9085322b37a972fc4e024a4125c07d393e72436c7235a2c94d8504afecd3c21b9d22765f35968bb56554e0ae648f
+EBUILD d-spy-1.4.0.ebuild 666 BLAKE2B d356872e88a32fe6276730a972e2e822a687ba4d12f03031550ae3d2128dbd8f39e232b3f399ac4ce2e2e10a803020316cba66c02a56702940fb168db3162fac SHA512 c05c3f043ec33c7821637b4d99ab046fab7889ad46c0ccd33d45a7b3024d0f4adf13d0b968b2deef3049c053e511b4871e75c278b846aa728f295a7afa16b7eb
+MISC metadata.xml 252 BLAKE2B 1dee28ae6c6e69a9c06e2c6f7f309e1193633c7571f0fc645546b89aa018837d3222514caf1db9ac7d43a014377d6ba04620347c78aeba5b6aa020dc51a49690 SHA512 e8d972cad532f8afa0e4d67eb837160d7d436db8c8296a69e97d40e010a12ae11651147cd8f6b5e39c445992ee16008f52ea2eb6f8c032e340040d298abf979f
diff --git a/dev-util/d-spy/d-spy-1.4.0.ebuild b/dev-util/d-spy/d-spy-1.4.0.ebuild
new file mode 100644
index 000000000000..96b1f7360251
--- /dev/null
+++ b/dev-util/d-spy/d-spy-1.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson
+
+DESCRIPTION="D-spy is a blisteringly fast D-Bus debugger"
+HOMEPAGE="https://wiki.gnome.org/Apps/d-spy https://gitlab.gnome.org/GNOME/d-spy"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="1"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.68:2
+	>=gui-libs/gtk-4.6:4
+	>=gui-libs/libadwaita-1.0:1
+"
+RDEPEND="
+	${DEPEND}
+	>=sys-apps/dbus-1
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	meson_src_install
+	mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+}
diff --git a/dev-util/d-spy/metadata.xml b/dev-util/d-spy/metadata.xml
new file mode 100644
index 000000000000..5078eeb29079
--- /dev/null
+++ b/dev-util/d-spy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 17aa94ccba85..04b9f8ec0b4a 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -2,6 +2,6 @@ AUX glslang-1.3.224-Fix-cmake-file-install-dir.patch 13162 BLAKE2B fb58095f7f9c1
 DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8
 DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e
-EBUILD glslang-1.3.224-r1.ebuild 880 BLAKE2B f4e4a13341eb7fd9c6f61777115adeb17ebe6162428d84436b8ca81bcad2e70149c60c7e59724c88b2ae6c04c5c638cb0b17e80c2f4e8891cc6f5cc7070285bc SHA512 0917150e19bffb965bddd8054d35c8385f30f372ae446908d9050bf46e7e5193cf65710634028ce77f10be6d4a7a6e7f6e9cc8d459b4dc404ec5ba2b0a66ba50
+EBUILD glslang-1.3.224-r1.ebuild 879 BLAKE2B 947e887ce2fcdd06e279eec2d89065516145a9bd8051c67489f0e61b009f9469682079b66e9ade611f403bb73155c71217e05c51c91528149c36ae096cc175e8 SHA512 c1bdc3b4df60c3274e1e56299ce65787406100eec6fa03f12301bafb635c6d06d00a2993fa044f86d323f4321bff60938467313646e82d5f2f7b1a6af8b4764f
 EBUILD glslang-9999.ebuild 815 BLAKE2B 5e6986adf59b9c16a8f7792d3cb5317bf5f98b0afdcc8aa6046a3eb3cdd136ed715dde7acc5ed2854ba0064f433f4047f034558f7cc4371bd6cfc4e898a32f64 SHA512 5d935aa37f345e8008d735208ebf4e8a14de4fafbd0cd46675f2cb23068ae8781ca9c60a43783283d775bcf9dfa72ccd99b7283d0600e74f947d9b78907afc4c
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.224-r1.ebuild b/dev-util/glslang/glslang-1.3.224-r1.ebuild
index 7d76d7006c5b..02a6c50851e8 100644
--- a/dev-util/glslang/glslang-1.3.224-r1.ebuild
+++ b/dev-util/glslang/glslang-1.3.224-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 1c5d3d7a5cb8..9d07dff19936 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-builder-42.1.tar.xz 13276028 BLAKE2B 657e362ab9a2df1c70d9071ecc010747e5c73bbaa1c0d903778720e4fe874361013cfca3fe162328dfae180502c4fcc68ee01f04d1329add874b9e8db41abcd1 SHA512 a04a71efb163808ed4bfc446334b8f9cabe33cd33c977c9047e4fb00042b18cf7095217b2e287a45efda863ef479fce11435a2d24d489ba1816e3f36a561244e
+DIST gnome-builder-43.2.tar.xz 10276768 BLAKE2B 52637fdcac1d455cfe84c7f8eead8ce941ff641c0af932b053afa6c346ed1eab54747edbf5b3a516cdc557cc0c2934fcd9c352ff71a1ee74830d8bd11d452af6 SHA512 39e4081bbd2aae8bb2ce152b6a907849693a7c7fc12d232b6909a15eed9dd791e58b1dabfadc92cfdc01ba2ab20c553bf0dd4f098d0441f0705e3db3bfe67869
 EBUILD gnome-builder-42.1.ebuild 8925 BLAKE2B 9ddf57f6d9348f0fdc2182e4664d126cd36137a6dcbcfec3c074ef92770c00b26a455f4e4a1a8927e02d9b7c8dc326917b3f0a69aa3e4e58a36d4f66b78ce1c2 SHA512 47006a1f96c834ac6c6f6abd157819b9b9db6b7af2fbf7fc471cc058b5adb8c8e180909ca7ac042e6dae50f92b405c09755192c38445a353c08acd723841540e
-MISC metadata.xml 1080 BLAKE2B fc1276ee90bb69bfee8b33d648778c132d721bc294612e0b404216d65d934b441b168a8749c2271bea9d125233e4d7cbd7ff4fa66cc7d5a4f2bca1429b643307 SHA512 efb512e36bc8bd83a15d247a36a325fb579f9f6532d8df53c2067d830697308709df5610b7d445d761b29cf7236d17525e892278e6647b72b1bde7a7e1bb112c
+EBUILD gnome-builder-43.2.ebuild 8714 BLAKE2B 64a53bd203a6c3e5be0ad7f37cb0ed855fe1cbf93cf4989c40ab8e1186eb9433a6d44f2b312523454f6dbb3adc15f93d87c61007824df9bc9fccb9410736974e SHA512 198cc1e61a57b9625bb242cdb00cef5ad38b011c80a33ab586762c6bf3b21c5ad53ccef3b1e058733b54213a59aea21626458ab6c65398b45b2f10f86cce87f4
+MISC metadata.xml 1175 BLAKE2B 364a546ed67a8dd652fffe3d980fc8366385365eac55a7c02190a2e7a42e0c5ce6051ccbc96b417f7a38b0bb90a72eb43d36102fc3187ed7332559f80a060fd9 SHA512 89b74ed1668649ca0433c77b7f30bac9cb85bb6dc0a822923f1ff9e4912cdb76f53bf329eaea8bc7ef026c924308fc24beaeb936cc3b8b1e862f8f8b3de7b5d4
diff --git a/dev-util/gnome-builder/gnome-builder-43.2.ebuild b/dev-util/gnome-builder/gnome-builder-43.2.ebuild
new file mode 100644
index 000000000000..93eb5643b264
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-43.2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	flatpak? ( git )
+"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/glib-2.73.3:2
+	>=gui-libs/gtk-4.7.1:4[introspection]
+	>=gui-libs/libadwaita-1.2.0:1
+	>=gui-libs/libpanel-1.0.0:1
+	>=gui-libs/gtksourceview-5.5.2:5[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.42.0:=
+	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libportal:=[gtk,introspection]
+	>=dev-libs/template-glib-3.36.0:=[introspection]
+	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
+	>=dev-libs/libxml2-2.9.0
+	webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] )
+	>=app-text/cmark-0.29.0:0=
+	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
+	app-text/editorconfig-core-c
+	flatpak? (
+		dev-util/ostree
+		>=net-libs/libsoup-3:3.0
+		>=sys-apps/flatpak-1.10.2
+	)
+	git? (
+		dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-1.1.0[ssh]
+	)
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	spell? (
+		app-text/enchant:2
+		dev-libs/icu:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.46.0:4
+		>=dev-util/sysprof-3.46.0:0/4
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus
+	)
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dchannel=other
+
+		-Ddevelopment=false
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dwith_safe_path=''
+		-Dgnome_sdk_version=master
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+		-Dnetwork_tests=false
+		-Dctags_path=''
+		$(meson_feature webkit)
+
+		-Dplugin_autotools=true
+		-Dplugin_bash_language_server=true
+		-Dplugin_blueprint=true
+		-Dplugin_buildstream=true
+		-Dplugin_c_pack=true
+		-Dplugin_cargo=true
+		$(meson_use clang plugin_clang)
+		$(meson_use clang plugin_clangd)
+		$(meson_use clang plugin_clang_format)
+		-Dplugin_cmake=true
+		-Dplugin_codespell=true
+		-Dplugin_code_index=true
+		-Dplugin_copyright=true
+		-Dplugin_ctags=true
+		-Dplugin_deviced=false # libdeviced not packaged?
+		$(meson_use d-spy plugin_dspy)
+		-Dplugin_editorconfig=true
+		-Dplugin_eslint=true
+		-Dplugin_file_search=true
+		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_gdb=true
+		-Dplugin_gdiagnose=true
+		-Dplugin_gettext=true
+		$(meson_use git plugin_git)
+		-Dplugin_gopls=true
+		-Dplugin_gradle=true
+		-Dplugin_grep=true
+		-Dplugin_html_completion=true
+		$(meson_use webkit plugin_html_preview)
+		-Dplugin_intelephense=true
+		-Dplugin_jdtls=true
+		-Dplugin_jedi_language_server=true
+		-Dplugin_jhbuild=true
+		-Dplugin_make=true
+		-Dplugin_make_templates=true
+		$(meson_use webkit plugin_markdown_preview)
+		-Dplugin_maven=true
+		-Dplugin_meson=true
+		-Dplugin_meson_templates=true
+		-Dplugin_modelines=true
+		-Dplugin_mono=true
+		-Dplugin_newcomers=true
+		-Dplugin_notification=true
+		-Dplugin_npm=true
+		-Dplugin_phpize=true
+		-Dplugin_podman=true
+		-Dplugin_pygi=true
+		# -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842
+		-Dplugin_qemu=true
+		-Dplugin_quick_highlight=true
+		-Dplugin_retab=true
+		-Dplugin_rstcheck=true
+		-Dplugin_rubocop=true
+		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_shellcmd=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use webkit plugin_sphinx_preview)
+		-Dplugin_stylelint=true
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_sysroot=true
+		-Dplugin_todo=true
+		-Dplugin_ts_language_server=true
+		-Dplugin_update_manager=true
+		-Dplugin_valac=true
+		-Dplugin_vala_indenter=true
+		-Dplugin_valgrind=true
+		-Dplugin_vls=true
+		-Dplugin_waf=true
+		-Dplugin_words=true
+		-Dplugin_xml_pack=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+
+	optfeature_header "Language support"
+	optfeature "Rust's Cargo build system" virtual/rust
+	optfeature "CMake" dev-util/cmake
+	optfeature "Java Maven build system" dev-java/maven-bin
+	optfeature "Meson Build system" dev-util/meson
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml
index 63870d032088..66e65b0e7344 100644
--- a/dev-util/gnome-builder/metadata.xml
+++ b/dev-util/gnome-builder/metadata.xml
@@ -8,6 +8,7 @@
 <use>
 	<flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag>
 	<flag name="devhelp">Provide API docs browsing and integration via <pkg>dev-util/devhelp</pkg></flag>
+	<flag name="d-spy">Provide D-Bus debugging functionality via <pkg>dev-util/d-spy</pkg></flag>
 	<flag name="flatpak">Enable support for flatpak applications using <pkg>sys-apps/flatpak</pkg></flag>
 	<flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg>
 		(such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index acf63bf11ee5..22f57f9c9f1d 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.3.216.tar.gz 437011 BLAKE2B df48c7709c79b2132056d51e513b564539aaba335dbd68b4849aa871b688b9db5a5ec50142b3d448fe50ce6c4e5f2016e516e9e31441c8d1ad89c90c24bfe14f SHA512 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0
 DIST spirv-headers-1.3.224.tar.gz 436938 BLAKE2B a0b1ddeb89a20a9ab3fa9dc0af9574a207fba2b7ff0e588678b33e1d773c19d09ce828980f9bd7956a94d1d7b6f1f138b3b9d48b45b7b307c6ebc37962f8f8ee SHA512 fbf776a3ef1db2e7b33067b3f36c1d4189ff3d89b73058374c5020c048931f88b798b84a89209b2bee419afa56fbf9bfe9df6a7387198778b8f23e79597cb057
 EBUILD spirv-headers-1.3.216.ebuild 492 BLAKE2B e7dd5c912375e55ca2c208570cc004dfe62af4889886b772dfe98365eb3cfdac1932107c4d1b9147cb07777ffa0cde53e1bb5e916947af8c887855f8616c00b4 SHA512 1f4037508476ca38280fa1cead6c3283c88ad4e2bdc5a083b38376b3810a9d686df388e070e2a3fb1cae7195625eb36d5f8a126fbbe8304b25b3a4ba478a5710
-EBUILD spirv-headers-1.3.224.ebuild 496 BLAKE2B 7c7b854fda101666d14c7eba05b9706f879ab4e1748857cbcfe25b067ce8bbebdf1331becf379aa4666d656a00d0da66263d4e069f28842036ea333161c1f943 SHA512 a43005d93629a551dd4d3781f18e6dc68c5076ace8a8b108ac9889acb2685fadb3180d5843a4240fa5acf318ce915a738849b6eda9aedcd309ce6bd48b9a0cdb
+EBUILD spirv-headers-1.3.224.ebuild 495 BLAKE2B 80905941c52efab9189518510897b4c7e4ea486bb9c067b3c09596d921688b9781e55ff517ee090f442cc646bc95be97fedb30de34b081dde8946ddc680812d6 SHA512 4fe24c6cfd2afb4025e38d9812d1796c71e2817874fff51eec304ceb5414c6b2bea5dc9920c1fd8022366140aecf9472abd07c4f181bf9f0535500f50dfe2053
 EBUILD spirv-headers-99999999.ebuild 607 BLAKE2B f94f54dc76cecce5116f6840334c3dc2b03c9b7e447765c491777562dc76cb94d2da530e4b678e7d2bde5b8b164b7aaee4421d2f05fde27c18c95e26e0fed2a0 SHA512 93a76d5a2dcb393607f194893ab1edeb28e158c22806a6bf144b345e368e57611f3114d2ad3d7b352d2c941b70ddf042b2325ed018e3cc9c4b4c5a2f7f3bde3b
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild
index d2781b9e4327..079f19c6af13 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 778468a30e00..00f2db12269d 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-1.3.216.tar.gz 3019645 BLAKE2B 88fed3d48f50c50276746dd2b69740482c95c83df13312e081ae4066351454f0a3afaad2f146c629ee39dd34708dd105941e2bc374146a6e9806631227372105 SHA512 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188
 DIST spirv-tools-1.3.224.tar.gz 3033611 BLAKE2B 806c1de27d0c8dac4991dbff321fb8f62647b25b5c87d66b2f924449599e37e85ace876b848afc2e16e42f943f413e0eb759983cce95d826952809974dd9ac7d SHA512 1265db4c15d4d6c6fcb201bc958386e9c910386a82ff595b5d5f84dc03f6ab7f70f67fd59a90ffa92533b02d809305334c06228b869151cbcfdee529e90e7bbc
 EBUILD spirv-tools-1.3.216.ebuild 1220 BLAKE2B a3b228a72c7b083ac0cc7fd79b4807c15ef2a1c8ce95f063ed7363bdfd18cc0fe69aa33562eb8cdf0191964acf678260605a75c70041cfaf319f3e3fbee122c2 SHA512 2876f5f2b8a2cca96ce2816eb3ae813fac348d9b771ee6bae0f916f72ab13caf45c46a306c2977c43c7ab9db985e23f65bda0abff181d2b589a43e561f151376
-EBUILD spirv-tools-1.3.224.ebuild 1226 BLAKE2B 67c721c2db2450209078f77172271257a4f9a16c5044d1b17d27749571fadb128901612cccd8fe51ac507c9c396d44e1d937bed1254be3045af428cea0ff6ffb SHA512 87051cc73651da3cbdafd4fe884166840f49a425c8a250a50a99209595e885b13c59f08e5edf866f0e233ff711d961c0ae03fd832dee1ab09ed61aa00a583ac6
+EBUILD spirv-tools-1.3.224.ebuild 1225 BLAKE2B 9c66eb308ee0b5e0ed07da47957f4490f07adbd550256c3480086d668a239a50356eb7f4ea408ee542f1b032bae68a7d0cd79715136a9e0d13235b8113602eec SHA512 7212dfcf39ff3a54f042091c1c51a75349065008410197e097eee8289fa10e05f5b8e61b44c2df8866c669d92d325dbc757004c9e1bea1cd6ec108816ef1d997
 EBUILD spirv-tools-99999999.ebuild 1228 BLAKE2B 14e6632663e0d507cfc0734669fcff523de12e8cc2d59e9d393f5f5fd7f497d583bc45fd163a8846b87d299406f7c1522c43d87359e8c3e7339f6238739002bc SHA512 f27542e6f9d50175e25ee80bb51a9c9dfab57746b76d225bab006803f8a21d79474beb05bbab1868ef6e52f1a8f74bfd7c2bc95ebab2aae788525ca869331cb6
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild
index 06111f85f500..0c6d8934fe08 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index ffbbdefd382c..ed1734e87dc5 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.3.216.tar.gz 1489322 BLAKE2B a6bdc5d0517405b121861f18c330dc9db28df9c7d48994c6131e047ff640f6dd858cd3fa6efe70d8feb910d3b51c4a7d5676c8d87eefbddbedc30ff3b6af6ace SHA512 cabce62c3e681c2f89f808a0838300f859d1ea046f0036f44c5191f5a9ebbc15058507cd5d07519c34b81ba602058a137f27142c58d4e6c84b2ad382431d675a
 DIST vulkan-headers-1.3.224.tar.gz 1521365 BLAKE2B 08e6e1badb473dfb760e20ee8a60f83cd288f33c4ad136026d2aecf474e1da13008691453886ee092e87cbd2ebbbbcf6bfcdff963276bdc8464521e07551ffa2 SHA512 856d80869267ba9c934400313cca1f9af67c1169974d70d21aed7469a39bf6d1821a95072a81edf8cdd463a62d766d478ee1c28bfc0f17a45b55ebd1634b9984
 EBUILD vulkan-headers-1.3.216.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
-EBUILD vulkan-headers-1.3.224.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
+EBUILD vulkan-headers-1.3.224.ebuild 634 BLAKE2B c9f57980d1d560c44b36ccbae5d58b7259143cd1e8426b90517526dd60a290cf1359322b0e8998d56e522875c191f583dd707c31a6802e733be50736b9181dbb SHA512 307ea2ff82fda0a2ac98450572dce279bb076496deac3cd9606a2d8e143185609e69782fdca2e7320ccdb803bffb48ac2788a717b9a85a0233fc52ad5de830d3
 EBUILD vulkan-headers-9999.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild
index 591287d773f0..4bdeb09cc919 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index cc89ed9cb2c0..db526496adc7 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-tools-1.3.216.tar.gz 866091 BLAKE2B 750b7d26de64844162f13bb5f2c82b134c0996e2bf23883b381fc05bb8eb26c19ef3a8dc4da63543096473845952115a8e3213ee3972baa9b01104adaa09ed82 SHA512 57d152072ecad744256397e357d756f82457929a026a29127a079ea7b3b805b99ece1e0eddfecb215882a8de18cf9ab3c32c4c90126e261bc582ad05ae6173e2
 DIST vulkan-tools-1.3.224.tar.gz 868481 BLAKE2B 464e923f1bd7f72b0c9fab1ba6afa0aa179355f0ebd17c4cd6eeaf84b61efde61c60ce982d0eb081f88a64659dc5676eba77b9782e00df9d9214594806699d98 SHA512 89d2fddaaa710c78020e03b133c947afd79e9bfd1b4de711e5ac8f3e3bd5486e75960dc5a5cb7722ec55a6973233ca8a438e19627b59aaacad1c54040fdd6acb
 EBUILD vulkan-tools-1.3.216.ebuild 1946 BLAKE2B 8112a58006428329551368ecc8e628b030a5c9d10b7038266a7e6643009c46b0132719c1deab56d9f8c4c58ebe716f5a979df40e4b99d592089550d1392a158e SHA512 f22187590f9f5702d52e58d5e3658233a769e9cd355a092b722cdd9039d939313f8b151716a233ae74969a29098ae878f3aab69bbf2f9ccb3a54b20b5e40cd8a
-EBUILD vulkan-tools-1.3.224.ebuild 1951 BLAKE2B 9069d1dd31ec8d161e6e47a6ecad7633bc80affa209b284da295efb612a9d173bc4c245fe57d02c81011fd63621b263654e247d800c88eac9de8e2adea1c7e7b SHA512 7a228ad92a1340d66f4de3e45c84c29d82da6e6c0bfbdfb292484d76466c90bd2dca2e632c1c389f91ea2bb7cd1471f1c4d27a28e5f3918ad77cab59ecaf277b
+EBUILD vulkan-tools-1.3.224.ebuild 1950 BLAKE2B 608fa4869c527423c159fc4ed9fce137975802d42b3917ef8c41bd50f7b3d88110a01129b5c30336c5d5ebf2a81498c863a51d6795596ec81990d589e91d50c8 SHA512 dc64df655af03b2ab59ed89e447885471bfa091258015aa3f43d33316726eef4c6d30ee47b1c2108d41e32975c135841ea6ac6a01371792c5f537b4d350e0040
 EBUILD vulkan-tools-9999.ebuild 1951 BLAKE2B 6a7cd950fe0ef6becdea897357f8e02440db2ae4c426ac2e5bb7ca139cc5b194545d082a09230c08fc4e3f3613f89cc0da74f60c9b362fcb072cce42c79a834d SHA512 190a32fb9346c17850fb8c741432990a16e8877cb797e37b15989395e06e708a990229dd9637244de5dd5e8d4e5a02404718b4c4ea6a1461c272c881afc4fb09
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild
index 3f1b0f2646e7..064b80ac9a26 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi