commit: a46a92220c0f5a24a25819bc3ce1d02c994ed668 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Jun 17 05:34:42 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Jun 17 05:45:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46a9222
dev-util/spirv-tools: Drop old versions Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> dev-util/spirv-tools/Manifest | 3 -- ...E_INSTALL_LIBDIR-in-installed-CMake-files.patch | 23 ----------- .../spirv-tools-2019.10_pre20191027-r1.ebuild | 45 ---------------------- dev-util/spirv-tools/spirv-tools-2020.1.ebuild | 41 -------------------- .../spirv-tools-2020.4_pre20200429.ebuild | 42 -------------------- 5 files changed, 154 deletions(-) diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index d8268e41ec1..88c170f4812 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,4 +1 @@ -DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4 -DIST spirv-tools-2020.1.tar.gz 2053947 BLAKE2B d9e641407e871cda5680e9ddac6af5213848b03ef9d13b9fe1acffcea12e9e40b43a834f9e0ae269f43dfffdc19bfaeca502b69ff69d59b95f6810f89b6bd276 SHA512 edd434e06cba44c402900684b8fea16c394f80951ff993b3962617a21630d2d8ff9be9a5203bc8eb9b402e9cafe8c68f13099cbc1eaf66a546df08cb43668c46 DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f -DIST spirv-tools-2020.4_pre20200429.tar.gz 2158602 BLAKE2B 1368fd1d446db447ecc20b7aa06e4a64f2a0278825e1384d789cf0ad0a0d7be4064b49e60d1a79c676056c0c22be5dd855f880a1288a11ad31fe96172e9cc0a6 SHA512 e6412306d7923a8e922edf48b1300f0b0ed35d126e3f56ceaa0c787ff2ff5625d20cf1fab14e022b2503dac0b469eb4ecff01f74f6e18884630f161d03d84728 diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch deleted file mode 100644 index c7dda4594c2..00000000000 --- a/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4c9f81249f0808af316f39c8f0e8b67e46ec0967 Mon Sep 17 00:00:00 2001 -From: Arfrever Frehtes Taifersar Arahesis <[email protected]> -Date: Mon, 18 Nov 2019 11:07:48 -0800 -Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files - -Fixes #3017 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 19108f3a0..aecaf8d68 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -215,7 +215,7 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) - endmacro() - else() - macro(spvtools_config_package_dir TARGET PATH) -- set(${PATH} lib/cmake/${TARGET}) -+ set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET}) - endmacro() - endif() - diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild deleted file mode 100644 index edab7a1b8b9..00000000000 --- a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake-multilib cmake-utils python-any-r1 - -DESCRIPTION="Provides an API and commands for processing SPIR-V modules" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"; -EGIT_COMMIT="ec12de9131244a076c34ddca2e8d7451288be7e1" -SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" - -COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1" -DEPEND="${COMMON_DEPEND}" -RDEPEND="" -BDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch" ) - -S="${WORKDIR}/SPIRV-Tools-${EGIT_COMMIT}" - -multilib_src_configure() { - local mycmakeargs=( - "-DSPIRV-Headers_SOURCE_DIR=/usr/" - "-DSPIRV_WERROR=OFF" - ) - - cmake-utils_src_configure -} - -multilib_src_install() { - cmake-utils_src_install - echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die - insinto /usr/include/"${PN}" - doins "${PN}-commit.h" -} diff --git a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild b/dev-util/spirv-tools/spirv-tools-2020.1.ebuild deleted file mode 100644 index 3c8fb137c2e..00000000000 --- a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=SPIRV-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"; - inherit git-r3 -else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}"/${MY_PN}-${PV} -fi - -DESCRIPTION="Provides an API and commands for processing SPIR-V modules" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"; - -LICENSE="Apache-2.0" -SLOT="0" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" -COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1" -DEPEND="${COMMON_DEPEND}" -RDEPEND="" -BDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND}" - -multilib_src_configure() { - local mycmakeargs=( - "-DSPIRV-Headers_SOURCE_DIR=/usr/" - "-DSPIRV_WERROR=OFF" - ) - - cmake_src_configure -} diff --git a/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild b/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild deleted file mode 100644 index d4687f7e8e3..00000000000 --- a/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=SPIRV-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"; - inherit git-r3 -else - SNAPSHOT_COMMIT="49ca250b44c633ba7cb8897002e62781a451421c" - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~ppc64 x86" - S="${WORKDIR}"/${MY_PN}-${SNAPSHOT_COMMIT} -fi - -DESCRIPTION="Provides an API and commands for processing SPIR-V modules" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"; - -LICENSE="Apache-2.0" -SLOT="0" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" -COMMON_DEPEND=">=dev-util/spirv-headers-1.5.3" -DEPEND="${COMMON_DEPEND}" -RDEPEND="" -BDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND}" - -multilib_src_configure() { - local mycmakeargs=( - "-DSPIRV-Headers_SOURCE_DIR=/usr/" - "-DSPIRV_WERROR=OFF" - ) - - cmake_src_configure -}
