gentoo resync : 16.09.2020

4 files changed, 53 insertions, 15 deletions

diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 487aaa525108..50ca379ce051 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,7 +1,7 @@
 AUX ispc-1.13.0-cmake-gentoo-release.patch 507 BLAKE2B e67be17f40dce55895ce307bd5383ad3f9dc8ec460c7195e23ce344f3a0324c53f9f69b695b6feb70d18da813d5d855d675a00e8dfd3e651aaaebf510de1138b SHA512 bdfd7d3f023ace4a0209201e05b7528e50cff644794bc48b5160d8051c2d70dad6690e509ca69102b08843ebb5fd7a76241954b22a0bb1f3c4714708df405d65
-AUX ispc-1.13.0-llvm-10.patch 4670 BLAKE2B 31fa72f49af116e253b45cd1a5750fcc32cb0b9986582b6501326194903d6c56fc8efcc0b86975eb153c725b5310c613012d670c2b6badf0b4da04204d4df38b SHA512 b8c83e8fd290b2c37e1ca5cec158e4aec4c0c5aa291069b0935851bbd8198a3784ee75a6bf38d1c57ee69f6712d10e292af809d1ac38199514cc45c2f1a82994
 AUX ispc-1.13.0-werror.patch 737 BLAKE2B 13ac7eb6f9db4a7379d5acd1f0fa8f44ddca7290329c1231c1b515b374438f5119d9e129c8b5326cfd084956a4ba005549bd30b67a9f64034e0ade8218b8f50c SHA512 254e0e21db59f2b8768d0953c9b0950bb7d860ea9eab7c4d450b3b006382959ab60eb650df9c1ddd4fda7628d5040f7b4779369cf67a99012d5fc2c4b9ef2f7b
-DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d
-EBUILD ispc-1.13.0.ebuild 1121 BLAKE2B 4b985cce80e289890738782c49bd13aa17d558e822e6eb7195c7c978eb897aa61ac7041585b858973332942025ed12c0f1d3c6321bc4ff66b8d29c8ba489db2c SHA512 8484cc0dd7ff53ece134283d8da415bf8a1f8693adbfb118df09c766b1d686aaeb2cad893bb509c8d7fdc69a4cf18bce2ec0bf0d0071b172e9d13f6e33dd071a
-EBUILD ispc-9999.ebuild 1145 BLAKE2B 207e69d834776b8e207e1d8ae4b89e8cfdb20cdd13b3b2744f4bd37e97d50abc7906dcaaff155af0a1b90956d0b65e68b9436d246ace995ca2d5a652ed3b5219 SHA512 282b7164ec52954a9ba6e09c8cd1d8cf355c095a6a0e187b7da3651d26da938eeccc6c99cd082e0b2fa5f39770d55edcc960cadf9705c7c5d669598bf1509287
+AUX ispc-1.14.0-llvm-10.patch 4695 BLAKE2B 91488c154a2034487c61df07467414ab83f0a15073332dc8261d619a5dab9ad9c0a6708918bce6491d2a88ca83a5ec8b9edf3c90634b8b91233175e1f41f5163 SHA512 0ee052711aacb01dafd182b3bf95f6d88e2124a7d5beb38bb2173acdcb23eb3f04fc0514c0edf6e286091bc2f855ccc192e38c2f1c4e38fb631bb5fd6a9b223f
+DIST ispc-1.14.1.tar.gz 19454189 BLAKE2B 615698e64ffbd2c82808d6ddd0b5b90f7c52bb8c202a04364d63af26f0e062631f4a8ad01895c1a4f1a8f11e7f91aec381354ddd873d0a4f2908431dcaabe383 SHA512 468e8a44408047ba7b43dc4baf05c2659093b986e131ebe973954ff3b9cf707a4ed22c705b6e01a9abc9a3911669ab31cd191449442c4ac73112a1297da32c5e
+EBUILD ispc-1.14.1.ebuild 1691 BLAKE2B e469218deb026d7a37bfa5372f8445afc7f4a9e28f74ec12f2c330aaf70e7abd18659ddeba43a75c0d3dd0f63b449ed6037438a6ef8ffeda90e433a50d7417c5 SHA512 efef7a6f82e949be60cadcafc11e1262c424867e496d501f30ffeac6058fde28b5737597a6f91d1e794d8fd29c0a52d654fa1a4281ddfea42e0b005c193209ca
+EBUILD ispc-9999.ebuild 1680 BLAKE2B d7f46e2d3d6e17460ca0c5d8351a1e1806376b8e3a8f0b00e0d5ccdaa438b92a252d2e3451408f8f411243ad9f63b4310ebdd2baf3f906620cad349efc5b9a04 SHA512 18c9a416596d2c4803889b64d9b8e5fd015fed2fbdc9501e6f505b44176fadd4e7afbec43e5a98dfe8f4701389c65dd4633426519b2105f7bfbca127bc6b28f1
 MISC metadata.xml 241 BLAKE2B 26c98e9f68d20d2275e5a9aef2d4c1cf74bd65e331e2e4869297a0a4d2b4dccab2e7709ad9ff844b973a97da0ee6eaae4fe17c6446ca06ed63f46804c8af5a82 SHA512 b9bb777e446879d214fab1adfa4b9dca1d3bd11c4084dfa449fb16d1896da27b85e11b869ed76b7b492814a1899b5fb00dbbeded579a0ed00666d4b204ddee14
diff --git a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch
index 6911a76d9e18..7a76d99aca81 100644
--- a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch
+++ b/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch
@@ -34,9 +34,9 @@ index 06fab989..57a7130f 100644
  #include <llvm/IR/Instructions.h>
  #include <llvm/IR/Module.h>
 +#include <llvm/Support/raw_ostream.h>
- #include <map>
- #include <set>
- #include <vector>
+
+ #ifdef ISPC_GENX_ENABLED
+ #include <llvm/GenXIntrinsics/GenXIntrinsics.h>
 @@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
          return;
  
diff --git a/dev-lang/ispc/ispc-1.13.0.ebuild b/dev-lang/ispc/ispc-1.14.1.ebuild
index 33144034d36a..58c0534cc5bf 100644
--- a/dev-lang/ispc/ispc-1.13.0.ebuild
+++ b/dev-lang/ispc/ispc-1.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake toolchain-funcs python-any-r1
 
@@ -13,7 +13,6 @@ HOMEPAGE="https://ispc.github.com/"
 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"
@@ -30,19 +29,34 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	${PYTHON_DEPS}
+	"
+BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
 	"
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake-gentoo-release.patch"
-	"${FILESDIR}/${P}-llvm-10.patch"
-	"${FILESDIR}/${P}-werror.patch"
+	"${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch"
+	"${FILESDIR}/${PN}-1.14.0-llvm-10.patch"
+	"${FILESDIR}/${PN}-1.13.0-werror.patch"
 )
 
+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
+		elog "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"
 	)
 	cmake_src_configure
 }
@@ -57,3 +71,8 @@ src_install() {
 		doins -r "${BUILD_DIR}"/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}"
+}
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index c8398b962c6a..07b62cdb24d2 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake toolchain-funcs python-any-r1
 
@@ -16,7 +16,6 @@ if [[ ${PV} = *9999 ]]; then
 	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"
@@ -30,19 +29,34 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	${PYTHON_DEPS}
+	"
+BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
 	"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch"
-	"${FILESDIR}/${PN}-1.13.0-llvm-10.patch"
+	"${FILESDIR}/${PN}-1.14.0-llvm-10.patch"
 	"${FILESDIR}/${PN}-1.13.0-werror.patch"
 )
 
+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
+		elog "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"
 	)
 	cmake_src_configure
 }
@@ -57,3 +71,8 @@ src_install() {
 		doins -r "${BUILD_DIR}"/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}"
+}