gentoo auto-resync : 19:12:2023 - 07:53:49

14 files changed, 129 insertions, 420 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 61a9ebbc0474..f1ed8fcb1360 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index 879b60fdb0d1..6eb7eccbc206 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1,4 +1,6 @@
 AUX babeltrace-1.5.8-slibtool.patch 4148 BLAKE2B e086dd6aee512a0d2cd3db63a33275dcabb129def9bbaff6cd1b081bed3dc7fcc99d3f645fe009f55db72b72e86b420c9c12757544f85bfe253b55e7940f4c81 SHA512 3a43c19309297838752181c1c4f1957b7fe93900e932410dc237c8d11b4cfa7a5044826e2f60e192dbfeb1fee46185508ed2fa093d62a200dd86ffd78e24a553
 DIST babeltrace-1.5.8.tar.bz2 992610 BLAKE2B 3d47f9ba40b406271a0b35e441968718c93e8744f95b56f79acf8359001ebffb4966931f2860d48ced4f0d98261b37156564a0d798bf8d9e0ed465c05355cc5d SHA512 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96
+DIST babeltrace2-2.0.5.tar.bz2 3252593 BLAKE2B 31a8f3c080e4a6b6e33c224ec4a64d5ff12724a5697954cb92b88c569d6f2019f49ddcb88f82d36be3007c7b5d1334370202d1c0e89122acf340a7cb9e399fa3 SHA512 63469cb0796c720b18bfc09569875eb9a44d2f8a776228bfa503af8ba613b2988b2d20be870f41451e5d6146a3dfb08de6284131d25f1a86137deb75c3a4d514
 EBUILD babeltrace-1.5.8.ebuild 795 BLAKE2B ed86a7ec023ed5553b60359ed1d547c34711607d300fee95e1028c40117b31c9d92b81aad019f22c7a8c30a9ec96b9c88748b60e58fd053e2d25346d11391262 SHA512 b99ee491b62e70be6c93e92e2cf7d1f777912815cb19b002df70909168e3402d1e2eb69af2e25c01778a58b982b3e04b6e4509735d1a0c1d1a966c7381a2713e
-MISC metadata.xml 391 BLAKE2B bcebbce1ba6b23ead6210c63ac3b62ddbede04417ec75359d1e18eee66a73abfe5a32d3af731246f2be7ed016d085f2787c4d5ff4892fa8acc724418d49531c0 SHA512 373361a5de42d71175b3358918c66d10e9ef5de64326ee60710d3db1853149d8b3b577c00d65262404e1e5ccf5a12d8c849a1e87e1f7726245ca1e70912fe6cb
+EBUILD babeltrace-2.0.5.ebuild 1536 BLAKE2B 6abc49d624d5c77f8478a96f29265c119c05b251529cb326d50b818248bf787f21e8d25fafda7d6c715aad8a120de41976dbe92fb048c5dbbe9d737b66fd37d0 SHA512 cfdc39746010e76949deab46e49b434ac73d7f74360d6adf722a660f7ff8a973fd499fdc748b57bab2c0187f321d0aefe390b236e904b60c898f9e13f0e1e371
+MISC metadata.xml 678 BLAKE2B 0298ddf00050c55f360e4e02d9c590db5df5b9b6cfc6d2096685281cef84130a8003bdb9190215310aa955e30fcf6c3fb72eb301091ae9c4f0a3d29b55d9e627 SHA512 2bf5458672c71b4511e64eea1cee4324d245a8adc0bc43b9e9340e43b8a2826555bcceb80f37baf06c99deb60340a752478d033eb8a271ac79d9b86ed0a583cc
diff --git a/dev-util/babeltrace/babeltrace-2.0.5.ebuild b/dev-util/babeltrace/babeltrace-2.0.5.ebuild
new file mode 100644
index 000000000000..a2ef0478d2cc
--- /dev/null
+++ b/dev-util/babeltrace/babeltrace-2.0.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+inherit python-single-r1
+
+DESCRIPTION="A command-line tool and library to read and convert trace files"
+HOMEPAGE="https://babeltrace.org/"
+SRC_URI="https://www.efficios.com/files/${PN}/${PN}$(ver_cut 1)-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc +elfutils +man plugins python"
+REQUIRED_USE="plugins? ( python ) python? ( ${PYTHON_REQUIRED_USE} )"
+S="${WORKDIR}/${PN}$(ver_cut 1)-${PV}"
+
+RDEPEND=">=dev-libs/glib-2.28:2
+	elfutils? ( >=dev-libs/elfutils-0.154 )
+	python? ( ${PYTHON_DEPS} )
+"
+
+BDEPEND="${RDEPEND}
+	>=sys-devel/bison-2.5
+	>=sys-devel/flex-2.5.35
+	python? (
+		>=dev-lang/swig-3.0
+		$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]' python3_12)
+		doc? ( >=dev-python/sphinx-1.3 )
+	)
+	doc? ( >=app-doc/doxygen-1.8.6 )
+	man? (
+		>=app-text/asciidoc-8.6.8
+		>=app-text/xmlto-0.0.25
+	)
+"
+
+src_configure() {
+	use python && export PYTHON_CONFIG="${EPYTHON}-config"
+	econf \
+		$(use_enable doc api-doc) \
+		$(use_enable elfutils debug-info) \
+		$(use_enable man man-pages) \
+		$(use_enable python python-bindings) \
+		$(usex python $(use_enable doc python-bindings-doc) --disable-python-bindings-doc) \
+		$(use_enable plugins python-plugins) \
+		--disable-built-in-plugins \
+		--disable-built-in-python-plugin-support
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/babeltrace/metadata.xml b/dev-util/babeltrace/metadata.xml
index e19173f54746..4a8c91ec4791 100644
--- a/dev-util/babeltrace/metadata.xml
+++ b/dev-util/babeltrace/metadata.xml
@@ -5,4 +5,11 @@
 	<longdescription>
 		Babeltrace is a command-line tool and library to read and convert trace files to and from different formats. It supports the CTF format, which is outputted by the LTTng 2.0 tracers.
 	</longdescription>
+	<use>
+		<flag name="elfutils">Build the <pkg>dev-util/lttng-ust</pkg> debug information filter component class</flag>
+		<flag name="plugins">Build support for Babeltrace 2 Python plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">efficios/babeltrace</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/mk-configure/Manifest b/dev-util/mk-configure/Manifest
index 820fc22a9a3b..e79697d8c43c 100644
--- a/dev-util/mk-configure/Manifest
+++ b/dev-util/mk-configure/Manifest
@@ -1,5 +1,5 @@
 DIST mk-configure-0.38.2.tar.gz 359518 BLAKE2B 17b28686d8d4d81373d86e4f23f4f9540cb62338b31aabbf21072c6ebe364d12db3fad2da6e7c0a2a5a6af39db099960879794dd7c9cb014e0cedea211c2fa5e SHA512 dd6542c39b24513288e69c0b971aa3c602bc450a812f1758b26c7f6b0cb9864a1a1d8e04153fb79394a53f7be1a5990c4dcf090d56de8edc8a6a7580799cbe76
 DIST mk-configure-0.38.3.tar.gz 362541 BLAKE2B 6c071fbeef508bb35be9983d0c89d573b1f3b2753511361406776f245559f9c419199a90482f4979e20121084f683a6fd5b4dd38db3b3a3a71727a354a3470a0 SHA512 646cfe82f126299824bd1f2412ca66c75acfef9fd115d37dec23cb69072f9ed3801318de15aa957843d2f6a7a124b5bd411f06408f86aeaed1b58949ffb7ff5e
 EBUILD mk-configure-0.38.2-r1.ebuild 1854 BLAKE2B 44d7b1a0d41b9826c890a567dd1487a0ef2634ee7eb9e251fdcc01fce7e3a396126d6892956e89b878bb48787c2926d53be5a14221dc472687e04a5269e2c13a SHA512 2a6a2f75df214b7946e629015e9200d0d82117f38b021bf824121bd39746d06955e93b073f16ad3de58c5849b93ef11c0b7f7dac97a65eb9a43881d30d1e68bf
-EBUILD mk-configure-0.38.3.ebuild 1893 BLAKE2B d3802e6b44834c766907c20d8fa6b4ea0840b071a5349b914852b981b4786ee502ff53bee19de110f6a48fe262ef5aeb9688932ea8d96918e5f64c0349f38d01 SHA512 fdbaf5e05722627772241d49ada6683a745ee0f943a402b8ef065f079f75e4b08822f3bc696e0672ef13b1a1b503a5ca37a2b804f3e29fcf8cd764ae944f3eec
+EBUILD mk-configure-0.38.3.ebuild 1900 BLAKE2B e6fb2495a3861d2b93d0504e48ae4de7c210eddfc8d8e0d20fde2c4a9890dc0ab43fc4ca2a7bb2e93252b2dad541eca9377b8039f2fb79fc38144b96e66536a8 SHA512 23afa049b9132e5eeb7596cf06f361337ca02d20260d97ab6f568320b4c0635004a4d307fb4a637b924b1fd422aed8e12860d8878fb624bdfe672b0d92223b7c
 MISC metadata.xml 382 BLAKE2B da0a75f928295c179866da180acd537f8b964b029f5d5f99aac2f84190fe9e2497b2845f6c5c506b236c650a6e460431183f24e0439b6bb81258567a5338bfc3 SHA512 e83bb04295df653acca72744e9575e8aed59063f5214409a99b32cec79a8fa54537545f8be839d4063831e8605ef52c7aad92491b3066364e1eea1750fdc1f17
diff --git a/dev-util/mk-configure/mk-configure-0.38.3.ebuild b/dev-util/mk-configure/mk-configure-0.38.3.ebuild
index 872e8e3f1f48..80a024eec43b 100644
--- a/dev-util/mk-configure/mk-configure-0.38.3.ebuild
+++ b/dev-util/mk-configure/mk-configure-0.38.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 GPL-2+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
 
 # TODO: investigate
 RESTRICT="test"
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 8f7338672f5d..ca162c340742 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,25 +1,13 @@
 AUX scons-4.1.0-env-passthrough.patch 1498 BLAKE2B 9aaae51779053518d983c9f028fff58a68a8c3e1213c8a746aad2e6dc6cebf139939dd3fb41a643c5db7e6079e09ad9850e552192e35bc4c8bf75818334b9e0d SHA512 4c5c3364575d95f4922b7c5b3c8f536a34b58136e7a604bc06760d94a8b20c7e8cdfd3100ab8c56e08b885e2e9521f036f4009512b1f1b10aec2785a74119683
 AUX scons-4.2.0-respect-cc-etc.patch 3493 BLAKE2B 3a36a9cced15ef81e671d8a90750afc14650fef564997d250ed63f0d9b1c91361872a8816cab9ba1f0ecae46711414ccac921ded954eff7c51e4161532030e5f SHA512 ce8690a126255047c8efbcad4e75b91fca07b0afac55d818d4f5467a41795394cae8f5d47484519c482bccfdae9c3df1b040689a656098f349629f1f609adbce
-DIST SCons-4.4.0.tar.gz 3096863 BLAKE2B 60f125c077dd8f50a7150db6dc1234eac988cf7ee7495036d73c46e8ae445b87c88dde23a537d6647709778a33e6f1ac529f7ac7f862648e3019bbe437bb451c SHA512 d4e630214a9221f00d668b6524803efa83b41534fa6e0acca689d926cbc8546e5cf79c1c7a4b5627afbcd5033564343b408790bf4c29067d053cfbb39408a8ed
-DIST SCons-4.5.1.tar.gz 3194371 BLAKE2B 830e3365be99e38aec0f3b99d406bb7547d3d8b7c7fb752db1199df5545879dafc52f449b001c3ef10290b1bdbcb52cd7c4befc7dee4b2f3be1234cca2d4fcec SHA512 aa676021694b1020a21a517a4d3df03f442a28e78b2d32d4316b7d7ee7271f8025f2b50d0ce8fe5d5a8be282b5ecaaebd9aa85be1e15e6a0bbad1567a394014d
 DIST SCons-4.5.2.tar.gz 3194724 BLAKE2B c27d00e4bc319e3b8d5d35d50d5f03df15e2b72256e26000299ac95c5bdaffbe850942df9e3c23a6b0dbf55ea000f768a7938cfedc451cc7bd3e2a521292d49e SHA512 a9675f4b4dbedf8c7375d4d099216cd935c38944d57b0a08de2b9c133bb53184de0d5803edf5cb9f800f205b1252ceca3aaf33a10bf5d8b48eacd58866cf776c
 DIST SCons-4.6.0.tar.gz 3230138 BLAKE2B adef2ad5394404ae48d85e8c2a91b5af29e4f9bfa7455504ac1cb8d22d9a05c9ace823e02c8e7a32b34dee281635987487ad43ca94c6adea8e287b086a0732f0 SHA512 c7dc952117c23ac30b8cf1f70ef0c4ad1c0a86c9865fd255fde1a29ea2fbf9e26573b73430f6adc8c545dab753077f380d29d77ac4eede7fce959c86576d2354
-DIST scons-4.4.0-user.html 1608381 BLAKE2B ff4eb1e0f9c5e8ea7ca44cc00dc37e3e2dd38c24cb09a857c691e6a48f11e5fc86a55740037cc295e6b23df2a1c1b600adf0462320ec87cc26d4bcf919b07342 SHA512 8c1d6578270054efba34c56ddc07b4314bf62630f6a445f5b9f865cc48d593f6c92101a8d216dece201b8d6cb5bce59ff4adb51caaa40128e96b6235087f748c
-DIST scons-4.4.0-user.pdf 2964111 BLAKE2B 45b37c99c3f3d0e9969a16506e27aeabfd562155405f5a59ba79c24404b14e5588fbd0673d86e2266adbd25eca140c9e1cf86e271228658591c0d9285474f078 SHA512 57330f685e7c775cb1c782e40f711c2b2322fad19212a22a920aff92db974610cc78f276e1606fb827660bb488ce803e2458bb9d93c452fa0600df4478f03d06
-DIST scons-4.4.0.gh.tar.gz 5808265 BLAKE2B f6ce757f2edc40551b05285098626bb62def6abda2380d4885ee4443868e715e53aaa34f26c09dc689bb6ade26d1b0e276046fe3b1d2ddf8eb40400bca9ea164 SHA512 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11
-DIST scons-4.5.1-mergeflags.patch 10518 BLAKE2B ea059c4347cfa8dcd99353c1f6b6c1d3aae1c6225b4683e421f3f3ea9181d5597862603c2491abff40dd1599094638239f34bf88458e7c44a8f28908eb91934c SHA512 11771c99d64cee413311f595faec8d2025152a7871ef53bdf0b22be45ffefc0d0c4bf49d185a10c1d3d2fb76ac94b04d992990375dc144587b101761a5d985a4
-DIST scons-4.5.1-user.html 1655168 BLAKE2B 644c808f129d2d83f40b1ef2c8c12781b697a0120dfc00f5f0425e88e23c609290ecf2c8b6daad556c876ae3a86e8b262c53915b05d69c6e3c79f58395789362 SHA512 171d9330df520a75fbc124bf646c55c5868b24343ff46755a6283fe444ad4e090f5658dafa7239e708b4ff8b910e81201c27655674bdaffd20e8cc6ffb81d633
-DIST scons-4.5.1-user.pdf 3023817 BLAKE2B caa782f77fac668eee0ccd76f3e96168ae3d61c9c3e80123c34bc45625182f77973fbab24170c5f67f133c6124412eadbf02c3497373211560c58a348d6b00ab SHA512 41fddff58032b6364ff3935259d4bf81a0d69398cd52158c42be71e4ff6efaebd2faaf1354781f7336ba1aa4f0cf99f0f37edcd72baf325f9ced7ec88b76ce88
-DIST scons-4.5.1.gh.tar.gz 5844118 BLAKE2B 88a82e12a034f6d0748555d0d33716e5af6ff957a9345d5b0ba87c2a36544bae0965ea0a29e3cc80d6d2493f3f8bf0bd314bed5824dc609123972f640b19a53a SHA512 160089342b93197237b9f0c5f0ada42126f3e5c83e0026f6dc121aaae85c94774b01ea3b0b0fc56edf3effd87d91612b2167d004abe7a00bd8d107d5415f5d4a
 DIST scons-4.5.2-user.html 1655168 BLAKE2B dab0b29ae7bdadc96b9081d1d9e1d8b29cc62afb39f3161e4b7694b3e58a31e82446319f3efc560fdbe2c3a37b902c79c74d15a790c865ec3c6d27811f0443fe SHA512 6f2c74d15dca903d500bebe33f0af6b90ca1458c3796048077d411b2c269013696036c7e9ae8b1f300f37c05dd6246f8b12d35b503f9018f002b9d01fea22ba9
 DIST scons-4.5.2-user.pdf 3023818 BLAKE2B b67e2ca3326b5e9ec2cdb530b22d347072e9c906678509a21aae1622487054d4aa3446beb599dd52cd93ad769a5b325dd101356ea88baedba907c931e0acc792 SHA512 172f494fd5e73f654adf9c137bd09f74f57bd2ef17dbd0f02c66aea49798a3fb136f176ee85fc7432378af49e28cbb498e830e519df74652533ecb9f3e52ecf9
 DIST scons-4.5.2.gh.tar.gz 5844800 BLAKE2B c0f42994a178bb0fb329cfa05328bdae89b374a33a7806276e7529a81b37a4ea9f52d07fb2afc55adbe3c1e00661ea3c3d53e981be4a8a095079fc35403328f1 SHA512 aa788d9365a8b5119fef404869562f61cb854be7ceadb5f5d47523e262c07f93ea7476166b577edec25339a64dc6a1f4a6f391fa5aeeab3f086a6659fc72e1ce
 DIST scons-4.6.0-user.html 1670870 BLAKE2B 0c84248791bdce093cce4d45b525357aeb3ae69835337000d753b007dc77053d63e70363b3d73c3e7c8157b24d50f0a0216ea9993d90bb298ba2591d6fce4cb4 SHA512 5b8a2626bca361dbce1b0b40f6009752b2dbde7e1f5886b449b9015514951b2e998ede0582876411e7cde56b4ea05546e2db8a8fdcada349c39a126c2e50be1a
 DIST scons-4.6.0-user.pdf 3058220 BLAKE2B 3a04e1c0fab47f2a1327f20d3ee500d7861599dc31b0007dd196173af5b880d9737ff528b419896e905cae5a5744c74ef38c2b29bc7945ef4157a79c1c6dabe9 SHA512 6a5ca9cdede81ec9536bb32d7df157fd1efd4b3e3f5afa386b7ecaa45d1fc212015673ccec5ab3283475ab0ee6ef001c111f51b7d3bb64dda664e61d11cbaec0
 DIST scons-4.6.0.gh.tar.gz 5891032 BLAKE2B 9aeda2ef899dcaf5bc7ca3bc77c0615544f2308f56ef095ad835d5cc748355b467a905ec737eef61a4afd183ff0f041dc244bdd58858ba3abc4f3a4efd9f8dc7 SHA512 d7dd30bbc94ec014b12b37a106aa536dd5c8b16e9f1605b68cad6721cf6e3959add1f75a42693fd8499734ca19eb76f648800d7cc8081fe334282841cd406954
-EBUILD scons-4.4.0-r1.ebuild 3729 BLAKE2B b687486ff4e25fd5f5921576d9fc4e0e248ce891cac569a8c63d0475b2f83dfff92624c561db79b28bedb3861bbb7331c04721e66d2593df613cf92ddb56a91d SHA512 072a26e39a50759810be5f36a0003185a06c474bc534e9a3835c3894b78eac84b215d38cd5e8fdfe6832c1b82c528a954c61dd2f1421032d8fc80344d9b8887a
-EBUILD scons-4.4.0.ebuild 3640 BLAKE2B 92569e54bb39afa9ac1d5943f7d4b76ee8da2e97af18326322443a41f24ebb75c921c712c356061f415da7ceb6cce3c2631ef946b3279a308716cdff922476d4 SHA512 8c26be4dc73dbad15bedb4349daba06e752425c5f93b71be5bd8f67796150545daf20582a5fa01f128d920eebc1e9480e931af14b2a968a96a9088a2433fbd83
-EBUILD scons-4.5.1-r2.ebuild 4080 BLAKE2B 38c4d44acd8e45ed44e00a7c814879be5ce927641f89894e3be3c45d5fe0a51ce3ca6010c87008dbe71287eb650d288246d4df99e9f3d0d6b267636cb44b0c05 SHA512 4832a754854d47d10a60f59347a778f9e1da234158074376a495492e5811dd892efad0f522d22cd131a1eee2d7e4a798758484287bb9f56014822abf4bda3492
-EBUILD scons-4.5.2.ebuild 4535 BLAKE2B 360d276dd149912f3cabbd75479c8edd4eeef1504dda34106102d3539353e4df3ae756a903d7796746278bc15d64faf1a386279fd72ed1cb14695fc045d5b698 SHA512 84bc3803a3cb7762054f72381b15b97133a07d469963a98f7425933e6a24f750bf424635808ae6499a47d988f94ba2a7638d331e1d90fef04230daf5a9d8ca72
+EBUILD scons-4.5.2.ebuild 4534 BLAKE2B 3c7f09fe378c3f1b2a6ea63046275a88c1031b08c15e10ebc4950a56ddd62a60dcdaa7610188d4609ae32a30e32342e8ddba308722fdf5fcc3013c64fd5d1a25 SHA512 69c035f26eec493ebf321eddaffd0ac799835ea84c9c3bfc208cb78af3d08669154638c2fa2092ac2ab3dcb3ef3875517b0af14187854ba157bac91c1ce27c35
 EBUILD scons-4.6.0.ebuild 4541 BLAKE2B 331db7436b30d29f81fbea8e309452b1c08ef8d97c27c47383271875b6ecf9eed16e19bb65c83772a816371d35b853a9122a9e4b5b9aa004a1660eee3fd186b3 SHA512 84917ec80c9baaecb52a387ccabdfb4708ef71697c91e3dc56e26c3e12020dbc175919cf08cb26b8f2a3ac3a8d14e32889bf540a70c0aaa5ebcf44203648fcdf
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-util/scons/scons-4.4.0-r1.ebuild b/dev-util/scons/scons-4.4.0-r1.ebuild
deleted file mode 100644
index 08f12df37ec8..000000000000
--- a/dev-util/scons/scons-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing
-
-MY_P="SCons-${PV}"
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="
-	https://www.scons.org/
-	https://github.com/SCons/scons/
-	https://pypi.org/project/SCons/
-"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
-	doc? (
-		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
-			-> ${P}-user.pdf
-		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
-			-> ${P}-user.html
-	)
-	test? (
-		https://github.com/SCons/scons/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	)
-"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
-	tar -C "${P}"/src --strip-components=1 --no-same-owner \
-		-xzf "${DISTDIR}/${MY_P}.tar.gz" || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	if use test; then
-		local remove_tests=(
-			# TODO: does not respect PATH?
-			test/Clang
-			# broken
-			test/DVIPDF/DVIPDFFLAGS.py
-			test/Java/swig-dependencies.py
-			test/Java/multi-step.py
-			test/TEX/newglossary.py
-			test/TEX/variant_dir_newglossary.py
-			# broken by commas in date, sic!
-			test/option/option-v.py
-			test/Interactive/version.py
-			# warnings from new binutils?
-			test/AS/as-live.py
-			test/AS/nasm.py
-			# hangs
-			test/KeyboardInterrupt.py
-		)
-
-		if ! use amd64 && ! use x86 ; then
-			# These tests are currently broken on arm and other non-amd64/x86 platforms
-			# Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to
-			# better plumb up the MSVC tests for alternative arches.
-			# Try again after 4.2.0.
-			# See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
-			# bug #757534
-			remove_tests+=(
-				test/MSVS/vs-7.0-scc-files.py
-				test/MSVS/vs-7.0-scc-legacy-files.py
-				test/MSVS/vs-7.1-scc-files.py
-				test/MSVS/vs-7.1-scc-legacy-files.py
-				test/MSVS/vs-scc-files.py
-				test/MSVS/vs-scc-legacy-files.py
-			)
-		fi
-
-		rm -r "${remove_tests[@]}" || die
-	fi
-}
-
-python_test() {
-	local -x COLUMNS=80
-	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
-	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
-	# unset some env variables to pass appropriate tests
-	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -a --passed \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-
-	# runtest.py script returns "0" if all tests are passed
-	# and returns "2" if there are any tests with "no result"
-	# (i.e. in case if some tools are not installed or it's Windows specific tests)
-	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm "${ED}"/usr/*.1 || die
-	distutils-r1_python_install_all
-
-	doman *.1
-	use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-4.4.0.ebuild b/dev-util/scons/scons-4.4.0.ebuild
deleted file mode 100644
index 7f8ec6d1a72d..000000000000
--- a/dev-util/scons/scons-4.4.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing
-
-MY_P="SCons-${PV}"
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="https://www.scons.org/"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
-	doc? (
-		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
-	tar -C "${P}"/src --strip-components=1 --no-same-owner \
-		-xzf "${DISTDIR}/${MY_P}.tar.gz" || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	if use test; then
-		local remove_tests=(
-			# TODO: does not respect PATH?
-			test/Clang
-			# broken
-			test/DVIPDF/DVIPDFFLAGS.py
-			test/Java/swig-dependencies.py
-			test/Java/multi-step.py
-			test/TEX/newglossary.py
-			test/TEX/variant_dir_newglossary.py
-			# broken by commas in date, sic!
-			test/option/option-v.py
-			test/Interactive/version.py
-			# warnings from new binutils?
-			test/AS/as-live.py
-			test/AS/nasm.py
-			# hangs
-			test/KeyboardInterrupt.py
-		)
-
-		if ! use amd64 && ! use x86 ; then
-			# These tests are currently broken on arm and other non-amd64/x86 platforms
-			# Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to
-			# better plumb up the MSVC tests for alternative arches.
-			# Try again after 4.2.0.
-			# See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
-			# bug #757534
-			remove_tests+=(
-				test/MSVS/vs-7.0-scc-files.py
-				test/MSVS/vs-7.0-scc-legacy-files.py
-				test/MSVS/vs-7.1-scc-files.py
-				test/MSVS/vs-7.1-scc-legacy-files.py
-				test/MSVS/vs-scc-files.py
-				test/MSVS/vs-scc-legacy-files.py
-			)
-		fi
-
-		rm -r "${remove_tests[@]}" || die
-	fi
-}
-
-python_test() {
-	local -x COLUMNS=80
-	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
-	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
-	# unset some env variables to pass appropriate tests
-	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -a --passed \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-
-	# runtest.py script returns "0" if all tests are passed
-	# and returns "2" if there are any tests with "no result"
-	# (i.e. in case if some tools are not installed or it's Windows specific tests)
-	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm "${ED}"/usr/*.1 || die
-	distutils-r1_python_install_all
-
-	doman *.1
-	use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-4.5.1-r2.ebuild b/dev-util/scons/scons-4.5.1-r2.ebuild
deleted file mode 100644
index abf7ca5ec4a0..000000000000
--- a/dev-util/scons/scons-4.5.1-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing
-
-MY_P="SCons-${PV}"
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="
-	https://www.scons.org/
-	https://github.com/SCons/scons/
-	https://pypi.org/project/SCons/
-"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
-	https://github.com/SCons/scons/pull/4322.patch
-		-> ${P}-mergeflags.patch
-	https://github.com/SCons/scons/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	doc? (
-		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
-			-> ${P}-user.pdf
-		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
-			-> ${P}-user.html
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	# use the git directory structure, then unpack the pypi tarball
-	# on top of it to make our life easier
-	unpack "${P}.gh.tar.gz"
-	tar -C "${P}" --strip-components=1 --no-same-owner \
-		-xzf "${DISTDIR}/${MY_P}.tar.gz" || die
-}
-
-src_prepare() {
-	local PATCHES=(
-		# https://bugs.gentoo.org/900971
-		"${DISTDIR}/${P}-mergeflags.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# TODO: rebase the patches <4.5.1-r2 is gone
-	# support env passthrough for Gentoo ebuilds
-	eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
-
-	if use test; then
-		local remove_tests=(
-			# TODO: does not respect PATH?
-			test/Clang
-			# broken
-			test/DVIPDF/DVIPDFFLAGS.py
-			test/Java/swig-dependencies.py
-			test/Java/multi-step.py
-			test/TEX/newglossary.py
-			test/TEX/variant_dir_newglossary.py
-			# broken by commas in date, sic!
-			test/option/option-v.py
-			test/Interactive/version.py
-			# warnings from new binutils?
-			test/AS/as-live.py
-			test/AS/nasm.py
-			# hangs
-			test/KeyboardInterrupt.py
-			# requires f77 executable
-			test/Fortran/F77PATH.py
-			test/Fortran/FORTRANPATH.py
-			test/Fortran/gfortran.py
-			# TODO, these seem to be caused by our patches
-			test/Repository/include.py
-			test/Repository/multi-dir.py
-			test/Repository/variants.py
-			test/virtualenv/activated/option/ignore-virtualenv.py
-		)
-
-		if ! use amd64 && ! use x86 ; then
-			# These tests are currently broken on arm and other non-amd64/x86 platforms
-			# Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to
-			# better plumb up the MSVC tests for alternative arches.
-			# Try again after 4.2.0.
-			# See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
-			# bug #757534
-			remove_tests+=(
-				test/MSVS/vs-7.0-scc-files.py
-				test/MSVS/vs-7.0-scc-legacy-files.py
-				test/MSVS/vs-7.1-scc-files.py
-				test/MSVS/vs-7.1-scc-legacy-files.py
-				test/MSVS/vs-scc-files.py
-				test/MSVS/vs-scc-legacy-files.py
-			)
-		fi
-
-		rm -r "${remove_tests[@]}" || die
-	fi
-}
-
-python_test() {
-	local -x COLUMNS=80
-	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
-	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
-	# unset some env variables to pass appropriate tests
-	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -a --passed \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-
-	# runtest.py script returns "0" if all tests are passed
-	# and returns "2" if there are any tests with "no result"
-	# (i.e. in case if some tools are not installed or it's Windows specific tests)
-	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm "${ED}"/usr/*.1 || die
-	distutils-r1_python_install_all
-
-	doman *.1
-	use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-4.5.2.ebuild b/dev-util/scons/scons-4.5.2.ebuild
index 9a862575209a..7ae8f38f6d5b 100644
--- a/dev-util/scons/scons-4.5.2.ebuild
+++ b/dev-util/scons/scons-4.5.2.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index 201c292d4658..2b4f12e28967 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,4 +1,5 @@
 DIST vulkan-utility-libraries-1.3.268.tar.gz 165464 BLAKE2B da08853b6be3e53b79b3e7e22a34dc2b8decc1bb67a6dfef79af4fca829f9989b04dadcbf7910834d1fde8beadb17b64fb3be928c4e1b3856626eb1fd0f96d32 SHA512 4bcb3f5f9a1567427675c5186a04c9d152b791989aaaba5f43a46cc8db7a8ab08626d5f9a101234b595fe283aa493655e26a521c17cf28752d30437d896fce40
+EBUILD vulkan-utility-libraries-1.3.268-r1.ebuild 1044 BLAKE2B 107a14b1a682437596b8db2bbd9234b72b9f7930a063ef020119a1397136c8c94a7cfbac9f970f18bbb1abf3ad23b75c05ed0adf601eb992481bd82c947a8006 SHA512 2983f300083ea94c95af463b90e6f7db9dd947892b40b3dcad6e91791f7b47395f0b6c48b1dfd55d17289e9b2b1073e463f660398335c5a251af09fdce03591f
 EBUILD vulkan-utility-libraries-1.3.268.ebuild 848 BLAKE2B cea0510a2aef1499a2ae9687e9247283d8fa21febfca55b67637edc981d6496a5129d2be34dac0847eb39c36f405aae452bc7a6340ed26b568aeb6b784904024 SHA512 bf8e4afdf5572edb3f489831eae3a0e7b3ac176d82b640884c93b014c6cfa749bc22f654e1822180b23e89a194c9a0f58bd330b593216a33b118675fb1083211
-EBUILD vulkan-utility-libraries-9999.ebuild 818 BLAKE2B 09d1904d510d2f2835163c1839a582a85f0ee9ad0d80306acbca5a850f6c94d48fb301dd1b433e35e48e1528c64930c76ad5b37ac3773709a48c431500d212aa SHA512 715eda94e6da9b88d0918d93efcbeb5f21bf829beb25e2224dbdab8baf390279c9c80533dda926a8b117d6c46e02b8bee4c1a43b69e0d018278063dd12481cdb
+EBUILD vulkan-utility-libraries-9999.ebuild 1061 BLAKE2B dc39c9481f86588c0225f66fa285202d598ee5d054d0ac1622cabaf0e873c02d755be26e04d2fcc21a1562e9e64556166286a131499ec35932262ff914b681ab SHA512 ca4837d740385b668acf7173507556afe23067c3cb8b94be0b141edaff5b00f493b2cee9588f0ade4870293c1f3dff33cbc4bbfc3a0241523886b22f73e5d16d
 MISC metadata.xml 442 BLAKE2B cd315d7e91cf05f2d05be32c171ef6145e818f9868d17886cc7b5a2cb5e5fb8d58961414f585b15ca6c9d989244c0004c366d022464bd3b3b70ea451a2b67c7d SHA512 3e059e27de852aa76dbfdcc3dac69f0f472f496c64e1ca2a9053799f090b9091800e397a92012b7e546fa8240702546a5ca0dd6b2be6cfee356f539e73439c94
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268-r1.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268-r1.ebuild
new file mode 100644
index 000000000000..9aa859a65161
--- /dev/null
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Utility-Libraries
+PYTHON_COMPAT=( python3_{9..12} )
+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}.0"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~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
+	)"
+RDEPEND="!<media-libs/vulkan-layers-1.3.268"
+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 b52a395a5133..01ec80c07d15 100644
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="vulkan-sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
@@ -23,7 +23,20 @@ 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}"
+DEPEND="~dev-util/vulkan-headers-${PV}
+	test? (
+		dev-cpp/gtest
+		>=dev-cpp/magic_enum-0.9.2
+	)"
 RDEPEND="!<media-libs/vulkan-layers-1.3.268"
 BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}