gentoo resync : 15.12.2019

4 files changed, 137 insertions, 18 deletions

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 5225cc11b87f..b574b1c4553b 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,9 +1,9 @@
 AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
+AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
 DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
-DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
 EBUILD glslang-7.11.3114_pre20190415-r1.ebuild 556 BLAKE2B 77fea586cb6202d0c9ae2edbd398bfec0f5b8aff7db0bf405e8954be09cdc82cf393a1d0da6ecd67dd7c7e4448c89b6bf9e6504d85561f604336d750e2d0919a SHA512 c0994b38b8984c98ded133636e2c2d3d0502e7581f799b39e11487aeb52f26b7cdf57cb0a2923135493b81eafd21f2c7bdf8bbc32a164486318c3a72fd8e06f1
 EBUILD glslang-7.12.3353_pre20191027-r1.ebuild 760 BLAKE2B 69e0f48308884297c6e8098ce44679167b645350bd939b38ec69d0756069e5995f9eade2d3ae9a26a2e6b82ca8b3d81fb4631cd4dfcab1c41d7569231e93f92f SHA512 1f4452c0c9a918a82b0464bf43beb35a1106c39a0c022bd966b79b4fdd49141ceb013cb41dd02b69d9eb2471ae5b6933f50e0f79c3680949e0644b55997a0138
-EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
+EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 843 BLAKE2B 57d3c4089d9d826f8e36971772ce425abc163fd1fd5a8237c11c2bbd9892fe2df1b79ade6d47c405d21940fb25be147060cc038f16910b73e81b393d1570d09c SHA512 6e87e371e322f31156e453bb7783ec6003a2fee504799bddb8a0c55d120db7a70808bbd0a579b4f536afd77c879ab84ea4835f9491d57af05cbee6cae2f74d92
 EBUILD glslang-9999.ebuild 617 BLAKE2B 30fd7c4245a34d125051b5f41cfe2aa37ba9fa3c921b464f5a6dca09af90a6dfffd13c0dc1551c0da2c56875842c08a2189243e4bd8009ec032d7b5d690d05fc SHA512 6b36df67fd05adc8e89af5da2775ccdd69b6c999b9c9f65808e3660e6d2eb089e52a841bf522d3647aeba7b617af0fcd08cc76b9c53f6d00e6de7e597f9fde9e
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
new file mode 100644
index 000000000000..8838a97809d4
--- /dev/null
+++ b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
@@ -0,0 +1,105 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index af4ab587..e0096743 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -11,5 +11,5 @@ endif(WIN32)
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
+             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-	install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
++	install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index e25ec0a1..364f04cc 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
+                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+ 	
+-	install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
+-	install(EXPORT SPIRVTargets DESTINATION lib/cmake)
++	install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++	install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ 
+     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index 0878965c..d9d71d1a 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS spirv-remap EXPORT spirv-remapTargets
+             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 	
+-	install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
+-	install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
++	install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++	install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+             
+     if(BUILD_SHARED_LIBS)
+         install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
+                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-		install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
++		install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+     endif()
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index 42df1d1e..446cabb9 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         install(TARGETS glslang EXPORT glslangTargets
+                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+-	install(EXPORT glslangTargets DESTINATION lib/cmake)
++	install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+ 
+ if(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 91fb45a7..9994314f 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -22,5 +22,5 @@ endif()
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT OSDependentTargets
+             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
++	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
+index f6bd4e9d..c050ef61 100644
+--- a/glslang/OSDependent/Windows/CMakeLists.txt
++++ b/glslang/OSDependent/Windows/CMakeLists.txt
+@@ -17,5 +17,5 @@ endif(WIN32)
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT OSDependentTargets
+             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
++	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
+index 77d217f1..aadf9a54 100644
+--- a/gtests/CMakeLists.txt
++++ b/gtests/CMakeLists.txt
+@@ -33,7 +33,7 @@ if(BUILD_TESTING)
+         if(ENABLE_GLSLANG_INSTALL)
+             install(TARGETS glslangtests EXPORT glslangtestsTargets
+                     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-			install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
++			install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+         endif(ENABLE_GLSLANG_INSTALL)
+ 
+         set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
+diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
+index 44f9d6a2..ae0d4d4e 100644
+--- a/hlsl/CMakeLists.txt
++++ b/hlsl/CMakeLists.txt
+@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
+         install(TARGETS HLSL EXPORT HLSLTargets
+                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+-	install(EXPORT HLSLTargets DESTINATION lib/cmake)
++	install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
new file mode 100644
index 000000000000..d0fcd6b8e021
--- /dev/null
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{3_6,3_7})
+
+inherit cmake-multilib cmake-utils python-any-r1
+
+SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-relative-includes.patch"
+	"${FILESDIR}/${PN}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch"
+	)
+
+RDEPEND="!<media-libs/shaderc-2019-r1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-7.9.2888.ebuild b/dev-util/glslang/glslang-7.9.2888.ebuild
deleted file mode 100644
index c91c892519df..000000000000
--- a/dev-util/glslang/glslang-7.9.2888.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils vcs-snapshot
-
-SNAPSHOT_COMMIT="7.9.2888"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"