14 files changed, 0 insertions, 434 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1d14fd5dd688..6f330f8b6ce2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index 27adcf907c0f..977e78d417ef 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,9 +1,4 @@
-AUX ccls-0.20210330-llvm-cmake.patch 528 BLAKE2B dc6846e48fb9c69947cba30ab5c5105656bc4519aebc13526f9af5bbee56046b1ccf980285e5e22a14ff4e4e2df8d533a264a9569eafe329d767795ce55b33b9 SHA512 27092844ac557d15d9ac822bdc7239a5206fcff43468b260b93448d30cde254dc8a3eb025975c6403671325ac1b90f6e0cb20a64abf01c6b73b907d6603cc980
-AUX ccls-0.20210330-llvm14.patch 5068 BLAKE2B 8477e86dcb22e976171636a39bb7e4f69c77dd6e47d4ddf0163dcffb618209b4435d7d92f1e383c14d07a749fd237e27590782907ba702ea39eca49ce2514678 SHA512 2b98b8ed38c6ab0ec1b5055437c913c59543656df1a708f25af270f90baa746e4b2d398400a8c9ec3b651fa6d1d57f4b7b6da9c5195a11117b12c9aad03ecdf5
-DIST ccls-0.20210330.tar.gz 160487 BLAKE2B f87539a5e726a8742552d811d741c379d62c146bed835c7fa8d32ab5eb1f609513f80051faf07bbb8e346f176c02ab3e54b3446d5e28dae744468f2209a9d037 SHA512 dd78c040c2a51d6b47f8dd2d8bdc0661111f26b9233ffeb41216254b1b0ad0f634190784e6b8c2d7b36475c13020356342d83a9f80047d7da75ce21ca8885b16
 DIST ccls-0.20220729.tar.gz 160861 BLAKE2B db096f0f1e1d56967086e2711af63f4882e77128236b3d1af3cc107a3b320aa29bcacd4b21769904727261b5608bb2c8409dbb0f3b0d9b0907a94f3bb7c966c8 SHA512 63cb4eace1700118f9c8c4d2f4be40aac948f9c658485c8e3f49dcc863ce7bdd8b6de810b95ec8f46c943b65c8aa5fa643b110a6b981a2e43f57569d897d36c1
-EBUILD ccls-0.20210330-r1.ebuild 999 BLAKE2B f9211984a17679c14bb19ac8a79809c50339c83f3a35cce83e7c5a7e458922740236dbe8538e65cb57604488b63833d1051c7326296df5c12d2f9507beff3625 SHA512 d091c15ad3803a067e35e6d598916cbb33a3ec9877fe2356eadca7238b6872f3ee19db1896f4c82b5fe2ec7f83399a40f417a3eb65d11f451a1f5c8b9f04398e
-EBUILD ccls-0.20210330.ebuild 805 BLAKE2B d34208298dbfc3e9b51599d22c733d062df7179c8b296ffb2ec964956eb112fa07ceabb7adb15775635f5e89b9f50f9b8719e6546956d6b9c785d35abfddfbf8 SHA512 c5059e01fc051f4890b095f838446d0c0e0573e6e6f58a7305b888ba610fd91ca1b437434e2e91a66fca91cbec9d4e5adce734ca51e5c86962ed4e254eaa64bd
 EBUILD ccls-0.20220729.ebuild 921 BLAKE2B 50e21bb9212cbdb778ff7fbfc28760e31fb4ff4e88161a15e0a075affb88d81ea2a3aff1e5b40e29ae156d85ea4675c58e99397671caa39995ad001c0fb8eee3 SHA512 23748a4c54ee93831f7d59af32b206e0c45795121a1c4070289a7e778f29b264e184ec2161b1677fd1cfad28659d9bc405bcc9f0f3f3ba0aafd616499e977ad9
 EBUILD ccls-9999.ebuild 914 BLAKE2B 1b1ed4f47573f3520c60c7f97e8a53276bafa09ce6db4d4984d1945ea2f4d1d0ebb62738fa02dc199f35dd121a6e8c5c7c366090d39989a1c2283013820a5ba1 SHA512 dfc1298ea33a989347d44a342a8a54b33b908300c5e156266abce5370f8f2ff26af4a65e93042d8faa12f04e5aa90846bb05ac80e2384f3acbd814ecbcb434e2
 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02
diff --git a/dev-util/ccls/ccls-0.20210330-r1.ebuild b/dev-util/ccls/ccls-0.20210330-r1.ebuild
deleted file mode 100644
index f2069853b3f4..000000000000
--- a/dev-util/ccls/ccls-0.20210330-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	LLVM_MAX_SLOT=9999
-else
-	LLVM_MAX_SLOT=14
-fi
-
-inherit cmake llvm ${GIT_ECLASS}
-
-DESCRIPTION="C/C++/ObjC language server"
-HOMEPAGE="https://github.com/MaskRay/ccls"
-
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-# 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)):=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-llvm-cmake.patch
-	"${FILESDIR}"/${P}-llvm14.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-0.20210330.ebuild b/dev-util/ccls/ccls-0.20210330.ebuild
deleted file mode 100644
index 9b48ac669633..000000000000
--- a/dev-util/ccls/ccls-0.20210330.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit cmake ${GIT_ECLASS}
-
-DESCRIPTION="C/C++/ObjC language server"
-HOMEPAGE="https://github.com/MaskRay/ccls"
-
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/rapidjson
-	sys-devel/clang:=
-	sys-devel/llvm:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-llvm-cmake.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/files/ccls-0.20210330-llvm-cmake.patch b/dev-util/ccls/files/ccls-0.20210330-llvm-cmake.patch
deleted file mode 100644
index 8d8db4483db5..000000000000
--- a/dev-util/ccls/files/ccls-0.20210330-llvm-cmake.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/MaskRay/ccls/commit/dce86b1362acbabb8f997869fdaa27adc67f9a55.patch
-https://bugs.gentoo.org/835916
-
-From: Fangrui Song <i@maskray.me>
-Date: Wed, 15 Dec 2021 10:13:29 -0800
-Subject: [PATCH] cmake: Add LANGUAGE C to fix find_package(Clang REQUIRED)
- error
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 3.8)
--project(ccls LANGUAGES CXX)
-+project(ccls LANGUAGES CXX C)
- 
- option(USE_SYSTEM_RAPIDJSON "Use system RapidJSON instead of the git submodule if exists" ON)
- 
-
diff --git a/dev-util/ccls/files/ccls-0.20210330-llvm14.patch b/dev-util/ccls/files/ccls-0.20210330-llvm14.patch
deleted file mode 100644
index 79bf0f124422..000000000000
--- a/dev-util/ccls/files/ccls-0.20210330-llvm14.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-https://github.com/MaskRay/ccls/commit/3ce756e39ae48204f016a58684652ad62b4dd9f9.patch
-https://github.com/MaskRay/ccls/commit/8422f0a522b6fbcb4412a8ec73d80b4acbc7e00f.patch
-https://github.com/MaskRay/ccls/commit/790daca4b2d9d5873623fee86283cd61212df674.patch
-
-From: Fangrui Song <i@maskray.me>
-Date: Thu, 23 Sep 2021 13:36:01 -0700
-Subject: [PATCH] Adaopt llvmorg-14-init-3863-g601102d282d5: refactor
- clang::isIdentifierBody
-
----
- src/clang_tu.hh      | 4 ++++
- src/indexer.cc       | 6 +++---
- src/working_files.cc | 9 ++++++---
- 3 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/src/clang_tu.hh b/src/clang_tu.hh
-index b37950926..7dbfc4a88 100644
---- a/src/clang_tu.hh
-+++ b/src/clang_tu.hh
-@@ -17,6 +17,10 @@ namespace vfs = clang::vfs;
- }
- #endif
- 
-+#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
-+#define isAsciiIdentifierContinue isIdentifierBody
-+#endif
-+
- namespace ccls {
- std::string pathFromFileEntry(const clang::FileEntry &file);
- 
-diff --git a/src/indexer.cc b/src/indexer.cc
-index 89d78959e..644c0ccbb 100644
---- a/src/indexer.cc
-+++ b/src/indexer.cc
-@@ -527,8 +527,8 @@ class IndexDataConsumer : public index::IndexDataConsumer {
-     auto i = name.find(short_name);
-     if (short_name.size())
-       while (i != std::string::npos &&
--             ((i && isIdentifierBody(name[i - 1])) ||
--              isIdentifierBody(name[i + short_name.size()])))
-+             ((i && isAsciiIdentifierContinue(name[i - 1])) ||
-+              isAsciiIdentifierContinue(name[i + short_name.size()])))
-         i = name.find(short_name, i + short_name.size());
-     if (i == std::string::npos) {
-       // e.g. operator type-parameter-1
-@@ -552,7 +552,7 @@ class IndexDataConsumer : public index::IndexDataConsumer {
-         paren++;
-       else if (name[i - 1] == '(')
-         paren--;
--      else if (!(paren > 0 || isIdentifierBody(name[i - 1]) ||
-+      else if (!(paren > 0 || isAsciiIdentifierContinue(name[i - 1]) ||
-                  name[i - 1] == ':'))
-         break;
-     }
-diff --git a/src/working_files.cc b/src/working_files.cc
-index f80f21053..4904388be 100644
---- a/src/working_files.cc
-+++ b/src/working_files.cc
-@@ -342,7 +342,10 @@ std::optional<int> WorkingFile::getIndexPosFromBufferPos(int line, int *column,
- Position WorkingFile::getCompletionPosition(Position pos, std::string *filter) const {
-   int start = getOffsetForPosition(pos, buffer_content);
-   int i = start;
--  while (i > 0 && isIdentifierBody(buffer_content[i - 1]))
-+#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
-+#define isAsciiIdentifierContinue isIdentifierBody
-+#endif
-+  while (i > 0 && isAsciiIdentifierContinue(buffer_content[i - 1]))
-     --i;
-   *filter = buffer_content.substr(i, start - i);
-   return getPositionForOffset(buffer_content, i);
-@@ -455,10 +458,10 @@ std::string_view lexIdentifierAroundPos(Position position,
-     c = content[start - 1];
-     if (c == ':' && start > 1 && content[start - 2] == ':')
-       start--;
--    else if (!isIdentifierBody(c))
-+    else if (!isAsciiIdentifierContinue(c))
-       break;
-   }
--  for (; end < content.size() && isIdentifierBody(content[end]); end++)
-+  for (; end < content.size() && isAsciiIdentifierContinue(content[end]); end++)
-     ;
- 
-   return content.substr(start, end - start);
-
-
-From: Fangrui Song <i@maskray.me>
-Date: Sun, 9 Jan 2022 12:25:07 -0800
-Subject: [PATCH] Adapt llvmorg-14-init-13600-g92417eaf3329: braced constructor
- call
-
----
- src/messages/textDocument_signatureHelp.cc | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/messages/textDocument_signatureHelp.cc b/src/messages/textDocument_signatureHelp.cc
-index 8e8a7277..4192272a 100644
---- a/src/messages/textDocument_signatureHelp.cc
-+++ b/src/messages/textDocument_signatureHelp.cc
-@@ -80,6 +80,10 @@ class SignatureHelpConsumer : public CodeCompleteConsumer {
- #if LLVM_VERSION_MAJOR >= 8
-                                  ,
-                                  SourceLocation openParLoc
-+#endif
-+#if LLVM_VERSION_MAJOR >= 14
-+                                 ,
-+                                 bool braced
- #endif
-                                  ) override {
-     ls_sighelp.activeParameter = (int)currentArg;
-@@ -93,7 +97,11 @@ class SignatureHelpConsumer : public CodeCompleteConsumer {
-           cand = OverloadCandidate(pattern);
- 
-       const auto *ccs =
-+#if LLVM_VERSION_MAJOR >= 14
-+          cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true, braced);
-+#else
-           cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true);
-+#endif
- 
-       const char *ret_type = nullptr;
-       SignatureInformation &ls_sig = ls_sighelp.signatures.emplace_back();
-
-
-From: Fangrui Song <i@maskray.me>
-Date: Sun, 30 Jan 2022 11:17:32 -0800
-Subject: [PATCH] query: include llvm/ADT/STLExtras.h
-
-The header is no longer transitively included in 2022-01.
---- a/src/query.cc
-+++ b/src/query.cc
-@@ -9,6 +9,8 @@
- 
- #include <rapidjson/document.h>
- 
-+#include <llvm/ADT/STLExtras.h>
-+
- #include <assert.h>
- #include <functional>
- #include <limits.h>
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 8761492dfad9..4a7611fe652c 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.3.216.tar.gz 437011 BLAKE2B df48c7709c79b2132056d51e513b564539aaba335dbd68b4849aa871b688b9db5a5ec50142b3d448fe50ce6c4e5f2016e516e9e31441c8d1ad89c90c24bfe14f SHA512 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0
 DIST spirv-headers-1.3.224.tar.gz 436938 BLAKE2B a0b1ddeb89a20a9ab3fa9dc0af9574a207fba2b7ff0e588678b33e1d773c19d09ce828980f9bd7956a94d1d7b6f1f138b3b9d48b45b7b307c6ebc37962f8f8ee SHA512 fbf776a3ef1db2e7b33067b3f36c1d4189ff3d89b73058374c5020c048931f88b798b84a89209b2bee419afa56fbf9bfe9df6a7387198778b8f23e79597cb057
-EBUILD spirv-headers-1.3.216.ebuild 492 BLAKE2B e7dd5c912375e55ca2c208570cc004dfe62af4889886b772dfe98365eb3cfdac1932107c4d1b9147cb07777ffa0cde53e1bb5e916947af8c887855f8616c00b4 SHA512 1f4037508476ca38280fa1cead6c3283c88ad4e2bdc5a083b38376b3810a9d686df388e070e2a3fb1cae7195625eb36d5f8a126fbbe8304b25b3a4ba478a5710
 EBUILD spirv-headers-1.3.224.ebuild 490 BLAKE2B c201f868fb03e46dee492548ac8d1997912eace7559d041dab2d15b8a7b5c46285d906930df30dfb2e629a1f89a9be2605aa0ec53719cfdd20edd0e6fd607726 SHA512 4a8e6249a2909bb240faab351d9f5a205c22281ec595ef151eccb5a0250a9c3cb7ad4902d998f59bff7b1a7a9a963063ef6e95f2a88f13942865a6c856ef6961
 EBUILD spirv-headers-99999999.ebuild 607 BLAKE2B f94f54dc76cecce5116f6840334c3dc2b03c9b7e447765c491777562dc76cb94d2da530e4b678e7d2bde5b8b164b7aaee4421d2f05fde27c18c95e26e0fed2a0 SHA512 93a76d5a2dcb393607f194893ab1edeb28e158c22806a6bf144b345e368e57611f3114d2ad3d7b352d2c941b70ddf042b2325ed018e3cc9c4b4c5a2f7f3bde3b
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.216.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.216.ebuild
deleted file mode 100644
index 294d87e79a46..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.216.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="sdk-${PV}.0"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 9ddb6dc28717..abf9ec3601ad 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-tools-1.3.216.tar.gz 3019645 BLAKE2B 88fed3d48f50c50276746dd2b69740482c95c83df13312e081ae4066351454f0a3afaad2f146c629ee39dd34708dd105941e2bc374146a6e9806631227372105 SHA512 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188
 DIST spirv-tools-1.3.224.tar.gz 3033611 BLAKE2B 806c1de27d0c8dac4991dbff321fb8f62647b25b5c87d66b2f924449599e37e85ace876b848afc2e16e42f943f413e0eb759983cce95d826952809974dd9ac7d SHA512 1265db4c15d4d6c6fcb201bc958386e9c910386a82ff595b5d5f84dc03f6ab7f70f67fd59a90ffa92533b02d809305334c06228b869151cbcfdee529e90e7bbc
-EBUILD spirv-tools-1.3.216.ebuild 1220 BLAKE2B a3b228a72c7b083ac0cc7fd79b4807c15ef2a1c8ce95f063ed7363bdfd18cc0fe69aa33562eb8cdf0191964acf678260605a75c70041cfaf319f3e3fbee122c2 SHA512 2876f5f2b8a2cca96ce2816eb3ae813fac348d9b771ee6bae0f916f72ab13caf45c46a306c2977c43c7ab9db985e23f65bda0abff181d2b589a43e561f151376
 EBUILD spirv-tools-1.3.224.ebuild 1220 BLAKE2B a3b228a72c7b083ac0cc7fd79b4807c15ef2a1c8ce95f063ed7363bdfd18cc0fe69aa33562eb8cdf0191964acf678260605a75c70041cfaf319f3e3fbee122c2 SHA512 2876f5f2b8a2cca96ce2816eb3ae813fac348d9b771ee6bae0f916f72ab13caf45c46a306c2977c43c7ab9db985e23f65bda0abff181d2b589a43e561f151376
 EBUILD spirv-tools-99999999.ebuild 1228 BLAKE2B 14e6632663e0d507cfc0734669fcff523de12e8cc2d59e9d393f5f5fd7f497d583bc45fd163a8846b87d299406f7c1522c43d87359e8c3e7339f6238739002bc SHA512 f27542e6f9d50175e25ee80bb51a9c9dfab57746b76d225bab006803f8a21d79474beb05bbab1868ef6e52f1a8f74bfd7c2bc95ebab2aae788525ca869331cb6
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.216.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.216.ebuild
deleted file mode 100644
index 6f5263e9dd52..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.216.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-PYTHON_COMPAT=( python3_{8..10} )
-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"
-COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
-		"-DSPIRV_WERROR=OFF"
-		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
-		"-DBUILD_SHARED_LIBS=ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 6e728f38ccd5..e807f6c64fd7 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.3.216.tar.gz 1489322 BLAKE2B a6bdc5d0517405b121861f18c330dc9db28df9c7d48994c6131e047ff640f6dd858cd3fa6efe70d8feb910d3b51c4a7d5676c8d87eefbddbedc30ff3b6af6ace SHA512 cabce62c3e681c2f89f808a0838300f859d1ea046f0036f44c5191f5a9ebbc15058507cd5d07519c34b81ba602058a137f27142c58d4e6c84b2ad382431d675a
 DIST vulkan-headers-1.3.224.tar.gz 1521365 BLAKE2B 08e6e1badb473dfb760e20ee8a60f83cd288f33c4ad136026d2aecf474e1da13008691453886ee092e87cbd2ebbbbcf6bfcdff963276bdc8464521e07551ffa2 SHA512 856d80869267ba9c934400313cca1f9af67c1169974d70d21aed7469a39bf6d1821a95072a81edf8cdd463a62d766d478ee1c28bfc0f17a45b55ebd1634b9984
-EBUILD vulkan-headers-1.3.216.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
 EBUILD vulkan-headers-1.3.224.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
 EBUILD vulkan-headers-9999.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild
deleted file mode 100644
index 767fada760a0..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index b4d91cd400f9..bc97f3162ef3 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-tools-1.3.216.tar.gz 866091 BLAKE2B 750b7d26de64844162f13bb5f2c82b134c0996e2bf23883b381fc05bb8eb26c19ef3a8dc4da63543096473845952115a8e3213ee3972baa9b01104adaa09ed82 SHA512 57d152072ecad744256397e357d756f82457929a026a29127a079ea7b3b805b99ece1e0eddfecb215882a8de18cf9ab3c32c4c90126e261bc582ad05ae6173e2
 DIST vulkan-tools-1.3.224.tar.gz 868481 BLAKE2B 464e923f1bd7f72b0c9fab1ba6afa0aa179355f0ebd17c4cd6eeaf84b61efde61c60ce982d0eb081f88a64659dc5676eba77b9782e00df9d9214594806699d98 SHA512 89d2fddaaa710c78020e03b133c947afd79e9bfd1b4de711e5ac8f3e3bd5486e75960dc5a5cb7722ec55a6973233ca8a438e19627b59aaacad1c54040fdd6acb
-EBUILD vulkan-tools-1.3.216.ebuild 1946 BLAKE2B 8112a58006428329551368ecc8e628b030a5c9d10b7038266a7e6643009c46b0132719c1deab56d9f8c4c58ebe716f5a979df40e4b99d592089550d1392a158e SHA512 f22187590f9f5702d52e58d5e3658233a769e9cd355a092b722cdd9039d939313f8b151716a233ae74969a29098ae878f3aab69bbf2f9ccb3a54b20b5e40cd8a
 EBUILD vulkan-tools-1.3.224.ebuild 1946 BLAKE2B 8112a58006428329551368ecc8e628b030a5c9d10b7038266a7e6643009c46b0132719c1deab56d9f8c4c58ebe716f5a979df40e4b99d592089550d1392a158e SHA512 f22187590f9f5702d52e58d5e3658233a769e9cd355a092b722cdd9039d939313f8b151716a233ae74969a29098ae878f3aab69bbf2f9ccb3a54b20b5e40cd8a
 EBUILD vulkan-tools-9999.ebuild 1951 BLAKE2B 6a7cd950fe0ef6becdea897357f8e02440db2ae4c426ac2e5bb7ca139cc5b194545d082a09230c08fc4e3f3613f89cc0da74f60c9b362fcb072cce42c79a834d SHA512 190a32fb9346c17850fb8c741432990a16e8877cb797e37b15989395e06e708a990229dd9637244de5dd5e8d4e5a02404718b4c4ea6a1461c272c881afc4fb09
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild
deleted file mode 100644
index 8fdda43a61ac..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{8..10} )
-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}
-	>=dev-util/cmake-3.10.2
-	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_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
-}
-
-multilib_src_install() {
-	cmake_src_install
-}