6 files changed, 93 insertions, 54 deletions
diff --git a/dev-util/cproto/cproto-4.7u.ebuild b/dev-util/cproto/cproto-4.7u-r1.ebuild
index 065167dec606..30f8f696e3d9 100644
--- a/dev-util/cproto/cproto-4.7u.ebuild
+++ b/dev-util/cproto/cproto-4.7u-r1.ebuild
@@ -15,8 +15,9 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND="
-	sys-devel/flex
+DEPEND="app-alternatives/lex"
+BDEPEND="
+	app-alternatives/lex
 	app-alternatives/yacc
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
 "
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 807155d51172..e3bf3a70fa09 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,2 @@
 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
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.ebuild
new file mode 100644
index 000000000000..d8a6834a6746
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5.ebuild
@@ -0,0 +1,86 @@
+# 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_{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"
+
+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/laminar/Manifest b/dev-util/laminar/Manifest
index 8ec6ca23072d..af049e422263 100644
--- a/dev-util/laminar/Manifest
+++ b/dev-util/laminar/Manifest
@@ -1,2 +1 @@
-DIST laminar-1.1.tar.gz 100429 BLAKE2B aadd04edb3c4921f762f3e3e7856ca60a54718a501fa342eb709777d56aa01bd6fff80ec0073010db61e9938bdd0ec3571134f9a2b020b5f97e8a20c387dac29 SHA512 b8cf0c2ee743614fe95d73c75692f9c4805e3c30e2cea369f8d8688b9bb6c287d06e97f9eaf2013dfb283380abd4637e16a44130c94abcf5a326651d6ce795a0
 DIST laminar-1.2.tar.gz 102614 BLAKE2B 2d5573bcc59edec61c756fc816c8fa7447b087d91b9e877374be3ed4550f3f2cfe59da930f72e961f767d0b4e39c4ff6659dc894c785776f81a954ec11e076d0 SHA512 3fc563dd735efad5fe35a4f8f8fa0b124b0113dc43578ea4c7e8415e5139a0d462a75ac88c9406336fd2c54e98cb9c27d9f268eaeeb738a304bfa19b0f05370a
diff --git a/dev-util/laminar/laminar-1.1-r1.ebuild b/dev-util/laminar/laminar-1.1-r1.ebuild
deleted file mode 100644
index 7b12697d6322..000000000000
--- a/dev-util/laminar/laminar-1.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2021 LiGurOs Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-inherit cmake user systemd
-DESCRIPTION="A lightweight continuous integration server"
-HOMEPAGE="https://laminar.ohwg.net https://github.com/ohwgiles/laminar"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="https://github.com/ohwgiles/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="network-sandbox"
-IUSE=""
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	acct-group/laminar
-	acct-user/laminar
-	>=dev-libs/capnproto-0.7.0
-	>=dev-libs/rapidjson-1.1.0
-	>=dev-cpp/websocketpp-0.7.0
-	>=dev-libs/boost-1.62
-	dev-db/sqlite:3"
-
-src_prepare() {
-	eapply ${FILESDIR}/laminar-manpage.patch
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_BUILD_TYPE=Release
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/laminar.initd laminar
-	newconfd "${FILESDIR}"/laminar.confd laminar
-	doman ${S}/etc/laminarc.1
-	doman ${S}/etc/laminard.8
-
-	cmake_src_install
-}
-
diff --git a/dev-util/laminar/laminar-1.2-r1.ebuild b/dev-util/laminar/laminar-1.2-r2.ebuild
index b868b2b74fbf..9b30f40d362a 100644
--- a/dev-util/laminar/laminar-1.2-r1.ebuild
+++ b/dev-util/laminar/laminar-1.2-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2020-2022 LiGurOs Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 
-inherit cmake user systemd
+inherit cmake systemd
 DESCRIPTION="A lightweight continuous integration server"
 HOMEPAGE="https://laminar.ohwg.net https://github.com/ohwgiles/laminar"
 LICENSE="GPL-3"