diff --git a/app-emulation/FEX/FEX-2412-r1.ebuild b/app-emulation/FEX/FEX-2412-r1.ebuild
new file mode 100644
index 0000000..0f96b3d
--- /dev/null
+++ b/app-emulation/FEX/FEX-2412-r1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 19 )
+LLVM_OPTIONAL=1
+
+inherit flag-o-matic cmake toolchain-funcs llvm-r1
+
+DESCRIPTION="A fast usermode x86 and x86-64 emulator for Arm64 Linux"
+HOMEPAGE="https://fex-emu.com"
+
+JEMALLOC_HASH="02ca52b5fefc0ccd0d2c4eaa1d17989cdd641927"
+JEMALLOC_GLIBC_HASH="404353974e335fb771562249163e2ea62c558e7e"
+CPP_OPTPARSE_HASH="eab4212ae864ba64306f0fe87f102e66cb5a3617"
+ROBIN_MAP_HASH="d5683d9f1891e5b04e3e3b2192b5349dc8d814ea"
+
+# This need to be vendored since thunk generator does not support the latest version
+VULKAN_HEADERS_HASH="29f979ee5aa58b7b005f805ea8df7a855c39ff37"
+
+SRC_URI="
+	https://github.com/FEX-Emu/jemalloc/archive/${JEMALLOC_HASH}.tar.gz -> jemalloc-${JEMALLOC_HASH}.tar.gz
+	https://github.com/FEX-Emu/jemalloc/archive/${JEMALLOC_GLIBC_HASH}.tar.gz -> jemalloc-glibc-${JEMALLOC_GLIBC_HASH}.tar.gz
+	https://github.com/Sonicadvance1/cpp-optparse/archive/${CPP_OPTPARSE_HASH}.tar.gz -> cpp-optparse-${CPP_OPTPARSE_HASH}.tar.gz
+	https://github.com/FEX-Emu/robin-map/archive/${ROBIN_MAP_HASH}.tar.gz -> robin-map-${ROBIN_MAP_HASH}.tar.gz
+	thunks? (
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HEADERS_HASH}.tar.gz -> Vulkan-Headers-${VULKAN_HEADERS_HASH}.tar.gz
+	)
+	https://github.com/FEX-Emu/${PN}/archive/refs/tags/${P}.tar.gz
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~arm64"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+	thunks? (
+		!crossdev-toolchain? (
+			sys-devel/x86_64-multilib-toolchain
+		)
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+"
+RDEPEND="
+	dev-libs/xxhash
+	>=dev-libs/libfmt-11.0.2
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[wayland(-),X(-)]
+		dev-qt/qtwidgets[X]
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,wayland(-),widgets,X(-)]
+		dev-qt/qtdeclarative:6
+	)
+	thunks? (
+		x11-libs/libX11
+		x11-libs/libdrm
+		dev-libs/wayland
+		media-libs/alsa-lib
+		media-libs/libglvnd
+		x11-libs/libxcb
+	)
+	app-emulation/fex-rootfs-gentoo
+	app-emulation/fex-rootfs-mesa-asahi
+"
+DEPEND="
+	>=sys-kernel/linux-headers-6.8
+	${RDEPEND}
+"
+
+PATCHES="
+	${FILESDIR}/${P}-unvendor-drm-headers.patch
+	${FILESDIR}/${P}-tiny-json-as-static.patch
+	${FILESDIR}/${PN}-thunks-toolchain-paths.patch
+	${FILESDIR}/${PN}-thunkgen-gcc-install-dir.patch
+	${FILESDIR}/${P}-llvm19-support.patch
+	${FILESDIR}/${P}-revert-pause-inst-changes.patch
+"
+
+IUSE="crossdev-toolchain fexconfig qt5 qt6 +thunks"
+
+REQUIRED_USE="
+	crossdev-toolchain? ( thunks )
+	fexconfig? ( ^^ ( qt5 qt6 ) )
+	thunks? ( ${LLVM_REQUIRED_USE} )
+"
+
+my-test-flag-PROG() {
+	local comp=$1
+	local lang=$2
+	shift 2
+
+	if [[ -z $1 ]]; then
+		return 1
+	fi
+
+	if ! type -p ${comp[0]} >/dev/null; then
+		return 1
+	fi
+
+	local in_src in_ext cmdline_extra=()
+	case "${lang}" in
+		c)
+			in_ext='c'
+			in_src='int main(void) { return 0; }'
+			cmdline_extra+=(-xc -c)
+			;;
+		c++)
+			in_ext='cc'
+			in_src='int main(void) { return 0; }'
+			cmdline_extra+=(-xc++ -c)
+			;;
+	esac
+	local test_in=${T}/test-flag.${in_ext}
+	local test_out=${T}/test-flag.exe
+
+	printf "%s\n" "${in_src}" > "${test_in}" || die "Failed to create '${test_in}'"
+	local cmdline=(
+		"${comp[@]}"
+		-Werror
+		"$@"
+		"${cmdline_extra[@]}"
+		"${test_in}" -o "${test_out}"
+	)
+
+	"${cmdline[@]}" &>/dev/null
+}
+
+my-test-flags-PROG() {
+	local comp=$1
+	local lang=$2
+	local flags=()
+	local x
+
+	shift 2
+
+	while (( $# )); do
+		case "$1" in
+			--param|-B)
+				if my-test-flag-PROG ${comp} ${lang} "$1" "$2"; then
+					flags+=( "$1" "$2" )
+				fi
+				shift 2
+				;;
+			*)
+				if my-test-flag-PROG ${comp} ${lang} "$1"; then
+					flags+=( "$1" )
+				fi
+				shift 1
+				;;
+		esac
+	done
+
+	echo "${flags[*]}"
+	[[ ${#flags[@]} -gt 0 ]]
+}
+
+my-filter-var() {
+	local f x var=$1 new=()
+	shift
+
+	for f in ${!var} ; do
+		for x in "$@" ; do
+			[[ ${f} == ${x} ]] && continue 2
+		done
+		new+=( "${f}" )
+	done
+	export ${var}="${new[*]}"
+}
+
+THUNK_INC_DIR="${WORKDIR}/thunk-include"
+
+find_compiler() {
+	(
+		pattern="$1"
+		shift
+		shopt -s nullglob
+		IFS=: read -r -a paths <<<"$PATH"
+		for dir in "${paths[@]}"; do
+			for cand in "$dir"/$pattern; do
+				"${cand}" -o /dev/null -x c "$@" - 2>/dev/null >/dev/null <<<'int main(){}' && echo "${cand#/${dir}}" && return 0
+			done
+		done
+		return 1
+	)
+}
+
+pkg_setup() {
+	use thunks && llvm-r1_pkg_setup
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+	use thunks || return
+	use crossdev-toolchain || return
+	errmsg="Unable to find a working ARCH compiler on your system. You need to install one using crossdev."
+	find_compiler 'x86_64*-linux-gnu-gcc' >/dev/null || die "${errmsg/ARCH/x86_64}"
+	find_compiler 'i?86*-linux-gnu-gcc' >/dev/null || find_compiler 'x86_64*-linux-gnu-gcc' -m32 >/dev/null || die "${errmsg/ARCH/i686}"
+}
+
+src_unpack() {
+	default
+	local -A deps=(
+		jemalloc "jemalloc-${JEMALLOC_HASH}"
+		jemalloc_glibc "jemalloc-${JEMALLOC_GLIBC_HASH}"
+		robin-map "robin-map-${ROBIN_MAP_HASH}"
+	)
+	use thunks && deps[Vulkan-Headers]="Vulkan-Headers-${VULKAN_HEADERS_HASH}"
+	for dep in "${!deps[@]}"; do
+		rmdir "${S}/External/${dep}" || die
+		mv "${WORKDIR}/${deps[${dep}]}" "${S}/External/${dep}"
+	done
+	rmdir "${S}/Source/Common/cpp-optparse" || die
+	mv "${WORKDIR}/cpp-optparse-${CPP_OPTPARSE_HASH}" "${S}/Source/Common/cpp-optparse" || die
+}
+
+THUNK_HEADERS="
+	GL
+	EGL
+	GLES
+	GLES2
+	GLES3
+	KHR
+	glvnd
+	wayland-client-core.h
+	wayland-client-protocol.h
+	wayland-client.h
+	wayland-cursor.h
+	wayland-egl-backend.h
+	wayland-egl-core.h
+	wayland-egl.h
+	wayland-server-core.h
+	wayland-server-protocol.h
+	wayland-server.h
+	wayland-util.h
+	wayland-version.h
+	X11
+	libdrm
+	libsync.h
+	xf86drm.h
+	xf86drmMode.h
+	alsa
+	xcb
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i -e "s:__REPLACE_ME_WITH_HEADER_DIR__:${THUNK_INC_DIR}:" ThunkLibs/GuestLibs/CMakeLists.txt || die
+	mkdir "${THUNK_INC_DIR}" || die
+	for header in $THUNK_HEADERS; do
+		cp -a "${BROOT}/usr/include/${header}" "${THUNK_INC_DIR}/${header}" || die
+	done
+}
+
+src_configure() {
+	if ! tc-is-clang ; then
+		AR=llvm-ar
+		CC=clang
+		CXX=clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+		STRIP=llvm-strip
+
+		strip-unsupported-flags
+	fi
+	oldpath="${PATH}"
+	use crossdev-toolchain || PATH="${BROOT}/usr/lib/x86_64-multilib-toolchain/bin:${PATH}"
+
+	local x64_cc="$(find_compiler 'x86_64*-linux-gnu-gcc' || die)"
+	local x86_cc
+	if x86_cc="$(find_compiler 'x86_64*-linux-gnu-gcc' -m32)"; then
+		x86_cc="${x86_cc} -m32"
+	else
+		x86_cc="$(find_compiler 'i?86*-linux-gnu-gcc' || die)"
+	fi
+
+	sed -i -e "s:__REPLACE_ME_WITH_C_COMPILER__:${x64_cc}:" toolchain_x86_64.cmake || die
+	sed -i -e "s:__REPLACE_ME_WITH_C_COMPILER__:${x86_cc}:" toolchain_x86_32.cmake || die
+	sed -i -e "s:__REPLACE_ME_WITH_CXX_COMPILER__:${x64_cc/linux-gnu-gcc/linux-gnu-g++}:" toolchain_x86_64.cmake || die
+	sed -i -e "s:__REPLACE_ME_WITH_CXX_COMPILER__:${x86_cc/linux-gnu-gcc/linux-gnu-g++}:" toolchain_x86_32.cmake || die
+
+	export X86_CFLAGS="$(my-test-flags-PROG ${x64_cc/%gcc/cc} c ${CFLAGS} ${LDFLAGS})"
+	export X86_CXXFLAGS="$(my-test-flags-PROG ${x64_cc/%gcc/c++} c++ ${CXXFLAGS} ${LDFLAGS})"
+	export X86_LDFLAGS="$(my-test-flags-PROG ${x64_cc/%gcc/cc} c ${LDFLAGS})"
+
+	my-filter-var X86_CFLAGS '-flto*' -fwhole-program-vtables '-fsanitize=cfi*'
+	my-filter-var X86_CXXFLAGS '-flto*' -fwhole-program-vtables '-fsanitize=cfi*'
+
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=False
+		-DENABLE_CCACHE=False
+		-DENABLE_LTO=$(if tc-is-lto; then echo True; else echo False; fi)
+		-DBUILD_FEXCONFIG=$(usex fexconfig)
+		-DBUILD_THUNKS=$(usex thunks)
+		-DX86_CFLAGS="${X86_CFLAGS}"
+		-DX86_CXXFLAGS="${X86_CXXFLAGS}"
+		-DX86_LDFLAGS="${X86_LDFLAGS}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	tc-is-lto && dostrip -x /usr/lib/libFEXCore.a
+	use thunks && dostrip -x /usr/share/fex-emu/GuestThunks{,_32}/
+	rm "${ED}/usr/share/man/man1/FEX.1.gz" || die
+	PATH="${oldpath}"
+}
+
+pkg_postinst() {
+	if [[ "$(getconf PAGESIZE)" -ne 4096 ]] && ! type -P "${EPREFIX}/usr/bin/muvm" >/dev/null ; then
+		ewarn "Your system page size is not 4096 and as such"
+		ewarn "you need to install app-emulation/muvm or a similar solution"
+		ewarn "for FEX to work on your machine."
+	fi
+}
diff --git a/app-emulation/FEX/files/FEX-2412-revert-pause-inst-changes.patch b/app-emulation/FEX/files/FEX-2412-revert-pause-inst-changes.patch
new file mode 100644
index 0000000..71a9be0
--- /dev/null
+++ b/app-emulation/FEX/files/FEX-2412-revert-pause-inst-changes.patch
@@ -0,0 +1,26 @@
+From 71158784ae331089350c8965c427a822ef87eedf Mon Sep 17 00:00:00 2001
+From: James Calligeros <jcalligeros99@gmail.com>
+Date: Sat, 7 Dec 2024 10:11:11 +1000
+Subject: [PATCH] Revert "FEXCore: Change yield implementation to use wfe"
+
+This reverts commit e53f3969e9cc2086fd3f6d283a2d45f2ec67f12c.
+---
+ FEXCore/Source/Interface/Core/JIT/MiscOps.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp b/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp
+index b826c038c..717a92af5 100644
+--- a/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp
++++ b/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp
+@@ -267,7 +267,7 @@ DEF_OP(RDRAND) {
+ }
+ 
+ DEF_OP(Yield) {
+-  wfe();
++  yield();
+ }
+ 
+ #undef DEF_OP
+-- 
+2.47.1
+