gentoo resync : 12.05.2022

4 files changed, 90 insertions, 5 deletions

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index a936e12cd44f..9acd0702ca58 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-tools-1.2.198.tar.gz 847429 BLAKE2B 8927740853eb45d495996a8be0bae3d40f84f14f12eb838474241745321d7337a6bae7e118bd626fbb15f8ffd42d574a04c93bd3aca0b3373976d7d976c05d2d SHA512 304ce76c47d4adef3a286439712ef4fd3f08ec8e47ed0e2a37162f9cac5e08af3c7b7fb449fddd4772080d678d84db9e238a5db4d98c7d4ee5f6d87a3f5c8f5f
 DIST vulkan-tools-1.3.204.tar.gz 860464 BLAKE2B d0fdf95bff0dc914cb324a0780763dd87120b7f88a7bfaa6a2e0adef72263bd9cb0769636eda793ca5517560903ce314b96a5e3b00e018010ba0f99f68ba05cd SHA512 1295d0e86b8b81e33b0cd1038847211fb808456435fce9446f9890f8653b854dbd1e8b84a22b646b0fddb8cca33aaee12a2edc043e76c9c4bc718b11f281a98f
+DIST vulkan-tools-1.3.211.tar.gz 864436 BLAKE2B 09dcb3ce388962cff0e75837d07e58572ac1cbdabdc26edf7f6bd1740278f7ea871e0e14c4ac6a203fa13033616240d7338dfb1a52c4e2ed045ed28585bc62cf SHA512 36be2970dd42e12bf6f6644bc1b14f102af36f1297c33fadddca470b65d7d324532b20c071d2f0dd790d556cd99012a4fb80f185db6165ed3f09d1fd7e5c50e7
 EBUILD vulkan-tools-1.2.198.ebuild 1958 BLAKE2B d728a9c077343621f53e04c982a7e4d8b6d2ba6966ab3c6d2d78da3db89bdb4c4c4408b5ebdd596c89ed5efa0466cf2c727a65613d20bebb80cf6c022dce02a2 SHA512 aa6789146f968ca85ac77c3442287288b218278b40469390f60be55e2b32cf43a24c54a1745d688d8021d046db472fc23862b0377f32c5e3e254b5106d6bbeea
-EBUILD vulkan-tools-1.3.204.ebuild 1963 BLAKE2B 4a15a51a56a514922805aa1ffec23f6cbf7fe2559b8ce4d074233a929293679b70080ddf9438199a6b80f54d2904159544c7ed225463d39ac2103bc0cd00d016 SHA512 1e1cdd11c8414163f46ea637ede5f888f581e94f7d280b1080d1defdccf86fa7895128617a3cb17bc2f05a3c3a65ffe5ceaac2e596dea3dd82faca594652fac7
-EBUILD vulkan-tools-9999.ebuild 1963 BLAKE2B d50bbb479d0eb90b119cbdbb0c356456c946e252058548a8a4adedd4ce24c4b1594ed0dd9874710945f8dcc7e4cdd202a32385037974b75a08078f49da286382 SHA512 8a487e259f1e0325e5f8a77fb1c1ff079c31d2eda17e76bb8833389449ad478e40bc9da23ffa6bcf4052a45cacdc3c04fac3681ccf5b3289217e47e833ac9037
+EBUILD vulkan-tools-1.3.204.ebuild 1958 BLAKE2B a9e2f85bcababb40309f8cb50c0432d427d26225ac1f32bd10beeca7072e0b88e3625fa376b4ad6a8e6dc793c5be9d0548896249dc419f47968221758fea8aca SHA512 98ca0f09b3e568057c5037ff50bd84606c501097b5c4891832f2fed332160a708b79bbc96a46802f6a98164b8fc155c9a58431eb6ee9acd86cf86338abc86fbd
+EBUILD vulkan-tools-1.3.211.ebuild 1965 BLAKE2B 9a76cffe3ee30dc47f30958c80873676d0e0b25830618d8ae60ff870cdb5bee4b478a282449a33551ac134d0e7a272fab28cdc4f461a42d274d85cd6d1035528 SHA512 f4853a51eb9531cf4066e452c5fe03ebc37666330ab6110205c633f7755717c30791a7a2d0375611381e153741ccb0991387916f1a044eaf40586eb61b2b82b6
+EBUILD vulkan-tools-9999.ebuild 1965 BLAKE2B 9a76cffe3ee30dc47f30958c80873676d0e0b25830618d8ae60ff870cdb5bee4b478a282449a33551ac134d0e7a272fab28cdc4f461a42d274d85cd6d1035528 SHA512 f4853a51eb9531cf4066e452c5fe03ebc37666330ab6110205c633f7755717c30791a7a2d0375611381e153741ccb0991387916f1a044eaf40586eb61b2b82b6
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.204.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.204.ebuild
index 3b9fcf9a3c97..8f49fd225154 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.204.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild
new file mode 100644
index 000000000000..d0d34357c400
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+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"
+	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}
+	>=dev-util/cmake-3.10.2
+	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_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
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 183eec642b25..d0d34357c400 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PN=Vulkan-Tools
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then