gentoo xmass resync : 25.12.2021

3 files changed, 3 insertions, 97 deletions

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index bd2a235badb4..1be80def3a76 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,6 +1,4 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2021.2.tar.gz 221444 BLAKE2B 77ba2a6cd5a08d19ef1e3e81b186a4ce5478aeccdafa940192347026dc550666eaf0acbf9c0e3ab5c62eaacf3c56c7bfc888480a13490403d30b0edaa173f19a SHA512 44779d3ec8c3451c51ad1a51a5644565dd7feacb0695fe3adc5c46fd2b5b5ca1220ed92f2178e0c56352a73db7c89653eac829b5cdc6ae8394902e1805b73ed3
 DIST shaderc-2021.3.tar.gz 221509 BLAKE2B 5061073e4489bdf2245a7cd18968a5a874cd33c16b8944b5c781b78e648f20bc8cf49b52e61ee3fe5b2aa029fa8195687079865403bb662839917b142421c49c SHA512 759eca72564bea59c06d31f70a85571a391360d5d428db85a30f934d080bb25e254ecb5650f71a96742cf417f09d819f36d301e92294a5d0d294581ca554248a
-EBUILD shaderc-2021.2.ebuild 2143 BLAKE2B a261b5b0633e101afdd6e19aed5249b487a4fe96f07219315123fe648fcc938bb577e4ed8110a92e19ac04ad643f411b689aa041720b4564569954fa0b86d495 SHA512 d4505504b470dea73ef871d9691fe268987e52420371b37a0ca57d04bd07ddfad218814113b5a0b0a47ced0bc54c84c9cd8faf14bf61644646561db3222ab935
-EBUILD shaderc-2021.3.ebuild 2108 BLAKE2B b9bf03bf7618b61b75417734ec10ebb5bb0204416ae2a3f32918a07752d45fe1edbd4a2e6b0660ac2cbdf3280ff0c5bac697c5973fd59bde006fe1025a197068 SHA512 d28e8f07ebfcd27e0414b419286b07b751351600e2f3315a48d4cc72c9ef2aeae5e82c64d60400a1d27860f84bb9b0a208f44d750ab8536a1a2c555842145546
+EBUILD shaderc-2021.3.ebuild 2101 BLAKE2B 42f3908ff4b993f0d42ebee384c8dcc5ca37b1519fcb4e46be80aeea3ff4bc3d6ae6b7c03900c50a78fd7b25d5b24bf3a8b7dedeb1ab6bd6764feb1aab56e95f SHA512 a64488699535d988181ff860af17010990d4db9abf467f00d3c579b9a64c7b8dd60eb256908f63fe9c5bfcbaf3701330729cd854b125b3160c5ab2a1c20a1fa0
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2021.2.ebuild b/media-libs/shaderc/shaderc-2021.2.ebuild
deleted file mode 100644
index 94f52642f34b..000000000000
--- a/media-libs/shaderc/shaderc-2021.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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="d0d8d7e7ea5074cb107499a73a22ce14bec3fb10"
-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.6.0[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-20210825[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-20210817
-	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
-}
diff --git a/media-libs/shaderc/shaderc-2021.3.ebuild b/media-libs/shaderc/shaderc-2021.3.ebuild
index 5fde20a88adf..542b6fc9b649 100644
--- a/media-libs/shaderc/shaderc-2021.3.ebuild
+++ b/media-libs/shaderc/shaderc-2021.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 CMAKE_ECLASS=cmake
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="