8 files changed, 231 insertions, 96 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 17c287123f10..c316cbb63d7e 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 df56bd57edfa..53ef51f1f6c7 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,11 +1,10 @@
 AUX intel-graphics-compiler-1.0.11485-include-opencl-c.patch 507 BLAKE2B 1a777971e4db95a7ac719944f8533d7cb045e2092c452af35c2d5fd7e696ec848ed4777e9653f77627e4ca0fe36f4beffc9a39e3c7a13bda7973af6722238857 SHA512 8aaef1aaf0a6cedcd66e55ee8df0d89d40f3827b28243cc434dbbcadb568d8c1317a0968b57ad0b2a88de4479023a00b1b3b9a65fd34105cebe56fdeb3c30f1b
+AUX intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch 6543 BLAKE2B a3d0daac6434c5b96e57496a8c94973d416f9c8e9a917316adb6245cf016a393c8cef36d324fac3be2fc4e29622270a717f3a2d013965e45142053a46b667404 SHA512 d9e853c60905a5903004538ab22edc8b7275d00313ef5bf6f2975b82da19987c7e739d030bb3203e10bef82f1169723dd4e2d8e09d2034eede95d8affee2b900
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 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.12260.1.tar.gz 8887984 BLAKE2B 626b5f2bd189ba9b2933b9d65227ca1552484f73f7398b2a763744d21a4ea189987e4eb08e9e7f09898fb49568b59a2c45298363495c1759fec9927a95cf4478 SHA512 4223e9c8213c7e6cf3539d955394a0a4a39cb8d2114ce18ccaeeb0b36a91ca6fc6a314fa9d9db24929fa7cd6b86ff8b82f369f35dd80e5df49b23ac9cd3a519b
 DIST intel-graphics-compiler-1.0.12504.5.tar.gz 8941924 BLAKE2B 6441cc50c2449524c800c73736f8963bc0011c6b87eefa03575cf09d00a8e812c9961bd50fb9801b77452da2d993e76196beb0a2093a249a87d7182e1c1e8707 SHA512 32a94b213a591f9ceb8ca08674c9fb8994b50818c51a6bfd412c4cd30bb9433b938eb7b49ba0afac9f2900a3dcbc7dd79e3e66fb444c7fd5723b6b50c5d1ab89
-DIST intel-graphics-compiler-1.0.12504.6.tar.gz 8941916 BLAKE2B a3a3a3e2ce8d0c6effe6657cb4f9e3ff69c24dcc6ccb6c9b8d39c079c6592689ebfb36067be696796b4be26e6fffb75b2d67d5480d25919bd135540c44345080 SHA512 9506af6a67c151c1f18e674f2a0ac1acf98b6f546b46ca8df0c986655e69b07634f3aed650838d0821d3425c6e720d8ce5cdd902df564aaff09de73e04df3bc2
 EBUILD intel-graphics-compiler-1.0.12260.1-r1.ebuild 2502 BLAKE2B 80d5e154cde0ed1f77876e088f0f2ad2efd734ecc898004d7c91876d73b1d990adb1009efe2ae3f46ec3046f1a1e69a7cbdc75533a2b90d6a85e7296bf34d296 SHA512 e5b5aa14e1c1ccb60f73efe090d0f228e3d751dd5f32d9a618ecec939d75782456704c293c98b189b5c98f933ccc9a49156590dd64e69ab6f6bb544ca911d229
-EBUILD intel-graphics-compiler-1.0.12504.5.ebuild 2503 BLAKE2B a12ab9934b62bdbde59f421544e9b9f6e01e72a19a6819048745419beaf6269a4e343ee27da1fe1474620ad1669fd2f86d9a9691c414a270ae36fe118d8640d2 SHA512 c0d4d5b5579dac3909bf97c8af495346c5e5dd902a5e5e47e9409f5155082ad1450874417a015731b2354fc4879408ac1e445bd2fff4aa0c79ddf56268c28693
-EBUILD intel-graphics-compiler-1.0.12504.6.ebuild 2503 BLAKE2B a12ab9934b62bdbde59f421544e9b9f6e01e72a19a6819048745419beaf6269a4e343ee27da1fe1474620ad1669fd2f86d9a9691c414a270ae36fe118d8640d2 SHA512 c0d4d5b5579dac3909bf97c8af495346c5e5dd902a5e5e47e9409f5155082ad1450874417a015731b2354fc4879408ac1e445bd2fff4aa0c79ddf56268c28693
-MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
+EBUILD intel-graphics-compiler-1.0.12504.5-r1.ebuild 2537 BLAKE2B 917cc4afc526b9ebad63cbd7ae5cdce0bd6eeab37b5a4b656ccb542305cfa0090bbd402b9725db5b909c4b80019b058c0e102bbae45563fe50c680bc9bb65525 SHA512 1d5fcece688a4475a83d5cbe92d748842c91f3f24f0fde73463ac9933d1d38e455e59cc9ac715df7de640fb4204fcf6111d7255a8b15b8d49aa6a1452b931c5f
+MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
new file mode 100644
index 000000000000..ec75efc22b97
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
@@ -0,0 +1,165 @@
+From 753a6a4efd5fcb42a86a5f62b64c29393513d807 Mon Sep 17 00:00:00 2001
+From: Victor Mustya <victor.mustya@intel.com>
+Date: Thu, 29 Dec 2022 05:03:39 +0000
+Subject: [PATCH]  Fix open source build for some configurations
+
+When building for some Linux distros, cmake configures IGC to build all
+the libraries as shared by default. So we have to explicitly configure
+all the libraries as static or object.
+---
+ IGC/Options/CMakeLists.txt                                   | 2 +-
+ IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt           | 2 +-
+ IGC/VectorCompiler/lib/BiF/CMakeLists.txt                    | 2 +-
+ IGC/VectorCompiler/lib/Driver/CMakeLists.txt                 | 2 +-
+ IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt            | 2 +-
+ IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt               | 2 +-
+ IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt     | 2 +-
+ IGC/VectorCompiler/lib/Support/CMakeLists.txt                | 2 +-
+ IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt             | 2 +-
+ IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt          | 2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/IGC/Options/CMakeLists.txt b/IGC/Options/CMakeLists.txt
+index 834d74d37ce..1dc079d1c1e 100644
+--- a/IGC/Options/CMakeLists.txt
++++ b/IGC/Options/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ #
+ #============================ end_copyright_notice =============================
+ 
+-add_library(IGCOptions "")
++add_library(IGCOptions STATIC "")
+ 
+ add_subdirectory(src)
+ add_subdirectory(include/igc/Options)
+diff --git a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
+index ebab3db0005..eda77667ddf 100644
+--- a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
++++ b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
+@@ -12,7 +12,7 @@ set(CM_CL_SUPPORT_SOURCES
+   InitializePasses.cpp
+   )
+ 
+-add_library(CMCLSupport ${CM_CL_SUPPORT_SOURCES})
++add_library(CMCLSupport STATIC ${CM_CL_SUPPORT_SOURCES})
+ 
+ # LLVM dependencies
+ igc_get_llvm_targets(LLVM_LIBS
+diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+index 6235fc1d21e..c439f334a98 100644
+--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+@@ -275,7 +275,7 @@ add_custom_target(VCBiFPreparation
+           ${SPIRV_EXEC_BUILTINS_SRC_PATH}
+           ${SPIRV_ATOMIC_BUILTINS_SRC_PATH})
+ 
+-add_library(VCEmbeddedBiF
++add_library(VCEmbeddedBiF OBJECT
+   ${PRINTF_OCL_32_CPP_PATH}
+   ${PRINTF_OCL_64_CPP_PATH}
+   ${PRINTF_ZE_32_CPP_PATH}
+diff --git a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
+index 74e4e661e74..fc14937a1c6 100644
+--- a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(DRIVER_SOURCES
+   SPIRVWrapper.cpp
+   )
+ 
+-add_library(VCDriver ${DRIVER_SOURCES})
++add_library(VCDriver STATIC ${DRIVER_SOURCES})
+ igc_get_llvm_targets(LLVM_LIBS
+   Analysis
+   BitReader
+diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
+index 185a7533a89..4c3eada26fb 100644
+--- a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
+@@ -88,7 +88,7 @@ set(CODEGEN_SOURCES
+   GenXFixInvalidFuncName.cpp
+ )
+ 
+-add_library(VCCodeGen ${CODEGEN_SOURCES})
++add_library(VCCodeGen STATIC ${CODEGEN_SOURCES})
+ add_dependencies(VCCodeGen
+   GenXUtilBuild
+   GenXCommonTableGen_target
+diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
+index dca9455f464..8a0b66f7b55 100644
+--- a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
+@@ -10,7 +10,7 @@ set(INFO_SOURCES
+   GenXTargetInfo.cpp
+ )
+ 
+-add_library(VCTargetInfo ${INFO_SOURCES})
++add_library(VCTargetInfo OBJECT ${INFO_SOURCES})
+ 
+ igc_get_llvm_targets(LLVM_LIBS Support)
+ 
+diff --git a/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt
+index 44ebf851d6e..0f56a8c1a26 100644
+--- a/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt
+@@ -27,7 +27,7 @@ set(OPT_SOURCES
+   CMPacketize/PacketBuilder_misc.cpp
+ )
+ 
+-add_library(VCTransforms ${OPT_SOURCES})
++add_library(VCTransforms OBJECT ${OPT_SOURCES})
+ 
+ igc_get_llvm_targets(LLVM_LIBS
+   Analysis
+diff --git a/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt b/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt
+index 332d74e25dd..060cccc91fc 100644
+--- a/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt
+@@ -14,7 +14,7 @@ set(LLVM_COMPONENTS
+ )
+ 
+ igc_get_llvm_targets(LLVM_LIBS ${LLVM_COMPONENTS})
+-add_library(VCInternalIntrinsics
++add_library(VCInternalIntrinsics OBJECT
+   InternalIntrinsics.cpp
+ )
+ 
+diff --git a/IGC/VectorCompiler/lib/Support/CMakeLists.txt b/IGC/VectorCompiler/lib/Support/CMakeLists.txt
+index 047f2528761..12b7bb62cca 100644
+--- a/IGC/VectorCompiler/lib/Support/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/Support/CMakeLists.txt
+@@ -15,7 +15,7 @@ set(SUPPORT_SOURCES
+   PassPrinters.cpp
+   )
+ 
+-add_library(VCSupport ${SUPPORT_SOURCES})
++add_library(VCSupport OBJECT ${SUPPORT_SOURCES})
+ igc_get_llvm_targets(LLVM_LIBS
+   Support
+   Core
+diff --git a/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt b/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt
+index e5a7bff2392..b77547c6bcd 100644
+--- a/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt
+@@ -21,7 +21,7 @@ set(GENX_UTILS_SOURCES
+   TransformArgCopy.cpp
+   )
+ 
+-add_library(VCGenXUtils ${GENX_UTILS_SOURCES})
++add_library(VCGenXUtils OBJECT ${GENX_UTILS_SOURCES})
+ igc_get_llvm_targets(LLVM_LIBS
+   Core
+   Support
+diff --git a/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt b/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt
+index 873d45e8025..8408828f748 100644
+--- a/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt
++++ b/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(GENERAL_UTILS_SOURCES
+   IndexFlattener.cpp
+   )
+ 
+-add_library(VCGeneralUtils ${GENERAL_UTILS_SOURCES})
++add_library(VCGeneralUtils OBJECT ${GENERAL_UTILS_SOURCES})
+ igc_get_llvm_targets(LLVM_LIBS
+   Core
+   Support
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5-r1.ebuild
index 5d6a7abde11f..5942edc5cd67 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5-r1.ebuild
@@ -19,13 +19,17 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug"
+IUSE="debug vc"
 
 DEPEND="
 	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
 	dev-util/spirv-tools
 	sys-devel/lld:${LLVM_MAX_SLOT}=
 	sys-devel/llvm:${LLVM_MAX_SLOT}=
+	vc? (
+		dev-libs/intel-vc-intrinsics
+		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+	)
 "
 
 RDEPEND="${DEPEND}"
@@ -40,6 +44,7 @@ PATCHES=(
 	"${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"
+	"${FILESDIR}/${PN}-1.0.12504.5-vectorcompiler.patch"
 )
 
 pkg_setup() {
@@ -62,6 +67,7 @@ src_configure() {
 		-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_BUILD__VC_ENABLED="$(usex vc)"
 		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
 		-DIGC_OPTION__CLANG_MODE="Prebuilds"
 		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
@@ -72,14 +78,10 @@ src_configure() {
 		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
 		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
 		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
 		-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-compiler/intel-graphics-compiler-1.0.12504.6.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.6.ebuild
deleted file mode 100644
index 5d6a7abde11f..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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="14"
-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})"
-	local llvm_version="${llvm_version%%-r*}"
-
-	# 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-compiler/metadata.xml b/dev-util/intel-graphics-compiler/metadata.xml
index 084e53520273..35c67387290c 100644
--- a/dev-util/intel-graphics-compiler/metadata.xml
+++ b/dev-util/intel-graphics-compiler/metadata.xml
@@ -13,6 +13,9 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<use>
+		<flag name="vc">Enable VectorCompiler for a better performance.</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">intel/intel-graphics-compiler</remote-id>
 	</upstream>
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index d873402a18a4..d29de358bc91 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,3 +1,5 @@
 DIST intel-graphics-system-controller-0.8.4.tar.gz 173733 BLAKE2B c51f21bd2093d44c12ce10b4e5990a4428294093c6a8ccd90b01be30d918ac0898ea57b68ad004f4f477a7049e5060521c7fb1547d09f6e30cae8eab41090a69 SHA512 948c2043765c7a5b5dd9c350474725871601a76d292fd34c57c81b492945107ba2519b6a3f113cefed158adb7ac61164e85284be4683d1f48870650fdba969ad
+DIST intel-graphics-system-controller-0.8.6.tar.gz 179906 BLAKE2B cadbcb559418f5e6164002cdff1dea2b8a0cec946fd0128c4f374f9b58d5086e9aba3cc97a05641be0255d848e8acf3429df16ca7d70debfff3a282445a7ca3f SHA512 40b89f54754fba3a5cf43c4cc822ec5ea0506cd854b0a85bb29e03370cbb25638ab67b8a568fe6f4d7dd2e41e7f302c550e6d4955b6e6fbf4df0d512a3afe64b
 EBUILD intel-graphics-system-controller-0.8.4.ebuild 1082 BLAKE2B b1de0cfda977845ba15dc491bdf6d1191293cf1ace5777bbfeac4f994d2923b6decc2d13869cca507cc9a290a542bcd2b89c99cb530344c494808af21eb09dff SHA512 02a3189921927cbc955864f8a35ef2c48d1e5d650f1de54342fe71474c5a8fe3eaeb89c8d7a086573635d6d7b6a4abbfdd61d84e7361697a903cdf1641385f0e
+EBUILD intel-graphics-system-controller-0.8.6.ebuild 1082 BLAKE2B b1de0cfda977845ba15dc491bdf6d1191293cf1ace5777bbfeac4f994d2923b6decc2d13869cca507cc9a290a542bcd2b89c99cb530344c494808af21eb09dff SHA512 02a3189921927cbc955864f8a35ef2c48d1e5d650f1de54342fe71474c5a8fe3eaeb89c8d7a086573635d6d7b6a4abbfdd61d84e7361697a903cdf1641385f0e
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.6.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.6.ebuild
new file mode 100644
index 000000000000..035371628b77
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.6.ebuild
@@ -0,0 +1,50 @@
+# 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..11} )
+
+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/${PV}"
+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_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
+}