gentoo resync : 02.06.2018

4 files changed, 3 insertions, 84 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 2d358cc18b66..2ad74f69dd65 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,10 +1,8 @@
 AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918
-AUX vulkan-loader-9999-Do-not-install-vulkan-headers.patch 725 BLAKE2B 6b48104a774c0981af5625e9908b752494e3603c86f7d2ca59181d7510acdb859e445b366ef55b574b169476b84a2c81894f90191edaa83bdd3d4e8d747d14c9 SHA512 8cf05233a575108f29dd7f4bea2a92e68067b9fa87c1a6f5a29072d5044833d8b9eb9a7fe79e8b75d0c23c46fb4129f2fd1cf655a69223d68ac894805c3fcbab
-AUX vulkan-loader-9999-Use-usr-for-vulkan-headers.patch 2084 BLAKE2B d8dbb0df82d5bb3b570b1233e5bfbf7c80bd8eab1e7127d3964cb7307a324e91b6e964c26161f6e824ab2dc5ee3519d1bb2ed792c355a23ce7bd5e5ccbbfacc4 SHA512 8406ccbde73bd9d5868c1c3fb33ef1799bee653d177839ed576ecc2e78a2286d67228ba035d38f9dba9e43819995c950f88f300832170f333541649fd4774d2d
 AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
 AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
 DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
 EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1780 BLAKE2B ee2078c51a1368e97e347565d0152b70b636ff094b39e3c44c348c2d37aecba7781140a36deb74f803e90c25d272d34e46dfa4853345c05bb2490cb4c702623d SHA512 4c9254c7cc300db6107e77755117e0c1a86c4e5e5750aaff31f753aa7222516c48e84a4cdabe7fb7f84f92bfbc8f4f84b8ad4287126c423627898ab1fbe3cccd
 EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681
-EBUILD vulkan-loader-9999.ebuild 1588 BLAKE2B 55c21df60e6919ccbe0646414f0ea4c9efca6f243665640acdc77a3807f3cab5c6c4b42b3a598cac622d3d6292755e87c2fef2de5d0c51e8737291b8bac48fc6 SHA512 bcdcee331cfe38008ce58aff629f52ccf75337649cc38af9e2e0801d2a700e1a027391294c6da08775bdd3d30285aa70529f339e041a6fa15346a4d71ca75945
+EBUILD vulkan-loader-9999.ebuild 1502 BLAKE2B 1286fa5cef46bc3a3a27f247824d130fe7d1b08ebc40ab0486610519afc5ed4d57bbf3b0c68a4b1d8daca6186414b4a544cfd9099b2e6801ed3369338ed8e7bb SHA512 b306b5d6d8df2b5b257e155d94b7bd4a56c8cf48ef84b57f89ffb7157463f683ad848df9c1f8ca481d75118c36bddb2ba9d46537c6799278b86c4f0edc2f314d
 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
deleted file mode 100644
index b0cc73c44868..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d3d9f1b73732d4f9d4d33bc7fa782cadbc10d80f Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Mon, 21 May 2018 22:34:25 -0400
-Subject: [PATCH] Do not install vulkan headers
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 627de6f70..65f5ea0d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -170,7 +170,6 @@ if(NOT WIN32)
-     endif()
- endif()
- 
--install(DIRECTORY "${HEADERS_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
- 
- # uninstall target
--- 
-2.17.0
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index 49dd54c83c8f..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d9b3835e1ad455853e3a58ec0d2a0653e5952a21 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Mon, 26 May 2018 16:57:33 -0400
-Subject: [PATCH] Use /usr for vulkan-headers
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0b744a87..14034d33c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -68,7 +68,7 @@ if(WIN32)
- endif()
- 
- set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
--set(HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
-+set(HEADERS_DIR "/usr")
- 
- # Output warning if vulkan headers submodule contents are not present
- if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h")
-@@ -131,8 +131,9 @@ set (PYTHON_CMD ${PYTHON_EXECUTABLE})
- # Define macro used for building vkxml generated files
- macro(run_vk_xml_generate dependency output)
-     add_custom_command(OUTPUT ${output}
--    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/registry/vk.xml ${output}
--    DEPENDS ${HEADERS_DIR}/registry/vk.xml ${HEADERS_DIR}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/registry/reg.py
-+    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${output}
-+    DEPENDS ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${HEADERS_DIR}/include/vulkan/registry/generator.py
-+    ${SCRIPTS_DIR}/${dependency}  ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/include/vulkan/registry/reg.py
-     )
- endmacro()
- 
-diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
-index 0de555fae..dab543ed3 100644
---- a/scripts/lvl_genvk.py
-+++ b/scripts/lvl_genvk.py
-@@ -17,7 +17,7 @@
- import argparse, cProfile, pdb, string, sys, time, os
- 
- scripts_dir = os.path.dirname(os.path.abspath(__file__))
--registry_dir = os.path.join(scripts_dir, '../Vulkan-Headers/registry')
-+registry_dir = os.path.join(scripts_dir, '/usr/include/vulkan/registry')
- sys.path.insert(0, registry_dir)
- 
- from reg import *
--- 
-2.17.0
-
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 33afbd7d8348..9e7474822138 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -32,11 +32,6 @@ DEPEND="${PYTHON_DEPS}
 		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 	)"
 
-PATCHES=(
-	"${FILESDIR}/${P}-Do-not-install-vulkan-headers.patch"
-	"${FILESDIR}/${P}-Use-usr-for-vulkan-headers.patch"
-)
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
@@ -46,6 +41,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }
@@ -58,5 +54,5 @@ multilib_src_install() {
 
 pkg_postinst() {
 	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the media-libs/vulkan-tools package"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
 }