gentoo resync : 25.09.2021

9 files changed, 9 insertions, 406 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index d37ecd68e408..9cdd9e9587b7 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,4 +1,3 @@
-AUX intel-graphics-compiler-1.0.4111-opencl-clang_version.patch 1567 BLAKE2B cef900deb559e251e7fce91b8b8558e5eff846d5bab0153edb6d01ee29bdd0fd4c8dfcf3f3d732a23c357eebb119a4b833205f6e8526ef612069cec165395bf6 SHA512 984a3f26bd16d2d2db0608338f498ebefbbadb6b75552d3c3eaa0fea3456bf52e5ed0c57bedbd144e1d72bf6dea132fb21fe0d8cbca008ddd6b5456352143942
 AUX intel-graphics-compiler-1.0.8173-fix-missing-limits.patch 744 BLAKE2B 61e7fc376d7e5aa197794f8cc7f9cd4fc469ca4a7f0e9463c4d066ad119869da7ce6501d542e3c660326bd6131769534339fbedc18e954c49eb471243c48059c SHA512 c1ca22cb158c2c83e9bc355cc9c9aa4d710877c2431c0d769013e91fe15f6c4245e529de08b889548dcdecec34ce3708a2b976fb9ccd7b4b69e11c066878582d
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch 1572 BLAKE2B 978ee89e5067a56a168f74b9707307a2f2dc6aedac1521f0494b4891ee269dfceedb06b951d0e0a6bc68d157bca83ed8f3285f770afc7facfe0cf8921a0e4ae8 SHA512 e751206b5a14be92e6bacf2b39cbd87efd462dcba935be028a8b648e4a36870456237b66c361f3ac5481896cd2c1beb145b75708fa6b52219fe3a42e238193ee
@@ -6,18 +5,10 @@ AUX intel-graphics-compiler-1.0.8365-cmake-project.patch 774 BLAKE2B 7b117f1acec
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.8517-fix-missing-limits.patch 661 BLAKE2B bcfdbe8442511cc6b0c6458da9728c64dc740c1e67673e2a8c29288b6f6c51b3d48ad9134e39e386aa6302333dcddf30a6dce3f6f20d476bd7a32041ed31d617 SHA512 a1ae9d3c4d8bbcb5977d150dbf1ba3686870d959d7cadfd0c487bd724ba02369e09c1efb8d8cd55179c37791500aecf889f7a4368e54ad1f89c538f56744ddaa
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
-DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105 SHA512 34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
-DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1 SHA512 e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80
-DIST intel-graphics-compiler-1.0.8173.tar.gz 7471884 BLAKE2B 2248a8d5f23d4578c5bd04a799af65767916b3705e16a8145149794a2cf16e5a0e16c21669336151a241cc52e7672b05eb892ac4925f2c2d0b22673af4ebf67f SHA512 bebccee0699dea48e98ddcdb320cacacda0cdcd36b68e51d932791756b0a8e2171a78cc1921ca2a092b9fe7dbd7a783d4898ada08c58bf856dd29bfc08334fa0
 DIST intel-graphics-compiler-1.0.8365.tar.gz 7509633 BLAKE2B ffe18d18b409db36bd24215d841daaa36d5055d61b9021e385fe9178351b6a92383839e271a12d1e5017150b9697060fe37f803c5153d2f107813aeb2e7a74cf SHA512 6597afbab2c101d69e6a991b5b065ebbded7ccc6227c0ed82b6b0bd33fec26489c30a0a7a9558617578a767ca6d7382a6ab36144f4c64df742c6bd545ce991e9
 DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825 SHA512 35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f
-EBUILD intel-graphics-compiler-1.0.4111.ebuild 1948 BLAKE2B b94c41a2657cb985065ef195ae06d62d53db8a02d30f48fdd37014b8209382d459cec5da6bfc4f1a2ded793a60adf736ea4d43f6511aecde9614c2b6aac42c49 SHA512 0abfecf61f289b258909da53e3edae8eea31577a3b57108043b7e8d6902d53153d55d8f635bc3146e71e986e9f12bfebf280ead5f58196e3f36abaeeda7411a0
-EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785
-EBUILD intel-graphics-compiler-1.0.5353.ebuild 2559 BLAKE2B 16d24827231f286999542377531e90d89599ca7c70674be8200c47bc6270412cf6aa548b5a1a0a23968375f3a25060011edd2655a1522b16abf07765ae79763c SHA512 f3d195649693fd25cff7f34762f0b18ab1e5f0c2072b5ebd0bab9b1a69a1f9dcc5bd0ed482010bf7a1b50515dda122343a6dabda464c6ce61ea08511099d1041
-EBUILD intel-graphics-compiler-1.0.8173.ebuild 2578 BLAKE2B 65fd7700ebc866e3b8057a8508a052c53b5c2d3902af391378bcbed257cb2ed7ef1120ad8d0f6d708354457983cb9260aa0f4fcb7fed57fbd65fc36c103a03b3 SHA512 e0879fd7e50d11aba0dd3cffc29d9a37676a54fb6272b2b9c74800f3d80768d72c6948902bf211a9eadeabd9fa557b830c23978a30045e7ce9c9fdf2337d9c84
-EBUILD intel-graphics-compiler-1.0.8365-r1.ebuild 2167 BLAKE2B 3a031f63846ac1fae0ae20baef89f0cf7a85c3c7b08409fdf0b9a32b76058eff1ee6ddb1a42d7ad4b4fdde8a5cbec74e75b412482e3dce3d4716c355452e06b6 SHA512 f75bdcea58dabca275db473e5722cfafd08fe466c87225e437f91711be7a84d2679c2e4c022a3b2cbda0d948a4f3817c2eb2551337a0657eaee7e69a391efbae
-EBUILD intel-graphics-compiler-1.0.8365.ebuild 2587 BLAKE2B 058b83d1ff2045d0f4311ca13af0a335b89a0c22f07196580bbb220fdbda3b176fa3cfd90c46e295650381f3e0a7a81ccf2f5f509476b5c6bcae443e18e6410f SHA512 9ad9c83a8649503d534ad2587642155e5565d6ab09dcf5187f8be1127545b7541f5b59d4c2a5541e82b177cf4155ac90d01bd8cfdeb399d0307fc1f478c53ff9
+DIST intel-graphics-compiler-1.0.8708.tar.gz 7574517 BLAKE2B 578b29a103d3d0b7f481971a801fa11bc14430b7ecd00c99492f5d80ce713b84d00d278726a425edf5884ac15f4877c96a39a3f3f3f1c22bc972db039be28dc2 SHA512 3685c2fe0750d860facd7f378a1de4ac21127e7720d7a8889ac0ae8ab9e58dfacfc50b5bbe37d5744c9a17958b057512871125b58784a8c62ddffc2997f80ba8
+EBUILD intel-graphics-compiler-1.0.8365-r1.ebuild 2166 BLAKE2B 61d3f255586dd52ac42e75da5e5f68183418d95483c40ce13207d227735d84e2959c556dc9518a02a47aeb9247fe6137cc7ce266412a9eb809b2bae04e42775f SHA512 c5ab29f8188144402d97405e4ae114e8851fe94a0431a73c6e8ce1b6f0e4c323b9f1b444ff7ada65a82f50ca99c4f70664daec8cdc626cf7fb3dfd370031d50a
 EBUILD intel-graphics-compiler-1.0.8517-r1.ebuild 2319 BLAKE2B cdf35fad3f98e4b53c368a09ebd73f4b770ecd5bd0223d0653313bfa1058939a7950bb5c51ab264167f1b709870f9b8d066261c3cdd1651de87fd4b9f84566b2 SHA512 61cb7c35d6327a854d371216ccc230f3b690401560e9560657037c444650273232d46c4bd2b624f4bb753ba9845b545bff4500ef3d59b880d5d1d0c4d3bfa207
-EBUILD intel-graphics-compiler-1.0.8517.ebuild 2222 BLAKE2B 0a303414b38f6b9a1f6128f6cc20c78e4e434b76ba505f90e1a48ee2970d161ef4b95c66eae502d40574ba2968161286f5ba7f594afca2c2237758ad9b07a530 SHA512 545f2673fcd2028ce1a568c444ba3676eeee87564107bc082dc435b84e572fa9ff7e90e20768f8d05b12cfb5947bf931b51558028705a5d5a3f2ed1f2e2bee87
+EBUILD intel-graphics-compiler-1.0.8708.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
deleted file mode 100644
index 8996466275c9..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/IGC/BiFModule/CMakeLists.txt
-+++ b/IGC/BiFModule/CMakeLists.txt
-@@ -160,20 +160,10 @@
- 
- if(UNIX)
-   if(NOT ${CCLANG_BUILD_INTREE_LLVM})
--    # Get common clang library soname
--    get_target_property(CCLANG_LIB_PATH opencl-clang-lib "IMPORTED_LOCATION")
--    execute_process(
--      COMMAND readelf -d ${CCLANG_LIB_PATH}
--      OUTPUT_VARIABLE CCLANG_READELF_CALL)
--    string(REGEX MATCH "\\[${COMMON_CLANG_LIB_FULL_NAME}\\.([0-9](\\.[0-9]*)*[a-zA-Z0-9]*)\\]" CCLANG_SONAME_VERSION "${CCLANG_READELF_CALL}")
--    set(CCLANG_SONAME_VERSION "${CMAKE_MATCH_1}")
--
--    # Check if common clang library is newer than 5.0.0 version on which we have SPIR-V support
--    if("${CCLANG_SONAME_VERSION}" VERSION_GREATER "5.0.0")
--      set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
--    else()
--      message(FATAL_ERROR "[IGC\\BiFModule] : Version ${CCLANG_SONAME_VERSION} of library ${COMMON_CLANG_LIB_FULL_NAME} is below version 5.0.0 (where it's starts support of SPIR-V), please upgrade this library at least to version 5.0.0")
--    endif()
-+    # Workaround for https://bugs.gentoo.org/739138 : instead of checking
-+    # the version of opencl-clang, have ebuilds set CCLANG_SONAME_VERSION
-+    # for us.
-+    set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
-   endif()
-   if (NOT CCLANG_FROM_SYSTEM)
-     install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
deleted file mode 100644
index 2ce45fda5adf..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-LLVM_MAX_SLOT=10
-
-COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-	"${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-clang && [[ $(clang-major-version) -ge 10 ]] ; then
-			die "Building IGC with clang-10 and newer is presently not supported (see Bug #738934). Please use clang-9 or gcc instead."
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# Select the same slot as the best opencl-clang
-	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
-	einfo "Selecting $ocl_clang_ver"
-	local llvm_slot=$(ver_cut 5 $ocl_clang_ver)
-	# opencl-clang brings the right slot as dep
-	has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
-	einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
-
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
-	# IGC uses this definition causes problems for some users (see Bug #718824).
-	use debug || append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION=${llvm_slot}
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
deleted file mode 100644
index 7651df693d6b..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-LLVM_MAX_SLOT=10
-
-# Yes, the last dependency does effectively force the use of llvm-10
-# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
-# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
-# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
-COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-	>=dev-libs/opencl-clang-10.0.0.2:=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-	"${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
-)
-#	"${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-find_best_llvm_slot() {
-	local candidate_slot
-
-	# Select the same slot as the best opencl-clang
-	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
-	einfo "Selecting ${ocl_clang_ver}"
-	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
-
-	# Sanity check - opencl-clang brings the right LLVM slot as its
-	# dependency so if this is missing, something is very wrong.
-	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
-
-	echo ${candidate_slot}
-}
-
-multilib_src_configure() {
-	local llvm_slot=$(find_best_llvm_slot)
-	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
-	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
-
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
-	# IGC uses this definition causes problems for some users (see Bug #718824).
-	use debug || append-cppflags -DNDEBUG
-
-	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION=${llvm_slot}
-		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
-		-DIGC_BUILD__VC_ENABLED=no
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
deleted file mode 100644
index 0173f758337a..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-LLVM_MAX_SLOT=11
-
-# Yes, the last dependency does effectively force the use of llvm-10
-# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
-# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
-# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
-DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-	>=dev-libs/opencl-clang-11.0.0:=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-	"${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
-)
-#	"${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-find_best_llvm_slot() {
-	local candidate_slot
-
-	# Select the same slot as the best opencl-clang
-	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
-	einfo "Selecting ${ocl_clang_ver}"
-	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
-
-	# Sanity check - opencl-clang brings the right LLVM slot as its
-	# dependency so if this is missing, something is very wrong.
-	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
-
-	echo ${candidate_slot}
-}
-
-multilib_src_configure() {
-	local llvm_slot=$(find_best_llvm_slot)
-	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
-	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
-	local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot})
-	llvm_ver=${llvm_ver##*-}
-
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
-	# IGC uses this definition causes problems for some users (see Bug #718824).
-	use debug || append-cppflags -DNDEBUG
-
-	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION=${llvm_slot}
-		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${llvm_ver}
-		-DIGC_BUILD__VC_ENABLED=no
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild
deleted file mode 100644
index dd493717301b..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python{3_9,3_10} )
-LLVM_MAX_SLOT=10
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-BDEPEND="${PYTHON_DEPS}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}"
-# Yes, the last dependency does effectively force the use of llvm-10
-# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
-# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
-# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
-DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=
-	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=
-	>=dev-libs/opencl-clang-12.0.0:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
-)
-
-find_best_llvm_slot() {
-	local candidate_slot
-
-	# Select the same slot as the best opencl-clang
-	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
-	einfo "Selecting ${ocl_clang_ver}"
-	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
-
-	# Sanity check - opencl-clang brings the right LLVM slot as its
-	# dependency so if this is missing, something is very wrong.
-	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
-
-	echo ${candidate_slot}
-}
-
-src_configure() {
-	local llvm_slot=$(find_best_llvm_slot)
-	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
-	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
-	local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot})
-	llvm_ver=${llvm_ver##*-}
-
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
-	# IGC uses this definition causes problems for some users (see Bug #718824).
-	use debug || append-cppflags -DNDEBUG
-
-	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION=${llvm_slot}
-		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${llvm_ver}
-		-DIGC_BUILD__VC_ENABLED=no
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild
index 5f73442c79b4..768df3bdabce 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild
deleted file mode 100644
index b504e2949b3c..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python{3_9,3_10} )
-LLVM_MAX_SLOT=10
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}
-"
-
-# Yes, the last dependency does effectively force the use of llvm-10
-# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
-# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
-# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
-DEPEND="
-	<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=
-	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=
-	>=dev-libs/opencl-clang-12.0.0:=
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
-)
-
-find_best_llvm_slot() {
-	local candidate_slot
-
-	# Select the same slot as the best opencl-clang
-	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
-	einfo "Selecting ${ocl_clang_ver}"
-	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
-
-	# Sanity check - opencl-clang brings the right LLVM slot as its
-	# dependency so if this is missing, something is very wrong.
-	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
-
-	echo ${candidate_slot}
-}
-
-src_configure() {
-	local llvm_slot=$(find_best_llvm_slot)
-	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
-	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
-	local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot})
-	llvm_ver=${llvm_ver##*-}
-
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
-	# IGC uses this definition causes problems for some users (see Bug #718824).
-	use debug || append-cppflags -DNDEBUG
-
-	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION=${llvm_slot}
-		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${llvm_ver}
-		-DIGC_BUILD__VC_ENABLED=no
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8708.ebuild
index fff9a377a38a..0e7e9889129e 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8708.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="10"
+LLVM_MAX_SLOT="11"
 MY_PN="igc"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -36,11 +36,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
 	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
 	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
 	"${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
-	"${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch"
-	"${FILESDIR}/${PN}-1.0.8517-fix-missing-limits.patch"
 )
 
 pkg_setup() {
@@ -54,6 +51,9 @@ src_configure() {
 	# See bug #718824 for more information.
 	! use debug && append-cppflags -DNDEBUG
 
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
 	local mycmakeargs=(
 		# Those options are ensuring, that we are using
 		# the system LLVM with the correct slot.
@@ -64,7 +64,7 @@ src_configure() {
 		-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_MAX_SLOT}"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
 
 		# VectorCompiler needs work, as at the moment upstream
 		# only supports building vc-intrinsics in place.