gentoo resync : 21.06.2020

7 files changed, 5 insertions, 268 deletions

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index b9305a67a35c..63508125f917 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,12 +1,6 @@
-DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
-DIST vulkan-tools-1.2.133a.tar.gz 698176 BLAKE2B 55f1b298a5daf7c656492c75999002aa54811df448f635e6d0c95cf717ae00c8d8158c39557c3c646281f1b763a848716d1a4429540a5a3a137462e355338427 SHA512 3f7a431b6889e2d62d16105b928707b9ae9d77515398284bfde8ced7b0741523f0b37c281c789d5c786c089854010edb9c7b18ed373f342ca0db7533ec9fd698
-DIST vulkan-tools-1.2.135.tar.gz 709765 BLAKE2B 3e25e8936ebad2b5488618ec3680a322e9b3b20976cbf8e61b37702482e2203bc93c6f63ad5122688e074e9f1b178c57fa32b623ca07321fd7fb08b5aec9eef3 SHA512 604f4815b837bffca132fc0cb6f155ad59c8c13d68dea70d1ca18d1595c6c834f296faac551467766b5e7fe3e3afa3e91c0bb299b365603de2719df9232dde40
 DIST vulkan-tools-1.2.137.tar.gz 710528 BLAKE2B be7d2110f2ca9df5e3c2e898a4e985252f5e6568d061d2842a91cc95941bdd00e9662f6aeba4acacaf7c9a0abfe61915baded15be0ef2a4c43a4b57a5a04e99b SHA512 879529ccea9a894f62222cd0110b946ddf055f092994bf71942a3c5c50906dc062edc5081ea2150757cdb501426ca341e9a4260319c6565acdcb731f172d43d8
 DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337
-EBUILD vulkan-tools-1.1.124.ebuild 2289 BLAKE2B 9ef4efda8cfbe0b26afb75e983a91552a25d32a788f6f24f28e5a2cff0bda510be9b2895b708c047bc07dd74544ca043aa7d465dc15be13dd31fb6d443e242a9 SHA512 f877f93a5e449cc497ad3cae1a35f4289a3d3b3d81c762d9a7f68e7024548dd68d2021bcae93166ad8c4e7756d931e63612579cd55fb4d2a27fe451291134e33
-EBUILD vulkan-tools-1.2.133-r1.ebuild 1870 BLAKE2B 255a251faaad7fce7731196a7e15ec2726a821bae1392af9cf802d6bc85c7b66428f51521d0e61b7c9674cb4c67946a5056fa1efa3dbc45ccd514247a9218c04 SHA512 7f1996a305286d3827adb41ceb3d31469024f54d9318970fb7f536b17a8ec26cedc8305725c754211b29bd6040b43f1bd45e63c6772da21c6b6b157a51b1691f
-EBUILD vulkan-tools-1.2.135.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
-EBUILD vulkan-tools-1.2.137.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
-EBUILD vulkan-tools-1.2.141.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
+EBUILD vulkan-tools-1.2.137.ebuild 1868 BLAKE2B 469d21df29887ef3e51674952ea5fe5eb277c4579be7b3dc5a3573d073cc0752640377f544784d58cf4da3da3426118a62b63878db2e586510796fbdb0361732 SHA512 c2759a50c627b63170d205bfd45ef071376f4faaccc70522e7c3d177bf1185da8208029f9705dfd2c81cdae72636869bfd347302c1c2fa6d53fd522fd3e65df1
+EBUILD vulkan-tools-1.2.141.ebuild 1868 BLAKE2B 469d21df29887ef3e51674952ea5fe5eb277c4579be7b3dc5a3573d073cc0752640377f544784d58cf4da3da3426118a62b63878db2e586510796fbdb0361732 SHA512 c2759a50c627b63170d205bfd45ef071376f4faaccc70522e7c3d177bf1185da8208029f9705dfd2c81cdae72636869bfd347302c1c2fa6d53fd522fd3e65df1
 EBUILD vulkan-tools-9999.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
-MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
+MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml
index bee42ed5665e..9d9218cb035e 100644
--- a/dev-util/vulkan-tools/metadata.xml
+++ b/dev-util/vulkan-tools/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="cube">Build the cube/cubepp demos</flag>
-		<flag name="vulkaninfo">Build the vulkaninfo utility</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id>
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
deleted file mode 100644
index 4abdb96716d9..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
-	KEYWORDS="amd64 ~ppc64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-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 +vulkaninfo +X wayland"
-COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
-DEPEND=">=dev-util/vulkan-headers-1.1.125
-	${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
-			vulkaninfo? ( X )"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=()
-
-	if use vulkaninfo; then
-		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
-	fi
-
-	if use cube; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/vkcube
-			/usr/bin/vkcubepp
-		)
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-
-	# Upstream only supports one window system at a time
-	# If X is set at all, even if wayland is set, use X
-	#
-	# If -cube and/or -vulkaninfo is set, the flags we set
-	# are ignored, so we don't need to consider that
-	if use X; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="XCB"
-		)
-	fi
-
-	if ! use X && use wayland; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="WAYLAND"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild
deleted file mode 100644
index ff7a561dba67..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 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_{6,7,8} )
-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}a.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
-	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 ) ) 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_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="${EPREFIX}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/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.135.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild
deleted file mode 100644
index 1d6d8e74d61e..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 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_{6,7,8} )
-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 ~ppc64"
-	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 ) ) 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_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="${EPREFIX}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/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.137.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild
index 1d6d8e74d61e..c2805c77cf4a 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.137.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 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
index 1d6d8e74d61e..c2805c77cf4a 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.141.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 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi