gentoo auto-resync : 18:05:2023 - 04:11:16

30 files changed, 207 insertions, 1029 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c2eb4094a2e5..54b0079ddf68 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
index b14c0a2747e8..0e42ee53e45a 100644
--- a/dev-util/d-spy/Manifest
+++ b/dev-util/d-spy/Manifest
@@ -1,5 +1,3 @@
-DIST d-spy-1.4.0.tar.xz 215428 BLAKE2B 8641ebc77c2829f77ef563773da242deb512fc9c85ba4c3c16a4c5ff27fb5e61e55c71abc265abcf8d3c4a0c85704af52e0651d63e1b90a8e4b570d9ecb0f357 SHA512 748ba922ff77bfb6a186e155b5f83d833f7c9085322b37a972fc4e024a4125c07d393e72436c7235a2c94d8504afecd3c21b9d22765f35968bb56554e0ae648f
 DIST d-spy-1.6.0.tar.xz 215844 BLAKE2B 4811591024d3b599e5e10354db8aa14d5b80bf6fb3c8bfbeadcf5d9c14501af0d00368643cb58eac5ad9452b541743ce3ff9f8376202270f635078876a1012b3 SHA512 7a65bd64320a69eb54077a359381bda35f285b42f4181bf972bc790a8002a773b66c23303e5e94c3dec8c7b9bfc7b8aa60a5ce60f2eb47459ce3dfd634a05703
-EBUILD d-spy-1.4.0.ebuild 811 BLAKE2B 9f69be833bc83c2b8867840e00bfd8b306992a58f7c8ef3735d2593b6b633dc32a7f51bf9ad19734a341b8530e55ded80f256bb21253a0e0b36d7c3b99e87bbc SHA512 92a31f6ad13d306eb311c625b3fcf8cb2af6e8d3667910f44be64cbe8d78a15fc03d34785e7924dd2782767d7521bb4e86ad764e9bd3c76a71bfadd8ea550b6b
 EBUILD d-spy-1.6.0.ebuild 713 BLAKE2B c20eb83944720bc54f7534e687d8210b492fa04f90fd0714e8f8044a48789e4b661db632d21a615cc5cd6c5fbf37d0685828ec5a7a00f84b4b9793728a5735c0 SHA512 4bb75be0821d544937d08dc6635869f33fe53847e6ca2cc3a8b97e5e1cad7487cff839509177c42f222ea8d527b10858f6744d8b91e95ff560e57012ccfd1564
 MISC metadata.xml 346 BLAKE2B ed5a5f063aa92eb582564f615a38bb8e3d71955f0c42cc91eb488d0cb81b615dd1bb05b8b833c9a225dddf2e6f5d3089983357a4dac0f81edac3303327dc3121 SHA512 fb5ae140eaf1130d78e8222253cc2c2ef059e7b3d7d765c2f1b8038f691e1119867be986b1585c981f07fe038ec010f427e1a758ec3d22c618cc7e289160274b
diff --git a/dev-util/d-spy/d-spy-1.4.0.ebuild b/dev-util/d-spy/d-spy-1.4.0.ebuild
deleted file mode 100644
index e926096c9dfc..000000000000
--- a/dev-util/d-spy/d-spy-1.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson xdg
-
-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
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 1d418e51cea7..acb8566e4bf1 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,5 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.74.6.tar.xz 5217312 BLAKE2B 07b0a5cb74c1451ba863d5f9a781a122d3d20af1f1227177025de114279277cacada3dd6ab5eb5ad5c0bff5ac7abab6fdfbe0551f44d07b2ddc9141a0640a8c8 SHA512 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b
-DIST glib-2.76.1.tar.xz 5270936 BLAKE2B 6e6d15bda7ca6365d5f33e197cad41043f17c2f505997953e4f5222121571dabfa07ac88d0a1e298313021c63ef97e7560128c3f8ddf7f518afba98692555e81 SHA512 7ab8740925fa4ed2d860a35544c475ae905df5fa7fc0cc64ffa8c543df6073794e44c8ff39e3e1de1d677016ef9d27e9bc709d2505d13090faa8d6c47cd64bd0
 DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6
-EBUILD gdbus-codegen-2.74.6.ebuild 2197 BLAKE2B ac5f5eceed9ee2673b2d8145032615e44b0ccefe23b82abace8b5d54ef8c52d517ff5fd5d3dc4774d5870c54e1bb907d8af22ed1cc9913cdf4d96334853f5c9f SHA512 2632236a58cb71ece53bbecd61622c52ffc15a9fb6a683ab3be1ecd1f12ba8ac860f750b049a05552612a9f10b3006c8111032f607a9643340d2b9d74f448bed
-EBUILD gdbus-codegen-2.76.1.ebuild 2205 BLAKE2B a8dfe56fbb23209056025bbb0dc0be5f19e4cd256480e5f17d034ef7d7a408b27259dc32fbf13b959b5ce47339e5f34575131d06335e54248dfe76355ffb18b4 SHA512 a64faee8a9a579ba4706a3e817c9d6cd6d7c8538d592b1665dc47ce47552d47948d8fdccec293208fd40d6052f326fc59f2947ed2fdd75caa4510dba502b8074
 EBUILD gdbus-codegen-2.76.2.ebuild 2197 BLAKE2B ac5f5eceed9ee2673b2d8145032615e44b0ccefe23b82abace8b5d54ef8c52d517ff5fd5d3dc4774d5870c54e1bb907d8af22ed1cc9913cdf4d96334853f5c9f SHA512 2632236a58cb71ece53bbecd61622c52ffc15a9fb6a683ab3be1ecd1f12ba8ac860f750b049a05552612a9f10b3006c8111032f607a9643340d2b9d74f448bed
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild
deleted file mode 100644
index d4ca839d3013..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.76.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.76.1.ebuild
deleted file mode 100644
index 787dfc5d3dab..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.76.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 6561bb831267..b6053046c763 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,3 @@
-DIST glib-2.74.6.tar.xz 5217312 BLAKE2B 07b0a5cb74c1451ba863d5f9a781a122d3d20af1f1227177025de114279277cacada3dd6ab5eb5ad5c0bff5ac7abab6fdfbe0551f44d07b2ddc9141a0640a8c8 SHA512 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b
-DIST glib-2.76.1.tar.xz 5270936 BLAKE2B 6e6d15bda7ca6365d5f33e197cad41043f17c2f505997953e4f5222121571dabfa07ac88d0a1e298313021c63ef97e7560128c3f8ddf7f518afba98692555e81 SHA512 7ab8740925fa4ed2d860a35544c475ae905df5fa7fc0cc64ffa8c543df6073794e44c8ff39e3e1de1d677016ef9d27e9bc709d2505d13090faa8d6c47cd64bd0
 DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6
-EBUILD glib-utils-2.74.6.ebuild 2332 BLAKE2B 0732180201fd68ab2775d231ba1eddf10ee8cc5092cecd1a50b2161417fb27c8d299c1908b933711013fc5b8b881d15a298b7ad60f743f39fb82fbcb2f5aa093 SHA512 fe9cac3eaca77c746a09d5ff451e308b8274c986a8dd8dedf974b1536a44235dadb963843b6ad4067b477e5269b668008289b5e8405ede4b03269080926b3d48
-EBUILD glib-utils-2.76.1.ebuild 2340 BLAKE2B 9a64c220aa19f3ac6d111cb1b825c926d673d0537331e9d69d5e42693d2e800358be6b83e649af01d3537f5eead7db010f67d9509c3593f6e117ac6a467a0784 SHA512 ecca302d5990aaa0d345b1aba5bdc31fd214243c5df875a1c147d401b0121aa0eb1d76c0bfc3018916078b7b91bd0ca53ad11b67f405611f5004e8e50653540b
 EBUILD glib-utils-2.76.2.ebuild 2332 BLAKE2B 0732180201fd68ab2775d231ba1eddf10ee8cc5092cecd1a50b2161417fb27c8d299c1908b933711013fc5b8b881d15a298b7ad60f743f39fb82fbcb2f5aa093 SHA512 fe9cac3eaca77c746a09d5ff451e308b8274c986a8dd8dedf974b1536a44235dadb963843b6ad4067b477e5269b668008289b5e8405ede4b03269080926b3d48
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.74.6.ebuild b/dev-util/glib-utils/glib-utils-2.74.6.ebuild
deleted file mode 100644
index d94a24e0b19e..000000000000
--- a/dev-util/glib-utils/glib-utils-2.74.6.ebuild
+++ /dev/null
@@ -1,62 +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} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.76.1.ebuild b/dev-util/glib-utils/glib-utils-2.76.1.ebuild
deleted file mode 100644
index 33bfee268b48..000000000000
--- a/dev-util/glib-utils/glib-utils-2.76.1.ebuild
+++ /dev/null
@@ -1,62 +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} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 6ceb663d6b5c..b911280c5cad 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,7 +1,9 @@
 AUX glslang-1.3.236-Install-static-libs.patch 1460 BLAKE2B f17b5b7325e112d52a65767166530c9976833a2a893e608fe89c662a2e84feccd8e51b36a620dcf94b269cbeb96307744b4376799821dd4d4e422ad8fd887b14 SHA512 032da16afb9ca98bb0377625fc16458c641836fb3bb63940818c1bf4b068b6fe03b3f14b03cf00e10991236ca20d292293c67d02dbc429b2e3714e6a8bf85b19
 DIST glslang-1.3.239.tar.gz 3683945 BLAKE2B ffc690522814d7a28bea7168744d390a5a1c7e34e67f2037c72b2a040c8c48fbb9d46f37d74ea58b2bcf7621b0008498a9dd592da08e9e93037e3f45c5b920d6 SHA512 a7cd35c76dc4f3a4f2f1015e7495b87313472d7c766075256c0d2d0004f395f62d38d715675b49f13f66a12645175c421af4622129aeb588528397e92f51790b
 DIST glslang-1.3.243.tar.gz 3688482 BLAKE2B 4346d7a3524f16ef938e9bf2f3c184fb4b915b3adb1facb0297ddb1c4095a6d32dac35d4be0ad18918d80e2106db5bdd037e035efe613ec4b42ff1878f8bc653 SHA512 0febe5d4187970ebea3e28a323bc85da2ad24feee12390410fe817b363847409f00c1b7e8d4e88156443929eb9a616e6064bf73aa5f8914e71c01d985d6fc15c
+DIST glslang-1.3.246.tar.gz 3688484 BLAKE2B 6013b0d8903a96344d6f77a50b8689a53429522b6793016378023d5f5179ed9116d10d19b02ccd7abbcf2d30e4864989ebcc3fbfc86110492f58dd283b7d42ea SHA512 92b1cb4d55cfbffb50eed094568d5fc78785b4d42967d3ce70c704135ddc1d75191c58809cfac99e81cf9e2735226606d3792b4a59ca5351fe8e412f5865b005
 EBUILD glslang-1.3.239.ebuild 973 BLAKE2B b4810ffb64a48c2103345a55b55ce856ec4fd7a0e5be22324e0cdf52cce95816fa2cf7759e1a30d85130e54cd80f81b2fd42598e61aee3ff082ad5da35f984c9 SHA512 197e83ba1850f56f348bbbff6c48e29f091855116c5ce0709b4f3148e6e96ab9718a4511670ef7db802b3cf8836325ca4c8d4b5f07ee4ae88a72c7cbd2fa64c4
 EBUILD glslang-1.3.243.ebuild 973 BLAKE2B b4810ffb64a48c2103345a55b55ce856ec4fd7a0e5be22324e0cdf52cce95816fa2cf7759e1a30d85130e54cd80f81b2fd42598e61aee3ff082ad5da35f984c9 SHA512 197e83ba1850f56f348bbbff6c48e29f091855116c5ce0709b4f3148e6e96ab9718a4511670ef7db802b3cf8836325ca4c8d4b5f07ee4ae88a72c7cbd2fa64c4
+EBUILD glslang-1.3.246.ebuild 979 BLAKE2B 9be4b50d30e27260788c9702f784c61df580b96efa40833d3685edb9774ff119dd72cc9d2859c23264785ea271d2cc94f4a93583f857930bafe4058a0dc0d703 SHA512 cf8af799beee2b6a945fffd89b3cdb8813b51d06985286d109d237347d086cc90ed2a7058b428bf1d9b117109bbc67ad161b714cdb7ffd634c4bd681bf4762b1
 EBUILD glslang-9999.ebuild 979 BLAKE2B 9be4b50d30e27260788c9702f784c61df580b96efa40833d3685edb9774ff119dd72cc9d2859c23264785ea271d2cc94f4a93583f857930bafe4058a0dc0d703 SHA512 cf8af799beee2b6a945fffd89b3cdb8813b51d06985286d109d237347d086cc90ed2a7058b428bf1d9b117109bbc67ad161b714cdb7ffd634c4bd681bf4762b1
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.246.ebuild b/dev-util/glslang/glslang-1.3.246.ebuild
new file mode 100644
index 000000000000..c00807a5549c
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.246.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+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"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0/12"
+
+# Bug 698850
+RESTRICT="test"
+
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 861b2b754ffd..754456b9c14b 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-builder-43.6.tar.xz 10289396 BLAKE2B e9b8c98f5463906e0ec522307f0ec07c130045288db5b1295b56320ac36814019ee3350f73543c8a1655812dcd8b26da4cbe9d1b5bd3bda8cc7a943f308a91ee SHA512 e444843e1eae2a901048dc6f2ff7683c3693fcbceeb113ebd28e7a51d1ea9c3b7e317e28ceae9b659dc89cf3b75cabd526fff9483b81c623d809ca268a2c9a45
-DIST gnome-builder-44.1.tar.xz 9785408 BLAKE2B 43a41aa4856f3bbd84b6bab6686cd128d697d54e539d6b88e668a088eb256d11459d058046428564a706bf6e3766e3f61f9ff503151f16647f82bbbe400ab3fa SHA512 92653392fcd6c3a83f78c500037e8b8be05663cc8918e5521baacfbf5d251896358a284e7b37e4c49428c921b7f0cc2a96afa029cd00589b48f40b365e4decbc
 DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090
-EBUILD gnome-builder-43.6.ebuild 8733 BLAKE2B 4fcfccd449d726ffb335101546cc1d8610fa48f93247413ac5c87b3207e005c61194c9963a3ef6896819861b3712b3e920ee7e7e926f157da66be6a2c2ab3cde SHA512 b90fea7c51cd3cc40f1ef4a2c4bca0852d9fa662b977f404832856f9eaa3759ac510550f89d5afe19fc58263533d3f4bff842140c18717264caa331c66ea0c54
-EBUILD gnome-builder-44.1.ebuild 8982 BLAKE2B e21d41fbd298d8b62b4c124e9d0123899f0bd14540db06be7f436c5b4265f8a5656a038aec50e1cb77550465f75269f13f72170e7037596a2933959899a3a017 SHA512 64eef400246e57efe70bea3b23f0ea4e754ffa53f4473bce7606980a0dfb38639d96f36278254644892a9dd3ef4c506fa2b633df6bb7030fb837dd96b8770fab
 EBUILD gnome-builder-44.2.ebuild 8981 BLAKE2B 36f88fcfb7202f4aea37d265eb1126018b2becff8984a004de6ad70fd92602b4fbcc2457403d8124bac66c3127050b562e3d66d686f9e7be79f666ae495d696d SHA512 df63701aae93033088141377ccecc8f0e72a0654a33bc64b4e3e78df2facef185d68dd47ac9a4ebf498cf6a695ea97cdbe5697085d9baf867e16d3d6eccac468
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-43.6.ebuild b/dev-util/gnome-builder/gnome-builder-43.6.ebuild
deleted file mode 100644
index 92f02b73c78b..000000000000
--- a/dev-util/gnome-builder/gnome-builder-43.6.ebuild
+++ /dev/null
@@ -1,261 +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} )
-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"
-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.
-* virtual/rust 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
-		-Dplugin_shellcheck=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/gnome-builder-44.1.ebuild b/dev-util/gnome-builder/gnome-builder-44.1.ebuild
deleted file mode 100644
index 1961588e03a8..000000000000
--- a/dev-util/gnome-builder/gnome-builder-44.1.ebuild
+++ /dev/null
@@ -1,275 +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} )
-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"
-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.75.0:2
-	>=gui-libs/gtk-4.8:4[introspection]
-	>=gui-libs/libadwaita-1.3.0:1
-	>=gui-libs/libpanel-1.1.2:1
-	>=gui-libs/gtksourceview-5.7.2:5[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.43.0:=
-	>=dev-libs/libdex-0.1.1:=
-	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.36.1:=[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:6=[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/python-lsp-server for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* virtual/rust 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_codesearch=true
-		-Dplugin_codeshot=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_dub=true
-		-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_glsl_language_server=true
-		-Dplugin_golang=true
-		-Dplugin_gopls=true
-		-Dplugin_gradle=true
-		-Dplugin_grep=true
-		-Dplugin_hadolint=true
-		-Dplugin_html_completion=true
-		$(meson_use webkit plugin_html_preview)
-		-Dplugin_intelephense=true
-		-Dplugin_jdtls=true
-		-Dplugin_jedi_language_server=false
-		-Dplugin_jhbuild=true
-		-Dplugin_lua_language_server=true
-		-Dplugin_make=true
-		-Dplugin_make_templates=true
-		$(meson_use webkit plugin_markdown_preview)
-		$(meson_use webkit plugin_markdown_indenter)
-		-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
-		-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_serve_d=true
-		-Dplugin_shellcheck=true
-		-Dplugin_shellcmd=true
-		-Dplugin_sourcekit_lsp=true
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use webkit plugin_sphinx_preview)
-		-Dplugin_stylelint=true
-		-Dplugin_swift=true
-		-Dplugin_swiftformat=true
-		-Dplugin_swiftlint=true
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_todo=true
-		-Dplugin_ts_language_server=true
-		-Dplugin_update_manager=true
-		-Dplugin_valac=true
-		-Dplugin_vala_indenter=true
-		-Dplugin_vala_language_server=true
-		-Dplugin_valgrind=true
-		-Dplugin_waf=true
-		-Dplugin_words=true
-		-Dplugin_xml_pack=true
-		-Dplugin_zls=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/idea-community/Manifest b/dev-util/idea-community/Manifest
index cf0cd569c635..f555d8616ffc 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1,3 @@
-DIST idea-community-2023.1.1.tar.gz 937975661 BLAKE2B ca902c719e98b7c3b7777ca236ca1737f02ac9f856f02fe27f94600e7a2f40ca62bf7a9bb2788ec1a9558b9034a8a86771cad7eb55137e1fce18c5b1a690d719 SHA512 489f0d70a8f96a2c943a61c456a7ca47ae111c82696e4ac0144ca78fcea302c682b2ca4a2d0fa2d0f679c8aae5365984b699f9614e74728a37ba60068f6cd241
-EBUILD idea-community-2023.1.1.ebuild 3766 BLAKE2B d4a43b83baf191a3f0af1c4243f4e1bf5622f70a29a3b5067fe72cb96951ace41c51a663990a83dbe0e24c81ea80dfd4391e3f02147bee7e28bc7b8ea4fa5c95 SHA512 c0b580893d06ee5063851845f16e43ea1d862fb835058602142d581100dda3a70e58acac00c523489f200df40b75ed1ab0cf68bbc1fa207582b817556d6acc59
+DIST idea-community-2023.1.2.tar.gz 938083157 BLAKE2B 9f7195ad6b435f36fa9f7e67e6da39a5f728c6c2b47af982e11b13d8b763600f5b92d5373bc535ae81c86e6bfb6f94b1e62851def1c84cb112e783a9b759a0b5 SHA512 c859fbe0ef58978891d5a12f14c3507aa3bc65497bab3e407e0bcb924dcebe8ec009bbc3d8dd22b15092d8c646251bf2a04ba076c788a21af42efdff01bcf149
+EBUILD idea-community-2023.1.2.ebuild 3766 BLAKE2B d4a43b83baf191a3f0af1c4243f4e1bf5622f70a29a3b5067fe72cb96951ace41c51a663990a83dbe0e24c81ea80dfd4391e3f02147bee7e28bc7b8ea4fa5c95 SHA512 c0b580893d06ee5063851845f16e43ea1d862fb835058602142d581100dda3a70e58acac00c523489f200df40b75ed1ab0cf68bbc1fa207582b817556d6acc59
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2023.1.1.ebuild b/dev-util/idea-community/idea-community-2023.1.2.ebuild
index 0a1132b3b38a..0a1132b3b38a 100644
--- a/dev-util/idea-community/idea-community-2023.1.1.ebuild
+++ b/dev-util/idea-community/idea-community-2023.1.2.ebuild
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index daa5fd6e5a05..53f0028d9492 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.3.243.tar.gz 449872 BLAKE2B 15d8607dd14d10559249c0d161342153cd316481bf59ea502d102941a2f4a60f1d27285d46c68b3a0c5b738fff7d2956cf753fc135d282f61b254302df7b1d5a SHA512 04e7ac3d99ad9aa704c0a9fdc1a2126c9593aac855f255a2783d84c1226ce35b0adcd74065b24953dca9c43726e2b723791c64b441fdba1f4f726a5ada172e75
+DIST spirv-headers-1.3.246.tar.gz 449878 BLAKE2B 9756eaf5e38f7267693dff348dd0133d57c5027c8a168bacaa214ed0e4bd6be24ec8101a9a81059752fbde4e014b5cfdf051aa0a9a27927ba25077cb90870f3c SHA512 54c689ef394bc03d6033af9b319f3d87b36def64759904c44eee11e81a83b51e1ae54ead62b8189436bc112f43fd3104dd0f6018f33a1256bc5614712537d5af
 EBUILD spirv-headers-1.3.243.ebuild 489 BLAKE2B 48386f966fcaf7a849a1835fdedf93d61abc5017c62fbf0145e83ec8c9fcf2a58c7b240047dc82ce06075656acb4d0359cb9cf5074a4ba0d51fd0306489d28f6 SHA512 4d7b961f5344ce9ed16004715626e0822d10a8cf46241f910d05deb17542741fbc48f7aa051cbbe1977036522d5ac0b3416ca56aec44bfa6068e1fdc34c75fff
+EBUILD spirv-headers-1.3.246.ebuild 495 BLAKE2B 88852d1ccce3b5e3ac8b8339ab0872dd9b377e62fe1b1cfb2394f7ca04706386fc9cf0beed9a8a51107da94c5184471e50b01fbcf9d72ea58a54222ae21fba00 SHA512 32c8646c11acbf07e99b6fe63d08b6e293131794af630a01d70c80b3a74d9f197d980c8595a01968f93d32142ecdcc071e312a318031431a21991ef0499475b8
 EBUILD spirv-headers-99999999.ebuild 631 BLAKE2B 3b51ab12672d7f984b1964a4b52ca0b490fec7fc2c6ad4c9c1c30573d9181864a9654d62c95bf6bdc15627285550f40248f55ebf34b648280d311eb190842661 SHA512 293b4f77a53319ac245cfd61c06607f8fddfc88ecf7ed4d38887493527a249ecee56e1722b8582122263847918e026e9badba135bdf461ef356e2c50de6d6114
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.246.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.246.ebuild
new file mode 100644
index 000000000000..d01ba8ef9a93
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.246.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="sdk-${PV}"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 0ad1d171fda1..eb7b2cf2df3a 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-1.3.243.tar.gz 3102102 BLAKE2B c871a1e152423a1e09d228cc91df86df5c81e62aaecf140c57b95929bec63142384f3908deff51735b520e31261514124c0063c67a80fff688a054b3364f31df SHA512 6a3ad537d74892fb3418bb11dd7bd174b59edfb99029128dddde18a02d677d485a704d11cbdd3a3f1df3a18f8c534ab081b461cc82b5bc00c5a5c0601102bd65
+DIST spirv-tools-1.3.246.tar.gz 3102137 BLAKE2B b0532e5eb489cdd12c0c58dda5a6aca743d3a1de8a1cf255da55375224fd407037696d73f792e6a3758c9fdc222b8d820285c9d8fa0908597d9223299b597be6 SHA512 9308be180e7dcfc10c06d84fd8f7998fddc0d9bdaf06d0d150f645ab3cf8fa7551dee8014bb245019afa05bd9439eaf58ddfc0ed197226d11b111904119e310b
 EBUILD spirv-tools-1.3.243.ebuild 1139 BLAKE2B a8254b1a1e26f1f88c930d01d934bc9e4f282969999b8dcd823ff5c697f20a7d7800c0ce1c9da1f8d88089ff923543ca23e6ac4749fbd0284a2668cfa81cb423 SHA512 7ba92485860b9d0ea68b501d2f4e70d422df78649df97a24c96da266d693d2ac2a350de4e6f8783d96b603a6fe774155496247b7eb1d5969b11bef5bf8a8ad38
+EBUILD spirv-tools-1.3.246.ebuild 1145 BLAKE2B 9944035c79eb26bbd6e783d3b199e3bffc5febd8c1cf36aaf5c80920468ebdbb5e955a54889aa5385ff28730e8a7091db48c54f2058f7faec7ef207c85149ecf SHA512 27bd3df64ede70486d23e14d1560bf0a85e0a0173021809d9ef62e15d7d7583a8513e543468b0740e37330c2a2d6b6de123211a92e8667a0357999a44a60cdb3
 EBUILD spirv-tools-99999999.ebuild 1147 BLAKE2B 56595323992efb3c2e9a255b3b57af95c38d3a12c59d4d8a3f1afd0b6d3758dbe1f3bf8607ae359591ef3b382c654f1e89b719bd01fe21021c15e4c32a6923eb SHA512 88dc7e115dddedf124c30d3233591a47827f0f6e5c755f67230ed830ba8625e7c6224d97042fc721a0d1b06305ecdfef20c0535074e2dfe75df1a5cad4739727
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.246.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.246.ebuild
new file mode 100644
index 000000000000..9b7c8253a4ff
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.246.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+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"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+
+DEPEND="~dev-util/spirv-headers-${PV}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/
+		-DSPIRV_WERROR=OFF
+		-DSPIRV_TOOLS_BUILD_STATIC=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index cf66aa4aaefc..98b97b0df7fd 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,7 +1,5 @@
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
-DIST sysprof-3.46.0.tar.xz 518536 BLAKE2B 8925f0cbe34411cce6bd86e9f4a924d3ff627429812682898fffe0a08c2dab9228e5d8bde44b460404f90fb29961a30154af1e8240df24bfa20b70cc7a36448e SHA512 ac248e2a06d2f7905bebae4e685dd320e3ac85097e33b9c6b8482a4647a5bfcaadc4d9a1fe117b3a74cb855d6c72d9a1453a37d7b64762a223c0fe5da2653a87
 DIST sysprof-3.48.0.tar.xz 533092 BLAKE2B 5af48d9216f13ffcc8824b0ba6a4e0ff931c903991953e66c2b50534399320d3d3fccd6e8478b10dc895d19544f9c08733565d95fe9c2c70d64f2294ccce2330 SHA512 100b79fabee005b5445dab3ad78d43facf375a488aa6513e987deecd6a3036cc43bfd78db106a4b8a15b4280dcd975872784c839f560779183adb5a339b0648c
 EBUILD sysprof-capture-3.36.0-r1.ebuild 744 BLAKE2B 433bfab5288a22ec0ff380cbc1a7c557acc803910be35b6545b1fda0103c6497140857a6bb79128c8e54909be9d4976f5184b2ef75fe572f8529ea47444f62ae SHA512 3ac57dd089f38aa713353e258f1414d2fe7e2f17c53a8ad3c38330751ec377086862a930b8c8d42fc5fb8549477ec49f376ebf3bd53a460f4fa2ce6adbc90bb9
-EBUILD sysprof-capture-3.46.0.ebuild 778 BLAKE2B 18d1e2a5e29f9a4c0f016a4a953b553253c73392e38d4753dd1edf51e2081b004294b722050bac315f823edc86ff9def1231bf4118e2b686f34348fc1c787a5b SHA512 4cbda26df918fef6fd59d1c260db74f83798d2f2343c11200bcc740d962241d130082a598783b39de8b9578fc9bcacd236f1bf7327c26d3fe34f35bd72ea3479
 EBUILD sysprof-capture-3.48.0.ebuild 778 BLAKE2B a2b2020168160adf692cbe6d44f13e8b15d1364e20542cd7ad35734ad85cf50866d854c87d005dec9f79540c0ea3c4676cf4dd90d3b7066692c385df6571b368 SHA512 1b9fad016768619b263d20b2c24d06866d41d5a137a894059af80aa1a8c8da4be3ddfec7896da34d7694cc909b017863429a0dd52490890646cc09de3de9b1d0
 MISC metadata.xml 348 BLAKE2B 6d20b95f03e7ae7ac3bc5e3633757cef8d68a914da52b6d6fab3c16af3abc54e3d571c770a16772e755c4246a611d3ae20b31a2bfe5d9acf934aa28c0e64719d SHA512 b5132c2bea9fc617ac3732001154e5000c37ff1034ddc904875d8d807aeec5dec3c8d7c0a36bd3ad26bc0310a70842daae96d743d9f82a4b2f1057ef8d65e406
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.46.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.46.0.ebuild
deleted file mode 100644
index aea86a7f4029..000000000000
--- a/dev-util/sysprof-capture/sysprof-capture-3.46.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="sysprof"
-
-inherit gnome.org meson-multilib systemd
-
-DESCRIPTION="Static library for sysprof capture data generation"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dgtk=false
-		-Dlibsysprof=false
-		-Dinstall-static=true
-		-Dsysprofd=none
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=false
-		-Dlibunwind=false
-		-Dtools=false
-		-Dtests=false
-		-Dexamples=false
-		-Dagent=false
-	)
-	meson_src_configure
-}
diff --git a/dev-util/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest
index 3f8fecf40684..a36fc5e189b0 100644
--- a/dev-util/sysprof-common/Manifest
+++ b/dev-util/sysprof-common/Manifest
@@ -1,5 +1,3 @@
-DIST sysprof-3.46.0.tar.xz 518536 BLAKE2B 8925f0cbe34411cce6bd86e9f4a924d3ff627429812682898fffe0a08c2dab9228e5d8bde44b460404f90fb29961a30154af1e8240df24bfa20b70cc7a36448e SHA512 ac248e2a06d2f7905bebae4e685dd320e3ac85097e33b9c6b8482a4647a5bfcaadc4d9a1fe117b3a74cb855d6c72d9a1453a37d7b64762a223c0fe5da2653a87
 DIST sysprof-3.48.0.tar.xz 533092 BLAKE2B 5af48d9216f13ffcc8824b0ba6a4e0ff931c903991953e66c2b50534399320d3d3fccd6e8478b10dc895d19544f9c08733565d95fe9c2c70d64f2294ccce2330 SHA512 100b79fabee005b5445dab3ad78d43facf375a488aa6513e987deecd6a3036cc43bfd78db106a4b8a15b4280dcd975872784c839f560779183adb5a339b0648c
-EBUILD sysprof-common-3.46.0.ebuild 473 BLAKE2B 51861524abec8694d39fa696e527f33b7fd2f0ab6605176aeafe0e46d37b0e9fb504bc2710a3916450a9bd0f5fcc1ac7232eb26a87d9b0ffdb446ef47a3bec84 SHA512 6498df83ab524e82a4a399dce26e745a0693cc6bbfc4f7c6318bee374cb00c7be8ec9f94931bae82c937bc881e164855499ed01ce6652ca6641e9f445a686b31
 EBUILD sysprof-common-3.48.0.ebuild 425 BLAKE2B 2a9aba610d00bd2538cdbc0c75bcbfa806bee189c1e8fe5f7974a45f7587682cd02df9fc25225560c9144a1eb5ae707a38826ffec8aced737d9a3c2f96901207 SHA512 89bebb5d683891ed9e9c420dc9441a496281c38bc3bdc5d010078e110c892aad590293b3d3893632765aea0bcfc1e93431a8df9ff423ef31b1d9b5b33ab34a56
 MISC metadata.xml 348 BLAKE2B 6d20b95f03e7ae7ac3bc5e3633757cef8d68a914da52b6d6fab3c16af3abc54e3d571c770a16772e755c4246a611d3ae20b31a2bfe5d9acf934aa28c0e64719d SHA512 b5132c2bea9fc617ac3732001154e5000c37ff1034ddc904875d8d807aeec5dec3c8d7c0a36bd3ad26bc0310a70842daae96d743d9f82a4b2f1057ef8d65e406
diff --git a/dev-util/sysprof-common/sysprof-common-3.46.0.ebuild b/dev-util/sysprof-common/sysprof-common-3.46.0.ebuild
deleted file mode 100644
index 360220812d02..000000000000
--- a/dev-util/sysprof-common/sysprof-common-3.46.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="sysprof"
-
-inherit gnome.org
-
-DESCRIPTION="Static library for sysprof capture data generation"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="!=dev-util/sysprof-capture-3.36.0-r0"
-
-src_install() {
-	insinto /usr/share/dbus-1/interfaces/
-	doins "${S}"/src/org.gnome.Sysprof3.Profiler.xml
-}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 917388091348..c5db93edaf82 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,3 @@
-DIST sysprof-3.46.0.tar.xz 518536 BLAKE2B 8925f0cbe34411cce6bd86e9f4a924d3ff627429812682898fffe0a08c2dab9228e5d8bde44b460404f90fb29961a30154af1e8240df24bfa20b70cc7a36448e SHA512 ac248e2a06d2f7905bebae4e685dd320e3ac85097e33b9c6b8482a4647a5bfcaadc4d9a1fe117b3a74cb855d6c72d9a1453a37d7b64762a223c0fe5da2653a87
 DIST sysprof-3.48.0.tar.xz 533092 BLAKE2B 5af48d9216f13ffcc8824b0ba6a4e0ff931c903991953e66c2b50534399320d3d3fccd6e8478b10dc895d19544f9c08733565d95fe9c2c70d64f2294ccce2330 SHA512 100b79fabee005b5445dab3ad78d43facf375a488aa6513e987deecd6a3036cc43bfd78db106a4b8a15b4280dcd975872784c839f560779183adb5a339b0648c
-EBUILD sysprof-3.46.0.ebuild 2530 BLAKE2B f02ef42feaf6c58a7951a40ceda61e8b0a6142e4bd69ea6e9ee786c22eaabc3bc16d1c9ef67d3413e0a147193836ae8ca55433d8f67de289f5abb257eaca188a SHA512 e32874e30bf34bbb1d329ff75184d3e86df6ec1658610dec3a7d6364d3b7861ded8c8f4d0bae9ff1fb522bdaf96f9d17b2e05aab32b1d191b1077ca90beaee3b
 EBUILD sysprof-3.48.0.ebuild 2530 BLAKE2B 98d8e0a61a724dfbe399b6a8001607e4ca170ea18ba957d0744150f74a3fc430ea28a3a8d03017099b5ba991f26bcb553ef4923a07e6c33981b68aded2385a2d SHA512 0c79c53cf8979cdb4bf92b4319f1ad8ffdcb9c761e1bfbd5db191246dffbb86925c63a3686eee5f2166ff7ef89842c911c0f529c6c551b65a5f113161f25e2ba
 MISC metadata.xml 833 BLAKE2B 35f88ffbe55a8acf5322b2f30556b950d2cdf148e0e16d1dcf8eac080273419bdca505088d4cea12c01cd2644fe9129995dfb497177aac70dbd75c82ed018917 SHA512 de169c39ab639a120f4ca13d5619fdb531239cfcb2af90c7fc0c4b7d234002fca5b9f2f1cbc8ab305648a7a13bd116d2c1addd2e32f2d04e7ef37118dd2af913
diff --git a/dev-util/sysprof/sysprof-3.46.0.ebuild b/dev-util/sysprof/sysprof-3.46.0.ebuild
deleted file mode 100644
index 690f93d47d41..000000000000
--- a/dev-util/sysprof/sysprof-3.46.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-API_VERSION="4"
-SLOT="0/${API_VERSION}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gtk test +unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.73.0:2
-	gtk? (
-		>=gui-libs/gtk-4.6:4
-		gui-libs/libadwaita:1
-		x11-libs/cairo
-		x11-libs/pango
-	)
-	dev-libs/json-glib
-	>=sys-auth/polkit-0.114
-	unwind? ( sys-libs/libunwind:= )
-	>=dev-util/sysprof-common-${PV}
-	>=dev-util/sysprof-capture-${PV}:${API_VERSION}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# These are installed by dev-util/sysprof-capture
-	sed -i \
-			-e '/install: not meson.is_subproject/d' \
-			-e '/install.*sysprof_header_subdir/d' \
-			-e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' \
-			src/libsysprof-capture/meson.build || die
-}
-
-src_configure() {
-	# -Dsysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk)
-		-Dlibsysprof=true
-		-Dinstall-static=false
-		-Dsysprofd=bundled
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=true
-		$(meson_use unwind libunwind)
-		-Dtools=true
-		$(meson_use test tests)
-		-Dexamples=false
-		-Dagent=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-common for the benefit of x11-wm/mutter
-	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index d049ea9c40a6..ad922ea278d6 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.3.243.tar.gz 1841214 BLAKE2B b9361dba611b9719bdaade74084b020bdecbaa68f21fe7cd17ac57fa58f6b05683cc5c7c706014ab52bf604e849e822770c6697330877243aa9ee816ab8f6841 SHA512 d01304ae6b9bc142bd93ee5e0e66aa484d781bb9a6ca2ef6b0f0a367d1549f060a4c8810be13e2672fbea0e37c4c9de87070e56a772c5d6c75a60399d2f6ab53
+DIST vulkan-headers-1.3.246.tar.gz 1948824 BLAKE2B 78e32f737ec48a3c65566817440bf811097850b7e41458e1d997bcf69db7265fa66e1ec2ac4002408290a6e1498e18474766871dba2518da12a01dbdc8bb9f83 SHA512 0de84229b64c93234adc2735a32c19dc706f74fc09d3f2a82aea1134d55ac392889591c56573e6f28f48317ebe795fc1bcf44a304c888f7dba3692173fe418c0
 EBUILD vulkan-headers-1.3.243.ebuild 594 BLAKE2B 6faa9ea68b845b6d6fc5426e4eeeb9fa133a11bb420931496137c9f563005e6be84da1a8b2ab97afc9dfe55443589aa4ddbee028712e964f5bd24d219ab9e8d9 SHA512 6b72e8ccc8a6d85669eea09484848283aaa81b10a09c48c0f5822a94c108d956f4a7f2ca1b2db07965f94bda667c380c9194135eebadcfa7e38294814484be6a
+EBUILD vulkan-headers-1.3.246.ebuild 600 BLAKE2B 0daf239aa649fb07a0cf75f53b709fdd45da34d5ab5d03bea21de97dd15871a440859ace5089d7de99665af2b1eac52ab4b312bad809d22ccb5a1ba858828a8b SHA512 c5c5e86b12dec0b97c1dcc1ef5edfa993665f99ff573892e7426ee7533829a72884e8b5eb4b19ec27d289c8cdb0c383299aa41c05f543e6af54455b2ecf06a1c
 EBUILD vulkan-headers-9999.ebuild 600 BLAKE2B 0daf239aa649fb07a0cf75f53b709fdd45da34d5ab5d03bea21de97dd15871a440859ace5089d7de99665af2b1eac52ab4b312bad809d22ccb5a1ba858828a8b SHA512 c5c5e86b12dec0b97c1dcc1ef5edfa993665f99ff573892e7426ee7533829a72884e8b5eb4b19ec27d289c8cdb0c383299aa41c05f543e6af54455b2ecf06a1c
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.246.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.246.ebuild
new file mode 100644
index 000000000000..fdef9654420b
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.246.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	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"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index faf6a902deeb..d6c0124a5640 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.3.243.tar.gz 778991 BLAKE2B 4b1e2a1b92ab4b4db7967fa01980b50845e8495c4ba638fe472968ec0069ce3d5207436e081401e7cacfd673002aff681ecd97ef2545a52decbbbb98b9150fd0 SHA512 6ba4c14073006e12615fcf054cd224b6e9f7f60215454349c19f671f4f9f987f38fe3d3dcd610d9a7dc7a39c6fdfcfae61509d31e44c86cb83b8429d1cb0febf
+DIST vulkan-tools-1.3.246.tar.gz 783735 BLAKE2B fd95f9b2dac60ab5c8231b0f600dd897a2fb16c0b3782e40f39e997caafa15c22d78df064701ff68cb8e6bd18108c8ed4357b75d569ae34f4142a9ed3cf7b0d7 SHA512 5320b25fd3ec5cd9afee3a746b1e09dac1d9aac9831cd41b58d6768316eb1c490d7fd8db27610c76a27d8e6a3b681f8a3b1408dfc6d353178594a7b74ef4f6d8
 EBUILD vulkan-tools-1.3.243.ebuild 1895 BLAKE2B b62ab9d1a808a44ec9b5c756cb914e0807ca043e9515e89320203c39b4d18613cf1c8728eb97a609b1e815e096ac0731dd4061bcc8d224de9bb3198dc2869531 SHA512 11e950158f1ee4dc2c0d4960c4496f8e518f7e02b9ed90ebd643b1270fd2515dd7f1a9cff617d11f3d7bfa850b2832b7a5ba0686aef868ad58c8b02852ab9e70
+EBUILD vulkan-tools-1.3.246.ebuild 1900 BLAKE2B 6599fa23b8bb2e178420e33d7e6d093467a72cd0b04028b92c59d0434458f80f81b6e34eba26143e76c831624f222080cf7cf1811941e36f0addc83139fc2d83 SHA512 c507621b6a5535d02371d4cf3c3bb12edc82b5322ebf47ae9c52af04090c4f0ac292f6fd89244c9fb7592c4d2698c2f2da896f1665222e3235890b128dbf12dc
 EBUILD vulkan-tools-9999.ebuild 1900 BLAKE2B 6599fa23b8bb2e178420e33d7e6d093467a72cd0b04028b92c59d0434458f80f81b6e34eba26143e76c831624f222080cf7cf1811941e36f0addc83139fc2d83 SHA512 c507621b6a5535d02371d4cf3c3bb12edc82b5322ebf47ae9c52af04090c4f0ac292f6fd89244c9fb7592c4d2698c2f2da896f1665222e3235890b128dbf12dc
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.246.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.246.ebuild
new file mode 100644
index 000000000000..ae7ec142589b
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.246.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	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"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}