diff --git a/llvm-core/mlir/Manifest b/llvm-core/mlir/Manifest
index 2b152a7f299f8..e2d28bb840268 100644
--- a/llvm-core/mlir/Manifest
+++ b/llvm-core/mlir/Manifest
@@ -2,3 +2,4 @@ DIST llvm-project-21.1.4.src.tar.xz 158939036 BLAKE2B b87eff4e3cb881d86aafcfdb46
 DIST llvm-project-21.1.4.src.tar.xz.sig 119 BLAKE2B c74a56448ad3e325234fcbe7d62ea888831e1e7696afb5aa5a185ea76a0880abe2d755f9e69a07760bbf9380534c3bb96c920ed6359ffd0f5f51c962d1494dcf SHA512 4812c2e3861aa3b726d842c3ca259b19ef1aa531fed9f6f47099483de91de2b2a165f40d243f6f40f2eea749741d5f8b7090f394399c56db02053f308921077a
 DIST llvm-project-57a8599d14d4685487064e8b8a5c748970daa4d6.tar.gz 250938364 BLAKE2B 793d84c9716cb392667f84005048d549c96cbdbe666b52025c4f3fbd59d47d0b8b1d2485fe5ea52dfb67b6617e97b17197b208dc0d6744468475e459d0193b6d SHA512 06a2dfd70fc7a0bc772a67cc2eb5fe25cf5a170a3e0e07dfa284aaf5f4d90337a66ff026843c7798ed6bbdca84aa42428a9a9caf7ceba354665d2cd811ae84e6
 DIST llvm-project-6a0e5b2fd7c340a872ae1e011cfb9de0d188feba.tar.gz 249848364 BLAKE2B 5d8eadfd43e1a131d7c061968c7d306b0537c0983c9366973d5b8d1bab4b384d1319604e12f097e235e077aefcd8b9c8395c3e16b53612f9f06fb11ba358aad6 SHA512 d931218ca1dafab09525f862f4b993cb6dde2f8738092e84b87542318d05c81fd41499098833f8629501c19f4fa741a35fc6447631f1c8830b2bb0b2cb64cc43
+DIST llvm-project-c1779f33bdada6e478e882cc23a647ef9abaad96.tar.gz 253250521 BLAKE2B fbd40cb52d56d5a817ff6cb469b9772af4eb358584eed1440c82864923add456961a672784838f510c390680a54c4abc7a33159848a34133f8d23b80b5feb0ef SHA512 01f8944ee6c89fd4a56caab236b302bc6b49b933c968a73edcb00ae2522b884371a05a75dec1321b0efed24e20cde4a58e1697c3c097f26ed0fbd629d8cf561c
diff --git a/llvm-core/mlir/mlir-22.0.0_pre20251028.ebuild b/llvm-core/mlir/mlir-22.0.0_pre20251028.ebuild
new file mode 100644
index 0000000000000..4916d3b6f7c34
--- /dev/null
+++ b/llvm-core/mlir/mlir-22.0.0_pre20251028.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit cmake llvm.org multilib-minimal python-any-r1
+
+DESCRIPTION="Multi-Level Intermediate Representation (library only)"
+HOMEPAGE="https://mlir.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( mlir cmake )
+# tablegen tests use *.td files there
+LLVM_TEST_COMPONENTS=( llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	llvm.org_src_prepare
+
+	# https://github.com/llvm/llvm-project/issues/120902
+	sed -i -e '/LINK_LIBS/s:PUBLIC:PRIVATE:' \
+		lib/ExecutionEngine/CMakeLists.txt || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					mlir-libraries|distribution)
+						continue
+						;;
+					# dylib
+					MLIR)
+						;;
+					# installed test libraries
+					MLIRTestAnalysis|MLIRTestDialect|MLIRTestIR)
+						;;
+					MLIROpenACCTestPasses)
+						;;
+					# static libraries
+					MLIR*)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		mlir-cmake-exports
+		mlir-headers
+
+		# the dylib
+		MLIR
+
+		# shared libraries
+		mlir_arm_runner_utils
+		mlir_arm_sme_abi_stubs
+		mlir_async_runtime
+		mlir_c_runner_utils
+		mlir_float16_utils
+		mlir_runner_utils
+
+		# test libraries required by flang
+		MLIROpenACCTestPasses
+		MLIRTestAnalysis
+		MLIRTestDialect
+		MLIRTestIR
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# tools
+			mlir-linalg-ods-yaml-gen
+			mlir-lsp-server
+			mlir-opt
+			mlir-pdll
+			mlir-pdll-lsp-server
+			mlir-query
+			mlir-reduce
+			mlir-rewrite
+			mlir-runner
+			mlir-tblgen
+			mlir-translate
+			tblgen-lsp-server
+			tblgen-to-irdl
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		# this controls building libMLIR.so
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DMLIR_BUILD_MLIR_C_DYLIB=OFF
+		-DMLIR_LINK_MLIR_DYLIB=ON
+		-DMLIR_INCLUDE_TESTS=ON
+		-DMLIR_INCLUDE_INTEGRATION_TESTS=OFF
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		# this enables installing mlir-tblgen and mlir-pdll
+		-DLLVM_BUILD_UTILS=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		-DLLVM_BUILD_TOOLS=ON
+		# TODO
+		-DMLIR_ENABLE_CUDA_RUNNER=0
+		-DMLIR_ENABLE_ROCM_RUNNER=0
+		-DMLIR_ENABLE_SYCL_RUNNER=0
+		-DMLIR_ENABLE_SPIRV_CPU_RUNNER=0
+		-DMLIR_ENABLE_VULKAN_RUNNER=0
+		-DMLIR_ENABLE_BINDINGS_PYTHON=0
+		-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+}
+
+multilib_src_test() {
+	local known_xfail=(
+		# https://github.com/llvm/llvm-project/pull/157885#issuecomment-3288095032
+		mlir-pdll-lsp-server/view-output.test
+	)
+
+	case ${ABI} in
+		arm|ppc|x86)
+			known_xfail+=(
+				# MLIR is full of 64-bit assumptions, sigh
+				# https://github.com/llvm/llvm-project/issues/124541
+				Conversion/MemRefToLLVM/memref-to-llvm.mlir
+				Dialect/Bufferization/Transforms/one-shot-bufferize-pass-statistics.mlir
+				Dialect/LLVMIR/sroa-statistics.mlir
+				Dialect/Linalg/vectorize-tensor-extract.mlir
+				Dialect/MemRef/mem2reg-statistics.mlir
+				Dialect/Tensor/fold-tensor-subset-ops.mlir
+				Dialect/Tensor/tracking-listener.mlir
+				Pass/pipeline-stats-nested.mlir
+				Pass/pipeline-stats.mlir
+			)
+			;;
+	esac
+
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local -x LIT_XFAIL="${known_xfail[*]}"
+	LIT_XFAIL=${LIT_XFAIL// /;}
+	cmake_build check-mlir
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+}