gentoo resync : 03.03.2019

5 files changed, 58 insertions, 8 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index d42209ca5990..d63f65d53e9f 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,9 @@
 AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
+DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498686e1035e69b4d51f36ffdfc179b36323850d1004759941dfaa6ae8e6a25cc909d041e840a589d102f82086f339bfaa1c6 SHA512 d962483ab7149d436ac1bafb65d26ae965e147b7bd0dfd610b35cd54598ee84cb961c472d824a33964b117a14f224c984cf73764aef4de787de13b0a1ad29c4a
 DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
 DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
-EBUILD vulkan-layers-1.1.82.0.ebuild 1499 BLAKE2B 2f2b35c2ea64ea2ed34ab92a191cccf4892d8d5716d9420d09f3a23649d6d2a5007d1fb259abe059512dde226daf76b759c6bf62bd45d408b8d2211d5f38605b SHA512 6425c3c3b6f1caa8acc61b60c2252a9b2860d965e7938321919aed8298146063aedc7ae63acf0c51598948b0fed0d512e83dfa306d79e0f0031a03dd04e6abdb
-EBUILD vulkan-layers-1.1.92.0.ebuild 1381 BLAKE2B c91d8ec63a26db099e5a251422e786cb816378a99c91ec08947790a34e6ff55d5d00ef4b994b1e81ecec7bd694a37d434b0c82a29eb16f139f8c62eb939c971e SHA512 ed34962e991fbfdb9404e78424818159211e33cd1828631afbb054bdc40b4a06735e1126e30ab9f0a44a54965b986a19658f154dcfdaf645aaa41601c80f1f0c
-EBUILD vulkan-layers-9999.ebuild 1382 BLAKE2B 4085c6efe3f7fef3c784ed51818914adf7851a4d0c2b2c1e6b83cb0ce744e1fd89548533141f38d006f5ca455722cd7f2ac588fbfec8f97b7c78902f8457322f SHA512 5721d495b9d79c3aa846fe274fa76122e59c3aa415f8d2544a6570716014ade2bbc940b7a7117d5e10841330b0b5094e512ef12480cb2876fa4903303bbc5a6f
+EBUILD vulkan-layers-1.1.101.ebuild 1392 BLAKE2B 425bfe63cde877b3cf5a0a705d75eaa2c8c0073f6c3e32158e033d7ed64fae6b9f1efbe306829cab3014af8357e7d4f05d3b6c34f2c73b582dbd9e548a831a27 SHA512 1e846e3a136b1cf8483929a3b5cd04ae7a3e51c383f4964b1e0b0df695f9405ff36873342acc2a94b0486013911c8e6a67f0989735f49403e2d798f76f406986
+EBUILD vulkan-layers-1.1.82.0-r1.ebuild 1513 BLAKE2B 9e9d3274b3eef9197b08fa6f0a1d07439abef1774194b63d6d0b0ab60da4a1f477d6c30239c91df87317f05a0d260a6220f0bed5b949a908314ae5a469eb94a9 SHA512 f890f1ece720ba37ff414b0f1a912c27ef68c1fe8e07bea10d06eb4f156e927b517a76b7b0918d12347e9064846eb9338706a7c088c1602a71489023ff07a9df
+EBUILD vulkan-layers-1.1.92.0-r1.ebuild 1395 BLAKE2B 4c2275f707fd5a4239661640dc9babd20c6b685f572c765faacb19ab498669961940d37bb97462498b563fc6baf9464d8a1d8c215dcf38dbea6b6538afda7279 SHA512 72c9e52f422973584d598dd9f5e808de7786e6102263d2f97789e32a0081a7585f9c196318df4c59399d98bb0429c3ae42d44ca38fef12c5f9b7b4e1d5245870
+EBUILD vulkan-layers-9999.ebuild 1393 BLAKE2B 3b56717bcee88b852af50d847ec3d5085b2db758377e5b18c4595049cd8a565db478390379c00da814bfcbaae8701e9a17ed065af8796ecbe22a94071ea69c88 SHA512 0a3c78931607c4bac6c51b0c6982ab3398350ac54865b7fb3c330999e71e56271c0e3092944a682343ce36a798bee2b0212a04ec9e01c54c8ec6cd928e2ce8e2
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
new file mode 100644
index 000000000000..9ac4ea00384e
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="f06d731b7caf3e446acef3f4f5e62bdecd6f73d6"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+DEPEND="${PYTHON_DEPS}
+		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
+		>=dev-util/spirv-tools-2019.1:=[${MULTILIB_USEDEP}]
+		>=dev-util/vulkan-headers-1.1.101
+		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+		X? (
+		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+		   )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=False
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
index da4914c98bf2..c196972139d0 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
@@ -47,7 +47,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=False
 		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
index 648e31fd8100..c37c62f8b84b 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
@@ -42,7 +42,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=False
 		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index a01cafe630db..f11a1d33e59d 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ IUSE="X wayland"
 
 DEPEND="${PYTHON_DEPS}
 		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
+		>=dev-util/spirv-tools-2019.1:=[${MULTILIB_USEDEP}]
 		>=dev-util/vulkan-headers-1.1.92.0
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
@@ -42,7 +42,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=False
 		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
 	)
 	cmake-utils_src_configure
 }