gentoo resync : 12.05.2022

3 files changed, 2 insertions, 83 deletions

diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 8427f75ddf70..42909790017c 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,9 +1,7 @@
 AUX ispc-9999-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
-DIST ispc-1.16.0.tar.gz 19548153 BLAKE2B 9b6d9329430d59041a76c20332b527560afa47a5585652abdf93aedb7907483d1647c829f2bd3f396cd53301bc79367cd91606b90a543fa8bec2f6ab34452989 SHA512 8469db4e3e9834477345b431162543f1c8e680aa9834c9a50239781dc7febfdde0561c2f13d1387e37f95a18c4376a85cb9cbae33cb614dc8977dfc9f47da215
 DIST ispc-1.16.1.tar.gz 19549428 BLAKE2B 742d94208d39f0560c3f2199ee06fc12f3ec2cf47c1039212219c6aa106b20cd58219e5d439c4fd1ce4a0c1a423655d0c2113a2a78152c99b4d77452171acce6 SHA512 89b844a15a888ae7074c4baa47f46d1d7176501f215c9a8c3b4bf9ad1960dc77d53f1f448d5253ad0c6a91e5088af243c3dfd148e619f9abeb6a16f715e3b463
 DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac
-EBUILD ispc-1.16.0.ebuild 1640 BLAKE2B 9ce0305eed03e7746df300fccfa0b34b64dbc332c6994ec001d0e37d8cf62440762b5063e5191f119d5f431b6012770c3bd646c7cb29f20be33b4bb2209d8bda SHA512 c493d3bd8577b7cd880b56e291c03252a7a2d0fffff7dec604b902d4ffbd71a515e35117247d71d5e789c1a5134d6e877bd85b5f923d2b99e0f3027301a5b721
 EBUILD ispc-1.16.1.ebuild 1647 BLAKE2B 221b35d7480c8ffe6b378e447487561f63ca1a4aa63b9645d59a074ad5115c0087bc21acbe95c2515e1ca507489e0dd2bc4f2506b1f8a706eeb4f5abe0299fe1 SHA512 19c017654763ca9e83cd1e682ddc3da760b125e54dbdc1f1982c94b1b404bfc252544d05780f8cc3b464c17aee975df18732184e03d2c0dd5eb8cde17978c3d6
-EBUILD ispc-1.17.0-r1.ebuild 1648 BLAKE2B b9fc3ffb90c50e256cff68337f10f418576f8f7a8bd36fbaec9df851ed3d75fbfbe056123e12731b4243b7192829b48bd652d204b9b89c7b36f3653e5bb9b20e SHA512 8c540d81199ba049ce63d95d1e4d426d3841f5e96c8d75e004053f92c1b13810b037545969d0118e113972ae34de160515e2f43143d2f8f3261c62b8fe7239b3
+EBUILD ispc-1.17.0-r1.ebuild 1647 BLAKE2B 20f949f1226ce986b2cd253a0b49b12c6b9032e0b50d9674041143a2933984a4944aef956581a8928516ee0e49842c78862a402c0a4e0389cc38c9d4dd042be4 SHA512 ee09edc95685447646e36d15c2fbb28fbee0d44a7f3e870dfb89360782a6d034240b06d02853912b0b9ef98cc690a4fd30d590cbf1605fcb1b9e77a4a4961f84
 EBUILD ispc-9999.ebuild 1648 BLAKE2B fe5e36cf7555a0dfcaccc9a64434cf8691bbdd5bfdd0db25bc9ae954ac78ccdf292e233a150bbe91febeed6f7dc9efb5546b67d544742adf3b64487c6872cc51 SHA512 c5dd01950694517b53b392da60492ec82e762c6f3e6abe1e3844bf3d8b97064759fb56095299a99ec12b0b6e4a080a34ab0dffe2b21ad909906da2e83363fd1f
 MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115
diff --git a/dev-lang/ispc/ispc-1.16.0.ebuild b/dev-lang/ispc/ispc-1.16.0.ebuild
deleted file mode 100644
index 7ea24fc9ecc2..000000000000
--- a/dev-lang/ispc/ispc-1.16.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake llvm python-any-r1
-
-LLVM_MAX_SLOT=12
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.io/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="<sys-devel/clang-13:="
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9999-llvm.patch"
-)
-
-CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	if use amd64; then
-		# On amd64 systems, build system enables x86/i686 build too.
-		# This ebuild doesn't even have multilib support, nor need it.
-		# https://bugs.gentoo.org/730062
-		ewarn "Removing auto-x86 build on amd64"
-		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARM_ENABLED=$(usex arm)
-		-DCMAKE_SKIP_RPATH=ON
-		-DISPC_NO_DUMPS=ON
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# Inject path to prevent using system ispc
-	PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}"
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/bin/ispc
-	einstalldocs
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-lang/ispc/ispc-1.17.0-r1.ebuild b/dev-lang/ispc/ispc-1.17.0-r1.ebuild
index 1856351fc963..1aa1bd3661c7 100644
--- a/dev-lang/ispc/ispc-1.17.0-r1.ebuild
+++ b/dev-lang/ispc/ispc-1.17.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="BSD BSD-2 UoI-NCSA"