From 905e7d07da40378586e71ece65bd962b0b00c578 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 7 Mar 2024 01:06:27 +0000
Subject: gentoo auto-resync : 07:03:2024 - 01:06:26

---
 dev-util/vulkan-tools/Manifest                 |  2 +-
 dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 31 +++++++++++++++-----------
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'dev-util/vulkan-tools')

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 7afaf367bbff..cab61e959e50 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-tools-1.3.275.tar.gz 755289 BLAKE2B 2366a0c55982ef9ef13495ac62d958d0055fcbbbd7cdaab9530ebf15af9369a71bf3b8d3d6479f3a0ee02d44ace027e0fd57b2b93d6a9a373781c60529a48663 SHA512 5d70498341b8d2447128cd5ab3fd081b706830f5f85d9f7e752dfca9c74fa4c1567207eef6e34e9bf99ff65ec2855b835eb30362fd544e1cf61ecc7a7119df06
 EBUILD vulkan-tools-1.3.275.ebuild 1938 BLAKE2B b7d8535c88d5d3cba35ecdb6f4c6f777628902094a67d83e855f61b0db7e4d848672824003ce863dc8bd8b9b2190dd929047fdc2819c6f331bf395ff977b30f7 SHA512 74f5879b5e53e516b5f3fbd311a57f77ae4d07bf83eaff7a0411f45e95e21df34a1c0e942b474e78031bc14c61fba56623e3da36ef8236a3da4722071383b870
-EBUILD vulkan-tools-9999.ebuild 1891 BLAKE2B f0415527fb56402fdae1005e36c1a3f4a2059a0bccaea4a547cea00d4a94d60b4089f820a254ab5d9a929c7e53af49d555ec3748f8b305d5b28369ee2f7f742f SHA512 862a357cb7d2f098eaeb7c6699c0c52c5de30df3e541a5d8debf2eda91ab4e8e24782c15e5348d7f620e6076b69bffee66074c1c95312b0f33a1003ebdf602fc
+EBUILD vulkan-tools-9999.ebuild 2075 BLAKE2B 9320eec4ed5af1748ce77e2955dee27b22179683765873df11f32da0d07f80147a3d3412366761e78d13ed18f564c90a074bce5cfd338ec2ad77c3175ef22376 SHA512 a4f2361dd425c785c8257c68ab0799533d1b8682a63d8137da35c8080ed22a7b3eccba86353d39b60b48f4935c41b5646b490edbc21d2d82784a0eb7d28aab1c
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index a12f8e848df4..14e817838f6c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
 	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"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+	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"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
 fi
 
 DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
@@ -22,24 +22,23 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cube wayland +X"
-
-REQUIRED_USE="cube? ( || ( X wayland ) )"
+IUSE="cube wayland X"
 
 BDEPEND="${PYTHON_DEPS}
 	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
 	~dev-util/volk-${PV}:=[${MULTILIB_USEDEP}]
-	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	~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}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
 	~dev-util/vulkan-headers-${PV}
+	X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
 "
 
 pkg_setup() {
@@ -72,9 +71,15 @@ multilib_src_configure() {
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 
-	use cube && mycmakeargs+=(
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
+	if use cube; then
+		if use X; then
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB)
+		elif use wayland; then
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND)
+		else
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY)
+		fi
+	fi
 
 	cmake_src_configure
 }
-- 
cgit v1.2.3