gentoo auto-resync : 19:01:2025 - 06:42:08

25 files changed, 405 insertions, 28 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c3609d40b1fd..efadcb25287f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index c1ef1a4ae59f..71beb0cc4337 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -2,6 +2,6 @@ AUX ctags-20230423.0-alignment.patch 3528 BLAKE2B 0b5a2c267067c1203021150f2c093f
 DIST ctags-20230423.0.tar.gz 3038197 BLAKE2B 4b6114526e9dc94c95dcf1b27136fe1fde185aadcd3f880459314b6567f4ec935da10f87aaad590f4c16999adea8b15b3a153f4e80b3b9e57d9a04ecee377a09 SHA512 7a4b3ffcc4906765dda381ad637981f5ce8c6fc24d4141b8b0e9997b71767dda307dab4d2c2aa0e5ba003774c100d8f85e494e368cedbef12c8f415a13b85554
 DIST ctags-20240609.0.tar.gz 3158634 BLAKE2B fe662dc0c48a0ac484bf3fc7ba7d0a31285398cd5da111a96f14b3637045fa0b0245119da034ab467e43b776849f47891e829af86a1889548f410070df6395d4 SHA512 60ebc506a04aabd7ada13801ab3ac662a9798960cf2aaa90270e6d5df82850b4e709a15a7523eb2e1e347a08b458ff2b85a99c787ab08b3c2599232492ef0ebc
 EBUILD ctags-20230423.0-r1.ebuild 2485 BLAKE2B 2de0372252d75e80a10d13b627c5aefc0b421e8c1782babcdae7368383a17aef7d8a9bf9b000ff7e3b954dbdd57f9d2297277920cefe7714dfb05eca336656fe SHA512 1c649d81239b74af4cc50e4abf45ca98aef37f69968a0741001a73c56c885d3debec46cc83728551a9bc61c23bc8f3a4a585541f11060209cf31e26a615b74f9
-EBUILD ctags-20240609.0.ebuild 2556 BLAKE2B a026a6b1d70be5b69a0b7904ac0db00039f041ddca0ffb93831a43647ccf413563033abb9a6a86dce823b18d2aa6c8ccbd021ee71d538c6426b0e0882a1372f4 SHA512 be2c0f1d4f88b3804797e839e83f7beca8b184920344efc99274d77aa5cc8219813de4c60916ed4b64ff5aec4373aaaaa68f18503c3ba10f9077d4a2e52afc58
+EBUILD ctags-20240609.0.ebuild 2555 BLAKE2B 34fcd43344e90abd0236c484d7fb3e43325ba724cc0e037d51d4477b16fed8fd20b8c43cd14e7bf60fad51a15874af2d074077b2198917577f592ca444051acd SHA512 bcae7c328e4b61c0b068f624dbe63f4e8c54026909d2d2a5a8f10f1a0b9f8fa269040d915b8402c6dcb6a2581ad2a70775e1443af47d72d83d859d8c1cfb5aae
 EBUILD ctags-99999999.ebuild 2562 BLAKE2B 0a6944c72451e81215a8dac7a76e4f46321310a8712aab5d580bf31612e98094c384af2482bc2066b045ddf9db1d013f6eb203220f6b1f8334a9c1c7fa266db1 SHA512 af0cdefe0fba1d0fc92e38583dc7faede146c269387c4269a5cb250ebb8a5eab0acf6ae68b617f5b6bf7425bc29f52f6399359ac9f6e9f99204d44c800233f64
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20240609.0.ebuild b/dev-util/ctags/ctags-20240609.0.ebuild
index cbf5bcb44403..8297e0548743 100644
--- a/dev-util/ctags/ctags-20240609.0.ebuild
+++ b/dev-util/ctags/ctags-20240609.0.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.1.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-p6.1.${PV}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index df887f39621b..b842dbad7ec8 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,7 +1,9 @@
 AUX glslang-1.3.283.0-gcc15.patch 804 BLAKE2B 213603cd66e19c02691964b30ac53de71fde277d832ccc6bce1d233348b8124ec69a1a58420a36e74979b1daa4dcf1376883ea98335f59bfd4d55c66b23749fb SHA512 ca2cb4c6579e79a0eb8847da49984d9f0cda0777d6baacbeb51977a864f285bfd8577fcf754de39f11e8ad101c76171c58b08a2359bd7624cb5ae9633137b5fe
 DIST glslang-1.3.290.0.tar.gz 3854382 BLAKE2B 02f781c318fe8ec47dae646c45ec6567e7cdd266ca8f8cacfd165fe29b5cd37b4d44f8b7b46d4b0175b2cb63ddc29d20652b27a78194c3922441744b45e5a8b3 SHA512 1dbea2d90864c02e4cd95eef0577bc7954a10608dffb19e49f803195153d082e67e71da4ba673dcd857d3c8e12628a9504385eaa3241f3f06c4de12cbdb3dc1e
 DIST glslang-1.3.296.0.tar.gz 3868046 BLAKE2B c68b5e59e5490d2102d084a7d852a818c05eb0d496866796567a7606cb4685b378a4a15a0d2bc196c6ca035cd6f023ffdcf9a6e5cf0b450e340b5f4e97052793 SHA512 5c6ad0fc14c3a1d3282d692da77f2e155e7a9e5e84c89a3dbb3d64f9a0e5803c9db49085e05c6e2581f3448567ff35b85eff363047b67620bf153b7c02598af4
+DIST glslang-1.4.304.0.tar.gz 3917406 BLAKE2B 6d5beec94c5daafe905dabd6a4031e1c010cc9b395c5d8a8b4fdafd265a076251519056236b8f98fff613f21a0af6d4a2562c4c3c8255731642a6b887f3c4d24 SHA512 dae98afbea27b518e6230ebae5207c67b4f1a695b8f65033159bcf0064ec6546c8db4f2d52bd028353c15e4d7d9409c1f7dffc589639bfd8ee07d98ea7c73b12
 EBUILD glslang-1.3.290.0.ebuild 1115 BLAKE2B 5c22816e35aa6b8c837a318f5069ad21dc24937e4a550fabb6198823b8c0238429f222ed856bb166ee37287fdb5369ac4d48602683d9a53cbf576de8f67dae85 SHA512 f2cff2d29e015f555b50ebb146c8abf578eac4013d28ab9fe296868f0535bba830e7198e63cb80c22db20c1c957c50eef7a88a87c5bc253eb894bb7ad6a3837c
 EBUILD glslang-1.3.296.0-r1.ebuild 1061 BLAKE2B bc74d5d150bed4d03944d277356a7448f2d03c7f5f094c4d23bf9d6f058b43ee72ded26b79d73bafafcd63ed001ede33cc5b691166e870735ae7b1f05fcc6a01 SHA512 402309bc0150d81d2eea4b1261cd0e609369a6666ae8a9c1acbe0238737d44da9323e7c6afad6e6226d58dc06d91a3eafbbd0bd0772d6f03462d3c42ccf19836
-EBUILD glslang-9999.ebuild 1065 BLAKE2B e0d4a956d2f9f8ab700c9f63b6eaedb510ba85cb28195372971e56dd8ccfaae02862bea996b663474f9576ebe130fac45774caf8ede7ee25b691195965868b05 SHA512 2571f4cbe77d7b333fa9bbd7a02e0d6c9827a70c581e6cee7c67163b697bb4933cf98b565ae9e4514b6c02d2596afac79fec302a616c52ffda9dec18736f08aa
+EBUILD glslang-1.4.304.0.ebuild 1067 BLAKE2B 2c246eb17b47e9d5509cc52a75c65b7d3f7bb28ffcf94edba182f28521621478982d89a9497d60e21c3863e775516647de6c33cdb4dc1df99b069c89e25f7b61 SHA512 10ce391d7da11c314c8db7b7857d4405edbfc4265a614f7a79d92c6d99d9228aa87a235d72fb27b98a1e64388ed987d3d8fb431e54c7a7ea3a6c06163e46f835
+EBUILD glslang-9999.ebuild 1067 BLAKE2B 2c246eb17b47e9d5509cc52a75c65b7d3f7bb28ffcf94edba182f28521621478982d89a9497d60e21c3863e775516647de6c33cdb4dc1df99b069c89e25f7b61 SHA512 10ce391d7da11c314c8db7b7857d4405edbfc4265a614f7a79d92c6d99d9228aa87a235d72fb27b98a1e64388ed987d3d8fb431e54c7a7ea3a6c06163e46f835
 MISC metadata.xml 334 BLAKE2B ae09d8fe730e84cb5958c711c272ec0508a1be199fedeba1b82ae43552cdf4557e387b8405312bfe1cc4bdc43a1bd68507056ed182691d20e7759fb7fa8b396e SHA512 7abee6c6391f6c42a546a3f98791e3623152e1c6d0900afeb321ebad1a864ab71c2a282be2f651273b667986d9902bed7e9b5315fb5c569bab4f34c7812ed8bb
diff --git a/dev-util/glslang/glslang-1.4.304.0.ebuild b/dev-util/glslang/glslang-1.4.304.0.ebuild
new file mode 100644
index 000000000000..122554318d47
--- /dev/null
+++ b/dev-util/glslang/glslang-1.4.304.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	GIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${GIT_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/15.1"
+
+# Bug 698850
+RESTRICT="test"
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]
+"
+
+DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+		-DALLOW_EXTERNAL_SPIRV_TOOLS=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index b5d0179ef351..122554318d47 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V ge
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
 LICENSE="BSD"
-SLOT="0/15"
+SLOT="0/15.1"
 
 # Bug 698850
 RESTRICT="test"
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest
index 3d87c7034054..ecdbf9da8aa0 100644
--- a/dev-util/premake/Manifest
+++ b/dev-util/premake/Manifest
@@ -1,7 +1,8 @@
 AUX archless.patch 1516 BLAKE2B 6a4b335cc41f466a45170b016da0e26c7d5b955c8d0fdb118bb90370663711ea42e66308e455dbc671eee2a29c4999f2628c416e30491825d8ccac151b3bec65 SHA512 e74f895b24a7bb3da118aa694c35b2473994881ffa6e54ec5a0be450ab55374c0bb418b93fa84b5e30f46a04987c1cb75305463a1a181e458c750d38cafecd04
+AUX premake-5.0.0-c99.patch 1728 BLAKE2B 47608a0f018d5c8f8b4494d428edd4706d2c9ff90ab7ab7f928013c733bc3120c1efce211feeea6d0a61271c02d3c0e7dbdcdb43f111a1ecf1a94e31636d37de SHA512 940ed970c6eca5fdb4b5dc4cdb46e5e0ef4a615625e224a9f29e5459a0436c2d4681e6727b5b32dae9f5749f64e40baaa68236b506977044f02eaf8277fd0618
 AUX premake-5.0.0-remove-hardcoded-libpath.patch 3334 BLAKE2B 0dcb4101af388c0ceb23e89f5f45d11042bf4dfe155106eb32ff19edcb8d562c32dee1c8a23504dd17c4520679fb7dc6ce7ad712f1f837a08d7c8b58ab89d122 SHA512 a045f5b1e0bff31a068ec5d33678d1c4b030c30b98d09cc09258b86a24516053e3e9c0267ff7a47cea05d580540c167d5bcafd1bb2dacdf7d3f42df188061d95
 DIST premake-4.3-src.zip 514366 BLAKE2B 5079f9d7c5dbe46d60149ec7c01523eaca5ab3cccce9f2f66d05905152ceb0b8bddaf181624288b722dd1534da6aef256ed5bb997db448f1499c8ab989277bc6 SHA512 df3a4f1e04afb6ae9acf06c063b084a4bcc7c48a98eebeb242eafef40de4097c6a6fe549369d9538b93efea35244222b9d26c15824f126a67b8f80abaecdf001
 DIST premake-5.0.0_beta2.tar.gz 6491805 BLAKE2B 1e5245ded3c36b61afd9339351ae2250cebd488a3723c1844b98a8bcf257a3a33102483d5b830a264aff7371b40edcac7dca18dbaacb0dffeb6e43d69e5d6a4c SHA512 0385e2859ed8873f78e2e8e4a57112c9ec5ff5ef6c456caa7a96b9fc372f148cec9c745e19cac7daee6c55820e86e55224737aa172e2134c169303829c1080eb
 EBUILD premake-4.3-r2.ebuild 476 BLAKE2B 3c406be4661a1a22b7fd6ffbd90702fd5709f093637eb224f8b2abe2d5c57f784c8371cbb23641c48a6becd21d2bb56aed44cf3fbae67f24b17ee1ef1567a135 SHA512 0fe42fce6fe9cefca37ed67d28c4fc45442e2927305bd56219a3b24044f4230820a67344d8afa7a6f0848cab29da3fb7ceeb1895e502466a51a776c9a0d5183c
-EBUILD premake-5.0.0_beta2.ebuild 691 BLAKE2B 3f74f2a3045981c7237029efe6a9bfba13c432494c1497ebf7156bd2ee2dc17558131442c1da11386d34a9ce3280295014a72e17703f9cf07bef67f6119a1e70 SHA512 0bef2810e2965f9fd66b8de3e75d395315d0d74a5b1991bdcbf937a9fb65cb1fd1cd91feb8efbe6ea2a8d1b07ffb94791f61db14ae2b1f1189630d9bfc86a779
+EBUILD premake-5.0.0_beta2.ebuild 729 BLAKE2B 9deacd2866d7f8360e56859418f55c4340faf75899e17cf2e62f6c430c9dedb26b57eb5c2e797dddf6a67096154031cba776ff4d033097478f2dbbdd5075562d SHA512 5124540b02d98c53819d656c677f7a9f614cec278bfed4f087349635dbbb8e31ba7d6a8348fcccdd3a4899d06a65cd45b6095aeaa6956bb462e627818ac13a93
 MISC metadata.xml 771 BLAKE2B 6a8c2ca614ad4e799efcbc4b30be952160df8ec9b6ce0a2a179a98b5cd1520515a4abef4f0815221a81e03eac86b16728a8474d3e3d0df1aaa038fe7d8a6a977 SHA512 ceb9e5f086a4ac803c1aa901b45fbc9a37a6dd75b5c573ad49772413631c897b54cd53b2873b42c91b000a087e48dc13300a9b945292b848a0f462a738f689b0
diff --git a/dev-util/premake/files/premake-5.0.0-c99.patch b/dev-util/premake/files/premake-5.0.0-c99.patch
new file mode 100644
index 000000000000..49f9f70e5160
--- /dev/null
+++ b/dev-util/premake/files/premake-5.0.0-c99.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/895842#c6
+diff '--color=auto' -burN premake-core-5.0.0-beta2-orig/contrib/libzip/config.h premake-core-5.0.0-beta2/contrib/libzip/config.h
+--- premake-core-5.0.0-beta2-orig/contrib/libzip/config.h	2022-09-02 21:11:21.000000000 +0200
++++ premake-core-5.0.0-beta2/contrib/libzip/config.h	2024-05-17 14:07:31.072971328 +0200
+@@ -25,6 +25,7 @@
+ #endif
+ /* #undef HAVE_STRINGS_H */
+ /* #undef HAVE_UNISTD_H */
++#define HAVE_UNISTD_H 1
+ #define __INT8_LIBZIP 1
+ #define INT8_T_LIBZIP 1
+ #define UINT8_T_LIBZIP 1
+diff '--color=auto' -burN premake-core-5.0.0-beta2-orig/contrib/libzip/mkstemp.c premake-core-5.0.0-beta2/contrib/libzip/mkstemp.c
+--- premake-core-5.0.0-beta2-orig/contrib/libzip/mkstemp.c	2022-09-02 21:11:21.000000000 +0200
++++ premake-core-5.0.0-beta2/contrib/libzip/mkstemp.c	2024-05-17 14:07:31.073971328 +0200
+@@ -31,6 +31,8 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include "zipint.h"
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+@@ -43,13 +45,14 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ #ifndef O_BINARY
+ #define O_BINARY 0
+ #endif
+ 
+-
+-
+ int
+ _zip_mkstemp(char *path)
+ {
+diff '--color=auto' -burN premake-core-5.0.0-beta2-orig/contrib/libzip/zip_fdopen.c premake-core-5.0.0-beta2/contrib/libzip/zip_fdopen.c
+--- premake-core-5.0.0-beta2-orig/contrib/libzip/zip_fdopen.c	2022-09-02 21:11:21.000000000 +0200
++++ premake-core-5.0.0-beta2/contrib/libzip/zip_fdopen.c	2024-05-17 14:06:29.441972020 +0200
+@@ -31,11 +31,10 @@
+   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+-
+-
+ #include "zipint.h"
+-
+-
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ ZIP_EXTERN struct zip *
+ zip_fdopen(int fd_orig, int _flags, int *zep)
diff --git a/dev-util/premake/premake-5.0.0_beta2.ebuild b/dev-util/premake/premake-5.0.0_beta2.ebuild
index 0e2a5f82c593..3128380832df 100644
--- a/dev-util/premake/premake-5.0.0_beta2.ebuild
+++ b/dev-util/premake/premake-5.0.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,10 @@ LICENSE="BSD"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ppc x86"
 
-PATCHES=( "${FILESDIR}/${PN}-5.0.0-remove-hardcoded-libpath.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-remove-hardcoded-libpath.patch"
+	"${FILESDIR}/${PN}-5.0.0-c99.patch"
+)
 
 src_compile() {
 	# bug #773505
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 9d9ff9d52e62..b3946ffb6193 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,8 @@
 DIST spirv-headers-1.3.290.0.tar.gz 521685 BLAKE2B f6179e8666a66c2f512153a3574ea252925020903739956f06eb24972ab5dc063dc19692b5c5eee96a3106db6bce652b625209cbcfd587ee73cd95a960ddffdd SHA512 d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89
 DIST spirv-headers-1.3.296.0.tar.gz 523647 BLAKE2B 2ebda8006e83223620a9600973162b5ce4580442fab44edb5fa177642f61907385feeba5e33e29b2acda4527b523bc74e60b1b75b5c71111a606bb192e8baa9b SHA512 b4f975d3051eda41ef5c3a6efc832607a165adfd6f43d7af171d2c0446b227bdcb5de0017a081fa9e7a3d2710ba8583fadbc06c0a364043b2778b02818d01040
+DIST spirv-headers-1.4.304.0.tar.gz 532015 BLAKE2B c2b4fcc61c4d6c6134c19ddd31722fd2a87820621ce46fd8f5c810c53b0d671b40d4c5b2cef7ec54e273b17518778ea6059f5ff7f06049799457b8c4586a73ef SHA512 09d6a2e4f7758e8e6bd0c5036d8895befc96ea049b655d2786df4092a6f4ad4185a70ca83bd38683afb9b5e1ec45d8699a38d19774ca39c09f4f199fa1085946
 EBUILD spirv-headers-1.3.290.0.ebuild 779 BLAKE2B cab82b4ec21fbfe852e435b5768f91ea8740686020dc423ce2c85a2097a03a2680c0f51b4696340f4de9905b42c7679a16440a8e1d025f753fc6e061e5d5562d SHA512 eac6f8a3f8af8d13905f1931b6cc634617c3629e00055186ce8367600eda0ab54fb7bfa0ed7b44bcac72beec0cfc341a8898e361e8beddddc41a03e98d532090
 EBUILD spirv-headers-1.3.296.0.ebuild 781 BLAKE2B 215543033bbb18608da6692cdf5587edaff7369afb779a18be67a6bb67a78c5d614bfe6bd790bbad424bbb534919cd2ac08fcfcc2ccd47ee87696929a73bcdd0 SHA512 5c2c680a7017683c0f564362f4cd8b6dbcfb81d68cedebcc44660bf5c7e5a84b1e07b7bc23e9edde08a61e9f4db52e15424c4c0608c1b67fa080214416bbe078
+EBUILD spirv-headers-1.4.304.0.ebuild 785 BLAKE2B f6ebfd63b7b0e60aa4c2b09c37befa2ad16e30ae992c182e53ae03289cb816f3c493adce4208435921e05de8d397ce88382453b12ed6548bf419b762a7ad7e48 SHA512 f263bcc77c40a2c1859f1da305d777585ee2ec0925ad95c20273464f95a9d6a9b283594c9ac00dab13ff3453374dac26cb786a7aa84221ac3011b5cafdff3946
 EBUILD spirv-headers-9999.ebuild 785 BLAKE2B a45fecc5ec273ddc5b54b608b4e34b16e7b415e7d8d89b60a617d94c476799fa4ebffb8b931f823d95657afd1c35e1271f48e6de71bb47b2d1df033c56d6251d SHA512 0b84d9d4afb589ddfabcd5106949810a55c0d0824e887a752a92603d7facf906df089762996806624c21ef702ec77caf57113dc9c82dd8401e0f3449d1888e0b
 MISC metadata.xml 340 BLAKE2B c05193d0f3d8cd7e261cc224f4a0e2b9ec6a43478692d26da90c5e9e645ee847190345c39a3eda184060d33b376d15e6ef5f74f8f9dbaca3ca949f1bf551bbaa SHA512 5021be4a35c06c779b290c6c68180ae83cd6caa10ef4319fdf47c9ea63245e3b56a6d72f88b6ab46df04a79d68a1008f39dfa1a5c9c15d3d339302d1d29926be
diff --git a/dev-util/spirv-headers/spirv-headers-1.4.304.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.4.304.0.ebuild
new file mode 100644
index 000000000000..f30b78d207c2
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.4.304.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://registry.khronos.org/SPIR-V/ https://github.com/KhronosGroup/SPIRV-Headers"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPIRV_HEADERS_ENABLE_TESTS=OFF
+		-DSPIRV_HEADERS_ENABLE_INSTALL=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index a5174b236c95..cc078b1ee5f9 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,7 +1,9 @@
 DIST spirv-tools-1.3.290.0.tar.gz 3170780 BLAKE2B 37609534f77e411ffb90e2904e847b2baec80332b5f3d3d3fb6950d835f9526fb95778d4c903574cf8be142370a69cace50d2e69d41e2eccf5f74a764464c148 SHA512 d4e8440c0843fb084dde4a576b95442783ab8204670b199798bd87f754d77f3c258bb69ab1d4dd7859c1d2c681ed8813309c76c6f70b5a7d8d21b6a48ef63b67
 DIST spirv-tools-1.3.296.0.tar.gz 3195963 BLAKE2B ea20efe36090a0e8d46c2fab0c6d08b4f5dc02dce176b88331cbddd8a8bc2fe507abb07e98bcdd15295a311480366d83837e3de2f7d175013b1518682e88b5a4 SHA512 62f0a6034bd016aedfb8975bbd3bb134ef928bd6bafbb61d9f73c46760019597b9841b80243c86e5e5e0576824cd20255067e447590eb0d2d51593439152215e
+DIST spirv-tools-1.4.304.0.tar.gz 3203635 BLAKE2B e4a80a5de07d62f3544d165ea5f7fe4c0bdaf389e56e93cd2b6ccbcaff759dbda90be99fd07a136112e7e53b7c220819fe4da56f46bc68ab84b441748c74e6aa SHA512 5824e8ee1360fccab6f41afb0d1f297fd044f4237448de49906349f745522f3208f2960e7ddf5396c3e2ea4e35b6e0e3e61e7855f4599ee22a0c9829daab3156
 EBUILD spirv-tools-1.3.290.0.ebuild 1147 BLAKE2B c2204a99fcd4bf40da0f0386e32faf2393df4586e83e0db848a099f1dacb052538da626dd6457c1765a7379314879d16d437a46f3540fbc6e38f6d87f970a50f SHA512 e258bb7ae9a89b7d0ddb984f13ce244238e36c2dd0a480cc19980b0c5d15cabf0e67c9b895c40def8c985ca9b45cbe34038002466f5e31660d3448e8882ef319
 EBUILD spirv-tools-1.3.296.0-r1.ebuild 1235 BLAKE2B ad18cc42fc68dda400e8705c0b86eab4d111fe6dd0cc807c8bc4387ab903190e8e3c8e1a0fd416c5d1e01198b2c5e6ad32f9e66bf0256d59467712364601ceeb SHA512 4b34ce4b1e97d695483915249bf7b972244174739a9edfc948f6a9bd5940ffaf5f7a0c046625a5d1b9dab007b1eb92e465fb24d9d790f0c8a77970520d8aecdc
 EBUILD spirv-tools-1.3.296.0.ebuild 1149 BLAKE2B 053690fe76e2d635d5c4052ac9ef04302cfcee9ccf386b7ea667858a1dc0dbb85ac8755841e57fa8f4f5750d7ad1e3e3bc6dbc0d4361cda12f10b8aff0d78a2c SHA512 557177e949633d4e3231fbc38008c24d31bb809aefcc27c55a32a63b3e941431144be21f50213582f17a1877de42936233bfad95922de5e2050839eba7494510
+EBUILD spirv-tools-1.4.304.0.ebuild 1235 BLAKE2B 984d0c1732449469939f16a872527107ee580f1e83816b48b8e3820cb562208e8d7fed1f7ad39d3ca6eea3f817584017c47c208500ac7635decd668df623eeb7 SHA512 dcdd20bb43e657c71bb760d613bfcbc2d328b3607437ff2969b984bc5e83daba80b1b3dc770206081716fd5fa5fecff5e250e8dca8626c2157157bb4f5ed71da
 EBUILD spirv-tools-9999.ebuild 1235 BLAKE2B ad18cc42fc68dda400e8705c0b86eab4d111fe6dd0cc807c8bc4387ab903190e8e3c8e1a0fd416c5d1e01198b2c5e6ad32f9e66bf0256d59467712364601ceeb SHA512 4b34ce4b1e97d695483915249bf7b972244174739a9edfc948f6a9bd5940ffaf5f7a0c046625a5d1b9dab007b1eb92e465fb24d9d790f0c8a77970520d8aecdc
 MISC metadata.xml 338 BLAKE2B daa2952fd92a1ebb904941cd59beefd0aafd28be3e47eda81bf15dff4d72fb2ce4ba9a777a2233a411843ed8e7963699bea5b327ee82f4a0b392505f0bff929b SHA512 0688c185bcd6b5c5ba6cf68b353786fe22a61eaeef81e6fdc07e7f3a633408b1666423c824928100b1453d372b172c82a89ddad39c6bacc8e646bbaa6e059001
diff --git a/dev-util/spirv-tools/spirv-tools-1.4.304.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.4.304.0.ebuild
new file mode 100644
index 000000000000..6d90e4eed0bc
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.4.304.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{10..13} )
+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="vulkan-sdk-${PV}"
+	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
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index 5e596a7fcba7..fc4ec89e3f06 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -3,5 +3,5 @@ DIST sysprof-3.48.0.tar.xz 533092 BLAKE2B 5af48d9216f13ffcc8824b0ba6a4e0ff931c90
 DIST sysprof-46.0.tar.xz 1170396 BLAKE2B 6455d31c00509540d43137863e330dc0dff49887108f80091b4374630e91a9c1c8e16c8475f6c3e992e7e416dfb3fe19e14e6e466c37424d960b91ba6c65e5a6 SHA512 f04d887218257d177f7bc68485bcc47c310188335530ff9bf5e3efa7c383d56e97d5d969b2e8b5b0469993456aa734873c599f3d743615716305b8c7f113f534
 EBUILD sysprof-capture-3.36.0-r1.ebuild 751 BLAKE2B b726d6bab459175813116148a18c32d9f80d91b5486b142f072795fa2e22bb0396c54a189d734d7846bde91107fe2be8fad26e0e79cfc0727824cfc88e5cd516 SHA512 927f4a52354e4a746ec7c13f6b29d5535ce50c943a6e1ab6d1ecd180d125332c5416a5df23fd894fe78f2b710205eb8dd72cd920cb4163820fae89db547c889b
 EBUILD sysprof-capture-3.48.0.ebuild 778 BLAKE2B a2b2020168160adf692cbe6d44f13e8b15d1364e20542cd7ad35734ad85cf50866d854c87d005dec9f79540c0ea3c4676cf4dd90d3b7066692c385df6571b368 SHA512 1b9fad016768619b263d20b2c24d06866d41d5a137a894059af80aa1a8c8da4be3ddfec7896da34d7694cc909b017863429a0dd52490890646cc09de3de9b1d0
-EBUILD sysprof-capture-46.0.ebuild 742 BLAKE2B c2cfea1e3cab9f6a7d78ab018ce8dbcba75d6565863069dd9947b0fdd76075c6fb9127a2cdf459fbbb4fd40883b2854fed92ecffa991a67ec3ced6329345ad1f SHA512 bbc47aad6f7a89f1a8460bb81b81edd43acec765c83473fd48bcf10e8265a26e3dcc32263ce75b214ecc4e6f8524550d7516dad5ed05deee421809e44b01843e
+EBUILD sysprof-capture-46.0.ebuild 749 BLAKE2B 1c5d280b21579e26bdd5be6dd0a73b39df871f64797e482188909fcfd604d53854bc732a3298f40bf9c58205b09bf8ac26fdb6f4efc509efd91ca23af0312324 SHA512 2428904fe4d5cd6b46b79d3351c4e9179e479107093cf20006a24d234f412cd5df3dbe10d1f8ff4d36d184b88dcc874b2d2f21d6dfeaf236ab94824cd03040cd
 MISC metadata.xml 348 BLAKE2B 6d20b95f03e7ae7ac3bc5e3633757cef8d68a914da52b6d6fab3c16af3abc54e3d571c770a16772e755c4246a611d3ae20b31a2bfe5d9acf934aa28c0e64719d SHA512 b5132c2bea9fc617ac3732001154e5000c37ff1034ddc904875d8d807aeec5dec3c8d7c0a36bd3ad26bc0310a70842daae96d743d9f82a4b2f1057ef8d65e406
diff --git a/dev-util/sysprof-capture/sysprof-capture-46.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-46.0.ebuild
index 0404f4afe544..5778f007b2db 100644
--- a/dev-util/sysprof-capture/sysprof-capture-46.0.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-46.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-util/volk/Manifest b/dev-util/volk/Manifest
index b7af352e8749..1f390706d783 100644
--- a/dev-util/volk/Manifest
+++ b/dev-util/volk/Manifest
@@ -1,6 +1,8 @@
 DIST volk-1.3.290.0.tar.gz 62571 BLAKE2B be7495fa0b5509f10259842b5394a651a2b57eb6d607a04b69a43faac2ab10ccc259acbd8445970d12d4111362806b20bf9acc2459438ff15c903d3978f395d7 SHA512 1af3933ab18120ab9418282069ee5a1ba86e8333b6fb1cfc04c85132f9c54ba1d21bbd833fa9e35cfd08edf2867982f19c536c0744569c6a91b0be8b54986e09
 DIST volk-1.3.296.0.tar.gz 63986 BLAKE2B 72cf4178028ead0c604b30fc8d24a988e32382ddee7851c3ce70f17868396105a5dddf773879fed6235208c66c96ca1f0040c753d113a26af4b6f4a6caa7871b SHA512 b9c305db98d931d5bb8580f415262522d97f7041fe351afd8198b5d26a31aaaf573dd651e6e5b3ceb86b67bb74850ac6b237c89dca6de9d423de631160316b31
+DIST volk-1.4.304.0.tar.gz 65511 BLAKE2B 31e9faf00a3abba7f226e1c08b924d6b3575b670b51cad157a02bf4594ebad64483d88dae9bd4ddae8b8766214db47ed4aab1b14ba0f5cec6d29910628fb7b98 SHA512 de7c58e7242e7c876cf40ef87c7e65b1baf1d73759fe3d98c5bfafd81e5ef56d9a7421c782d04c3180673e502cbbf430bcf14e4ebe12ec9634f400446937602c
 EBUILD volk-1.3.290.0.ebuild 806 BLAKE2B 5ff99f912d5d9381218c0bb0d5ef9c173df362aa70e703bb43c0a98ad8d42a5a369bef79bfad1235aa6424ecf3cfcf4a9b24760ba825e53d4feb34354459f340 SHA512 2ec2e4b82b891f60cbcacf48ae643bf66099c95e435fadc338c86cac5fb257d8bc2e9afec46bd64710a8c52a6d7ef327e9fcfefc305b17b3d2fc8a228dbccd58
 EBUILD volk-1.3.296.0.ebuild 808 BLAKE2B d052b105980e14a270b3d2744af6d9801c5c9359f42eaed4fba2a22bbfae2f2b59bdcba7232e4d55572b43d81fde18cb9f496614664cbef19a4ff6ee5358e3cb SHA512 6a3654616ee496ae7216ba8dfe520a4a5ce21224b7b49a333f8de632d56f8a27344deb2a8a728dfc475bfe03360a47ff75c9abeb479f24e8348f745416f3a8a2
+EBUILD volk-1.4.304.0.ebuild 811 BLAKE2B 504fbe7e99938bf6651e7c438cd83fa0a064c4d32f410d45db3d66693970308e4584b9588077a34ee9275bbcefd6d068957d8ea1048e3b9eb36250d693c65112 SHA512 1eaefdd652ee37ed0f0b173b0a65eec5646aa6db102f6cfc46b9bf2554ad2d3c2ae012afc3986b2698f3c91e962196c1a7042b0ff1af43789f28cbbd0c802a00
 EBUILD volk-9999.ebuild 811 BLAKE2B b3ed30b113af2be33ab08e6b84f36c994716f27298d20b13d9cab13104d09cb28ebf36b5595f41c99a3b1824875df07a82c8b96bca4fd0b3e9591a66880581b7 SHA512 788456d71718f59801cc526ca19a20e39626efb36274ab893b858f20d5f53aa00c46b136d0e36b55a00564e4bb7ccc9048ce62f1d523c50e4c3f749f0edf8416
 MISC metadata.xml 323 BLAKE2B d016824f72dddf4218a357c2c083cf96c861c14ea9ec7b4f300b394a58bd11f3f7672b7bfc4179afeaf731f77589bf260271eb9e5bf74b97d44ecf7142ac76f8 SHA512 e0437e6a1a761f09c80e55f6012f8d1d16549ad30434b2386fee1eac4e2ab325ef7d89c25b95026cb7589a5fe930590ac41589b0f50b25c096ec5bf53d0fed02
diff --git a/dev-util/volk/volk-1.4.304.0.ebuild b/dev-util/volk/volk-1.4.304.0.ebuild
new file mode 100644
index 000000000000..994cfbec26f1
--- /dev/null
+++ b/dev-util/volk/volk-1.4.304.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/zeux/volk.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/zeux/volk/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Meta loader for Vulkan API"
+HOMEPAGE="https://github.com/zeux/volk"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DVOLK_INSTALL=on
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 3aaebf18d681..572b061d2764 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-headers-1.3.290.0.tar.gz 2284263 BLAKE2B d0013a88fd6336fcd191931952a44b543647f70b1b8b4fc656e271468e94b3aa1f12b7031aac9750cb2792c55f17b520a2c5c93920802449c2e7a1eb114361d7 SHA512 2bba1b9f3b97e22066ad89bce48a999dd253baf47ed3c76575777e7fc03199c67b1f8b301c1e152eaf4ce63351af9901bcea3a34f2d8cdcea81c25648bfb4706
 DIST vulkan-headers-1.3.296.0.tar.gz 2358781 BLAKE2B 39c7f643591ea4914f5912a7576190252a63388e6bc496f1a115545563e83fb7552a4355f9ec6312fe3fbe162c6d87391ebd1a2bfe6727238063e136abf05937 SHA512 475cd0c3249c7998e5e85390651a6652e229d65e42adf3b4d18f9f7509037d217e87de01632c9b4142d26ab295cd2272c2e88f897a5420d693a82ff7e4003157
+DIST vulkan-headers-1.4.304.0.tar.gz 2443240 BLAKE2B ab8db5100fe80292bda1f243591435d128a2e4b0045c5168400e5fda19ef5f120d0cb68902db0734fe4bb4846218eab21957ef949426aec33bb378b415779c80 SHA512 25a1afe5383e640c28d56d4b04e80be80d8db248ee38e7c7e1a7cb2d5052a505cf4ea0c6b2c5c12b6616f7f391d2a729e9a3b497ad1b0f39ce049846da5de946
 EBUILD vulkan-headers-1.3.290.0-r1.ebuild 714 BLAKE2B 612d392fd534cd23c2881cbd1be443953e6ecbe787fe65ccd8a97470270e58db5ea4552ed8d0338d55690be4def52b98fe7080e7957601c997249141a1036f32 SHA512 d367f6fd235ae719644a410c4ca33ee3b72c5a1c8032ec85e4a04dce70bd958a9335efda26c56be8aebe3a2017e1337db72dbc013bf31f8548bb151eab501197
 EBUILD vulkan-headers-1.3.296.0.ebuild 716 BLAKE2B 705600ae5ea4c8d9a5cd8fb190f7933cd9262075c51d696615f5f705ab30b7ca411557ca68cba7f78ea03400e9d6ded80cbf9425adeacc4725129410b2144820 SHA512 82d84e7eedd77abbcd51ef313f23907f8e6d52c3df2b2a61608708e829abfba2f69ab69f04630842b37537e9a63298a07f7e3d5ac80e17a07337660c282ee1bf
+EBUILD vulkan-headers-1.4.304.0.ebuild 720 BLAKE2B 27a8138c0e112b467db4cd14faa6a0e58cd2986487d07a10067f9841e748216995cef0270a27356fa3aa7e6daf75cf27b7d90fedea9e13801feef04c411a55a7 SHA512 04dc5363521937c7513e29bcc255f12708e5a5fe151a6c3c7b4295ca73a5edf7cbffb7710a6ed1e33792977e78e4b622f801a847cf251c6349342ab0a50a1146
 EBUILD vulkan-headers-9999.ebuild 720 BLAKE2B 76fbfa07703519b41c904cbbab451fb45cfc637c139010f60e81114d8f44f417e5a533f470f7dbb675f845e84cc6bf976310eedab47b1f054c506129d599bc77 SHA512 b77c4cf9b62b5483399a06adc086f5fb3cc16cf3988f2e122147c40f844827f17af157ef3c886a39e2ce5305185b2827db858f25596ba7802bb703e146688247
 MISC metadata.xml 341 BLAKE2B d3f0197be65cb4684a7f0a3d095962d326a131ca539910145a3ac3f875b89ff6451441b36b5be71d047fd531f5b3958c300f159299926ecd564ff8e223882910 SHA512 817b6e70b4bb9eb28743358d50d9c0f74da89a771b283efb9826b8690f46544a39060d725b525ab6468c78792ea36553ae74b271d62d11bcf9dbeb76216d133a
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.4.304.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.4.304.0.ebuild
new file mode 100644
index 000000000000..65eb0c96786e
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.4.304.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DVULKAN_HEADERS_ENABLE_MODULE=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 84ee51e8f02d..4bde2b1a38f2 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-tools-1.3.290.0.tar.gz 754806 BLAKE2B 322763f930660b52ac1fd4b56f5b7cd133b49da7a5ecf4f6d36712029dfba44edaa61ab65eaf4f9771ec5e5fac159e8d30b46b0f057b3d9b61220e58dab07ff8 SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
 DIST vulkan-tools-1.3.296.0.tar.gz 757355 BLAKE2B b5fa5ad2cc1aacd1f31361a85eb4df95701c7dd0207092722941ace9d5b215c1a094982f3713b3a8e77dc4ffb46e0cbbf7957bdf7ff089d2174e697dafdd9a0b SHA512 66bc89272f150198cd52f2971ad67a2fd6c922ac4bafb420c0d54788ca6bab2246e8a153a09eccce15a87e1fe16fdeef16af1c6b6b13386bff79dd73858f3cae
+DIST vulkan-tools-1.4.304.0.tar.gz 758609 BLAKE2B 81a55a4d84d3bd95c033e790b823a19b1c2776675061be37e325ef5bd98ad77afc328bce8372b0d87028922241c48a975f34f8d199cc2876659ac02f2133b7bd SHA512 9ef9fdda000977f913869419702b3e2ea2a6e41525c47711bc9aad9df5b538b7fad164c3ae43b87f183146f2f27c928b600eadc5ac2bb0e6c81f12a3487cb21c
 EBUILD vulkan-tools-1.3.290.0.ebuild 2067 BLAKE2B 3c9209c0d62c15724a711a426483b33938ce57661b79cc8434964d70fbaf0baec07c0bac572804ada6a8a8f1e8157efaf21d4f647e0aabf629285ebabff3041a SHA512 3ffe1e3ab44b872f9d7d0e2e3acf7e3acf9011cbb40649f8f473ca4631c71cc1ecf5968fa7403a0e1ad9a7f61b9cb7749a3823c52669ac8e47b1d06bac4ae155
 EBUILD vulkan-tools-1.3.296.0.ebuild 2069 BLAKE2B 6a74ffcdf448177051113c144a3b231cffe8b27c4a5a891b78d3a18e58a96aab201ca069549db4f4bc81ad1c6cd47b4189a8ad7ad2205baade07bed3c4a809d1 SHA512 ca64fad3ef661f3b6301be681fcb5c123299a9bfe7313f1ef47792aed1d04c53cec7b57a991e612c4f8cb6041b9d4c1f479abd63b42f6cefa850e95c1eda790d
-EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
+EBUILD vulkan-tools-1.4.304.0.ebuild 2195 BLAKE2B 39e8e5ca4a9e91b6de66a14f356d8485a9447b9bbdb1f04cdd67d6261cbe88375c07b7b000e3e330d47265fa4637f3de9b83647cdac6a3bed35a2db40724e547 SHA512 799e1883cd3235ccc82c126665d359a9ef53a7499da4c035122275e509dce294c139394e07e13bd951f88dc99fb67716fe84cc0ad1af07ad0a3c0db6bedf4af2
+EBUILD vulkan-tools-9999.ebuild 2195 BLAKE2B 39e8e5ca4a9e91b6de66a14f356d8485a9447b9bbdb1f04cdd67d6261cbe88375c07b7b000e3e330d47265fa4637f3de9b83647cdac6a3bed35a2db40724e547 SHA512 799e1883cd3235ccc82c126665d359a9ef53a7499da4c035122275e509dce294c139394e07e13bd951f88dc99fb67716fe84cc0ad1af07ad0a3c0db6bedf4af2
 MISC metadata.xml 409 BLAKE2B 92472d6c8620665d243fa5b7df59caffca7eb8761150cc1474fe80077e1bcb31470d4df8decbc61b0e3bbb04eabe18f19cf350d97ec47bca7bca7eacfaebfe8d SHA512 bca2fb46cbea1137524ebda2c66e88249b77b2fa8248d2f7984583e4da02fdcb97e28b682e590746631d8ccee5c238bffa879c244948f2e81c187faee933e30c
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild
new file mode 100644
index 000000000000..1492f1179004
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{10..13} )
+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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+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"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	~dev-util/volk-${PV}:=[${MULTILIB_USEDEP}]
+	~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+	X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
+"
+
+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"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if use cube; then
+		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
+		einfo "can be selected at runtime using the '--wsi' runtime argument."
+		einfo "For example, Wayland can be selected using '--wsi wayland'."
+		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
+		einfo "must be used instead. See 'vkcube --help' for more information."
+	fi
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 1c19288ef980..1492f1179004 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,9 +50,6 @@ pkg_setup() {
 		/usr/bin/vkcube
 		/usr/bin/vkcubepp
 	)
-	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube-wayland
-	)
 
 	python-any-r1_pkg_setup
 }
@@ -71,15 +68,15 @@ multilib_src_configure() {
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 
+	cmake_src_configure
+}
+
+pkg_postinst() {
 	if use cube; then
-		if use X; then
-			mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB)
-		elif use wayland; then
-			mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND)
-		else
-			mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY)
-		fi
+		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
+		einfo "can be selected at runtime using the '--wsi' runtime argument."
+		einfo "For example, Wayland can be selected using '--wsi wayland'."
+		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
+		einfo "must be used instead. See 'vkcube --help' for more information."
 	fi
-
-	cmake_src_configure
 }
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index 4396cb14d950..aca9d280faa0 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-utility-libraries-1.3.290.0.tar.gz 542854 BLAKE2B 669cb85d05fff69aa14461feb84848ef3f1667e79fc740d20ed1209f58a8972aba547f9dedffce4e304c157d6fb8bd63e270c796d927c00729c5c5a62ed638b5 SHA512 73637d7fb511aa00b267d415e4bef780f8b3ffc206a6da4c3447472fbb3e358de6c1ea15601e4c951b6bfb49b736c2449d58dd257f2870388b5b3f9fd396dc62
 DIST vulkan-utility-libraries-1.3.296.0.tar.gz 556437 BLAKE2B d0b401318f03cde83f046a835b8a6e8a65cbcd6cd6325ccf9e23d47d3a015a2ccf2cdc936a60aef4ea654cc3a6cbda44b801788c9c518fc6be478c4194ccadae SHA512 03466c78fbd43461990014a02deb06d2c4668c6230f336d3d9710e93aefa56d0ffadf959892c6d85c409088705e8ecf5fdd0a037b99af767b832f17fe4a44454
+DIST vulkan-utility-libraries-1.4.304.0.tar.gz 572128 BLAKE2B 013c4321ca53475e9a503c4c8d879c8f8a2bc2ef0ab4b038c10ed3e1cd0bdd986d1b72e1999e1c4c4b7acc4fa94b9ce9ab2d486151ad16571bc05511b6e291bb SHA512 8c6348342d66a7fc4c531e39beb2254649dbb7d02dda4301b2e339bb162692f3a84f1003136ef17d51bd918218339f974087bc18945bdab45c056cd2def4c771
 EBUILD vulkan-utility-libraries-1.3.290.0.ebuild 1061 BLAKE2B afa01f095afff189f3049dd761ef9602fcbeacba80df0385062a69c3f49864d736930e0a5b369539d0586d06802e2df1ea441968e020b09bfcb94a22e55fd364 SHA512 19eb092822dbe9e47b359144d5761a2cd9f72c8c49ed5c19de3f7ffc35f3221642e2aa6ec772eca1d8a41350a07e88b417ca8e86a9e7030df97ec6ff6a52e421
 EBUILD vulkan-utility-libraries-1.3.296.0.ebuild 1063 BLAKE2B 29fcddd7d557c1ab02022f889c5edf0863f158f58c7d62d1bcca2dfcd645bad472a492cb7b7b39abcdbbab2405b38617c064f125fc0febda3dc8a032b05b1128 SHA512 6667dbb763cdd2b2106972e82e2952fa675fe37fa452365fc25394aab6b452dcdc2778e4dfe3c1e5a91b193216111f73bccffe8fb16a4ae3aa28582f853154f5
-EBUILD vulkan-utility-libraries-9999.ebuild 1067 BLAKE2B 3129972e6413494e6d09548229480a604e3a688b3318848ef8385c86ba489b5e4c736a9a1c3266810094cc03345b422e5cb42171d967bd6b161f0a57a205a3fa SHA512 0ad154aa3bbc2a5e5c29477fa6c68d154861e231b728c37cea75314533d37205c136d6351224a586fb355030598a1064c79bc700de73ca1ff00c32ed3dd017c9
+EBUILD vulkan-utility-libraries-1.4.304.0.ebuild 1022 BLAKE2B a47b335ddba7a62351c5cbd04061e4f7929ea475ca416e06feecfb0049b46375eba0ddbbef27bd1722946cb1ce4bc41a498fb58ef37d33859177dbe0ff127737 SHA512 d3b0c6e75a6f89fdd5bd821b70ad4c892db1bcf1f6654f0d9135dd781e5eb2dcf3814b07a3ecb9b8f7a7280760d2d247c9898b816143094ef062f9489f5ec006
+EBUILD vulkan-utility-libraries-9999.ebuild 1022 BLAKE2B a47b335ddba7a62351c5cbd04061e4f7929ea475ca416e06feecfb0049b46375eba0ddbbef27bd1722946cb1ce4bc41a498fb58ef37d33859177dbe0ff127737 SHA512 d3b0c6e75a6f89fdd5bd821b70ad4c892db1bcf1f6654f0d9135dd781e5eb2dcf3814b07a3ecb9b8f7a7280760d2d247c9898b816143094ef062f9489f5ec006
 MISC metadata.xml 351 BLAKE2B 6a288ab5597a1ff8afa449a8ad0af7942e5464d3939b5ff2d256b5de3b29b38ee73f6d2666c046a6e49114b636a55ba9b2717fadd08c4a6c5fefddcb1d413a3b SHA512 64149bef2851c07477d71da04408e5b8f46b2f0fcf03cfd02078772fbd26beade3613dec9b6e5af99e3e4a3059760061591ea35a1309fc16caaeb77060ecc142
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.304.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.304.0.ebuild
new file mode 100644
index 000000000000..258528f9ef26
--- /dev/null
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.304.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Utility-Libraries
+PYTHON_COMPAT=( python3_{10..13} )
+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="vulkan-sdk-${PV}"
+	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="Share code across various Vulkan repositories"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="~dev-util/vulkan-headers-${PV}
+	test? (
+		dev-cpp/gtest
+		>=dev-cpp/magic_enum-0.9.2
+	)"
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild
index 82dd22dc1006..258528f9ef26 100644
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,6 @@ DEPEND="~dev-util/vulkan-headers-${PV}
 		dev-cpp/gtest
 		>=dev-cpp/magic_enum-0.9.2
 	)"
-RDEPEND="!<media-libs/vulkan-layers-1.3.268"
 BDEPEND="${PYTHON_DEPS}"
 
 multilib_src_configure() {