gentoo resync : 05.12.2021

5 files changed, 20 insertions, 109 deletions

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 87768ca9d9f2..400fb5f0f735 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,8 +1,8 @@
 DIST vulkan-tools-1.2.182.tar.gz 847991 BLAKE2B 5ab9d73383338bcc3c54487f0f433466d9974269d3be2aa0d50281affeee8fb94414eb638fc94be6fd2dc059c0a2d3dca4e9a8caf3e2b8758c03c57373e2f73b SHA512 5cc9500923288641529556e82a708b88f7dc775c75166d10ae2a807562ce9dda3993aa01a261ff4f9c2cc31ea47423a12f21ec64d32e6aee66ef7c3fc2dc17fc
 DIST vulkan-tools-1.2.189.tar.gz 849041 BLAKE2B ae38aaca9789276bcb93c5c297c9113fcced4cd3417f0619c0e1fb539df5891e725a77785fbeca0c8957644af7245ff9f0a3981cf5f8726f4f231e39f05ddfbb SHA512 3ac4f79a6ba18690026d1933b7f3c45769f9759e25d19508bc34d431454dc548e1f738ae3d804db2864a97de3b8628f167bc00dcad4059eaeb1714e4fdd3507a
-EBUILD vulkan-tools-1.2.182-r1.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
+DIST vulkan-tools-1.2.198.tar.gz 847429 BLAKE2B 8927740853eb45d495996a8be0bae3d40f84f14f12eb838474241745321d7337a6bae7e118bd626fbb15f8ffd42d574a04c93bd3aca0b3373976d7d976c05d2d SHA512 304ce76c47d4adef3a286439712ef4fd3f08ec8e47ed0e2a37162f9cac5e08af3c7b7fb449fddd4772080d678d84db9e238a5db4d98c7d4ee5f6d87a3f5c8f5f
 EBUILD vulkan-tools-1.2.182.ebuild 1860 BLAKE2B 3e3f89a5c3f26601333dc91a3532638d08bb15023f2cf487dd075f300245fbbe109b7b84f4046af3972132504d41a8f8bcb82c03bc8c24f9ad0c738d456beab7 SHA512 ad5a23b0a5e4375d80f0d5f912daceff89992c563ba29858f8ddd9b5b3a34a5c3570a80d57617493662b76aa0033027849b0908f463ac88aed55715c91860c9e
-EBUILD vulkan-tools-1.2.189-r1.ebuild 1946 BLAKE2B 4415d72ebb75d99ed7a9058be037387dcd00b4865b4a15aed337c7aaad6f1c0eeae8c4b4dd180386e8f8ca60d60954ed1b594b8b02fa809bba8daf71f1201ee1 SHA512 345f5e6ef33a0002fa9272bc81e5084e0d263eedef349cbd1d042a3c20ffa178bbf6c93ec9baca286898b6c0d614cf649f1045a97357ebe23c1c64c9f0c44ea1
-EBUILD vulkan-tools-1.2.189.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
-EBUILD vulkan-tools-9999.ebuild 1947 BLAKE2B 9c39acf596d5cb4a98560f1ca28a0f577f03987e15ba37ce8d3bffef742282abfab7569c20a814eb8fe448e7448d05cd9fb951d8f7615b93e9a4c0c2b70580cd SHA512 ecf6d88130aff53aa336450f337092c4a6cf117cf71fe6ab47e39cc00e39df8de40d340531ca27c06a17e7920afd9c0dcaff54dfdf6eda8818031b5e5d528f8e
+EBUILD vulkan-tools-1.2.189-r1.ebuild 1942 BLAKE2B 1bccd8d13dcb1111f8d24a5de7477281fbe3a8407b4c229e22784f86cf43c3952832eb425225f92219172116f90e0cd65210e5013de4247593b931b47899eb55 SHA512 4093de5b4f319026bef517acdf81ca8bb8b08ef64bd3a8c8c82b85554258a3dc9a059bcdb987e00b44592aa96c3f6b9523cb2b11ca606cbb0a38ef600c6d4285
+EBUILD vulkan-tools-1.2.198.ebuild 1963 BLAKE2B d50bbb479d0eb90b119cbdbb0c356456c946e252058548a8a4adedd4ce24c4b1594ed0dd9874710945f8dcc7e4cdd202a32385037974b75a08078f49da286382 SHA512 8a487e259f1e0325e5f8a77fb1c1ff079c31d2eda17e76bb8833389449ad478e40bc9da23ffa6bcf4052a45cacdc3c04fac3681ccf5b3289217e47e833ac9037
+EBUILD vulkan-tools-9999.ebuild 1963 BLAKE2B d50bbb479d0eb90b119cbdbb0c356456c946e252058548a8a4adedd4ce24c4b1594ed0dd9874710945f8dcc7e4cdd202a32385037974b75a08078f49da286382 SHA512 8a487e259f1e0325e5f8a77fb1c1ff079c31d2eda17e76bb8833389449ad478e40bc9da23ffa6bcf4052a45cacdc3c04fac3681ccf5b3289217e47e833ac9037
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild
index 75e74596704a..316c83ee003c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.189.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189.ebuild
deleted file mode 100644
index 82f33ec2490c..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.189.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{8,9} )
-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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-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:=[${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
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-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-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild
index 82f33ec2490c..183eec642b25 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake-multilib python-any-r1
 
@@ -14,9 +13,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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}-${PV}
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
 DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
@@ -31,10 +30,10 @@ REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
 
 BDEPEND="${PYTHON_DEPS}
 	>=dev-util/cmake-3.10.2
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
-	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -42,7 +41,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
 "
 
 pkg_setup() {
@@ -58,12 +57,10 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 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)
@@ -78,9 +75,9 @@ multilib_src_configure() {
 		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install() {
-	cmake-utils_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 038bf033579c..183eec642b25 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -13,9 +13,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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}-${PV}
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
 DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
@@ -30,10 +30,10 @@ REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
 
 BDEPEND="${PYTHON_DEPS}
 	>=dev-util/cmake-3.10.2
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
-	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -41,7 +41,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
 "
 
 pkg_setup() {