9 files changed, 229 insertions, 126 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 93993984d3f2..7220a635722e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/cubeb/Manifest b/media-libs/cubeb/Manifest
index 8b17ae5b9b40..dd269abeff2e 100644
--- a/media-libs/cubeb/Manifest
+++ b/media-libs/cubeb/Manifest
@@ -1,29 +1,16 @@
 AUX cubeb-0.2_p20211213-automagic.patch 1378 BLAKE2B 4ecf503dce1cdfbfa44601dff21871755515452850ce720c83df5857b55ca8e6ee6b4e39ca204a7d411a6011ab272db50e4e407a59ae1c020609b8f59551fbb4 SHA512 ce7bf7954def11f95e8406bcb9e275680bcb9a072cd80ba49353322356142175317bb11482c912825c3c5e6e66c01b007d5adea8d6024ebb1d51b986d48f72d6
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
-DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
-DIST cmake-0.1.46.crate 15119 BLAKE2B 0889436835c16bc47cdc671615f421a50acf6c34a3ba3b6b8b4289e11bf1b803abd15d88a65ae9c1588586151f467524517e9c60d5dcc820e41ff21711f3a536 SHA512 e2749309055c85baa242cef8d0f4a91eb7e694664c5e42339df8ccc6644d1563337b835d3d931f5a0a75351efd299a21fe6eea497941802ea041916d665c7311
 DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
-DIST cubeb-0.2_p20211213.tar.gz 220413 BLAKE2B 65cf123351f1d465e15c3822f4ae2890cb62e7b5cec22beffd444ac452650b71c1bbc71e50836da6d0474ae6847fdf57c4ee85975f26a35f6db4e1f7a21fef76 SHA512 33abe2bc426b06c3c6cb557fe1be62725f1dc56776d02ec6651ef8710d3a5d302b1f730ceaefe516ff1974775cdabd3753f24436c705af3c6e98fd5dabb6b015
 DIST cubeb-0.2_p20220922.tar.gz 223096 BLAKE2B 55e9bca6792a9e27e74ad29d0059b97997f15c58b04982a37e9afb0edeecfddf9ef41c40f934207883b46f3b669c5323ee9399fd4abd78b0bf91609ffda7d8ab SHA512 cbdaed8202649cd5ef6970457c412c94e3a7e12036017e551a2396d52ddd66061ed7cd9f5442418e5b410756836f1535bc957af92c2709c72a2a1c8e77f0678a
 DIST cubeb-backend-0.10.1.crate 6359 BLAKE2B 5830be150dfa1dd2ece6dd1bbc3400c23d85867ca066107175f0da8e2cb2066e247f103f2cc4d523018f8ff98235b794fd68272798ee8e09c59a070bbb6b6ce2 SHA512 dd9d47af3f1b0a5af2e6bbccd42e8c8ea50cb995d82f0a090adb236a3759a5107c1b840da03701594181e63138e5d31ca3741262a7a4aa1ca1309e54c8aa50b2
-DIST cubeb-backend-0.9.0.crate 5871 BLAKE2B ac8cfd9a43eefa336fbad67c7183c3bd2375f7de36dfe17df55aef0003b950cd8eb45c823b51302f60773ebafbe6de8a80f276f5bc4c2fe250be6073fe95ae1c SHA512 e02c4703b630cbecfbe20bf3193fa88a130385885fecc18c2a8d6e464b13f0f395251afb35049cd1371532e372a6a5addc856e959fd2d6da63615f1cfdb20f14
 DIST cubeb-core-0.10.1.crate 10915 BLAKE2B e428637a4d0946a630b9a33c9ac856a8a92d4a8e30e33abf375e592bdc061a95c33414345b18c8c447d7753a8b0a1c8fcaa7b0b3e3b15593908816e029182871 SHA512 2d3f6c904c966adaf9fb886b42d33776ff5ad57600e1057a9b35e7cd9e2de34a028b0e33602db69d6f0bc038391ebbe6b102bf3a883e1fa9104f55e2ec124a62
-DIST cubeb-core-0.9.0.crate 10782 BLAKE2B 60feec670c0d0d74f45a2c8ef4d0d564aae3e79f28087b7392f61baf3a0f31822929cdbbf1dd2506ea5d4249765eead516e6adb8d1867fbc2e77eeec9b06eb4a SHA512 2a7b660f6a1c36e6cbdaef4e26589240675d1e553f75d2093b39e4dfc4c82327ce080f68143e7c8383cb198796d7ab764cd4038532010847d9829b98f07f530e
-DIST cubeb-pulse-rs-0.2_p20211213.tar.gz 37658 BLAKE2B 82b137df7072a048b6115a17a8f973f1464470094468f19c0e56835db6d8d7355115e712b02f29be3055868435c21915423cfc48c8b55f856e0b008f14802e3b SHA512 1bee7bbeacccf31e51a420cb28c37fb6747ff4b364cbf633e18e507959bbf46d4b706b35c7a200421b68295244289a56b4e8193c63f87c5996ddcdfd7c527054
 DIST cubeb-pulse-rs-f32b3ef708.tar.gz 37717 BLAKE2B f77cb42b32439025f4d1fbbd4558560b8420b24d8e13881f5280532860a495cc2ce95bd70d114de2777e3cacf785e55f6965b1a3aee9ba8fcca33d14e1a71956 SHA512 f801b24173f34b801b6e78fcec232736d353d78b4b8d3d690e69524c3b146aa0345e746dcb81aa8cf1fe17a85bf0e7f940f4b9c46d64de644e3b03d498af5f76
 DIST cubeb-sys-0.10.1.crate 682811 BLAKE2B 1920bcafa0ca3350cf0df84c32e41c04a0fef79f9440b90fb1c5cbb269f2a9a71c7ec57dc5f605ec1c00cdff3fd833e630889d0acd4894c70280942afe9a59cf SHA512 eb3e4c64e1480f487a2ab3db8da61286eca05960972c7d11ba61dbb131a0d718681021d7cdd220569fc802a3a6bfbae237a9f162514d3e05d066f22e6cbcd353
-DIST cubeb-sys-0.9.1.crate 677935 BLAKE2B a6e10ee95e67ef03e2fa1915007a69227b28c0ade055cdff8e7941634690c6f34de8509e9b10b870097f3b17ca478794577a480232534aa1e593b6813eedbeee SHA512 594e7be07e2558ae81506ca52724bebaf51d2b99158af3808edee827f827dbfef24dc9f1a160bf23e3ac39043b17b920578164697f48a7e0fd544c0196b4f773
-DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.133.crate 603256 BLAKE2B 00139eb8ec3921b961c20e9334e7b2fefe87d03df22c77b213491c07d93be193d991a814efa20c91cd5eab93fe392ef511ae4cec497bd5c41372d5aad1c31dde SHA512 526561652d77d5f61fa52dd9fe02a46a5f66289ec0aff5b2464311c3a90972c3ced0a84dbc901fa99a0fe35ef36af890bb7de40b9c6b7b7dce7fe8a1a738ed7b
-DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
-DIST ringbuf-0.2.6.crate 18882 BLAKE2B 048402ee7e0fbe81597fa8450a50f89faaffac8dbe2cba1d1ddb870127e0a85f0e4f7553a806ea94530c00e113ee039a9c5df4d5e458bffdd3d483f09b39fc0a SHA512 e8a038342226f13c88137a91c27f14323b02dbafb8991c369c0332024a421edbb797db665e31ff9b35f40147fd1d71235a059930b574195add9a6613312472d6
 DIST ringbuf-0.2.8.crate 19502 BLAKE2B e8f89e385c7bf6abca64861b7056327679cf6a969dbf2f2304c06fd1d67c99e246c647a58a13954cc8e0e16918fa544e8f25cc4610dfe5ba8879f22584356ea7 SHA512 8bf2d79c65451df9b22b696a6ddddd004768e8fd90920d624fccc77ff5c63067fb663b3cbff9e29e17b7d553f86e2016d754f3ff843f34dfd0a105ade2630f53
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-EBUILD cubeb-0.2_p20211213.ebuild 2534 BLAKE2B 0c468fccc86a08fba686e36cceead6d47ca8fbd4dccf60979ccf190bb76baa5fe830471d77a7480aba2fc60385357a864a2e4c26991d44eb7dac92c203bc1ed8 SHA512 1affc6b1f7f48309f9af8d7b2328e6762c3b892f0f3c552f9a2409e545d9704e0e4f8529a8a5df40c1ff5f388e41e113f763e7af144c87351a6fc5756cd31b5c
 EBUILD cubeb-0.2_p20220922.ebuild 2727 BLAKE2B a6666bd3472559dc31928e95f5c114c93a7f91a4cdd31d501bf2ce682e608893df369fade893342590a579fe290bc0d3757292b91dd8fc3ad2e3f47111b4c5e3 SHA512 9efbb6cab07f32108e6cd6b3c5ff22c87bab154253f5583bd1828651cbd939d1313d5dba36e6854b9efe5b6db84213a549600992876e2ae9f248b3c9f925952a
 MISC metadata.xml 569 BLAKE2B 811caf3735182ee5d94f88c8b4b725deb0a64dda04e211759b2fd3c280a5f87e9c2fdb53dc2ef1fcaa50a83f6feb8ea5b58274815f97c05502144c7d372f8002 SHA512 7a8cd8ed6464e4249aa9ed97bf9f4ec9995b710c39cca631b6e42edbcfd85839815fba00db3577c60f343cb7b805fa97fd186542cd03cae05d58684415cc82a2
diff --git a/media-libs/cubeb/cubeb-0.2_p20211213.ebuild b/media-libs/cubeb/cubeb-0.2_p20211213.ebuild
deleted file mode 100644
index 9403998387f3..000000000000
--- a/media-libs/cubeb/cubeb-0.2_p20211213.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-CRATES="
-	bitflags-1.3.2
-	cache-padded-1.2.0
-	cc-1.0.72
-	cmake-0.1.46
-	cubeb-backend-0.9.0
-	cubeb-core-0.9.0
-	cubeb-sys-0.9.1
-	libc-0.2.112
-	pkg-config-0.3.24
-	ringbuf-0.2.6
-	semver-0.9.0
-	semver-parser-0.7.0"
-inherit cargo cmake
-
-CUBEB_COMMIT="773f16b7ea308392c05be3e290163d1f636e6024"
-PULSERS_COMMIT="f2456201dbfdc467b80f0ff6bbb1b8a6faf7df02"
-
-DESCRIPTION="Cross-platform audio library"
-HOMEPAGE="https://github.com/mozilla/cubeb/"
-SRC_URI="
-	https://github.com/mozilla/cubeb/archive/${CUBEB_COMMIT}.tar.gz -> ${P}.tar.gz
-	pulseaudio? ( rust? (
-		https://github.com/mozilla/cubeb-pulse-rs/archive/${PULSERS_COMMIT}.tar.gz -> ${PN}-pulse-rs-${PV}.tar.gz
-		$(cargo_crate_uris)
-	) )"
-S="${WORKDIR}/${PN}-${CUBEB_COMMIT}"
-
-LICENSE="ISC pulseaudio? ( rust? ( || ( Apache-2.0 MIT ) ) )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="alsa doc jack pulseaudio +rust sndio test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/speexdsp
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndio? ( media-sound/sndio:= )"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	pulseaudio? ( rust? ( ${RUST_DEPEND} ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-automagic.patch
-)
-
-src_unpack() {
-	use pulseaudio && use rust && cargo_src_unpack || default
-}
-
-src_prepare() {
-	if use pulseaudio && use rust; then
-		mv ../${PN}-pulse-rs-${PULSERS_COMMIT} src/${PN}-pulse-rs || die
-	fi
-
-	cmake_src_prepare
-
-	use !debug || sed -i 's|/release/|/debug/|' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_RUST_LIBS=$(usex rust)
-		-DBUILD_TESTS=$(usex test)
-		-DCHECK_ALSA=$(usex alsa)
-		-DCHECK_JACK=$(usex jack)
-		-DCHECK_PULSE=$(usex pulseaudio)
-		-DCHECK_SNDIO=$(usex sndio)
-		-DLAZY_LOAD_LIBS=no
-		-DUSE_SANITIZERS=no
-		$(cmake_use_find_package doc Doxygen)
-	)
-
-	use pulseaudio && use rust &&
-		cargo_src_configure --manifest-path src/${PN}-pulse-rs/Cargo.toml
-
-	cmake_src_configure
-}
-
-src_compile() {
-	use pulseaudio && use rust && cargo_src_compile
-
-	cmake_src_compile
-}
-
-src_test() {
-	use pulseaudio && use rust && cargo_src_test
-
-	# these tests need access to audio devices and no sandbox
-	cmake_src_test -E '(audio|callback_ret|device_changed_callback|devices|duplex|latency|record|sanity|tone)'
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/docs/html
-
-	use !test || rm "${ED}"/usr/bin/test_* || die
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index dfda4812385a..411bc46e358f 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,7 @@
+AUX vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch 5089 BLAKE2B e76b6fdedf175c246e227e1317243ceb1842b19ad7f64cc0d7ffa4935f554dbdf5664ee8907b47ac22e7308110ea0faced11aa40f3870f059a9679b4ef1db6f1 SHA512 28cad48b59458e21e8a46d3e7ea915a8d7358962e2c0a7f99db1db99ed9d6090a129be874cce7fc528991476ccc41acccc1f1627b449dfdb8555ce8173dbb179
 DIST vulkan-layers-1.3.224.tar.gz 4193501 BLAKE2B 84982d63339a2ef101cf9e1e9038e94415326a4a8a46b47d0a913bd0d35fa333dd35579f96536c6e147bf37ccdee0a8de12c1c13b74d3529f34645f8e10f0fa2 SHA512 c7d4f6df4bf0cbb970b36cff9197306769bf3f86ea98496b93e8c1779a905966f6b2303b04ba84099ce9c12e828633e2e0db22e49060393335312508b3540488
+DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606
 EBUILD vulkan-layers-1.3.224.ebuild 1495 BLAKE2B 36a564ae87d74cea6ccb1290799061ccf719377d489c74489fcfb92583956d3b0fc833212fc96d14384e08497ac887ff57be74d27ffadbcdb1202ce10d40bb23 SHA512 f5c8bb61e30baa93fe96fba65b60f6dec4116610ca1ccb85e53b8f31129a333d22d2ef6ccaef7581e6be62832923aba81b9230a2a1be64e258563a315e3f2999
-EBUILD vulkan-layers-9999.ebuild 1566 BLAKE2B fc055c417e7418009316fba9c9528b6238bb4aa66d98169a7f85d14399130a69821780f51c0998291c454d35366ae315368b576fe30c4a3568bbcf6f655215e7 SHA512 d8e30d5336fa269f029a78f4d2aa90dddcc75fed1465b398e6e04d992e046d31c2249e0c4876aecd47b82cd51d5b5860b753de8302f3168e9c30f11aef137114
+EBUILD vulkan-layers-1.3.231.ebuild 1585 BLAKE2B 4826f973684ece1392a2ee24afa547c7d4b5689dcfe48c387fe8e7c676fcc5a775e9e2fb1770d12b841f3794e95c75af69fbdd052fb944ffe46acb974fde5231 SHA512 a7dfcae94689baf939bffe762bc642fc08ffb23385b77da68e6b8e4b365d52bb4dac22c92d92ce35786700ceec4f009df4e8630982951eb46720da816d493236
+EBUILD vulkan-layers-9999.ebuild 1512 BLAKE2B e1fd0a0e7a67d0756795dc42c17f2f016cd3207b7f071336d0bb4d82cc16fc92502eb103f5a8e2c433a94e0ac6be59fcbcaf64384442dd4665c8abfd39a24033 SHA512 99290ade61c8c8b0363ee7e5bea8e87f8a5a2ea979dcb12faa0462d3e3132049be9cc5fc93383d0808bc14ecc4a57d39028bb2f7b4e22c78b532d5ce18a67329
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch
new file mode 100644
index 000000000000..bd17c69315e0
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch
@@ -0,0 +1,101 @@
+From 836a09267fe034ce783570e6920e1b638c0bd212 Mon Sep 17 00:00:00 2001
+From: Juan Ramos <juan@lunarg.com>
+Date: Fri, 21 Oct 2022 17:43:23 -0600
+Subject: [PATCH] cmake: Cleanup find_package SPIRV code
+
+- Use get_target_property instead of relying on passed in var
+- Remove unused var
+- Cleanup find_package(SPIRV-* code
+---
+ CMakeLists.txt                    | 55 +++++++++----------------------
+ cmake/VVLGenerateSourceCode.cmake |  5 ++-
+ 2 files changed, 19 insertions(+), 41 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7f01081415..23de46a1a22 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,52 +204,27 @@ if (USE_ROBIN_HOOD_HASHING)
+ endif()
+ 
+ if(BUILD_LAYERS OR BUILD_TESTS)
+-    find_package(SPIRV-Headers CONFIG QUIET)
+-    if(SPIRV-Headers_FOUND)
+-        # Prefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed'
+-        # version of SPIRV-Headers, the package will be found.
+-        get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
+-    elseif(SPIRV_HEADERS_INCLUDE_DIR)
+-        # This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory
+-	    if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h")
+-	        message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}")
+-        endif()
+-    elseif(SPIRV_HEADERS_INSTALL_DIR)
+-        # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers
+-        if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h")
+-            message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}")
+-        endif()
+-	    set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include")
+-    endif()
++    find_package(SPIRV-Headers REQUIRED CONFIG QUIET)
+ 
+-    # VVLGenerateSourceCode depends on spirv/unified1
+     include(VVLGenerateSourceCode)
+ 
+-    if (NOT TARGET SPIRV-Tools-opt)
+-        find_package(SPIRV-Tools-opt REQUIRED CONFIG)
+-    endif()
+-
+-    if (NOT TARGET SPIRV-Tools)
+-        find_package(SPIRV-Tools REQUIRED CONFIG)
+-        # See https://github.com/KhronosGroup/SPIRV-Tools/issues/3909 for background on this.
+-        # The targets available from SPIRV-Tools change depending on how SPIRV_TOOLS_BUILD_STATIC is set.
+-        # Try to handle all possible combinations so that we work with externally built packages.
+-        if (TARGET SPIRV-Tools)
+-            set(SPIRV_TOOLS_TARGET "SPIRV-Tools")
+-        elseif(TARGET SPIRV-Tools-static)
+-            set(SPIRV_TOOLS_TARGET "SPIRV-Tools-static")
+-        elseif(TARGET SPIRV-Tools-shared)
+-            set(SPIRV_TOOLS_TARGET "SPIRV-Tools-shared")
+-        else()
+-            message(FATAL_ERROR "Cannot determine SPIRV-Tools target name")
+-        endif()
++    find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET)
++
++    find_package(SPIRV-Tools REQUIRED CONFIG QUIET)
++    # See https://github.com/KhronosGroup/SPIRV-Tools/issues/3909 for background on this.
++    # The targets available from SPIRV-Tools change depending on how SPIRV_TOOLS_BUILD_STATIC is set.
++    # Try to handle all possible combinations so that we work with externally built packages.
++    if (TARGET SPIRV-Tools)
++        set(SPIRV_TOOLS_TARGET "SPIRV-Tools")
++    elseif(TARGET SPIRV-Tools-static)
++        set(SPIRV_TOOLS_TARGET "SPIRV-Tools-static")
++    elseif(TARGET SPIRV-Tools-shared)
++        set(SPIRV_TOOLS_TARGET "SPIRV-Tools-shared")
++    else()
++        message(FATAL_ERROR "Cannot determine SPIRV-Tools target name")
+     endif()
+ endif()
+ 
+-# Generate dependent helper files ------------------------------------------------------------------------------------------------
+-
+-set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts")
+-
+ # VkLayer_utils library ----------------------------------------------------------------------------------------------------------
+ # For Windows, we use a static lib because the Windows loader has a fairly restrictive loader search path that can't be easily
+ # modified to point it to the same directory that contains the layers. TODO: This should not be a library -- in future, include
+diff --git a/cmake/VVLGenerateSourceCode.cmake b/cmake/VVLGenerateSourceCode.cmake
+index 43efdb8201c..13c81e38aca 100644
+--- a/cmake/VVLGenerateSourceCode.cmake
++++ b/cmake/VVLGenerateSourceCode.cmake
+@@ -20,7 +20,10 @@ if(PYTHONINTERP_FOUND)
+         message(FATAL_ERROR "Unable to find vk.xml")
+     endif()
+ 
+-    set(spirv_unified_include_dir "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/")
++    # Get the include directory of the SPIRV-Headers
++    get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
++
++    set(spirv_unified_include_dir "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/")
+     if (NOT IS_DIRECTORY ${spirv_unified_include_dir})
+         message(FATAL_ERROR "Unable to find spirv/unified1")
+     endif()
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
new file mode 100644
index 000000000000..472f1a4f3a2f
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{8..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 ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+PATCHES=( "${FILESDIR}/${P}-cmake-Cleanup-find_package-SPIRV-code.patch" )
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index c71475bdd661..af73de9264b5 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -48,8 +48,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=OFF
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
+		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
 	)
 	cmake_src_configure
 }
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index eb9e7b73f189..0ec17be2aadb 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-loader-1.3.224.tar.gz 1594886 BLAKE2B a2b548c1b2ce4b5a700dca2708fc628ebc6ae248b5c1750cc2fe33d24e3f8260007f1fd04f2f3f55984889708354ebebf21bcce73e24f1da23aba426718f053a SHA512 e75f0d399703606fc89a08783c5cc9a542d7e14073039d63df4aac673d2b246a5c5b0ac4acab5e0f276b533c47645af11606de96460066fd70ccaa6de1888b37
+DIST vulkan-loader-1.3.231.tar.gz 1609720 BLAKE2B 0e6c2bdb6934502cd7f315636cf17dc0eeca7b990f8573944dcf5aec775272ce8c246efe51ee0395e0c2ed23c63a584be104d8a49a556c6d17e0fa66fda772cf SHA512 07f1a8e7737d9609a138b4e9740f9c2228db1ac56f8ddbf3c1ec0ec3b745647002ba3af4725347941dae2feb63e7c33c9db5f14ab98d2f47dfd2181a559ba849
 EBUILD vulkan-loader-1.3.224.ebuild 1722 BLAKE2B c63c31356baef1b2a547f183d4be776b8c8826426b7ada3d2b17dd9583936f102917fbb082b398c929bdc54b87e01749308996ddf8ec80ac9efd6785c2b15eea SHA512 27b112a05d865d20cdd766fb46395967ee22966bfb481194636c340a8657bebc77f696d4d5a826d9b212c4ae6a1612ecc4e357634b4b4174269ac402665af89f
+EBUILD vulkan-loader-1.3.231.ebuild 1728 BLAKE2B 4e02e2516e5efe9509338a22e49fc58aec84424cb1d93a1da56262d9ac7a82ffc960b11c7dfdf6c75e7ca0c2b5ef7492b23560bed0b670cd2b490e960d8b3aaa SHA512 b9a286482431e3f8607f78e5975d897314114d6058f6f7e13d9ff9781a6b6ca8ab0b1beedde4d802f8e69ce412ef19816c683e0bb06a4017c9bab36315e1e274
 EBUILD vulkan-loader-9999.ebuild 1752 BLAKE2B b388bec1cfcb652262cd3da49722be05f8905a251949e8a69dca7dd29562bc77c1cd0dd95b1c100b7e30a6f242e88283bc1c159df284886fdd91052e4bfc059d SHA512 2a7b8d50a8317dd4ea7c454ccd5aefc3995f49a2e1c794161331c7fc8277d7dbe64b8ffcee3acc7b49675c9fe44994c91063527696aae137a52b59f3978d8ec3
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.231.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.231.ebuild
new file mode 100644
index 000000000000..873df8148a72
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.231.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+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}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}