gentoo auto-resync : 13:05:2023 - 05:50:34

16 files changed, 29 insertions, 258 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e8a295b181c3..bc24f8002559 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 0ab51a81ca14..b1e0810e4f0f 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,3 @@
-DIST bats-1.8.2.tar.gz 143952 BLAKE2B 0c2302f2c77f5ee0446a6559355d24fae8bb2f178b5b17778fea44ec2f069c061c2930814f73e56671bf6f7cea44a74cea9b6436ca80941a1747197ccddcec02 SHA512 7eace32f19789e081112af1ce8ab33ff210d52bd3ea84962bbec226349b3b8d8912b6a495f5524f9cc7cfe692f1d23d684c93c24e182752e2b30731670d6eeea
 DIST bats-1.9.0.tar.gz 151817 BLAKE2B 33ff5ec2b89a1605de2b838f3e6f68c1fc4dc15b6617fe001e87c387ccc4013d643b697fbbc7358950aaae556b36a614baa0ae8b38865d7428b3d8ee544516fa SHA512 743a1b3907c3a24eccd5d6fbfbdea3aec472ecf2b5c8cdd428d9dff8daa7f029ec30a2873f1beec2d758173e6f5ec892c03623dc70e56d73665c83343c9808fd
-EBUILD bats-1.8.2.ebuild 956 BLAKE2B f61beee7859da93e9cf8eea900c639c8f62e53ab8d25ce0d2e529744dc3c7deb05d6c8f988b954fe81bf9ddcf9a52c4c9ea91d6ee450ccdaee4bed42ede3dc0b SHA512 771519c4ea68640aa2ee10a4f01b49adc661d9d2b3aa158f518372fef1fcf81dc15fa4f32f8077e2b6fcaa6c6dbdbda5531d76a27f1b049ca5896013145a698f
 EBUILD bats-1.9.0.ebuild 952 BLAKE2B 8da03cbb70b7f02340941a7c3f464431fa8ec4403a95895c98cdcfb8cc577785b37663126c6219b288ef4822a1bc087ec3c452542db1d03939293da5980ccf20 SHA512 cfe52be91208981b2f92a7d6e50bbabcf946be544e9238c1ce2b80c87766856803e736392a3eef1cb6d66ddc96f24a53b3724eaf1ebdfb7799b5bc8ef3c21ce9
 MISC metadata.xml 960 BLAKE2B 1eef5273fa063fbeb31bf73be2dd264f83a37a75ae5bfc116cfe6e97a0707349b9fdd6e0700505d7f698e63eeffeec2f72f9f9e853be3c3eb70ea80891fddde0 SHA512 906495ef8f00981f362302c4cc0f24aca8a9a7d4898e4f729941836b3bb126590c7d4863b37b6d216c1485cc96502c330ca03801c9cb271793ebd298285f8923
diff --git a/dev-util/bats/bats-1.8.2.ebuild b/dev-util/bats/bats-1.8.2.ebuild
deleted file mode 100644
index 10513ea9e56b..000000000000
--- a/dev-util/bats/bats-1.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing optfeature
-
-MY_PN="bats-core"
-DESCRIPTION="Bats-core: Bash Automated Testing System"
-HOMEPAGE="https://github.com/bats-core/bats-core/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
-
-DEPEND="app-shells/bash:*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_test() {
-	local my_jobs=$(makeopts_jobs)
-	if ! command -v parallel >/dev/null; then
-		my_jobs=1
-	fi
-	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/${MY_PN}
-	doexe libexec/${MY_PN}/*
-	exeinto /usr/lib/${MY_PN}
-	doexe lib/${MY_PN}/*
-	dobin bin/${PN}
-
-	dodoc README.md
-	doman man/${PN}.1 man/${PN}.7
-}
-
-pkg_postinst() {
-	optfeature "Parallel Execution" sys-process/parallel
-}
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 7ad45a40b2e6..1b5f4d7ed401 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,6 +1,7 @@
 AUX bear-3.0.21-clang16-tests.patch 911 BLAKE2B e9a11358b80604ef7a2e59e22bc5bde5740e31acfe5603fdf231f187f053f494c498bd0c169d70d658d2326803f0b102146c51ce475453f5780a2a35dc407ebe SHA512 558082dada367a4b8e95294ad57bada30c0e982551be248c3b08d610f81b653d75fe02c07cf1bb9321f2314893de4aced0cc97f16d276d4762874e7fdbfbd70f
+AUX bear-3.0.21-libfmt-10.0.0.patch 936 BLAKE2B 1ac889c2bfa057cc6b25fa473a88b05a66f02524134b3f10ee37c5c5fa662800523ae86ec3ec4197eb503944f782449bd65f107e23ff6f9529d4ceb886c508d6 SHA512 cef41aa6ef8ce580f4b12df5e883b477f67d6bed3b71a31aa7d9c2265d0e324bb669d05387b5401629e2bbe72fe4094a53a96a11bdf656fd833585567a748890
 DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd
 DIST bear-3.0.21.tar.gz 125827 BLAKE2B f7dcd383f27c370edb2fa0225e8337b2abe086df25a0272f61051600c017527b4079750328cb811b6967ad6fab51647909333eb1d084e24060fe56ca1036e40d SHA512 9fe43a52fb30b7b413244576c6ea0d493bb720e54d0b6263280224efef4b0432dee46697df160ba7e76bc1a5c8735fe814e0eb686ed797658b563bcb8c5bb7e5
 EBUILD bear-3.0.20-r1.ebuild 2130 BLAKE2B 032ab0d9e944f03b29a31756b7b482a7b29c27e85767e25a6d32c94b0e5c98252d7d847df991989346625d90e92179a8307eba883758776c4653d1c99081302a SHA512 6b97b0d7e42951d9e78f0ba6940500b2d397f8326e1453041e088bada11e57c62828d5a02f5ea16f023ae0fe4d8651d1a0c62439392ea5cb39cb54691b454de7
-EBUILD bear-3.0.21.ebuild 2221 BLAKE2B d512fd4d0430fe7941824fc5e2b36b4eb0b523093f2369026feed4bb2971e676018fc13879478bc98436b3a116ec4f836271c5a3dab7def266f1fe43077c9ef3 SHA512 4d3a3358d1a09d8697f0bbddaafb2314c6417f0d0baae3af801c616af21fca0f6b1af90de42b16101c1e8c22bccbaec90634ac6a1398f9fd4f26e9bd21412810
+EBUILD bear-3.0.21.ebuild 2269 BLAKE2B c90eeb683137b82948a2fa44a0131188dcf3c94d46b25eac9b5e7a0dc63d1d834bd7b816b15d0dbe24a23161c86ce9de93dc8235b1c2a35bb2ffb6e36a4fbb4b SHA512 a9d88ebf9da3caf67f5800ab7c4ebfc775e47a6237c5b12ea07615ae9dcddf1593525b830bc1a346b93abf79347a212d88605010ed0d60e113a5349bfaf540eb
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.0.21.ebuild b/dev-util/bear/bear-3.0.21.ebuild
index 6a865c940fcb..814b202089e1 100644
--- a/dev-util/bear/bear-3.0.21.ebuild
+++ b/dev-util/bear/bear-3.0.21.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/${P^}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.21-clang16-tests.patch
+	"${FILESDIR}"/${PN}-3.0.21-libfmt-10.0.0.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/bear/files/bear-3.0.21-libfmt-10.0.0.patch b/dev-util/bear/files/bear-3.0.21-libfmt-10.0.0.patch
new file mode 100644
index 000000000000..7c8425e46ede
--- /dev/null
+++ b/dev-util/bear/files/bear-3.0.21-libfmt-10.0.0.patch
@@ -0,0 +1,26 @@
+BUG: https://bugs.gentoo.org/906082
+UPSTREAM: https://github.com/rizsotto/Bear/pull/526
+
+From 46a032fa0fc8131779ece13f26735ec84be891e8 Mon Sep 17 00:00:00 2001
+From: jinqiang zhang <peeweep@0x0.ee>
+Date: Thu, 11 May 2023 03:33:17 +0800
+Subject: [PATCH] dependency: fix fmt 10.0.0 incompatibilities (#526)
+
+Signed-off-by: jinqiang zhang <peeweep@0x0.ee>
+---
+ source/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 6da1131f..fe6b710b 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -29,7 +29,7 @@ find_package(spdlog REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(gRPC REQUIRED IMPORTED_TARGET protobuf grpc++)
+ 
+-if (fmt_VERSION_MAJOR EQUAL 9)
++if (fmt_VERSION_MAJOR GREATER_EQUAL 9)
+     set(FMT_NEEDS_OSTREAM_FORMATTER 1)
+     set(HAVE_FMT_STD_H 1) # FIXME: this should be done with `check_include_file`
+ endif ()
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index b50b5e7a2a45..daa5fd6e5a05 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.3.239.tar.gz 446227 BLAKE2B 43c115f2b9661b682455034479a056cbef9cb9d4d9e60be88a1d5e16354dbfc907c1719f0d90cb0a0d243e420b552b150b915baaa9aecf998604197f26ba214b SHA512 f537becf7940cc31bc7b578f33be1ca55264414f205582dff0c569bdbae085e78760ea317a32e6d3fe3510e29554ea1b1a00bf9e4df3e20cd4de6e998a891a5d
 DIST spirv-headers-1.3.243.tar.gz 449872 BLAKE2B 15d8607dd14d10559249c0d161342153cd316481bf59ea502d102941a2f4a60f1d27285d46c68b3a0c5b738fff7d2956cf753fc135d282f61b254302df7b1d5a SHA512 04e7ac3d99ad9aa704c0a9fdc1a2126c9593aac855f255a2783d84c1226ce35b0adcd74065b24953dca9c43726e2b723791c64b441fdba1f4f726a5ada172e75
-EBUILD spirv-headers-1.3.239.ebuild 489 BLAKE2B 48386f966fcaf7a849a1835fdedf93d61abc5017c62fbf0145e83ec8c9fcf2a58c7b240047dc82ce06075656acb4d0359cb9cf5074a4ba0d51fd0306489d28f6 SHA512 4d7b961f5344ce9ed16004715626e0822d10a8cf46241f910d05deb17542741fbc48f7aa051cbbe1977036522d5ac0b3416ca56aec44bfa6068e1fdc34c75fff
 EBUILD spirv-headers-1.3.243.ebuild 489 BLAKE2B 48386f966fcaf7a849a1835fdedf93d61abc5017c62fbf0145e83ec8c9fcf2a58c7b240047dc82ce06075656acb4d0359cb9cf5074a4ba0d51fd0306489d28f6 SHA512 4d7b961f5344ce9ed16004715626e0822d10a8cf46241f910d05deb17542741fbc48f7aa051cbbe1977036522d5ac0b3416ca56aec44bfa6068e1fdc34c75fff
 EBUILD spirv-headers-99999999.ebuild 631 BLAKE2B 3b51ab12672d7f984b1964a4b52ca0b490fec7fc2c6ad4c9c1c30573d9181864a9654d62c95bf6bdc15627285550f40248f55ebf34b648280d311eb190842661 SHA512 293b4f77a53319ac245cfd61c06607f8fddfc88ecf7ed4d38887493527a249ecee56e1722b8582122263847918e026e9badba135bdf461ef356e2c50de6d6114
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
deleted file mode 100644
index b074631e4c45..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="sdk-${PV}"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index b81f774f3790..0ad1d171fda1 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-tools-1.3.239.tar.gz 3088996 BLAKE2B b7900fee1b5fca47802cd168766c3bc2f316fd69380670a8f0241df607c8fb41e8534d699330e38fa33ca1632a63fe54fb6c69def68d5b7a30b4229598fdcd21 SHA512 77c06e9127e9f5ab5c83b2bae181a9e626adc4f37d10122a1ed62904dd7e05f78f5eb75f4213d8d986bc78f60f247ed23ddc2552fcbb8355c0160fb559d32707
 DIST spirv-tools-1.3.243.tar.gz 3102102 BLAKE2B c871a1e152423a1e09d228cc91df86df5c81e62aaecf140c57b95929bec63142384f3908deff51735b520e31261514124c0063c67a80fff688a054b3364f31df SHA512 6a3ad537d74892fb3418bb11dd7bd174b59edfb99029128dddde18a02d677d485a704d11cbdd3a3f1df3a18f8c534ab081b461cc82b5bc00c5a5c0601102bd65
-EBUILD spirv-tools-1.3.239.ebuild 1139 BLAKE2B a8254b1a1e26f1f88c930d01d934bc9e4f282969999b8dcd823ff5c697f20a7d7800c0ce1c9da1f8d88089ff923543ca23e6ac4749fbd0284a2668cfa81cb423 SHA512 7ba92485860b9d0ea68b501d2f4e70d422df78649df97a24c96da266d693d2ac2a350de4e6f8783d96b603a6fe774155496247b7eb1d5969b11bef5bf8a8ad38
 EBUILD spirv-tools-1.3.243.ebuild 1139 BLAKE2B a8254b1a1e26f1f88c930d01d934bc9e4f282969999b8dcd823ff5c697f20a7d7800c0ce1c9da1f8d88089ff923543ca23e6ac4749fbd0284a2668cfa81cb423 SHA512 7ba92485860b9d0ea68b501d2f4e70d422df78649df97a24c96da266d693d2ac2a350de4e6f8783d96b603a6fe774155496247b7eb1d5969b11bef5bf8a8ad38
 EBUILD spirv-tools-99999999.ebuild 1147 BLAKE2B 56595323992efb3c2e9a255b3b57af95c38d3a12c59d4d8a3f1afd0b6d3758dbe1f3bf8607ae359591ef3b382c654f1e89b719bd01fe21021c15e4c32a6923eb SHA512 88dc7e115dddedf124c30d3233591a47827f0f6e5c755f67230ed830ba8625e7c6224d97042fc721a0d1b06305ecdfef20c0535074e2dfe75df1a5cad4739727
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
deleted file mode 100644
index a8099b02d704..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=SPIRV-Tools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-DEPEND="~dev-util/spirv-headers-${PV}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/
-		-DSPIRV_WERROR=OFF
-		-DSPIRV_TOOLS_BUILD_STATIC=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index a085e54daebc..d049ea9c40a6 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.3.239.tar.gz 1804393 BLAKE2B ea7ab92539aa32a6973bb590b84e4004195eea1f41b3499b33c1f915514243e7d06c603f0dd9feb4d04a455dd732940f512d2acca150372ebf02b007e670b27d SHA512 d7b0bf3f41f0f4a43c89c13cabfeb99401b069e6d0358b03befef465cba7e6a34e1608e62d981d0d905f5cc6327334cdca4e249ebb2305ce1ae81ebcfb62dc20
 DIST vulkan-headers-1.3.243.tar.gz 1841214 BLAKE2B b9361dba611b9719bdaade74084b020bdecbaa68f21fe7cd17ac57fa58f6b05683cc5c7c706014ab52bf604e849e822770c6697330877243aa9ee816ab8f6841 SHA512 d01304ae6b9bc142bd93ee5e0e66aa484d781bb9a6ca2ef6b0f0a367d1549f060a4c8810be13e2672fbea0e37c4c9de87070e56a772c5d6c75a60399d2f6ab53
-EBUILD vulkan-headers-1.3.239.ebuild 594 BLAKE2B 6faa9ea68b845b6d6fc5426e4eeeb9fa133a11bb420931496137c9f563005e6be84da1a8b2ab97afc9dfe55443589aa4ddbee028712e964f5bd24d219ab9e8d9 SHA512 6b72e8ccc8a6d85669eea09484848283aaa81b10a09c48c0f5822a94c108d956f4a7f2ca1b2db07965f94bda667c380c9194135eebadcfa7e38294814484be6a
 EBUILD vulkan-headers-1.3.243.ebuild 594 BLAKE2B 6faa9ea68b845b6d6fc5426e4eeeb9fa133a11bb420931496137c9f563005e6be84da1a8b2ab97afc9dfe55443589aa4ddbee028712e964f5bd24d219ab9e8d9 SHA512 6b72e8ccc8a6d85669eea09484848283aaa81b10a09c48c0f5822a94c108d956f4a7f2ca1b2db07965f94bda667c380c9194135eebadcfa7e38294814484be6a
 EBUILD vulkan-headers-9999.ebuild 600 BLAKE2B 0daf239aa649fb07a0cf75f53b709fdd45da34d5ab5d03bea21de97dd15871a440859ace5089d7de99665af2b1eac52ab4b312bad809d22ccb5a1ba858828a8b SHA512 c5c5e86b12dec0b97c1dcc1ef5edfa993665f99ff573892e7426ee7533829a72884e8b5eb4b19ec27d289c8cdb0c383299aa41c05f543e6af54455b2ecf06a1c
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
deleted file mode 100644
index 872d26d1d2b5..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 6527c93ab708..faf6a902deeb 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-tools-1.3.239.tar.gz 775603 BLAKE2B ff2b07454b603a72f0f07c575c09b431f0ec996bab2d5adc66d8d5f1456b0897f3796a33c5658949c92f895b67cbc67ad777975697693cc677db69400549e824 SHA512 9397f71dba2b741dd43c101472ab5961e64b46a7252fca1aa2f3b7c2afbe44b789a25c13536c8eb5dbd6600d0c741330493b73177d805db38ff1542364ef4764
 DIST vulkan-tools-1.3.243.tar.gz 778991 BLAKE2B 4b1e2a1b92ab4b4db7967fa01980b50845e8495c4ba638fe472968ec0069ce3d5207436e081401e7cacfd673002aff681ecd97ef2545a52decbbbb98b9150fd0 SHA512 6ba4c14073006e12615fcf054cd224b6e9f7f60215454349c19f671f4f9f987f38fe3d3dcd610d9a7dc7a39c6fdfcfae61509d31e44c86cb83b8429d1cb0febf
-EBUILD vulkan-tools-1.3.239.ebuild 1895 BLAKE2B b62ab9d1a808a44ec9b5c756cb914e0807ca043e9515e89320203c39b4d18613cf1c8728eb97a609b1e815e096ac0731dd4061bcc8d224de9bb3198dc2869531 SHA512 11e950158f1ee4dc2c0d4960c4496f8e518f7e02b9ed90ebd643b1270fd2515dd7f1a9cff617d11f3d7bfa850b2832b7a5ba0686aef868ad58c8b02852ab9e70
 EBUILD vulkan-tools-1.3.243.ebuild 1895 BLAKE2B b62ab9d1a808a44ec9b5c756cb914e0807ca043e9515e89320203c39b4d18613cf1c8728eb97a609b1e815e096ac0731dd4061bcc8d224de9bb3198dc2869531 SHA512 11e950158f1ee4dc2c0d4960c4496f8e518f7e02b9ed90ebd643b1270fd2515dd7f1a9cff617d11f3d7bfa850b2832b7a5ba0686aef868ad58c8b02852ab9e70
 EBUILD vulkan-tools-9999.ebuild 1900 BLAKE2B 6599fa23b8bb2e178420e33d7e6d093467a72cd0b04028b92c59d0434458f80f81b6e34eba26143e76c831624f222080cf7cf1811941e36f0addc83139fc2d83 SHA512 c507621b6a5535d02371d4cf3c3bb12edc82b5322ebf47ae9c52af04090c4f0ac292f6fd89244c9fb7592c4d2698c2f2da896f1665222e3235890b128dbf12dc
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
deleted file mode 100644
index e868c43fde5b..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	~dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index 72bba1887b58..a094ec054846 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
-EBUILD wayland-scanner-1.21.0.ebuild 1023 BLAKE2B f9dc1119418dd9e0c9b9b75386eb92b9c04d042e272cf51396b8518195d3a0393e73a1cadf920bd670c59409c6812501beec53c66f5e742aab31fa555b7b4b38 SHA512 53e6eb2afb669fd64310446a2233d1cdc5587319ac915a8c3d0d06923261a5231bce8290f70921fc3d7caa47b5a5027a00726c7e643044e9855c65bd0a3fbe37
 EBUILD wayland-scanner-1.22.0.ebuild 1023 BLAKE2B ba0b5ff61f65e33f25d12c6c78976914f96e917a3060c5082a0c182a7f4fdc8cfa3cbfc0e747f393da37b76748769d2932e6d332d8e22c8891599253f14cdfa3 SHA512 b6ca5f1018d585248109a4a3f1cea8382d81ace47d7f6f7e7eb17f4dc4303da98af54eb58711fb24c3238fb4c2290155d22366d31a156ae0cc3aec63ebba054e
 EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 6856e91cc7614f6aff2df4ed205982bc0e2cb3dea95cb66c748c99b3f951bc9d87c24357b4262f22f383258cab8cd0010baf3bcc7fc72034848ac31f33e997c2 SHA512 8c4fd3e3b841c06842a4d448e4ad521af84c4546939c00eb7083cf169ad3d843a6229b80519ca85dbebd78e00dbaa964bca5a2b2330be49f85b8af1bf04713f8
 MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
deleted file mode 100644
index 0590127055c3..000000000000
--- a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/wayland-${PV}"
-fi
-inherit meson
-
-DESCRIPTION="wayland-scanner tool"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	!<dev-libs/wayland-${PV}
-	>=dev-libs/expat-2.1.0-r3
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=false
-		-Ddtd_validation=false
-		-Dlibraries=false
-		-Dscanner=true
-		-Dtests=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig
-}