gentoo auto-resync : 18:01:2024 - 02:07:06

10 files changed, 131 insertions, 90 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 252e697f75d5..a22f3b9f8fca 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 4109ce675d99..5288f63d3037 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,7 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2023.6.tar.gz 226361 BLAKE2B 023ce15caaff6ff9474f361c6c5442fd8c58bbb079774fd3c8525824e70e63c1b8fff37490601b599f4ed44f4bfaec3ca746b7a734782fc2af8d78c4f1f1de53 SHA512 6580384ac27c4f2225529873ba46ca61240bdf63f4f5b89875e9bd20a774fed49328094379b7f469c3b97b6a3744cb649998c0d6d5a391023317a64a91754bb1
 DIST shaderc-2023.7.tar.gz 227360 BLAKE2B de5ee8cc35bc76ba1301e80217587cbf55885999297755d78a72fe0940431351d4070cdd0793fe8f43208d40c9ec343bbe888da2b8ded471bd241be067b1addf SHA512 f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269
-EBUILD shaderc-2023.6-r1.ebuild 1906 BLAKE2B eec778484c3a322ad2b852c8d3da8d550af95a2a1d047f48c93b62e1309a801e6ecbe7182488ef2017a9a757bb89c2140814b1734188a787793c660f6c8199f5 SHA512 015c8c6abb9380e10e67d98d47b863c982fa1fdd83b18269c174e124119010696fb68eff887f23e950828285c14c3d2dc0ff2a785f0c87af7daf59da45603487
-EBUILD shaderc-2023.6.ebuild 1906 BLAKE2B 744fc1948e5949d636559bbe24db795f7228846f37504bb6c6ecbc104fb9d737f4a96273af5a35daebbad241f01c1b10817421cd07d3a6f7b3d8b34b9bbd13da SHA512 5fc386bd7e9bfd6d0137a28d8220b811a5dc4e0a4632d95cbeaddf1d3c29a437d052d0a07d3543455de03dca2aa188fc87d17190fb4ec1e28b65e0af6b98ed9e
+DIST shaderc-2023.8.tar.gz 227238 BLAKE2B 334bda3bdff510ac97f97fa710e18ca9a2c807d1e71973aaf4493112dca3adb69c7a83c0590c65db3e6dffab82f500058162d3190e5822a01ea2d611db771857 SHA512 2a5e59a2bb6c4b5462758d824747fee0edaf177dc64f30fe698fd2d2cc21cddab1a19ec2b2d63bd3d2e209330a13519f399395398379370b15daa39e6ee6b2bf
 EBUILD shaderc-2023.7.ebuild 1903 BLAKE2B 12ba1a434f6c45324932026950d541d16cf04b4a107a476ff2c231cb73c1beba8f8b45f9b4b9e4cd9a47d33bffbaf3443437b49b9197fa2ee0ee65b0771ff470 SHA512 ca3f4068a5e861348759537702a9173592b63346c43c928348a086b86c3a2ef1aa56244b96411d05ecbc538c400ebfb18553103f89026ce5ac12e029b1a9397d
+EBUILD shaderc-2023.8.ebuild 1906 BLAKE2B 7120f326e771d9d1c5806b75a2d267c00596df831f5773e8572583021503fad78c3a4c60c5597d7b00602fc3705a2daf841a07e50bb9af76fd12346f28425b56 SHA512 2f30c5474f79d7c4d269bcf6956e0784992a1dc8964a9ae8bda0e21798f582d0b106146c5f39674aaa30331ca60f3ce214afed52a94c2e235ecfa885aeca9d34
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2023.6.ebuild b/media-libs/shaderc/shaderc-2023.6.ebuild
deleted file mode 100644
index 310c15659d8d..000000000000
--- a/media-libs/shaderc/shaderc-2023.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib multibuild python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_COMMIT="${PV}"
-SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-util/glslang-1.3.261:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.261[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.3.261"
-
-BDEPEND="doc? ( dev-ruby/asciidoctor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
-)
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="true"
-		-DSHADERC_ENABLE_WERROR_COMPILE="false"
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake_src_compile glslc_doc_README
-	fi
-	cmake_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2023.6-r1.ebuild b/media-libs/shaderc/shaderc-2023.8.ebuild
index 74887a3cb668..7f50365de0f8 100644
--- a/media-libs/shaderc/shaderc-2023.6-r1.ebuild
+++ b/media-libs/shaderc/shaderc-2023.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,12 +18,12 @@ KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc"
 
 RDEPEND="
-	~dev-util/glslang-1.3.261:=[${MULTILIB_USEDEP}]
-	~dev-util/spirv-tools-1.3.261[${MULTILIB_USEDEP}]
+	~dev-util/glslang-1.3.275:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-tools-1.3.275[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	~dev-util/spirv-headers-1.3.261"
+	~dev-util/spirv-headers-1.3.275"
 
 BDEPEND="doc? ( dev-ruby/asciidoctor )"
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 41ac0f3edd3c..abc56bbdee20 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,9 @@
 AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413
 DIST vulkan-layers-1.3.261.tar.gz 5005066 BLAKE2B 76eee1121e58892be3b608d4fda17d1ef67bf1e8a361ff9b51651fb9dd80c14b52798e8978d4167d51f7dfe09a680f10868d2a4b576ff5af8938cbf2d0f943fa SHA512 cadd44773701b0937956c1b1f7c6a9f8c574c857af044271a64065367ec8c453dbda04c5bd42e307d7997441e9ad67df5656f18b5a81b315174ec8618cfe0e1a
 DIST vulkan-layers-1.3.268.tar.gz 5004147 BLAKE2B 228a146e436f3c91df85d853d9fb5f58fe244a3dbbd66ffdaff2fcd27734969b041c1fe8df7cc2142857ac5742c14465cbc6f86a6401c75736e712222c1d2123 SHA512 74282cede73f67ee39ab78b99cd53f78ac0427ec6ca897ec41eb28b0e2d1106006d688bfbfdb2f0924b84149d516d42b1abe3680cdc6019c66457451f19b44dd
+DIST vulkan-layers-1.3.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
 EBUILD vulkan-layers-1.3.261.ebuild 1599 BLAKE2B ba24ff8608d26f7bf2f68717202e3f728631c010d0a070cdedf1e1c5dcc82a8003428026ae49e324e211215e2a1aebcde702a6cda65278b1c24bbcdc965b2ec8 SHA512 6f5250cc7bbf04330f0394a524b6472ead35740b6b65c022ef15b027d88aa8ef57bcc6b27ab97a8ec66d0570889378882ea04fdffaf44d19023186c872da086d
 EBUILD vulkan-layers-1.3.268.ebuild 1677 BLAKE2B d27d66c2adbf7be1075fec40b950805512e252b3f47789c06f5182f8f4a4b6d36ea62f4dce138c0a2ee9390a9a983ef6ab18e2e489372756f1291d1810cc4d46 SHA512 c6635e5ac32357a4347ad1ffa4c0eed38a5dec96e4d88065051c6ac43708e574c8f155650cbbfd7d7b9c700bbda2e35d9b13d0e43201c17ff1835b2e4f639515
-EBUILD vulkan-layers-9999.ebuild 1675 BLAKE2B ea654389c12b5918ee860a49e0fdc0e0a90ffc48e64a7803a5c9969643f02f08c5853da4b744bf0af9d4acf323c0c52ee5eb1ef58c21866b3a44e330ab782343 SHA512 493ee93d4e7fbe1a7b4c7e3651f36e5416e1b2d6cd9e77919630fe6d92f37de9818d91f6e74bda03392f8e9f369ef7d11642d5908465277d5b04280ea195f30e
+EBUILD vulkan-layers-1.3.275.ebuild 1650 BLAKE2B 242e3b224bdd465cd7b358ee1b0943f5e61b40ee7c397f5bfbd0e27bf5185a9999200015f0bc0a337353bf7b7d1dc35012c6aee8827e24816ef32836fc8af224 SHA512 6139d20bdab62c448e8222420f1bfeaaa55cd69a8f9ac3d443868f8905a1fd64e9ad5d8c75d2b4096a64d6fc28294bbcb741f99d0fd68718e817c8487e34cd96
+EBUILD vulkan-layers-9999.ebuild 1642 BLAKE2B 4f3b7567bb5a183f3d3a1929531349a67c732c2dfe9fe2375c4516513f1af16675a622c566b8f47df1a3cc4b575601e1a25acf87c790c2a971d1adfdb5b69bf5 SHA512 7ca20decc9501fc86cddb8b14bab9ec1945d7e2f2a3c6634f02c35b95823be376a875da1941b354d5c76901e29b97b5a470657aea92c9fe0eab875f311ab789e
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild
new file mode 100644
index 000000000000..1fbbaccac81b
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{9..12} )
+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/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+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/spirv-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index eb1869aef56b..b1f4f7dd83eb 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -46,7 +46,6 @@ multilib_src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
 		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
 		-DBUILD_WERROR=OFF
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 96d4a01ea903..f6f43665d4b7 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-loader-1.3.261.tar.gz 1684713 BLAKE2B 0321a56329cc8f578e07c24a53846f0a3ac9f81ce897975f0d0732db6a6ab905e682a81cb232d96d01311a9d9b89fb142b3c0eca5330371f42ba52e12c7ed2cc SHA512 f43bf9714c30b0751d9f6725ad7df7f70516b5e12a637bfb4cdf175b33d2be78e1717a3ae9537544ca84e0c89d5b759d537b932eec7f5502fcc871f6cdaa440c
 DIST vulkan-loader-1.3.268.tar.gz 1689273 BLAKE2B 6d7c1bfe82f594a68f3298d884efb61556b6d408357eb0360db2103af17bd47f981916dcc7584f8380c2530a88f05d59faa0754993975219e1955941dd3d32d8 SHA512 01e5f281efd5702b9930cecf3148aad9a79812c54e780a5a8ff2df2326ae10511001f1b6e3ebde19e47de229a9c97f6195b6b1e9fb7b3b4c88a4d1b6746f7aea
+DIST vulkan-loader-1.3.275.tar.gz 1701415 BLAKE2B c92cc2d3ff3c90eaaa820f0f857030ab6f957d0691f7cbaf53985bd4d4c6f0f2b4222623740bd2c433c2e0116545af37b8ac9959b554b800ca95a978fd1b14b5 SHA512 7af0110083ab827e4ea8b4ea3e3ce00d9387f27f5725cefd426fa4dee4b80bc83210248c2968577a90bb82de8efb1a68691a1bdb93769f2f04600c5a3d3eff91
 EBUILD vulkan-loader-1.3.261.ebuild 1554 BLAKE2B e27d35577aa89e029eb29764a73ecfa275373c99257175b708776ac6dd765f4e056b2904df9e1c7ba95c3d3e81c3859cb8206dbdbdf75d72d06f49f5932ab85a SHA512 6bb68b91b0cb1aa75dc5017b6b5d45e24a185f04d623f2f672be62774dc3d27c6a9a560f463c713d34a85c7dc8f486fc5a909a08530fb7452a71cf9aed0ce354
 EBUILD vulkan-loader-1.3.268.ebuild 1568 BLAKE2B 153b080da25011f793dbe68054820ee26b7068d42fead991a002f56cf36920ae4da07c9c99896a954b09d4b7b6f346d791d6d793fbc18946d2dff75225752657 SHA512 6e05bfd8d3ea9a12148724fb2737d4dd1c21420cc4f1c862c181c392e5ab78aacc1902e5f1174ab8db9681bb3cdc4e3586ace00f30dc844161e31e95258ac145
-EBUILD vulkan-loader-9999.ebuild 1584 BLAKE2B 4eac72c8b9de1c8721ccdfc35ccd31bba3cb6b41cc06f66a8410c2eb9103d9a1df48b6509a237cc8d7a453a5ffdf39047e550f7a1e3a13206270b27786b27bfa SHA512 1031a3d0c76afd82d3ae5e7b3b22ca3fad65d8034709db45ba3ce9c01750ae92fcd2e0102639bc9bcf90b2037ee3723a2496cdc11eadd0219549f00418a1cf1c
+EBUILD vulkan-loader-1.3.275.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f
+EBUILD vulkan-loader-9999.ebuild 1562 BLAKE2B 19ca31786af5a26cc88d508374efebd1bb3f2bd7929ad0236b4a1bd70fbd5c54e44b149e8de23bb51ec8448a7bdc8573dca7adc4de45517b157f98b87ddfac2f SHA512 89f8b81fa6b47fa6a94abd3fa15e9b52b184de225b2e0a5df4cf833f9db804b7dd087c73fa12167ffc4d06414cdd50487f4ea462f78127810f0d23eadd3e8d1b
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.275.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.275.ebuild
new file mode 100644
index 000000000000..ca20e66ef4a1
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.275.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-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"
+
+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
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 8cc74ccb97e7..7d311b4ae225 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -49,7 +49,6 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-		-DENABLE_WERROR=OFF
 	)
 	cmake_src_configure
 }