gentoo xmass resync : 25.12.2021

3 files changed, 2 insertions, 87 deletions

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 77532d84fd58..c36665914080 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-tools-1.2.189.tar.gz 849041 BLAKE2B ae38aaca9789276bcb93c5c297c9113fcced4cd3417f0619c0e1fb539df5891e725a77785fbeca0c8957644af7245ff9f0a3981cf5f8726f4f231e39f05ddfbb SHA512 3ac4f79a6ba18690026d1933b7f3c45769f9759e25d19508bc34d431454dc548e1f738ae3d804db2864a97de3b8628f167bc00dcad4059eaeb1714e4fdd3507a
 DIST vulkan-tools-1.2.198.tar.gz 847429 BLAKE2B 8927740853eb45d495996a8be0bae3d40f84f14f12eb838474241745321d7337a6bae7e118bd626fbb15f8ffd42d574a04c93bd3aca0b3373976d7d976c05d2d SHA512 304ce76c47d4adef3a286439712ef4fd3f08ec8e47ed0e2a37162f9cac5e08af3c7b7fb449fddd4772080d678d84db9e238a5db4d98c7d4ee5f6d87a3f5c8f5f
-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-1.2.198.ebuild 1958 BLAKE2B d728a9c077343621f53e04c982a7e4d8b6d2ba6966ab3c6d2d78da3db89bdb4c4c4408b5ebdd596c89ed5efa0466cf2c727a65613d20bebb80cf6c022dce02a2 SHA512 aa6789146f968ca85ac77c3442287288b218278b40469390f60be55e2b32cf43a24c54a1745d688d8021d046db472fc23862b0377f32c5e3e254b5106d6bbeea
 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
deleted file mode 100644
index 316c83ee003c..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild
+++ /dev/null
@@ -1,83 +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"
-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
-}
-
-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-1.2.198.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild
index 183eec642b25..717742bd6504 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.198.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