gentoo resync : 12.05.2022

4 files changed, 61 insertions, 4 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 062f6de3a0b2..a58291325d91 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,7 +2,9 @@ AUX vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch 1068 BLAKE2B 4a91aa7
 AUX vulkan-layers-1.3.204-Fix-dependency-detection.patch 3923 BLAKE2B 7c07fb98dd07855e38d52b5af7fa557f722b83e6afa1c22bba027f2ffd6d6fee71dd27e4782b40d5e62734e7b913e332dfbf2d01b69eaad1a563337f9ac5df19 SHA512 4d4323acac168e5d9ea2b530c69400e980278bf5ec4450dcb2ff865c9714e02646ce90918dc4aa2f9dda932e46e3ff90c1639e4507ce5bf498a512b26f6b0417
 DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
 DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f
+DIST vulkan-layers-1.3.211.tar.gz 3967709 BLAKE2B f86ff0fa053e0138a0bbdbec30e2fe0a59cfc24f43fe787b007ae352db81a700442d777637e1fc577332a47f36bc09383dd29416b5170fcf5d735562b6a58230 SHA512 e494ba793064f0d32fbdeaddaa01dcd730a36a5c793625bb4671a4e8067364171416ec8fb7361f946cc5d5e8dc16d58e2194c3eb5d3a57d58f4ace2e7ed34f5f
 EBUILD vulkan-layers-1.2.198-r1.ebuild 1602 BLAKE2B 8eacbcfd0c71f721bfcefd5487570635c2113067104c3ef97cfe448a2ba4bec2a8c17fc162603060dce5ee83c1cc08f08cb59435c0cb97ac3c6e1d00d0bc187d SHA512 313a2f169ce77b408715cf6f6122d6856d5cff491f5160e8d594337ed21e94e3f314b635de00beecbb228a68020591a633b93c707e879a4abc3e600c923b70aa
-EBUILD vulkan-layers-1.3.204.ebuild 1631 BLAKE2B 3a33173fec35bf49cda2777aa38d6b6be02c8d26ec253dbbd1b0218dbc8c436ddc513584eba2ae1d7db8d539b58f861b855755e0f9adff7bccd2cb1c68cbc8d9 SHA512 33e854009921cfc83287241143db5e50f88f31fb3060d2a15967f0134aca747c8778ea80b971307c3b175eeb4e423a8857923f3d1489083b763ee037ac78eb51
-EBUILD vulkan-layers-9999.ebuild 1578 BLAKE2B 9de9bc4610ddd8be733ff703e6b181e693d31c6ac3819c21e2c62b644b213ef561b4515c4c60c8aa318550038182e0e1807af210029bdba55b146d06dbee2aa5 SHA512 87d4953f698930b71808e4df361294bed60c7deb92e09fe1a03ee1e8b4da00f6187c0b3b4a436e8fe41a8d25dfc748133b347957f585a50bd373fd967e365bb8
+EBUILD vulkan-layers-1.3.204.ebuild 1625 BLAKE2B 185afc830eea2ef233b17f445dac3f800b7b48bd30608589f693af0bbcf07b68ea43520566f12b116e48395f3539fe20f561f07b3585b05fa199e518d187d832 SHA512 993ab073216fb6086e61373244093a69857d67ec909df5c234f574fea73ea0474a75e2aa21d78f5c86f834b3175963485687877298d9f89f7441661ff94b1365
+EBUILD vulkan-layers-1.3.211.ebuild 1515 BLAKE2B 9bd2188639f752c469053660fa149254708045c879e696c02750817483411ec58b46121988911a51a9aca38f49c1a9959f3539056b7b2b73dd222edd800bfc99 SHA512 0f3cc41164869c868fe38b69703a9731ce60ff3a206ce1505a0f3e24c059df0e8d29af6a996b4efd31f099532bab2331f87b4303b6c312d569912b2350fd4b0c
+EBUILD vulkan-layers-9999.ebuild 1580 BLAKE2B 03665b8beed8a159df389fd81393541088511469fe9305495d6e1a5a9bebfe2e3649f4d2caa2ff4a1f83e8899ad00fde7e0895818d7803844cf27b5c51e131d1 SHA512 7a624fe100dc6a7bff7155a73b9faba422eb2ad83eee4a3d4924432e838ec95e7251ef73f0f12a3fdbee30b762a3b455a3687c3e2d6edeed99ee2e89a916fd2f
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
index 3b60f6688ddf..9ae97ee6a3f7 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
new file mode 100644
index 000000000000..71a5b3ebe001
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~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"
+
+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
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index d907a6f8f9b1..ced265c1f55b 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then