From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 640071382C5 for ; Mon, 15 Jun 2020 21:05:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FC4BE0E7D; Mon, 15 Jun 2020 21:05:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 544EFE0E7B for ; Mon, 15 Jun 2020 21:05:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DDC5134F2EF for ; Mon, 15 Jun 2020 21:05:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AD752A1 for ; Mon, 15 Jun 2020 21:05:18 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1592255090.3ca7d134fb41e0c0eb61553479b4a3bbafee407e.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/shaderc/Manifest media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild X-VCS-Directories: media-libs/shaderc/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3ca7d134fb41e0c0eb61553479b4a3bbafee407e X-VCS-Branch: master Date: Mon, 15 Jun 2020 21:05:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8483c6dc-e3ca-46db-aac9-3a02da2d4b22 X-Archives-Hash: a84cb12b3730c20250bb4ddbe3ca9868 commit: 3ca7d134fb41e0c0eb61553479b4a3bbafee407e Author: Matt Turner gentoo org> AuthorDate: Mon Jun 15 21:03:55 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jun 15 21:04:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca7d134 media-libs/shaderc: Drop 2020.4_pre20200405 version This was actually a snapshot of 2020.1 which is now in tree. Signed-off-by: Matt Turner gentoo.org> media-libs/shaderc/Manifest | 1 - .../shaderc/shaderc-2020.4_pre20200405.ebuild | 86 ---------------------- 2 files changed, 87 deletions(-) diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index a5a202aab66..c834547309a 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,4 +1,3 @@ DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e -DIST shaderc-2020.4_pre20200405.tar.gz 273897 BLAKE2B 6cd02d0db17d0c92b3f2b65bd46284b8432538e3899e088c2e08648a6797ed596af13e251afdf0c1747abc27fa49b56df32ce67beb72c6e99a6bda463cf9dea1 SHA512 556d519faf6e3df6efbe77a24b21e74198468b0638dd7c3143228afce5625f04707fa77aaec997998795166705271e2e8d086cd2e82609eaaef786ea36554ac4 diff --git a/media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild deleted file mode 100644 index 3de771d443a..00000000000 --- a/media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Collection of tools, libraries and tests for shader compilation" -HOMEPAGE="https://github.com/google/shaderc" - -SNAPSHOT_COMMIT="f175adffa9d2da6ae18a5f8d54e7b5f27df0f1c2" -SRC_URI="https://github.com/google/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="doc test" - -RDEPEND=" - >=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=dev-util/spirv-headers-1.5.1 - 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 - -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|\$|${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 -}