gentoo auto-resync : 09:04:2023 - 23:35:30

5 files changed, 2 insertions, 133 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index ff14f11f7f2b..00cd00acef54 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,10 +1,6 @@
-AUX intel-graphics-compiler-1.0.11485-include-opencl-c.patch 507 BLAKE2B 1a777971e4db95a7ac719944f8533d7cb045e2092c452af35c2d5fd7e696ec848ed4777e9653f77627e4ca0fe36f4beffc9a39e3c7a13bda7973af6722238857 SHA512 8aaef1aaf0a6cedcd66e55ee8df0d89d40f3827b28243cc434dbbcadb568d8c1317a0968b57ad0b2a88de4479023a00b1b3b9a65fd34105cebe56fdeb3c30f1b
-AUX intel-graphics-compiler-1.0.13230.7-spirv-tools.patch 1124 BLAKE2B 41dde36f81227f4d8306ad069492969350de001af6aef17002accbd41a1d7da4a976ee9edff74162b1daeeb5b4a55567ebc32d2de24d7430261512dfd3c99449 SHA512 84db5643791883dca792e6df77d42670055364c571531041f2d3224d4f957aa51215735cc6b996a5ac4d684864ca59c54e65039026eec3d3e06f668f2f1def7c
 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.13230.7.tar.gz 8813719 BLAKE2B 5cc6ef816b030d786dfcf6296b39f6c2bfcc9db4c4a12db84456a508bd7d8998d4dfc9e6993e05167a3f797287176dda31e5fd43bbc3284fa26d4c8ca89f6164 SHA512 774f62ff8f5b7bd95fd766c88bc62ff66498c23d020dbfdfd18734e532e7d701652325cb7aca00f7ab3cfdd051d37e56939d7978db127e9044cd5b6c077979ac
 DIST intel-graphics-compiler-1.0.13463.1.tar.gz 8283903 BLAKE2B abe9f2a8cc0c648d985890d65782db2df61966d25b740ee735b0198cee701e79fcd33267b8284002f049cc2582db13c3b33481131570c0d69435a3dc4ada64d4 SHA512 3edafc7cadb946b62b5afa44bf81663c83ad6eab15c2825b60cfb5120da94d66898d3f073af13a747cdf2db586085de14ee75fcdda0e16a1ca7197d5645fe1a9
-EBUILD intel-graphics-compiler-1.0.13230.7-r1.ebuild 2610 BLAKE2B 7bbd0eb41315bb110f7aeb5a3925834a7ef251673e2b8799acd7980a2a87ef7c2231f7f4455f84c285fb17f2b116f217c6800d85a1e840827f260e3da9742107 SHA512 985370f8d34918eb6c1fde9378385375193cf77898c1d1227c1a951111379b373118a6685c5d708ea95879c9d66fc7a2ca19963c35f3dbf59639415ae304409b
-EBUILD intel-graphics-compiler-1.0.13463.1.ebuild 2519 BLAKE2B c323208d37fe7d77b5562ba9e449db3c1a5104a471c6dc02905e9cd9c5acc3293da9fc9b81175518216265be68a29ed82b178039161e946d3d805c2136b172b8 SHA512 97a7851ff771d94424a26ef91a0ca87ae34be731a10c91db39b9d5d6f9aa569ca045d0e9255bc7cc14286e0dd1df462c90ac362eec2041beb735b5572360ec43
+EBUILD intel-graphics-compiler-1.0.13463.1.ebuild 2518 BLAKE2B 832fbeddffb0b3f9610772b6d79f37479b8d6a927a32241d42c6a27f5054f32d2668f2cfac90a3833efc7e84807e350f2b70af682e11cb55d9bda1abf9ef86b5 SHA512 f605a5cb37772bebf8d40519608066a48bae3eb3a920be953f5fc721ff1c5f62f3e6d95090db55e9df4a65e272ee566ce150755ae38ffeed8c448167dffc82d4
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
deleted file mode 100644
index dbf4188ad0bc..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/IGC/cmake/igc_find_opencl_clang.cmake
-+++ b/IGC/cmake/igc_find_opencl_clang.cmake
-@@ -104,7 +104,7 @@
- 
-     # Get parent dir of the location of CLANG_EXE
-     get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY)
--    file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h)
-+    file(GLOB_RECURSE opencl-header ${CCLANG_INCLUDE_PREBUILDS_DIR}/*opencl-c.h)
-     if(opencl-header)
-       message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}")
-     else(opencl-header)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
deleted file mode 100644
index d33f9eb2021f..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8068732355d18464a9fcb6846c225929349b450c Mon Sep 17 00:00:00 2001
-From: Jakub Czarnecki <jakub.czarnecki@intel.com>
-Date: Thu, 26 Jan 2023 11:35:03 +0000
-Subject: [PATCH]  Preinstalled SPIRV-Tools CMakeFile - target fix
-
-Added checking if SPIRV-Tools isn't already set as target before adding
-it as a custom target to avoid errors.
----
- external/SPIRV-Tools/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
-index 9afa5746c4d..3b768c1b772 100644
---- a/external/SPIRV-Tools/CMakeLists.txt
-+++ b/external/SPIRV-Tools/CMakeLists.txt
-@@ -33,7 +33,9 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
-  set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}")
- 
-  set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
-- add_custom_target(SPIRV-Tools)
-+ if(NOT TARGET SPIRV-Tools)
-+  add_custom_target(SPIRV-Tools)
-+ endif()
-  set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
-  set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
- 
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
deleted file mode 100644
index 2dd387059629..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 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_{9..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 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-0.11.0
-		dev-util/spirv-llvm-translator:${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"
-	"${FILESDIR}/${PN}-1.0.13230.7-spirv-tools.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 bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
-	append-flags -U_GLIBCXX_ASSERTIONS
-
-	# 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_BUILD__VC_ENABLED="$(usex vc)"
-		-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"
-		$(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
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild
index 7715b2c3fbdd..ba5b51cad315 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug vc"
 
 DEPEND="