6 files changed, 89 insertions, 55 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7a6c811a3a13..ccab86e9ef7a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 61af2e0eca1e..97285851ad03 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -6,5 +6,7 @@ AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.11485.tar.gz 8831925 BLAKE2B 7e2bcb37b4c34bb01788a8d75fc42498223b6193421cb726c21ce7949181757a10d112ae151736cd9283ba6ed8f0625597fb1f2a61229a7352e7f1f5ec34d1d0 SHA512 03fb571fdd61daea3a5c61ff75a146bd98b9b92dfd8bc1957143fe127977f5111df680ac86769d3c1fa1801ba2012b600b1ff844b318ce64460f2d042c4ae65b
+DIST intel-graphics-compiler-1.0.11702.1.tar.gz 8734601 BLAKE2B 7cc8a4f9fc820d822c3b435d172ca27145d916fd25fedf20d13b2d7041cba36fc4416e17307ab0cbf6b9785f5958a53c58486fb6fb4776025b696f5dfb195161 SHA512 cd7d27a3a13462517c3e75c43d7d951afa53ef77875f479304da43b93fd40ae19680c11dc5bcf2ec3fecf6dbe56daa954ccb88b9f99f3af4c53d3141ef0b93f5
 EBUILD intel-graphics-compiler-1.0.11485-r2.ebuild 2635 BLAKE2B a0f4542bf8343a23887c729fab4588480c11bcf884dd6b458fdc07c35765661d58f6e5bde6fd7bfe643754062b57165311d16b85b5c82f25cd8887576b6a73fb SHA512 8ca420c146f9332a7294fb8b4dcb7da42c5b4c9d782479500925e4ac0377e50a2edde0b05ff3582792664badcf0b483f8e7e7b96ccc12a6cf738098ca4bafa9a
+EBUILD intel-graphics-compiler-1.0.11702.1.ebuild 2461 BLAKE2B fb2245758e2a5e0e86fbcabe1f4deaa3c0fb6997bb657ab5d88cd8b2b424e10287b960397bd63f5efe8bbcbb89aa7de07c3970205566e9d9e01d3ca20ffb0771 SHA512 03b3c9ce763c91ed7d8e455b3d911d1ebc8a5a91e80e8632527fe8705d6fb362e219b7aa7a6f6e219e01db765dd572d91206251c8043940c4aab2cdc2fe6c802
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild
new file mode 100644
index 000000000000..40b31434451c
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+
+		# Compilation with VectorCompiler causes currently a segfault.
+		# See https://github.com/intel/intel-graphics-compiler/issues/236
+		-DIGC_BUILD__VC_ENABLED="OFF"
+		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index 72bebf10f3e9..17d70db95e1c 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,5 +1,3 @@
-DIST intel-graphics-system-controller-0.6.0.tar.gz 146082 BLAKE2B e67b6d5064aece983d047e1f64e0477c613fb7bc0912c5173cc1c1588151703098e0429c790f25d78a76caab8663b80e9fc20f313be2318c2be2b30aa6ca06f5 SHA512 265716648b1c2a2e8164643eaf8a6cdac57953493d67c805ecfb9077b834e17b13693c56958c219083fc8e4f5fb3e9cafb64d6b3dd40d510434d4517ec945fc3
 DIST intel-graphics-system-controller-0.8.0.tar.gz 166364 BLAKE2B 86a1aeb328554a7260c57bb4513dc236e34aa758b53d4d743562639326d22963742fe1ceca89df648187dfe8e7233c5306977241bb9d37e765d21f52d0073873 SHA512 a2fd38717cd1d02270c97eda20fe4294c634a0520293cdd396b93d474eed2ec903ed565a2d15d5e2671424000bb21c3f04b9812a4c050aa68383a75dee0281ef
-EBUILD intel-graphics-system-controller-0.6.0.ebuild 1103 BLAKE2B 8bc3afd859e66f76ae90ce229f9e2da04c16950dcea7305422677d53e7941c7d0e43682aaa2061c9375b84aad877f1c5c93cb0c326c0049d6ac76bca90dcf63f SHA512 c7d8525861f726323d23c9fd3544e2c092e8f34bd6c0113e8ef9b77e17d9c800d15f0b9160a5848daf4805dc314f3df17c05c72cfd918a5caedaa74e74b86393
-EBUILD intel-graphics-system-controller-0.8.0.ebuild 1104 BLAKE2B cc55f29c45a2c76139dd73eb069bdc821edfc63753e6d2e0c5164f8aba7d66c22ee104076ec62ee12a060c8671206ef57d67261fcd53685a09df8aadc9df9d5d SHA512 c081d1ff3d40a4a86db011d14d251044d12b8bbeb648503ead1a3b4a179fee34c9ac9d013c928de4b2358e8ba1064a738f8c93967a5e53607ab61ea949df7a15
+EBUILD intel-graphics-system-controller-0.8.0.ebuild 1103 BLAKE2B d60e459e0179267530ecf72f3ddc02baeb04bf602b5a1edb83a514edab4f9854446d2124c2877c1ba27cc7442c7a129ae70f35d09764b52230810ac0c0dd1699 SHA512 1b8425012471d436a2d66254bf0cb802916821f2f9007eb1da4616b3c2fa11ea221330a8720c0dc31814718620bc909c40d1b910ff27895f52d02e3d54225f35
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.6.0.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.6.0.ebuild
deleted file mode 100644
index 896cfe892dac..000000000000
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="igsc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Intel graphics system controller firmware update library"
-HOMEPAGE="https://github.com/intel/igsc"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0/0.6.0"
-KEYWORDS="amd64"
-IUSE="+cli doc"
-
-RDEPEND="dev-libs/metee:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-"
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CLI="$(usex cli)"
-		-DENABLE_DOCS="$(usex doc)"
-		-DENABLE_ENUM="ON"
-		-DENABLE_PERF="OFF"
-		-DENABLE_WERROR="OFF"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DENABLE_TESTS="OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.0.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.0.ebuild
index af442c4e311c..67fda7eed811 100644
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.0.ebuild
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+cli doc"
 
 RDEPEND="dev-libs/metee:="