gentoo auto-resync : 18:01:2024 - 02:07:06

3 files changed, 6 insertions, 86 deletions

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 4109ce675d99..5288f63d3037 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,7 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2023.6.tar.gz 226361 BLAKE2B 023ce15caaff6ff9474f361c6c5442fd8c58bbb079774fd3c8525824e70e63c1b8fff37490601b599f4ed44f4bfaec3ca746b7a734782fc2af8d78c4f1f1de53 SHA512 6580384ac27c4f2225529873ba46ca61240bdf63f4f5b89875e9bd20a774fed49328094379b7f469c3b97b6a3744cb649998c0d6d5a391023317a64a91754bb1
 DIST shaderc-2023.7.tar.gz 227360 BLAKE2B de5ee8cc35bc76ba1301e80217587cbf55885999297755d78a72fe0940431351d4070cdd0793fe8f43208d40c9ec343bbe888da2b8ded471bd241be067b1addf SHA512 f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269
-EBUILD shaderc-2023.6-r1.ebuild 1906 BLAKE2B eec778484c3a322ad2b852c8d3da8d550af95a2a1d047f48c93b62e1309a801e6ecbe7182488ef2017a9a757bb89c2140814b1734188a787793c660f6c8199f5 SHA512 015c8c6abb9380e10e67d98d47b863c982fa1fdd83b18269c174e124119010696fb68eff887f23e950828285c14c3d2dc0ff2a785f0c87af7daf59da45603487
-EBUILD shaderc-2023.6.ebuild 1906 BLAKE2B 744fc1948e5949d636559bbe24db795f7228846f37504bb6c6ecbc104fb9d737f4a96273af5a35daebbad241f01c1b10817421cd07d3a6f7b3d8b34b9bbd13da SHA512 5fc386bd7e9bfd6d0137a28d8220b811a5dc4e0a4632d95cbeaddf1d3c29a437d052d0a07d3543455de03dca2aa188fc87d17190fb4ec1e28b65e0af6b98ed9e
+DIST shaderc-2023.8.tar.gz 227238 BLAKE2B 334bda3bdff510ac97f97fa710e18ca9a2c807d1e71973aaf4493112dca3adb69c7a83c0590c65db3e6dffab82f500058162d3190e5822a01ea2d611db771857 SHA512 2a5e59a2bb6c4b5462758d824747fee0edaf177dc64f30fe698fd2d2cc21cddab1a19ec2b2d63bd3d2e209330a13519f399395398379370b15daa39e6ee6b2bf
 EBUILD shaderc-2023.7.ebuild 1903 BLAKE2B 12ba1a434f6c45324932026950d541d16cf04b4a107a476ff2c231cb73c1beba8f8b45f9b4b9e4cd9a47d33bffbaf3443437b49b9197fa2ee0ee65b0771ff470 SHA512 ca3f4068a5e861348759537702a9173592b63346c43c928348a086b86c3a2ef1aa56244b96411d05ecbc538c400ebfb18553103f89026ce5ac12e029b1a9397d
+EBUILD shaderc-2023.8.ebuild 1906 BLAKE2B 7120f326e771d9d1c5806b75a2d267c00596df831f5773e8572583021503fad78c3a4c60c5597d7b00602fc3705a2daf841a07e50bb9af76fd12346f28425b56 SHA512 2f30c5474f79d7c4d269bcf6956e0784992a1dc8964a9ae8bda0e21798f582d0b106146c5f39674aaa30331ca60f3ce214afed52a94c2e235ecfa885aeca9d34
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2023.6.ebuild b/media-libs/shaderc/shaderc-2023.6.ebuild
deleted file mode 100644
index 310c15659d8d..000000000000
--- a/media-libs/shaderc/shaderc-2023.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib multibuild python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_COMMIT="${PV}"
-SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-util/glslang-1.3.261:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.261[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.3.261"
-
-BDEPEND="doc? ( dev-ruby/asciidoctor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
-)
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-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="true"
-		-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-2023.6-r1.ebuild b/media-libs/shaderc/shaderc-2023.8.ebuild
index 74887a3cb668..7f50365de0f8 100644
--- a/media-libs/shaderc/shaderc-2023.6-r1.ebuild
+++ b/media-libs/shaderc/shaderc-2023.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,12 +18,12 @@ KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc"
 
 RDEPEND="
-	~dev-util/glslang-1.3.261:=[${MULTILIB_USEDEP}]
-	~dev-util/spirv-tools-1.3.261[${MULTILIB_USEDEP}]
+	~dev-util/glslang-1.3.275:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-tools-1.3.275[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	~dev-util/spirv-headers-1.3.261"
+	~dev-util/spirv-headers-1.3.275"
 
 BDEPEND="doc? ( dev-ruby/asciidoctor )"