gentoo resync : 13.10.2019

5 files changed, 3 insertions, 227 deletions

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 0ca5550c8726..f37ce44ad894 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,8 +1,4 @@
-AUX shaderc-2017.2-fix-glslang-link-order.patch 1803 BLAKE2B b5c880d6869a3a6d70405e12290bbb7f22d83c9903fdec62d0672f4e475bbb92ff377ed71121f7d8f935c1043d9c15949158aef616d45452dc3024ca24d8e4d5 SHA512 f8204ed66381864ee2f682f4e948d3e426fa4031b702e31ee5be7e1d963d7d64aea72b5e9234d621e0708c35f4009d788235b6d8c4bd45b91fa1957c1f641c0d
 AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b SHA512 558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18
-EBUILD shaderc-2017.2-r1.ebuild 2103 BLAKE2B c49adc567edf01fef06dc5104d0eb8a71d2b90f68dc707dd762120255f3e423da5a8dca55ce4efeeba29235081bd6dca76d323bdc274b9d801ca1a2ef51f3535 SHA512 c61eac14ff14c1a3edcbe4edd0da5ca3c4b349ac7cc74212c2c16e8534ec58101a77c3c31609b5ad6e92bd051fbd794ae27ed8ae7604d6a58e159c7d1092555c
-EBUILD shaderc-2018.0.ebuild 1984 BLAKE2B 00cd26db078ce879fae3903e851d6d37b9511ed4c849fcedf60a3747f3574e1d343ee31634906bdba8c1c19aeb155e4fb3d916e3c36fe2c8d8af13a683d3d109 SHA512 0d80b7648f59a56b63eed9579cc3ce400522bccde8d149e3497584fa259db0852502acc4bdfa2c828fab9a96975508a8940bfb62f5db41daaec3050c5bcef489
-EBUILD shaderc-9999.ebuild 1977 BLAKE2B 02bea7c2871d68dbe22ac47e22d062787ab7ef084fe740eeb71b1b7fa35be38b54fa1dc9f571c033be0fc6a0b108078ef1290fcf3654f5f9275de780adcb67d6 SHA512 c8d1fda68fc6162d3fcea9b4e9f8df21852ecf5c2546e990aeff03b730b9bce02c9e39ec40c3e0dd97e0f62031ae80f00fc5f7220844e983fd2b0daf7404fe0b
+EBUILD shaderc-2018.0.ebuild 1982 BLAKE2B 65f9c467b19222fc0d74454ae5564fe9f807cf4ec03f204b1dea7cef0c3898146b690771787953be671b9adcd4d77624a56ab209cd91055edf89b54914af202f SHA512 89ec6b3a50cff8021cf51eea7c11ac6c106f6e6a9bf0fae44ef881749ece590660947a86bd358089c87ea3c623f4f5268602241f16ccd9885fef10e3caf7af20
 MISC metadata.xml 246 BLAKE2B 1b5ed67f52168f632fd290d848b5cff1b99d79ce844a73d99fec57c671b0788d9e7c83b9e657a8a7172f89cbf0728bb7f3d8016db2e3575f686e60dabafef941 SHA512 ed75da45f240a95d52b0b1d6164e68c174c8083997636a3ddae0ee8c7b1921b18d09a8da0e7fe289b829e076f4d914828e830428aebe82d3274ee83aa44e98dc
diff --git a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
deleted file mode 100644
index 2cd24a165e5c..000000000000
--- a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Original upstream PR: https://github.com/google/shaderc/pull/463
-
-From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Tue, 29 May 2018 07:34:00 +0200
-Subject: [PATCH] Fix the link order of libglslang and libHLSL
-
-libglslang depends on libHLSL, so the latter needs to be specified last.
-This fixes an issue when trying to build shaderc against system-wide
-versions of libglslang/libHLSL, rather than the in-tree versions from
-third_party.
-
-Additionally, libshaderc_util also depends on SPIRV-Tools
----
- glslc/CMakeLists.txt           | 2 +-
- libshaderc_util/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
-
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..6d0c465 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
-
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
--  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  glslang OSDependent OGLCompiler glslang HLSL SPIRV
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
-
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
diff --git a/media-libs/shaderc/shaderc-2017.2-r1.ebuild b/media-libs/shaderc/shaderc-2017.2-r1.ebuild
deleted file mode 100644
index 133e87ec05e2..000000000000
--- a/media-libs/shaderc/shaderc-2017.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="7a23a01742b88329fb2260eda007172135ba25d4"
-MY_P="${PN}-${EGIT_COMMIT}"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/shaderc/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	<dev-util/glslang-7.10[${MULTILIB_USEDEP}]
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/spirv-headers
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
index b766cee080e9..1f712cb201dd 100644
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ b/media-libs/shaderc/shaderc-2018.0.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/shaderc/shaderc-9999.ebuild b/media-libs/shaderc/shaderc-9999.ebuild
deleted file mode 100644
index aad02e3ab3f7..000000000000
--- a/media-libs/shaderc/shaderc-9999.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-multilib python-any-r1 git-r3
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_REPO_URI="https://github.com/google/shaderc.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc test"
-
-RDEPEND="
-	~dev-util/glslang-9999[${MULTILIB_USEDEP}]
-	~dev-util/spirv-tools-9999[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	~dev-util/spirv-headers-9999
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${PN}-2017.2-fix-glslang-link-order.patch" )
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}