10 files changed, 392 insertions, 2 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dfab22da0204..1211065a28b9 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 05af91ff3adb..3dc6d6012bcc 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -3,5 +3,7 @@ AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6
 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.15368.3.tar.gz 8991895 BLAKE2B 93da50357052d4711c2bb2b49335aa5f3c27162ab478c8482ba491bda1d2fa4562abd612d052799f71942483256eeb94684db7b248ed6f3ae16c3f898cfa5981 SHA512 43415186f6be8c7821d7b0d5803070e6e707bcf1be64aca2d6f4d8f575e0d8ef0b1ea1b999f9b5ef32ace625feb889c6c875b4d8c66c7de3680ea91b9ae0da6a
+DIST intel-graphics-compiler-1.0.15770.7.tar.gz 9111574 BLAKE2B 41c180693c15759d26110a083e3f0354c3f771c7815b7e82c2493f73eb2fc79f9130e354ba5caf5636426e9f696f6fa6c42944aa1ff1008a916b25e04c90ef80 SHA512 c386eb03bb3c03eba649dec67b3ccc8d5fa0238e622586d095a3e4d5aa6c52e8bdc5dbf85bc95533f13d97f15cddadc925f3518a37b223e18c03653519058f2c
 EBUILD intel-graphics-compiler-1.0.15368.3.ebuild 2872 BLAKE2B 408edc41973ba22f466dd7aac95867127488cd4d7762e9949eb1c987239f11eb89e472bc532e84a8c1f76a1d5ef42706a950ee3b7b619832b2fdb33d1195c88b SHA512 4fde88d8f25951f851c5e9aaf2e7d1361afcf7cc80f15738e963dd2ffc4d3e892018d1ab7c54993c277572cd7a9e5bc2c02bc7a1efd085b1d4ae616e26bfb7b2
+EBUILD intel-graphics-compiler-1.0.15770.7.ebuild 2828 BLAKE2B c81fd5095bd2d8fc412ba258ff7d75cc0f6f00c65f8aea48171352d37eabd85fc8652d5d2051c8620d1963ac702d1385b455560c70b5a09e338509a1ef2c0ae4 SHA512 5044da7d71a19ca64d973da5eddc5a8497f787de4214eb9d1a1f4f7ac53b25546e78c8b98f24c5f1fac4e03f26bcf1837c4df4572b680691bea33411eb2fd90a
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.7.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.7.ebuild
new file mode 100644
index 000000000000..2f72895347fc
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.7.ebuild
@@ -0,0 +1,101 @@
+# 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="15"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{10..12} )
+
+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.16.0
+		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+}
+
+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_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+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' '')
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-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-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index 185cbce35c6a..44aff4eb0024 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.13.tar.gz 188769 BLAKE2B 95e6929c85c299b23ba1996c1e365aad65b975c94852a427fa24b35d4a42fae1ff49ee941bc754543db52a3c79d59fbf27e635866721a51301f7623591c40012 SHA512 9ea523c168d80dadae863c89ce8abefd7510687b721f9e5a0573b28e157b7ecec9caf4717381a3bee29d59611c6f06b77f263f3973063112eb8ca3493d2bc720
+DIST intel-graphics-system-controller-0.8.16.tar.gz 192027 BLAKE2B fc97dffcffe53b92fa03b9fbcaa2f784f3fd33e4cdfa2f85548d2f6bea60bdf1868b003a45448829685fd961f9699534781de3ce43703a378168d50bf14927ce SHA512 105950a44c3b756fa4c23aa1590e2c0ae2f83af87660af14889641465433903a9e2973c8689338a716e67799098a762885933ba53c4a8de72ca4be3dbb134a84
 EBUILD intel-graphics-system-controller-0.8.13-r1.ebuild 1090 BLAKE2B 9d6556f5b7b99b9ac14363d29f15f09fc3afd5a919e159936ca7c751cdafa238166f4108241a5364b74228d3041d6e50d175928d958204b2ca5e7074f8b47b74 SHA512 0cdbf19d5d385cbbf95d13734cc45841ef95dcd31a19e93c0abffe3114414d49cc836a2ce91c0fb8c1d721a8dc085aa838ac14ee578295b768e2083bed3bd55d
+EBUILD intel-graphics-system-controller-0.8.16.ebuild 1091 BLAKE2B e467d546e7026599548dd293c73806085c11fb85c018067e5bcf1681f177b1e695038ca1736989143fc8437d05ca95442e39e81858dc2c0ed10414e98e2e98e1 SHA512 69330997049dbc6b552cb2b236a2b81fff94b7d978d025a894952a275d64db8491be13681a53663e71298f7d5ca543faf6ccf854c39db81b194500a544f8e858
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.16.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.16.ebuild
new file mode 100644
index 000000000000..ff1020e9561a
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.16.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 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_{9..12} )
+
+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-3.2.4:="
+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
+}
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index 493ceb013d2d..0a88e27f50e1 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,8 +1,10 @@
 DIST mesa-23.3.0-rc5.tar.xz 19227440 BLAKE2B 844eb3dacc6f579f1a7bff74fc20ec22021ac33dcdd716488487e66e9ef8c6be4a5eaf7260628eec58baa55fd70bfe4a6223e83ea8b163d6e16dd8677af3c7e3 SHA512 f1c2421ab262da422ed9ac5ca08b0e1c41264373e022de9413c65e1e7e8ee929979d1c80741497a0acba1d118665a7f6076e24139be0c9c70f3fe8f5d319c187
 DIST mesa-23.3.0.tar.xz 19234688 BLAKE2B 1b87d15cbe1b4c761653b7042c46eac3036f08dfcf3a0a81aa7bf6c1c0c402b05f37ce8da9d88df72e1745d66a648c2b8c161b04bf558107f548f6d8167cc798 SHA512 3568b571974a2c6c0c3a4cc614c851729962e39926f0af906ba91604f9d43c0618db7df004cbec5d9e5dbade2d6bde818608c9aa1686183994d68ad3e6ac4521
 DIST mesa-23.3.1.tar.xz 19337988 BLAKE2B 73696281868e5eba6493cc34786a6c30eaf256bed2495444be9a1a5ebf1a0d4b8f00bcc3fb91ce9de3ac8ff23663e41cab17b8fe42b1048366c8e9b95aefa905 SHA512 0861fb5083e37439ad8cc0a0d8372a7c84d8665ea298dc784e2dd893162e20ae072f5ef0b860be88ecf74bc123714acbc1dec312e139b892ff40ef1887c5f4a5
+DIST mesa-23.3.2.tar.xz 19365140 BLAKE2B fc97e17dd7a139056190010325f1d57978ef8618ae87731f459daedc303223f3fbce660c2361dcd518d35c709357435366c75ebfd6366daa9f0dec99b534604f SHA512 634d2b67ade2121de3f19f2cccd4bf7ceb2ac391b9366587ed1c2412444e010de8ec14a25529fdec1f43f943096422eb23cefcb8a89d2f8b20286850188b65c3
 EBUILD intel_clc-23.3.0.ebuild 2490 BLAKE2B e26856b1c348027490d3012ab18a732d1c8216f93c3ad57df6764818ec6b8e72d4e28a98bab9346bf5d0cc78f2becf2b2b8ba8f35e545753680109eb72ed4f80 SHA512 218a4bb0b8b4f07b24162c7743dee325b65cb9751a994d53fd2dc57fe132200593b5d65ea771b00405d798fdd43dfe937abbdf8331d4317fa536748f8b21508a
 EBUILD intel_clc-23.3.0_rc5-r1.ebuild 2490 BLAKE2B e26856b1c348027490d3012ab18a732d1c8216f93c3ad57df6764818ec6b8e72d4e28a98bab9346bf5d0cc78f2becf2b2b8ba8f35e545753680109eb72ed4f80 SHA512 218a4bb0b8b4f07b24162c7743dee325b65cb9751a994d53fd2dc57fe132200593b5d65ea771b00405d798fdd43dfe937abbdf8331d4317fa536748f8b21508a
 EBUILD intel_clc-23.3.1.ebuild 2490 BLAKE2B e26856b1c348027490d3012ab18a732d1c8216f93c3ad57df6764818ec6b8e72d4e28a98bab9346bf5d0cc78f2becf2b2b8ba8f35e545753680109eb72ed4f80 SHA512 218a4bb0b8b4f07b24162c7743dee325b65cb9751a994d53fd2dc57fe132200593b5d65ea771b00405d798fdd43dfe937abbdf8331d4317fa536748f8b21508a
-EBUILD intel_clc-9999.ebuild 2490 BLAKE2B e26856b1c348027490d3012ab18a732d1c8216f93c3ad57df6764818ec6b8e72d4e28a98bab9346bf5d0cc78f2becf2b2b8ba8f35e545753680109eb72ed4f80 SHA512 218a4bb0b8b4f07b24162c7743dee325b65cb9751a994d53fd2dc57fe132200593b5d65ea771b00405d798fdd43dfe937abbdf8331d4317fa536748f8b21508a
+EBUILD intel_clc-23.3.2.ebuild 2490 BLAKE2B 7d15efd1b7d112b99e45f6a7b8077026a8bef485c28df5909c80b3f6d2cecde9c6f596749f98e8c3b442144e9d381b91782d74b87c90aaded1bbb42189cf01fe SHA512 3f77286e94697fc531e14445615b37dc66d411579a1057233b5086813541fc7efef18ee293f839686a90c430006fc6467a6e0d16c8dd16c66b516a7d99e3637b
+EBUILD intel_clc-9999.ebuild 2490 BLAKE2B 7d15efd1b7d112b99e45f6a7b8077026a8bef485c28df5909c80b3f6d2cecde9c6f596749f98e8c3b442144e9d381b91782d74b87c90aaded1bbb42189cf01fe SHA512 3f77286e94697fc531e14445615b37dc66d411579a1057233b5086813541fc7efef18ee293f839686a90c430006fc6467a6e0d16c8dd16c66b516a7d99e3637b
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-23.3.2.ebuild b/dev-util/intel_clc/intel_clc-23.3.2.ebuild
new file mode 100644
index 000000000000..b96f57ecbd96
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-23.3.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
+# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
+LLVM_MAX_SLOT="17"
+LLVM_MIN_SLOT="15"
+PER_SLOT_DEPSTR="
+	(
+		dev-util/spirv-llvm-translator:@SLOT@
+		sys-devel/clang:@SLOT@
+		sys-devel/llvm:@SLOT@
+	)
+"
+LLVM_DEPSTR="
+	|| (
+		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
+			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
+		done)
+	)
+	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=
+"
+RDEPEND="${RDEPEND}
+	${LLVM_DEPSTR}
+"
+unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
+
+llvm_check_deps() {
+	has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" &&
+	has_version "sys-devel/clang:${LLVM_SLOT}" &&
+	has_version "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dzstd=disabled
+
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/dev-util/intel_clc/intel_clc-9999.ebuild b/dev-util/intel_clc/intel_clc-9999.ebuild
index e1a7520244d4..b96f57ecbd96 100644
--- a/dev-util/intel_clc/intel_clc-9999.ebuild
+++ b/dev-util/intel_clc/intel_clc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit llvm meson python-any-r1
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 837f47201709..f8ad892cfc15 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -5,6 +5,7 @@ DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-17858ce6f3d24f994f6ad8c899bfa4eed39f739d.tar.gz 204267841 BLAKE2B 05232178574de9f7e6d4c2e5eb59cabc70670d14b5f92010a42aa3ab6087abd992672044857e6f8d21cd9d2c3d8129b47420f5e3ec746b50e82a3cac5352e824 SHA512 e7836fc56d7121d762cd714a4cd5e28c8b068ff375928d3b5cd32d7e4488b5cf59b21e16250b4f12a973ada3f73ce246af2cc3cd83efca17dc9c3da5b458196d
+DIST llvm-project-a700298b3d538452915703268ca18f7f8f7537e6.tar.gz 204307149 BLAKE2B 70c7bdf9694343145d12fe494bceb7e4c4325136a4d8eecaec0a53cb6193d42a6ce47e048569f4fe3bc1754e6a114cbc97225344f9cfc4f39935323d4cb64f68 SHA512 76b2c621a97ec3fffe504f4e7c9c5af4db1ee63556291078d302c2c88596b7d07d07d607226361d4272f7757cd8246faff64f4ad36b86cde141ded65fd0b7a62
 DIST llvm-project-d37ced88809cb4d2df57ec80887b3f8801ca719b.tar.gz 203826420 BLAKE2B 58448df837f2119720a36b837d0e4f2b2fc00da5658706b193b9d2d180cf0f6c5eb79a9cc0fa9d94310996a95210115a5a46371bd8537f16e105adea14a72399 SHA512 1348e5bf736acaeebf0ae0f613973e6c2d439d360c2272bb4ab112e579b12c297970bb765fd774c768aa55a922c93048b1d8ae6bfd636b241fa86f9427cc2069
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.6-r1.ebuild 2535 BLAKE2B 96b212bd55d3417a34975343e3a69a9673702c9bbe33c76499631a0b82f80edda2ada1de120c65641ed66bbf439d044a023795430d3f1b6c6d9cf134d0d3c8bf SHA512 988ea025731e7ae0f92a9090e3d0a3701b4f3671894492cdd9555a0ff3c0425f08e1b25a542a652c0ba549a79b175285ec5b29d2c06b34e3bc54aa0ace81beb2
@@ -13,4 +14,5 @@ EBUILD lldb-17.0.6.ebuild 2647 BLAKE2B 4a54e032b4f18fdaad612fd405336f4ee526a5cc7
 EBUILD lldb-18.0.0.9999.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
 EBUILD lldb-18.0.0_pre20231215.ebuild 2701 BLAKE2B 30ae09514d80a713fb7b7f57f0754c6b104f7b80229dd53b76f5cc216923c429603adc50fbdc3650f102aeb4c19f25ba47413ae14a507df74ae0bbc36cbf61ef SHA512 1f68efe8cc4371574b8dcab034bb08d59059d7ef0e4c4fbf15d78c84a52339657c7731a23f534d11feb6603a851ef675d31b89a2d9d8a6ac4c054452e795f178
 EBUILD lldb-18.0.0_pre20231222.ebuild 2701 BLAKE2B 30ae09514d80a713fb7b7f57f0754c6b104f7b80229dd53b76f5cc216923c429603adc50fbdc3650f102aeb4c19f25ba47413ae14a507df74ae0bbc36cbf61ef SHA512 1f68efe8cc4371574b8dcab034bb08d59059d7ef0e4c4fbf15d78c84a52339657c7731a23f534d11feb6603a851ef675d31b89a2d9d8a6ac4c054452e795f178
+EBUILD lldb-18.0.0_pre20231228.ebuild 2701 BLAKE2B 30ae09514d80a713fb7b7f57f0754c6b104f7b80229dd53b76f5cc216923c429603adc50fbdc3650f102aeb4c19f25ba47413ae14a507df74ae0bbc36cbf61ef SHA512 1f68efe8cc4371574b8dcab034bb08d59059d7ef0e4c4fbf15d78c84a52339657c7731a23f534d11feb6603a851ef675d31b89a2d9d8a6ac4c054452e795f178
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-18.0.0_pre20231228.ebuild b/dev-util/lldb/lldb-18.0.0_pre20231228.ebuild
new file mode 100644
index 000000000000..3e688e1370ae
--- /dev/null
+++ b/dev-util/lldb/lldb-18.0.0_pre20231228.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# broken in standalone build
+	# https://github.com/llvm/llvm-project/pull/70996#issuecomment-1843275813
+	sed -e '/Debuginfod/d' \
+		-i source/Plugins/SymbolLocator/CMakeLists.txt || die
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}