gentoo Easter resync : 12.04.2020

4 files changed, 61 insertions, 16 deletions

diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 1da9b9246272..58d1a6a5ecca 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,8 @@
 DIST vulkan-headers-1.1.125.tar.gz 662594 BLAKE2B 7cd18b74ff804ed02df3378485f0783332bd09bf898769c48ded20f7a6495b5208cfae3616de401e17ffcec30421b48222520dcd90b03ad83b548405fd8a656c SHA512 355df13347aaa3b32ad62185810c20d1b2f358525d9d8036f6bc7643e7505a25c087a51e05fa7b0758e4ee63221bb39d01d6e14bfb7f99a53cb2127ca5db5d67
+DIST vulkan-headers-1.2.133.tar.gz 713107 BLAKE2B a29272618d224195d38e13d40ca22ee4822e38f5c7b72d3dc02130ccc6a053e05b955993ec4842486f444d819a7f4a6af0690b5c925e6194f254cc196d024cf2 SHA512 9a8375e2634f55bc50653d530db774d39833ca0e9221f6a50667567b254e7334398cb8c0318cb1342b720f223b795933c546cab3cb433443dfbf2a9702700a4f
+DIST vulkan-headers-1.2.136.tar.gz 757563 BLAKE2B 0f793b260cf13eaff58f26b03b5a874202882e7f1de93db5e703f3f24653d4b0e3845c94a96dab8d19f8efba1c3abc9d8df5c2036f16184ca4e59c6abc94c0cc SHA512 cf3bf2cc930fc3642f867f163844267e9ccbc0587ca619b13a5349cc4b914c44f240347ce9b62afe321f769904f9599cecad37bac6a435603db70419e7a1edd2
 EBUILD vulkan-headers-1.1.125.ebuild 789 BLAKE2B 0b41fcc284ee87fc0b5ee161ed1bb7fd7c9d2c6c3827bb8358a0b51bac5f2a358368d797510410c2c46b64a9a25b898293158830dbe3ec81a9a64e4501324d48 SHA512 151e8be50ec7117f314338cc7ed397ed7b33de9dd3c1eeb7f2b07ce87273c11adb7abb4a284046e2aeb0102390a69de6f739f539579c0603d405351a2a1dbd5f
-EBUILD vulkan-headers-9999.ebuild 791 BLAKE2B 83bd4fce1b7e21c4614ef9d57096be9a4e3203bb54969bcab2f394fd2ca01f33f81c0c35c915480b5a07c355d87c24094dbe6a5eced3c6d51d322238381f044f SHA512 983f89e0dd1199e47752df699900a68a3cc972a72b589b136f8b1c5dac6bab8c8c608f51f08499f4681269f4cf6aac21bce0d050e3a68c399f9588405c899fef
+EBUILD vulkan-headers-1.2.133.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
+EBUILD vulkan-headers-1.2.136.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
+EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild
new file mode 100644
index 000000000000..10d614b0d1fe
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	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 Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild
new file mode 100644
index 000000000000..10d614b0d1fe
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	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 Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 5a328302ddb8..10d614b0d1fe 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -3,29 +3,22 @@
 
 EAPI=7
 
-inherit cmake-utils
+MY_PN=Vulkan-Headers
+inherit cmake
 
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-		MY_PV=v${PV}
-		MY_P=Vulkan-Headers-${PV}
-	else
-		MY_PV=${SNAPSHOT_COMMIT}
-		MY_P=Vulkan-Headers-${SNAPSHOT_COMMIT}
-	fi
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_P}
+	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
-RDEPEND="!<dev-util/vulkan-tools-1.1.124
-	 !<media-libs/vulkan-layers-1.1.125"
-
 DESCRIPTION="Vulkan Header files and API registry"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"