gentoo resync : 31.05.2021

2 files changed, 94 insertions, 0 deletions

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 4a15ec6ee49b..4753b0fe4c83 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,6 +1,8 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3
 DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6b25baba82068ecea6a5272a4c1e3432bb9f1c0062c1bcf9a57bac1e92dcd382dfb0837a03bbe434d19e83b755dc5da16e2f1dd SHA512 07f4a49faed28f23fb2f7b33c804c9909617e362f8046d6cafaaf3c74d6453ac53ea3f848dde8d2164a8827375e492c4fc544d7b9276c3e7ca80cae4baf1b47c
+DIST shaderc-2021.0.tar.gz 220308 BLAKE2B 7178b99ce726f73e4eee2eb1b81b9575cf5a97a1d29bf0ed6a64ffde1095f91e14ae2c7f62d21f33bf2f7551e94b6d3e3c8fd149446899276a67d7df33a8e679 SHA512 cec230949f98589eef2532b02048e3d1b4a2c07ceff1043bfe5b30cdbd3511cdfcbb625cc115d9cfa52252b20a486e146db7e2e1944d89f9371811d64f9f675c
 EBUILD shaderc-2020.5_pre20201216.ebuild 2155 BLAKE2B b9a0a6025f0c9e3a2b0ef62507691774030e3c231d8bad678aeed53597bd20de3ee4410f858c44ec5503b6b37d5fe542a3ffc57e3665beea30cc909a48d9f01b SHA512 61eaaff97c665286998865ebb1b85287b37b07ef04b0c813d58d2cc0c7519d6ae09f47ed08cf7fd8173c95fba777e17a9bc8a1c334f71f5a32d1f3b05c52765b
 EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B a1ce8d176c93ac883ce5e1992786a40db675c550bfd9356fa4c2c4c7b58f7e0f8fff7ae9890a58b49e9288f67913f3b43669d3a2936f64b29a2c6ce4e62cbce0 SHA512 197e4e7e5f67e8e0d56359d87f4a695d77720a3ca48710420441488a497670cb0091d259cd0420639e46c4e236da837c955826c7fd86d8f41d9ac741f723bcc9
+EBUILD shaderc-2021.0.ebuild 2155 BLAKE2B 0923a326dbb4ade19457254aebb3d245e48c0121675c93cd637e696e88313200bd4b863280fba80da6b3784b1ac06dc0107767399ed2fab162058247a5765418 SHA512 f2a5b2b1c698b42f1cc133dc5c1b3706a49aae36b757f6e8ae2297aece4719d4dc2e44caedaf5309692bcc0f75fc417b1e0c817e29fb657f1b8c5f3d5eac48e9
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2021.0.ebuild b/media-libs/shaderc/shaderc-2021.0.ebuild
new file mode 100644
index 000000000000..0cd81867acc0
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2021.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="bdd134d1b7eca01925c1919d2ea05fd3cd6843c7"
+SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-11.4.0[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2021.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.5.4.2_pre20210526
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+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_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="$(usex !test)"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}