gentoo resync : 29.12.2022

5 files changed, 103 insertions, 4 deletions

diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 42909790017c..37eb3c35c903 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,7 +1,10 @@
+AUX ispc-1.18.0-curses-cmake.patch 597 BLAKE2B 083a949e99a00819b1eed3ecb4276c7018f914a4902ea4c41dbd2a10c934d908ef2bc29a45e869ce290d5e787a7642de1ed630bc697b02e07267bb4e848fa1fc SHA512 6ba529e8dd4ce1483149e51a9a8ed28b476f604fcec263f806be7f9ec1b55decf8603126ea70600dce3d6947a328d907d046d25cc401847f6701cc9741d6cd14
 AUX ispc-9999-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
 DIST ispc-1.16.1.tar.gz 19549428 BLAKE2B 742d94208d39f0560c3f2199ee06fc12f3ec2cf47c1039212219c6aa106b20cd58219e5d439c4fd1ce4a0c1a423655d0c2113a2a78152c99b4d77452171acce6 SHA512 89b844a15a888ae7074c4baa47f46d1d7176501f215c9a8c3b4bf9ad1960dc77d53f1f448d5253ad0c6a91e5088af243c3dfd148e619f9abeb6a16f715e3b463
 DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac
+DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
 EBUILD ispc-1.16.1.ebuild 1647 BLAKE2B 221b35d7480c8ffe6b378e447487561f63ca1a4aa63b9645d59a074ad5115c0087bc21acbe95c2515e1ca507489e0dd2bc4f2506b1f8a706eeb4f5abe0299fe1 SHA512 19c017654763ca9e83cd1e682ddc3da760b125e54dbdc1f1982c94b1b404bfc252544d05780f8cc3b464c17aee975df18732184e03d2c0dd5eb8cde17978c3d6
-EBUILD ispc-1.17.0-r1.ebuild 1647 BLAKE2B 20f949f1226ce986b2cd253a0b49b12c6b9032e0b50d9674041143a2933984a4944aef956581a8928516ee0e49842c78862a402c0a4e0389cc38c9d4dd042be4 SHA512 ee09edc95685447646e36d15c2fbb28fbee0d44a7f3e870dfb89360782a6d034240b06d02853912b0b9ef98cc690a4fd30d590cbf1605fcb1b9e77a4a4961f84
-EBUILD ispc-9999.ebuild 1648 BLAKE2B fe5e36cf7555a0dfcaccc9a64434cf8691bbdd5bfdd0db25bc9ae954ac78ccdf292e233a150bbe91febeed6f7dc9efb5546b67d544742adf3b64487c6872cc51 SHA512 c5dd01950694517b53b392da60492ec82e762c6f3e6abe1e3844bf3d8b97064759fb56095299a99ec12b0b6e4a080a34ab0dffe2b21ad909906da2e83363fd1f
+EBUILD ispc-1.17.0-r2.ebuild 1647 BLAKE2B 3bbd313fa23a85cea4485fbabf738b1b01b9d122f244d6fc803e85b37ea640deb79db2fe8b7e8770d758d7ac133d45fee2849dc8d81ac7983fd5ec055837e635 SHA512 b5ea8de5c77453f06a582c0a6732c19558d923265d71670f1be2fd2a5af6bc6fb2cad78ef1541a38b295a143a9ebdb08f931c75f66bf77477954719dc66cd44a
+EBUILD ispc-1.18.0.ebuild 1757 BLAKE2B 323ddc0204c7ec7400264beff9338779531375704be59345b9c7a05d4b06016e10aaca110e29aa86df8df320b1ae3235ae7318b6da0304e9c0810cfd36f7d5c6 SHA512 15ee87c9229562c65598762dae831678b7d0a8908ee898e594b256632c44026e11eeff64f844d09f13a5751c97d633b8d38835a75511346ce797f0867fdf0ddb
+EBUILD ispc-9999.ebuild 1648 BLAKE2B 7f0b26c1b4ccfeccfa890d7e966c1c39796706852b3d50289d45725dc64c2172487d155574b5d648d9ccdefdf2fea992cd4d921a292127c9897b25a02cc47541 SHA512 c5acd4eb5f00aed9871534209c17bee053692efc47aa3566cfcd637f546601bc84b02b1d666f9900e18f4fea645d287306d78b86d72c50610bd63e1a8133faef
 MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115
diff --git a/dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch b/dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch
new file mode 100644
index 000000000000..127b7095a778
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -530,11 +530,8 @@ else()
+     else()
+         find_package(Curses REQUIRED)
+         find_package(ZLIB REQUIRED)
+-        if (CURSES_EXTRA_LIBRARY)
+-            # this contains the tinfo library, if found
+-            target_link_libraries(${PROJECT_NAME} ${CURSES_EXTRA_LIBRARY})
+-        endif()
+-        target_link_libraries(${PROJECT_NAME} pthread ${ZLIB_LIBRARIES} ${CURSES_CURSES_LIBRARY})
++        set(CURSES_NEED_NCURSES ON)
++        target_link_libraries(${PROJECT_NAME} pthread ${ZLIB_LIBRARIES} ${CURSES_LIBRARIES})
+     endif()
+ endif()
+ 
diff --git a/dev-lang/ispc/ispc-1.17.0-r1.ebuild b/dev-lang/ispc/ispc-1.17.0-r2.ebuild
index 1aa1bd3661c7..b195585f3de7 100644
--- a/dev-lang/ispc/ispc-1.17.0-r1.ebuild
+++ b/dev-lang/ispc/ispc-1.17.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=14
 inherit cmake python-any-r1 llvm
 
 DESCRIPTION="Intel SPMD Program Compiler"
diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild
new file mode 100644
index 000000000000..47d74e37d160
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.18.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+LLVM_MAX_SLOT=14
+inherit cmake python-any-r1 llvm
+
+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 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-llvm.patch"
+	"${FILESDIR}"/ispc-1.18.0-curses-cmake.patch
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+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
+		-DISPC_INCLUDE_EXAMPLES=OFF
+		-DISPC_INCLUDE_TESTS=$(usex test)
+	)
+	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-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index d71abadb585a..8da425ce2b9c 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=15
 inherit cmake python-any-r1 llvm
 
 DESCRIPTION="Intel SPMD Program Compiler"