5 files changed, 91 insertions, 39 deletions
diff --git a/dev-util/ignition-cmake/Manifest b/dev-util/ignition-cmake/Manifest
index c50c6c5fa29b..0c73a6a697e1 100644
--- a/dev-util/ignition-cmake/Manifest
+++ b/dev-util/ignition-cmake/Manifest
@@ -1 +1 @@
-DIST ignition-cmake2-2.14.0.tar.bz2 199069 BLAKE2B 4b73878bc364b0274dd3828b9dba2eaa7ae27d96c8512bf70a83a3b8bdfd60c7b2653eb3d65a4ee2bc42739e0fa5f0627d371ebba291cfd5aade511c1bbe17ff SHA512 2c4d3a7c7715927806115de4496a1f03a01627a6fc2aef150b7cd6caf0384aa14d3f6ed4673ba0575ee5cf7dafbab8c42971ff45c07d8b8ff3a1b444dbdf1763
+DIST ignition-cmake2-2.16.0.tar.bz2 209182 BLAKE2B 8ee21bedfbaa35ef3ea6a758de074e72b1b2003531ca5900310ef4b34bf95f7e2d49ca8cb3d023a86810e302eb11e4edbc1769e03cb58ddedb74819a520b3177 SHA512 c391112b9120bb415a596f8258da173949b62f3d28e216d1c94d2c3ec05062c6999148ef03ce2653d0ca21e70f66d991ec1d0fe105d280eb19aee57530b34896
diff --git a/dev-util/ignition-cmake/ignition-cmake-2.14.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild
index ce0125bc0d02..0706fbd7174d 100644
--- a/dev-util/ignition-cmake/ignition-cmake-2.14.0.ebuild
+++ b/dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index f32bfe6db88d..7120f78868b8 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,2 @@
 DIST intel-graphics-compiler-1.0.13463.1.tar.gz 8283903 BLAKE2B abe9f2a8cc0c648d985890d65782db2df61966d25b740ee735b0198cee701e79fcd33267b8284002f049cc2582db13c3b33481131570c0d69435a3dc4ada64d4 SHA512 3edafc7cadb946b62b5afa44bf81663c83ad6eab15c2825b60cfb5120da94d66898d3f073af13a747cdf2db586085de14ee75fcdda0e16a1ca7197d5645fe1a9
+DIST intel-graphics-compiler-1.0.13822.1.tar.gz 8356125 BLAKE2B 248bbf34031059506b6e41a07bb3ef0d849f388b660488345d0e21594994f7faa8d498d8f60ba0298c82f7cdf66839bc25bd9bb5856ab273b02fb415e9801176 SHA512 c0705b86955fe6cd38f4756bdd5029ff6ed62305d58b99184d85261b0ed0d9699a176fe414bbafb5e987b831d13d0e6709b1e83a442519500c7d66c049386baa
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild
new file mode 100644
index 000000000000..7fc51ec704b0
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild
@@ -0,0 +1,88 @@
+# 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_{7,8,9,10,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"
+)
+
+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_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__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-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/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
deleted file mode 100644
index 387da2374107..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
-index 291a56b4..19b87ef5 100644
---- a/src/pkgcheck/checks/python.py
-+++ b/src/pkgcheck/checks/python.py
-@@ -234,16 +234,16 @@ class PythonAnyMismatchedDepHasVersionCheck(results.VersionResult, results.Warni
- 
- 
- class PythonMissingSCMDependency(results.VersionResult, results.Warning):
--    """Package is missing BDEPEND on setuptools_scm or alike.
-+    """Package is missing BDEPEND on setuptools-scm or alike.
- 
-     Packages which define ``SETUPTOOLS_SCM_PRETEND_VERSION`` should BDEPEND
--    on ``dev-python/setuptools_scm`` or a similar package [#]_.
-+    on ``dev-python/setuptools-scm`` or a similar package [#]_.
- 
-     .. [#] https://projects.gentoo.org/python/guide/distutils.html#setuptools-scm-flit-scm-hatch-vcs-and-snapshots
-     """
- 
-     desc = (
--        "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools_scm or alike"
-+        "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools-scm or alike"
-     )
- 
- 
-@@ -291,8 +291,10 @@ class PythonCheck(Check):
- 
-     setuptools_scm = frozenset(
-         {
--            "dev-python/setuptools_scm",
--            "dev-python/flit_scm",
-+            "dev-python/setuptools-scm",
-+            "dev-python/setuptools_scm",  # legacy old name
-+            "dev-python/flit-scm",
-+            "dev-python/flit_scm",  # legacy old name
-             "dev-python/hatch-vcs",
-         }
-     )