gentoo auto-resync : 03:10:2024 - 04:43:49

20 files changed, 173 insertions, 53 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7acc78946c30..d0324eb0f551 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index 1ae8fbbc2f99..648e265f1ec4 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,5 +1,7 @@
 AUX ccls-0.20240202-gcc15-cstdint.patch 612 BLAKE2B a1c979b30a6477e5b0785313ad67dfab3921ea7d70aba733be519ee7917fd77cc1a8f402db4d7b3b478d25357e1eec7bc9f7db454fef09c3b86e3bf3cbb9acd2 SHA512 46dd83941d7e8deae089f73deba03927b953fc07a4d8be7f699c51c88ff6a6ac7eaba80ac4bc450d56d0fe5131a2b10a8016187a870ed5b29fcc08b72d011240
 DIST ccls-0.20240202.tar.gz 162283 BLAKE2B e96ae688690cfac13505e710c4b31afc5a3281bcb735d5f215b364870e0958b0b11799ab4340b74ef1530eb8d378d2b8dd7fddb1b16cbe5707073d63bce4a985 SHA512 bf30c869b985d7d6c0ecabfcc563b4983616c4f47ba743586a23441575695d87557113cdfd2603185adc454940d9244c331d9dc16444564358c910e2d61e9281
+DIST ccls-0.20240505.tar.gz 162441 BLAKE2B 881481d0d420d5e56e872271629051077c44ee8b5a6d184956ab7ae881afe0d7f6b798fd2f063904152f4b9aeadb8550ab2e1708c1ff7f3993bd97da6c0e9ee0 SHA512 1f250c4aee5d0f48886530c688581222b539b2b4fe9a11a5f9158306e85b47d2f299eccf721c171d92f83bda2b0ea90c299d393d25c0549c462f3f13decf2d6e
 EBUILD ccls-0.20240202.ebuild 966 BLAKE2B edb93d9343609e640315de7798d3ee144003938de8dd2c7780e3a57d434f87febc9429ebe92c37be8d68eefbe3f3b5e74e34a43aabe450229e32d48f1f535d2d SHA512 4e2efc6beaad0817b8769346104ed694b82c5ca99e6863a35bb718845af69065d004106b27da261fa8d2ed797cf740f22e0416f6573bb042e2b335ea84d3b266
-EBUILD ccls-9999.ebuild 903 BLAKE2B 04ee9d24877110aa22968785dadfb7d99267773dd7acbf9e2df3cb27f75ca7323ae2ad42863124b32e519696fddf1bff26515fde7cb02679cb8a96d7222b78a6 SHA512 f0c8f0a245d1b60a3d4458b3ab766192419a638d47c53a4893760c2e19861089176fbb564bb24a2c62d2e9fd24ebc1fbf5b88018238dde5890482c69ef994977
+EBUILD ccls-0.20240505.ebuild 921 BLAKE2B 120e0d2912d2424987f797debe34638b226933ac8bd4f004bf348c9c3e18e1b7fe5da21f65c99e67271dcf5b84665feb93a2e1f17b0af2f99a0ae24f3ed1f98c SHA512 16398eed5297315f61382a1d4efc392c656a3aff971437e0b53663c9809335eee9d1259049fa1ef6def64cb56838b783c29d00fbd70bb7497f5adf281304b481
+EBUILD ccls-9999.ebuild 857 BLAKE2B a7fc51bd93c1260d1eb961a031f43b6648f8f3554c040edd7b479983c6b1bc3e05fb22d49bd0fe08eddc78e131eda6dc47d46b04ee72d32e38f987f7b787f51b SHA512 104e8ffe68a01096d611feb7d55cd48bffba486ff27b6914e3afa44b0e772888a1671d0ed5d063412997217484b0bf165e846610504024a226990efa5d17a264
 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02
diff --git a/dev-util/ccls/ccls-0.20240505.ebuild b/dev-util/ccls/ccls-0.20240505.ebuild
new file mode 100644
index 000000000000..3c7188933225
--- /dev/null
+++ b/dev-util/ccls/ccls-0.20240505.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	LLVM_COMPAT=( {18..19} )
+else
+	LLVM_COMPAT=( {18..19} )
+fi
+
+inherit cmake llvm-r1 ${GIT_ECLASS}
+
+DESCRIPTION="C/C++/ObjC language server"
+HOMEPAGE="https://github.com/MaskRay/ccls"
+
+if [[ ${PV} != *9999 ]] ; then
+	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	dev-libs/rapidjson
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/ccls-0.20240202-gcc15-cstdint.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCLS_VERSION=${PV}
+		-DUSE_SYSTEM_RAPIDJSON=ON
+		-DCLANG_LINK_CLANG_DYLIB=1
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index 18afc3fd7cb3..fe5aaff02dd3 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -7,12 +7,12 @@ EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
-	LLVM_MAX_SLOT=18
+	LLVM_COMPAT=( {18..19} )
 else
-	LLVM_MAX_SLOT=18
+	LLVM_COMPAT=( {18..19} )
 fi
 
-inherit cmake llvm ${GIT_ECLASS}
+inherit cmake llvm-r1 ${GIT_ECLASS}
 
 DESCRIPTION="C/C++/ObjC language server"
 HOMEPAGE="https://github.com/MaskRay/ccls"
@@ -25,11 +25,12 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 
-# We only depend on Clang because of a quirk in how dependencies work
-# See comment in llvm.eclass docs
 DEPEND="
 	dev-libs/rapidjson
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index a5774f057b1f..709c0ef948e5 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -2,4 +2,4 @@ AUX glslang-1.3.283.0-gcc15.patch 804 BLAKE2B 213603cd66e19c02691964b30ac53de71f
 DIST glslang-1.3.290.0.tar.gz 3854382 BLAKE2B 02f781c318fe8ec47dae646c45ec6567e7cdd266ca8f8cacfd165fe29b5cd37b4d44f8b7b46d4b0175b2cb63ddc29d20652b27a78194c3922441744b45e5a8b3 SHA512 1dbea2d90864c02e4cd95eef0577bc7954a10608dffb19e49f803195153d082e67e71da4ba673dcd857d3c8e12628a9504385eaa3241f3f06c4de12cbdb3dc1e
 EBUILD glslang-1.3.290.0.ebuild 1115 BLAKE2B 5c22816e35aa6b8c837a318f5069ad21dc24937e4a550fabb6198823b8c0238429f222ed856bb166ee37287fdb5369ac4d48602683d9a53cbf576de8f67dae85 SHA512 f2cff2d29e015f555b50ebb146c8abf578eac4013d28ab9fe296868f0535bba830e7198e63cb80c22db20c1c957c50eef7a88a87c5bc253eb894bb7ad6a3837c
 EBUILD glslang-9999.ebuild 1065 BLAKE2B e79ae4cd9f63772df7e596efad9cab3545da780a67842cc5505054543082c7c8eec3ee3375cf504adc7bff74f3883f26a61f21d935ff47a071d2a065dd93a41b SHA512 3e9aa9a790ca8f90bf3555d568c658d9071d21879fa22d0cbde28e59d9eb3aa6aacf826dab60f9cae5592c725f88d566b6464d8216ae94c8b82eea05cb305fd2
-MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
+MISC metadata.xml 334 BLAKE2B ae09d8fe730e84cb5958c711c272ec0508a1be199fedeba1b82ae43552cdf4557e387b8405312bfe1cc4bdc43a1bd68507056ed182691d20e7759fb7fa8b396e SHA512 7abee6c6391f6c42a546a3f98791e3623152e1c6d0900afeb321ebad1a864ab71c2a282be2f651273b667986d9902bed7e9b5315fb5c569bab4f34c7812ed8bb
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
index 450e38a9cbff..5e57db148b30 100644
--- a/dev-util/glslang/metadata.xml
+++ b/dev-util/glslang/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+	<maintainer type="project">
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/glslang</remote-id>
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index a0b62df58345..b10a34b4f49e 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,7 @@
 AUX qbs-2.3.1-qtver.patch 196 BLAKE2B 6cfabd1bbd16b2e342ff9eeb2748ce2215ed25d18203f59e0f181f465e02dfe1e2416b8ab2b5c8eb3b5aa6ec9e7c37e938e389165b1a995ed7f48233f257af79 SHA512 f3f95fc9d1a96767d9a3e74ac428e9b00f4e460959d04298f3f6ecc99f5eb72a57290e6d248f82d1ba8ca7e655fe729b8320a77da585b145c48ac90b9a315181
 AUX qbs-2.4.1-ldconfig.patch 696 BLAKE2B eb0339773ebddbf913e09f6e50fc366b50b8a7974262e6f568da879cd96035d8c93cfe7c8e9a891f4716a5af3ceff27e0a753c5e6ccfe78481d696dd068e7cf7 SHA512 07bd268c6e95c306c1f69e29164e2e54b3290d415a96dac143c9438021acf8a8e42fbb1ae750308560279ac4762984dd74b4e18fe3be84a9c9933c9dd7d1a752
 DIST qbs-src-2.4.1.tar.gz 5739646 BLAKE2B 5455779be27a5eed316372303ec4264a6af8238684e9c4ae46dffcf7f9038b9aaff75dab29c84e761808158ce60f408c46eac829ef226168ad86c85df2fe7cd2 SHA512 caeb9289a208ca227fc2a16c38d88594b3b958c33f9108f74463bfad412a07ac7f7c4f85b6a741d3ee4c842e5a5d980d88b9c279ff8636cb2e98f67a70ee54b3
+DIST qbs-src-2.4.2.tar.gz 5718110 BLAKE2B 011051b16ec81684cf515e160da706dd2f781077a006e999f6c8bf9c8dc522655e6bd900c833f6fe53a076d83c11424975626e043c673a7d8bc10d7428964af9 SHA512 e584b03e7866991bb5fdfd1caed33beaa9480b820772bdbd0daf049f7d3fbe7d1ab19add520c69fd018e9298ff13ca8dfaae3b76e6245589708b59f976307464
 EBUILD qbs-2.4.1-r1.ebuild 2463 BLAKE2B e73512996d3dc7a791517c7a14e17bd129472ccd05fe6f0135fcf334663491f531870298e3a5bd591c9e2e25d1697119a97176ec45eb5d897e84f9a31ccb886d SHA512 b20d8b502ce0ac52a80a4226fce67748c719288dfc6cfd042fca8ba9de210c0b784bc0ab99caaba4e03858d5489e3d844d069dd874936266772893192b5060ed
+EBUILD qbs-2.4.2.ebuild 2464 BLAKE2B 3db130cfbad56cdfb8e8d80088dcc95516fc2b7bb098a765fc802d8df40add84dd7eb5238daa98b7a6900ddbdf236d62ddd994a2d17aaa527b726ef6aa7ace30 SHA512 48731ec065caeb88a5a61c521e4fefde65fceb0d6c9ca885cbd942f4f5f01f1edbb48befb2c673362606294a4f7b262adb68b203cb093ead784d12ab6ffc4b01
 MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6
diff --git a/dev-util/qbs/qbs-2.4.2.ebuild b/dev-util/qbs/qbs-2.4.2.ebuild
new file mode 100644
index 000000000000..c82bed8f744e
--- /dev/null
+++ b/dev-util/qbs/qbs-2.4.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.qt.io/qbs/"
+SRC_URI="https://download.qt.io/official_releases/qbs/${PV}/${PN}-src-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+		')
+		dev-qt/qttools:6[assistant,qdoc]
+	)
+"
+
+CMAKE_SKIP_TESTS=(
+	# QBS does not inherit toolchain/flags knowledge from cmake, and
+	# while can use ${BUILD_DIR}/bin/qbs-config to improve this it
+	# remains very fickle and will fail in varied ways with clang,
+	# musl, -native-symlinks, and libc++. After consideration it feels
+	# not worth worrying about affected tests here (even if notable).
+	tst_api
+	tst_blackbox # also skips blackbox-* (intended)
+	tst_language
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-qtver.patch
+	"${FILESDIR}"/${PN}-2.4.1-ldconfig.patch
+)
+
+python_check_deps() {
+	# _find_python_module in cmake/QbsDocumentation.cmake
+	python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# temporary workaround for musl-1.2.4 (bug #906929), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	# tests build failure w/ gcc:14 + -O3 (bug #933187, needs looking into)
+	use test && tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] &&
+		replace-flags -O3 -O2
+
+	local mycmakeargs=(
+		-DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DQBS_INSTALL_HTML_DOCS=$(usex doc)
+		-DQBS_INSTALL_MAN_PAGE=yes
+		-DQBS_INSTALL_QCH_DOCS=$(usex doc)
+		-DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+		-DQT_VERSION_MAJOR=6 #931596
+		-DWITH_TESTS=$(usex test)
+		-DWITH_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelogs )
+	cmake_src_install
+
+	use !test || rm -- "${ED}"/usr/bin/{tst_*,qbs_*,clang-format-test} || die
+
+	docompress -x /usr/share/doc/${PF}/qbs.qch
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 81ef46b2deaf..19c028734450 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-headers-1.3.290.0.tar.gz 521685 BLAKE2B f6179e8666a66c2f512153a3574ea252925020903739956f06eb24972ab5dc063dc19692b5c5eee96a3106db6bce652b625209cbcfd587ee73cd95a960ddffdd SHA512 d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89
 EBUILD spirv-headers-1.3.290.0.ebuild 779 BLAKE2B cab82b4ec21fbfe852e435b5768f91ea8740686020dc423ce2c85a2097a03a2680c0f51b4696340f4de9905b42c7679a16440a8e1d025f753fc6e061e5d5562d SHA512 eac6f8a3f8af8d13905f1931b6cc634617c3629e00055186ce8367600eda0ab54fb7bfa0ed7b44bcac72beec0cfc341a8898e361e8beddddc41a03e98d532090
 EBUILD spirv-headers-9999.ebuild 785 BLAKE2B a45fecc5ec273ddc5b54b608b4e34b16e7b415e7d8d89b60a617d94c476799fa4ebffb8b931f823d95657afd1c35e1271f48e6de71bb47b2d1df033c56d6251d SHA512 0b84d9d4afb589ddfabcd5106949810a55c0d0824e887a752a92603d7facf906df089762996806624c21ef702ec77caf57113dc9c82dd8401e0f3449d1888e0b
-MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
+MISC metadata.xml 340 BLAKE2B c05193d0f3d8cd7e261cc224f4a0e2b9ec6a43478692d26da90c5e9e645ee847190345c39a3eda184060d33b376d15e6ef5f74f8f9dbaca3ca949f1bf551bbaa SHA512 5021be4a35c06c779b290c6c68180ae83cd6caa10ef4319fdf47c9ea63245e3b56a6d72f88b6ab46df04a79d68a1008f39dfa1a5c9c15d3d339302d1d29926be
diff --git a/dev-util/spirv-headers/metadata.xml b/dev-util/spirv-headers/metadata.xml
index 02febea77190..e808bfd40dcc 100644
--- a/dev-util/spirv-headers/metadata.xml
+++ b/dev-util/spirv-headers/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/SPIRV-Headers</remote-id>
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index f1cdb415cb22..55c7896aac77 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-1.3.290.0.tar.gz 3170780 BLAKE2B 37609534f77e411ffb90e2904e847b2baec80332b5f3d3d3fb6950d835f9526fb95778d4c903574cf8be142370a69cace50d2e69d41e2eccf5f74a764464c148 SHA512 d4e8440c0843fb084dde4a576b95442783ab8204670b199798bd87f754d77f3c258bb69ab1d4dd7859c1d2c681ed8813309c76c6f70b5a7d8d21b6a48ef63b67
 EBUILD spirv-tools-1.3.290.0.ebuild 1147 BLAKE2B c2204a99fcd4bf40da0f0386e32faf2393df4586e83e0db848a099f1dacb052538da626dd6457c1765a7379314879d16d437a46f3540fbc6e38f6d87f970a50f SHA512 e258bb7ae9a89b7d0ddb984f13ce244238e36c2dd0a480cc19980b0c5d15cabf0e67c9b895c40def8c985ca9b45cbe34038002466f5e31660d3448e8882ef319
 EBUILD spirv-tools-9999.ebuild 1153 BLAKE2B e82b880ff4d815d41885a444aac1f4412d852f789556952bfde1bae0e13fbd9a8e3e0676de360070ad12f4591154eeba2ffe1fe5e331afc44f855bbd7c0368b4 SHA512 42f8dd7d74746f2fc22d615759b37da862ca93b85890235637dd544309d8de8e5dad058a65ca83f2b979112585df412635323944cd4d91f7427138356697b28b
-MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
+MISC metadata.xml 338 BLAKE2B daa2952fd92a1ebb904941cd59beefd0aafd28be3e47eda81bf15dff4d72fb2ce4ba9a777a2233a411843ed8e7963699bea5b327ee82f4a0b392505f0bff929b SHA512 0688c185bcd6b5c5ba6cf68b353786fe22a61eaeef81e6fdc07e7f3a633408b1666423c824928100b1453d372b172c82a89ddad39c6bacc8e646bbaa6e059001
diff --git a/dev-util/spirv-tools/metadata.xml b/dev-util/spirv-tools/metadata.xml
index 4377e5ef08b6..54175ca5f50e 100644
--- a/dev-util/spirv-tools/metadata.xml
+++ b/dev-util/spirv-tools/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/SPIRV-Tools</remote-id>
diff --git a/dev-util/volk/Manifest b/dev-util/volk/Manifest
index 677169b45f3f..b06ae156e890 100644
--- a/dev-util/volk/Manifest
+++ b/dev-util/volk/Manifest
@@ -1,4 +1,4 @@
 DIST volk-1.3.290.0.tar.gz 62571 BLAKE2B be7495fa0b5509f10259842b5394a651a2b57eb6d607a04b69a43faac2ab10ccc259acbd8445970d12d4111362806b20bf9acc2459438ff15c903d3978f395d7 SHA512 1af3933ab18120ab9418282069ee5a1ba86e8333b6fb1cfc04c85132f9c54ba1d21bbd833fa9e35cfd08edf2867982f19c536c0744569c6a91b0be8b54986e09
 EBUILD volk-1.3.290.0.ebuild 806 BLAKE2B 5ff99f912d5d9381218c0bb0d5ef9c173df362aa70e703bb43c0a98ad8d42a5a369bef79bfad1235aa6424ecf3cfcf4a9b24760ba825e53d4feb34354459f340 SHA512 2ec2e4b82b891f60cbcacf48ae643bf66099c95e435fadc338c86cac5fb257d8bc2e9afec46bd64710a8c52a6d7ef327e9fcfefc305b17b3d2fc8a228dbccd58
 EBUILD volk-9999.ebuild 811 BLAKE2B b3ed30b113af2be33ab08e6b84f36c994716f27298d20b13d9cab13104d09cb28ebf36b5595f41c99a3b1824875df07a82c8b96bca4fd0b3e9591a66880581b7 SHA512 788456d71718f59801cc526ca19a20e39626efb36274ab893b858f20d5f53aa00c46b136d0e36b55a00564e4bb7ccc9048ce62f1d523c50e4c3f749f0edf8416
-MISC metadata.xml 414 BLAKE2B 90b89b8f8cbc812c68d865df6379c29414f3a329ab31c5e56869d585570125835ae0961dae037bde864562bbb2f78736f0e023a3fad5757690b27d382ca7c7bf SHA512 2add3d201004761e26d8a05f878f221f350daaa6c804fabb856ea423d7fd8ae5a8da49f23c7a402b49db9ec19096736a88b4faf1d6ec44bfc49d769d8ab2bb93
+MISC metadata.xml 323 BLAKE2B d016824f72dddf4218a357c2c083cf96c861c14ea9ec7b4f300b394a58bd11f3f7672b7bfc4179afeaf731f77589bf260271eb9e5bf74b97d44ecf7142ac76f8 SHA512 e0437e6a1a761f09c80e55f6012f8d1d16549ad30434b2386fee1eac4e2ab325ef7d89c25b95026cb7589a5fe930590ac41589b0f50b25c096ec5bf53d0fed02
diff --git a/dev-util/volk/metadata.xml b/dev-util/volk/metadata.xml
index ff3703fcf01c..6cf6cb834e2c 100644
--- a/dev-util/volk/metadata.xml
+++ b/dev-util/volk/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">zeux/volk</remote-id>
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 68a4b81fed1d..d41f2d91d176 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-headers-1.3.290.0.tar.gz 2284263 BLAKE2B d0013a88fd6336fcd191931952a44b543647f70b1b8b4fc656e271468e94b3aa1f12b7031aac9750cb2792c55f17b520a2c5c93920802449c2e7a1eb114361d7 SHA512 2bba1b9f3b97e22066ad89bce48a999dd253baf47ed3c76575777e7fc03199c67b1f8b301c1e152eaf4ce63351af9901bcea3a34f2d8cdcea81c25648bfb4706
 EBUILD vulkan-headers-1.3.290.0-r1.ebuild 714 BLAKE2B 612d392fd534cd23c2881cbd1be443953e6ecbe787fe65ccd8a97470270e58db5ea4552ed8d0338d55690be4def52b98fe7080e7957601c997249141a1036f32 SHA512 d367f6fd235ae719644a410c4ca33ee3b72c5a1c8032ec85e4a04dce70bd958a9335efda26c56be8aebe3a2017e1337db72dbc013bf31f8548bb151eab501197
 EBUILD vulkan-headers-9999.ebuild 720 BLAKE2B 76fbfa07703519b41c904cbbab451fb45cfc637c139010f60e81114d8f44f417e5a533f470f7dbb675f845e84cc6bf976310eedab47b1f054c506129d599bc77 SHA512 b77c4cf9b62b5483399a06adc086f5fb3cc16cf3988f2e122147c40f844827f17af157ef3c886a39e2ce5305185b2827db858f25596ba7802bb703e146688247
-MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
+MISC metadata.xml 341 BLAKE2B d3f0197be65cb4684a7f0a3d095962d326a131ca539910145a3ac3f875b89ff6451441b36b5be71d047fd531f5b3958c300f159299926ecd564ff8e223882910 SHA512 817b6e70b4bb9eb28743358d50d9c0f74da89a771b283efb9826b8690f46544a39060d725b525ab6468c78792ea36553ae74b271d62d11bcf9dbeb76216d133a
diff --git a/dev-util/vulkan-headers/metadata.xml b/dev-util/vulkan-headers/metadata.xml
index c7e384dbab65..f32da29367c0 100644
--- a/dev-util/vulkan-headers/metadata.xml
+++ b/dev-util/vulkan-headers/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-Headers</remote-id>
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index c03a3896c8c3..814afe763eab 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-tools-1.3.290.0.tar.gz 754806 BLAKE2B 322763f930660b52ac1fd4b56f5b7cd133b49da7a5ecf4f6d36712029dfba44edaa61ab65eaf4f9771ec5e5fac159e8d30b46b0f057b3d9b61220e58dab07ff8 SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
 EBUILD vulkan-tools-1.3.290.0.ebuild 2067 BLAKE2B 3c9209c0d62c15724a711a426483b33938ce57661b79cc8434964d70fbaf0baec07c0bac572804ada6a8a8f1e8157efaf21d4f647e0aabf629285ebabff3041a SHA512 3ffe1e3ab44b872f9d7d0e2e3acf7e3acf9011cbb40649f8f473ca4631c71cc1ecf5968fa7403a0e1ad9a7f61b9cb7749a3823c52669ac8e47b1d06bac4ae155
 EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
-MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
+MISC metadata.xml 409 BLAKE2B 92472d6c8620665d243fa5b7df59caffca7eb8761150cc1474fe80077e1bcb31470d4df8decbc61b0e3bbb04eabe18f19cf350d97ec47bca7bca7eacfaebfe8d SHA512 bca2fb46cbea1137524ebda2c66e88249b77b2fa8248d2f7984583e4da02fdcb97e28b682e590746631d8ccee5c238bffa879c244948f2e81c187faee933e30c
diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml
index 6f7e91f6ed68..4eb50129bfe4 100644
--- a/dev-util/vulkan-tools/metadata.xml
+++ b/dev-util/vulkan-tools/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<use>
 		<flag name="cube">Build the cube/cubepp demos</flag>
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index 61281340770d..d6d30f05b94d 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-utility-libraries-1.3.290.0.tar.gz 542854 BLAKE2B 669cb85d05fff69aa14461feb84848ef3f1667e79fc740d20ed1209f58a8972aba547f9dedffce4e304c157d6fb8bd63e270c796d927c00729c5c5a62ed638b5 SHA512 73637d7fb511aa00b267d415e4bef780f8b3ffc206a6da4c3447472fbb3e358de6c1ea15601e4c951b6bfb49b736c2449d58dd257f2870388b5b3f9fd396dc62
 EBUILD vulkan-utility-libraries-1.3.290.0.ebuild 1061 BLAKE2B afa01f095afff189f3049dd761ef9602fcbeacba80df0385062a69c3f49864d736930e0a5b369539d0586d06802e2df1ea441968e020b09bfcb94a22e55fd364 SHA512 19eb092822dbe9e47b359144d5761a2cd9f72c8c49ed5c19de3f7ffc35f3221642e2aa6ec772eca1d8a41350a07e88b417ca8e86a9e7030df97ec6ff6a52e421
 EBUILD vulkan-utility-libraries-9999.ebuild 1067 BLAKE2B 3129972e6413494e6d09548229480a604e3a688b3318848ef8385c86ba489b5e4c736a9a1c3266810094cc03345b422e5cb42171d967bd6b161f0a57a205a3fa SHA512 0ad154aa3bbc2a5e5c29477fa6c68d154861e231b728c37cea75314533d37205c136d6351224a586fb355030598a1064c79bc700de73ca1ff00c32ed3dd017c9
-MISC metadata.xml 442 BLAKE2B cd315d7e91cf05f2d05be32c171ef6145e818f9868d17886cc7b5a2cb5e5fb8d58961414f585b15ca6c9d989244c0004c366d022464bd3b3b70ea451a2b67c7d SHA512 3e059e27de852aa76dbfdcc3dac69f0f472f496c64e1ca2a9053799f090b9091800e397a92012b7e546fa8240702546a5ca0dd6b2be6cfee356f539e73439c94
+MISC metadata.xml 351 BLAKE2B 6a288ab5597a1ff8afa449a8ad0af7942e5464d3939b5ff2d256b5de3b29b38ee73f6d2666c046a6e49114b636a55ba9b2717fadd08c4a6c5fefddcb1d413a3b SHA512 64149bef2851c07477d71da04408e5b8f46b2f0fcf03cfd02078772fbd26beade3613dec9b6e5af99e3e4a3059760061591ea35a1309fc16caaeb77060ecc142
diff --git a/dev-util/vulkan-utility-libraries/metadata.xml b/dev-util/vulkan-utility-libraries/metadata.xml
index e998d8c3dfb7..93b735b758e7 100644
--- a/dev-util/vulkan-utility-libraries/metadata.xml
+++ b/dev-util/vulkan-utility-libraries/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-Utility-Libraries</remote-id>