gentoo resync : 20.06.2021

3 files changed, 100 insertions, 23 deletions

diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 70358f4f2270..86391a86c8c2 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -3,6 +3,8 @@ AUX ispc-1.13.0-werror.patch 737 BLAKE2B 13ac7eb6f9db4a7379d5acd1f0fa8f44ddca729
 AUX ispc-1.14.0-llvm-10.patch 4695 BLAKE2B 91488c154a2034487c61df07467414ab83f0a15073332dc8261d619a5dab9ad9c0a6708918bce6491d2a88ca83a5ec8b9edf3c90634b8b91233175e1f41f5163 SHA512 0ee052711aacb01dafd182b3bf95f6d88e2124a7d5beb38bb2173acdcb23eb3f04fc0514c0edf6e286091bc2f855ccc192e38c2f1c4e38fb631bb5fd6a9b223f
 AUX ispc-9999-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
 DIST ispc-1.14.1.tar.gz 19454189 BLAKE2B 615698e64ffbd2c82808d6ddd0b5b90f7c52bb8c202a04364d63af26f0e062631f4a8ad01895c1a4f1a8f11e7f91aec381354ddd873d0a4f2908431dcaabe383 SHA512 468e8a44408047ba7b43dc4baf05c2659093b986e131ebe973954ff3b9cf707a4ed22c705b6e01a9abc9a3911669ab31cd191449442c4ac73112a1297da32c5e
+DIST ispc-1.16.0.tar.gz 19548153 BLAKE2B 9b6d9329430d59041a76c20332b527560afa47a5585652abdf93aedb7907483d1647c829f2bd3f396cd53301bc79367cd91606b90a543fa8bec2f6ab34452989 SHA512 8469db4e3e9834477345b431162543f1c8e680aa9834c9a50239781dc7febfdde0561c2f13d1387e37f95a18c4376a85cb9cbae33cb614dc8977dfc9f47da215
 EBUILD ispc-1.14.1.ebuild 1753 BLAKE2B 98161585a17a4ce4e13c9eb29b668077a4f23df5505b8d55f509b7df0f73bbde3fc11a897f57574d1b0a80b335604e431897d5a76fd8f064351ad548bdfe8905 SHA512 1184f4ae6e085842ae198a9c4ef6a5965412565622bc9f3cf41ea32dbcee1f6fadde26bacf9fd545ece43deea0086eceb669eb6cb008af0e5b2196cf908f7fbd
-EBUILD ispc-9999.ebuild 1746 BLAKE2B 94cc483c9760aebcfe4c917d84f1fd13106c69f5202137f8936074dd97a7413feaca7cab980fe0162da86dd71806cc6582fe00580019bf99c59332b5ce62650d SHA512 8233d10a97692e2b46779c8e549537f81725c8a35e3840a8e3a57cc49effb05c5a561b2b55d613a72192b684eab5d0c7d40f8288830fb24c10df7668ccbc36c2
+EBUILD ispc-1.16.0.ebuild 1622 BLAKE2B 927a3d1d9877f703f45f715862cb3102b3ec507b1d252831cacaaecdbcd114e1e8769b41e917618c6db0ea0d31d9f8515afd400c394a6b56f3933836dd994cf2 SHA512 5f2d8f7aadeec0a31ed92fcb6d399768ed0ec50a46c2d8eb726c6a30881492f50dde2f3f1c0e48ef3cd989accd6a708158e7bfbdaad1a33e67326e84ffd7827a
+EBUILD ispc-9999.ebuild 1622 BLAKE2B 927a3d1d9877f703f45f715862cb3102b3ec507b1d252831cacaaecdbcd114e1e8769b41e917618c6db0ea0d31d9f8515afd400c394a6b56f3933836dd994cf2 SHA512 5f2d8f7aadeec0a31ed92fcb6d399768ed0ec50a46c2d8eb726c6a30881492f50dde2f3f1c0e48ef3cd989accd6a708158e7bfbdaad1a33e67326e84ffd7827a
 MISC metadata.xml 241 BLAKE2B 26c98e9f68d20d2275e5a9aef2d4c1cf74bd65e331e2e4869297a0a4d2b4dccab2e7709ad9ff844b973a97da0ee6eaae4fe17c6446ca06ed63f46804c8af5a82 SHA512 b9bb777e446879d214fab1adfa4b9dca1d3bd11c4084dfa449fb16d1896da27b85e11b869ed76b7b492814a1899b5fb00dbbeded579a0ed00666d4b204ddee14
diff --git a/dev-lang/ispc/ispc-1.16.0.ebuild b/dev-lang/ispc/ispc-1.16.0.ebuild
new file mode 100644
index 000000000000..b0a22ba1f907
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.16.0.ebuild
@@ -0,0 +1,79 @@
+# 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 ~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-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index 8cc95c5d7497..b0a22ba1f907 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -3,21 +3,21 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit cmake toolchain-funcs python-any-r1 llvm
+inherit cmake llvm python-any-r1
 
 LLVM_MAX_SLOT=12
 
 DESCRIPTION="Intel SPMD Program Compiler"
 HOMEPAGE="https://ispc.github.io/"
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD BSD-2 UoI-NCSA"
@@ -27,15 +27,12 @@ IUSE="examples"
 RDEPEND="<sys-devel/clang-13:="
 DEPEND="
 	${RDEPEND}
-	${PYTHON_DEPS}
-	"
+	${PYTHON_DEPS}"
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex
-	"
+	sys-devel/flex"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch"
 	"${FILESDIR}/${PN}-9999-llvm.patch"
 )
 
@@ -50,7 +47,7 @@ src_prepare() {
 		# 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
-		elog "Removing auto-x86 build on amd64"
+		ewarn "Removing auto-x86 build on amd64"
 		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
 	fi
 
@@ -59,25 +56,24 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DARM_ENABLED=$(usex arm)"
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DISPC_NO_DUMPS=ON"
+		-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
-	dodoc README.md
+	einstalldocs
 
 	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		docompress -x "/usr/share/doc/${PF}/examples"
-		doins -r "${S}"/examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
 	fi
 }
-
-src_test() {
-	# Inject path to prevent using system ispc
-	PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}"
-}