4 files changed, 86 insertions, 3 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index da7a1607914b..4fe77f1ae267 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 9a18c946088a..b413d583b450 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,7 @@
 DIST vulkan-tools-1.3.250.tar.gz 785979 BLAKE2B d496f3859d3884cc2aaffdae62db9776f56dae1a45cc74bf093517d299fb9ff4e28d6a5227436c30faeab3fb5bceed6dec1a82bc327c539c9038b1a08960ab50 SHA512 7eecdd98e6be2f5dc66b32ed9962b0b7225f94d6185b490da0a6f3c6699ef6626a4db28615c73ecf6370efd6ccd5904e352c78947ec50dec57e32ae734f134b2
 DIST vulkan-tools-1.3.261.tar.gz 801309 BLAKE2B be85d035157312c423c6f574519825facc7e9d5313126171b0b50a1605478fe271370faa55bc6732857189668f3e102ad429e4191a12e7be5e2113c1a712dcad SHA512 8bc30ead031ad6bceb7e54a1b70f26048847a30147d86638ced9d621b11ef64b1e97f41394b068458f5c8ad6e30216aba6e14765e971fa9e6a49773a47593fe5
 EBUILD vulkan-tools-1.3.250.ebuild 1895 BLAKE2B 1b71bcace1fcc8cc5c5d583b6856b47d41becc29b004172ad6a53348df7c21acd996e98f9df9948ef3073b0ad6ac788da02b7d97b501eff6256acb1afb5d5558 SHA512 cc0fa23ea5dd85387bade167131c38fb65fad1ef6cdda792c42c9925335d542b091b19a2ba708a11d484f8e574815b3c6cae84969b055d2ff5764ec558008118
+EBUILD vulkan-tools-1.3.261-r1.ebuild 1927 BLAKE2B 4c588bc67f1d8ee204905501417817971e93e18e798f944e927b64a808860baa5bf1fe8a73e55b1b732c7dbc3cdc9bd88474c809bc603a4a4c2d7963724f9540 SHA512 30c4765b816a741dd71d637415fdda7660a3133d438268450513c9b1fe19d703ddcb38d8cc2fe5ac6bb1e496b9352bc655ddbec0ba4f84268c85473196492569
 EBUILD vulkan-tools-1.3.261.ebuild 1900 BLAKE2B 97bda2609c518a4f1db8bbc53f602713e4bd76f7e78d51d9b3a937f8a8ea109aa6ca66cb6f8a896dd32ceb9bc669a9f0669fe1ba4501646a8a2734ec1204cc0a SHA512 f7b531b3f67a4b3ac6e5316fe84b6ea783171d61ee20dbf2c3be71bbb634a6ec41a0456a8deaa46f20725c527943ad8fd1bb19e58e65a2942072f3f247ea9325
-EBUILD vulkan-tools-9999.ebuild 1900 BLAKE2B 97bda2609c518a4f1db8bbc53f602713e4bd76f7e78d51d9b3a937f8a8ea109aa6ca66cb6f8a896dd32ceb9bc669a9f0669fe1ba4501646a8a2734ec1204cc0a SHA512 f7b531b3f67a4b3ac6e5316fe84b6ea783171d61ee20dbf2c3be71bbb634a6ec41a0456a8deaa46f20725c527943ad8fd1bb19e58e65a2942072f3f247ea9325
+EBUILD vulkan-tools-9999.ebuild 1927 BLAKE2B 4c588bc67f1d8ee204905501417817971e93e18e798f944e927b64a808860baa5bf1fe8a73e55b1b732c7dbc3cdc9bd88474c809bc603a4a4c2d7963724f9540 SHA512 30c4765b816a741dd71d637415fdda7660a3133d438268450513c9b1fe19d703ddcb38d8cc2fe5ac6bb1e496b9352bc655ddbec0ba4f84268c85473196492569
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.261-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.261-r1.ebuild
new file mode 100644
index 000000000000..aeda890581ac
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.261-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+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/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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"
+
+REQUIRED_USE="cube? ( || ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	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
+	)
+	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube-wayland
+	)
+
+	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_WERROR=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"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 1269dcab52ee..aeda890581ac 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -24,8 +24,7 @@ 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 ) )"
+REQUIRED_USE="cube? ( || ( X wayland ) )"
 
 BDEPEND="${PYTHON_DEPS}
 	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
@@ -51,6 +50,9 @@ pkg_setup() {
 		/usr/bin/vkcube
 		/usr/bin/vkcubepp
 	)
+	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube-wayland
+	)
 
 	python-any-r1_pkg_setup
 }