gentoo resync : 21.06.2020

7 files changed, 4 insertions, 281 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index a8a5ef0a8bef..eb6ec54cb3eb 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,13 +1,6 @@
-DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809012a0540d928366b465a532fbf90e7d87bf42eeeff70b1a46efeadef9c599cad6009b122ed9c5c7298973207f05acc1032 SHA512 40e1e5c16491f0549eae3efc065c375c258b475d81e1c781a756c71ec329f390e2aba55ced5ed2005e938f9d074dffc1692e7e1e330a35f55460cae1606fdf2e
-DIST vulkan-loader-1.2.133.tar.gz 1401215 BLAKE2B 4a52e2735ed584f96f563dd23761c25169158a12488f50267375cb85dec411fed61f3ac0f090d77a650e9d055e384562d4fd644571b20e45ff0c316547b88647 SHA512 ba486cd0b20d1936a8a7e97509bdaa5e1c42f024428d6f710af80152d55f486c76db072ae44add089ff20eef21a768073904236e6d29d46dd1475d77d26f9907
-DIST vulkan-loader-1.2.135.tar.gz 1405922 BLAKE2B 02d984f758da0c57fbabf18b042da73a2e44d8990e74da9959eddabfb6190732f72ffbe91ccad9c54daf76535ad1b5d7a24244db5e6a0a32a2f1be0ca9dae683 SHA512 cd0092761fed30c830872ee7d5b923996047ac5fcd4e3ba7f5e5f02f36c31a17f93a4acf2b2a5f42e3b956a9769427730b6974f745697a2c871e1582afec7284
 DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796
 DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26
-EBUILD vulkan-loader-1.1.125-r1.ebuild 1814 BLAKE2B 85c569e9dc7779940d6ce2d6fb1d56cc2d0bd21625f09dc172b1439e6919c40f6258b5c0a69666af5d4f966fc657db23696c5b29f978b994fbd621380c95d809 SHA512 70cdc83a57c0285f0a632e0f04b63274f48a8bd91e1c2aeea625f145014027973769c6d3acaabc6cab6846f169329812c6ec1ae8346f923c3696c96f9187a88e
-EBUILD vulkan-loader-1.1.125.ebuild 1800 BLAKE2B 16285fe9cd9fff1e3e2ff741fb6755aa383cf6519adef4fb9e9ab0ee093b3a0e73212d16c94c6e366ef34cbcaa6aa6394288b6a180a605e5998b80628129f00f SHA512 0f6f1e42cde2d1f53e32d4b217986fc1e50e8c5286d58891181392ff1b85c59f6d6556519e1b82fca00e43433b7b85054f76c8805fffd211af45acbd920e0f9c
-EBUILD vulkan-loader-1.2.133.ebuild 1710 BLAKE2B 58d6114fdbc285b35423bd318cccd55e7a6bcddd682a2f7f8e622d1c38657991082bc1832c6c6edecff3101b9d85585ffcbe74e555b683751410b0a7c2ec9ccc SHA512 22c3909f1118270cf00f9a90d19bb5c89072a0da7691a91b53b0f1c20f853435c713022f69cbc83f3c8144dad13bb9e4bea5a5855b04a0153ea0a9e594451aa0
-EBUILD vulkan-loader-1.2.135.ebuild 1712 BLAKE2B aa4f8b37b669b257e1bfc7e61fbad75187ce6604c7a4b73f992255ce9de582bf9e06a04030638ffdd51e2b47bf1a77aa6ad245661d003d243481d7556a0d985c SHA512 6f327be621a3f90bc39b88a5d31eb32af3be0ee3609d8b71b810ef39fb0f7830ebdc75adb418ca43d8c46bcd91af2edff00b6e2ef3e56b7c8b29f2fa72038fb6
-EBUILD vulkan-loader-1.2.137.ebuild 1712 BLAKE2B 55ac967b74ec23b16cef99478681958964db6ee22c73ffe83b68c86f969e225ee31af58b842dd8e43508c1e7172808be44f066c74ab8827d9009aa1241610d9c SHA512 3e0fb63325d9d296190d45ad4311919787f4186854d641f81056d8f120a4f2de3696a11eb61a589e9da432ac6623c7ba0997486c58b47d1611d5e2c5711e9f45
-EBUILD vulkan-loader-1.2.141.ebuild 1712 BLAKE2B 499e5e98e4767791ddd389693ccf8a337cc3f520471fac0e88224d4b4e3d00679a36f32222e5cc6689be2125c177314580b7477c43adc91d312ae5d030ea606d SHA512 5c051c635ba1d300ef8000e6aa4daf264400019f17772c09179ce496dabf117e84e344c714a4eec2a19ea64237c7644d38a59adcc6c5c965cc6b5a3b95502d07
+EBUILD vulkan-loader-1.2.137.ebuild 1710 BLAKE2B 3427e40938c277700720bc50df5b0583f10ccfed19025bf0a6e7ed0cfae364ab8e3e1b420a0b2266f832c5ef7b0f574d03efee3658420771ff147698e11f3576 SHA512 f5923a57cfa7e80052e26eb3645771c7f9c506e638075d32186cc00ddd7e42c8e5c5f033554d7a8c624faff6a6dfd3ca9a78e2a4333d62e7f669c0df142d4ba0
+EBUILD vulkan-loader-1.2.141.ebuild 1710 BLAKE2B ace0b28fd303ae99b0ed7b4878ac2538534863f89f4a1442473db1508e570cfc5ebf0bd1a9b8d3e0bdc4d7f5a0c803ddd4ce02a0f62d13e4e17d3e00918b6978 SHA512 8004d2d27090080f0ee60f9d708ad0d51ee5335aa6301c92126a1972d692ebd85e0361c7779dd1cb0698eed7f6babccbde8628f264ab1c0ae54c5b63fbf520a1
 EBUILD vulkan-loader-9999.ebuild 1711 BLAKE2B 8a7cfcd2603391ba298c407b8fc5eff6bc6364bd650ffa6e07637ccfad00aea16ea813c81d6855fa6b84049f59e8eca039967a1cf89d8a2ddaaaa1ed4e8153df SHA512 f561c79296a73545c3cbca97d1807e57549869c9bff4f81aaa017d8846a3b28cd85208f1956af8b51982896411aea2c7f94ff6b77f97026a7da2d77ac5ec092b
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
deleted file mode 100644
index 815cee75b5ab..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
+++ /dev/null
@@ -1,69 +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-Loader.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-		MY_PV=v${PV}
-		MY_P=Vulkan-Loader-${PV}
-	else
-		MY_PV=${SNAPSHOT_COMMIT}
-		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
-	fi
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit flag-o-matic toolchain-funcs python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
deleted file mode 100644
index 50090116171e..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
+++ /dev/null
@@ -1,69 +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-Loader.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-		MY_PV=v${PV}
-		MY_P=Vulkan-Loader-${PV}
-	else
-		MY_PV=${SNAPSHOT_COMMIT}
-		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
-	fi
-	KEYWORDS="amd64 ~ppc64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain-funcs python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
deleted file mode 100644
index 24139711b288..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-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 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
deleted file mode 100644
index f82708238364..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-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 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-1.2.136
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
index ad3f56422f29..0246966ff47f 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-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 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
index 9f43ba5ef134..71f3ce8b1cf8 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-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 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi