diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index c89f9c1..6c93a81 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1 +1 @@
-DIST metrics-library-1.0.200.tar.gz 262759 BLAKE2B 1ca9bc1ac9292efd689fe582a9630a9f69bc5c65b70b2bac67d0289c7674c881bf2d527715d7b619ea669c3841cfac30e40f1b409f4fb358e2d6571d35e26382 SHA512 8b08e9823440d7e4fc8c9ff4b01622b74cc726febdc5e76830b1751ad063eea9b99ceb021a19f5285d18094b6d8ec93a87c999342147fcf6ef4b04e578d84b65
+DIST intel-metrics-library-1.0.218.tar.gz 272501 BLAKE2B 0025cedff7fecbddb71c006e186ba003241d57d6f09457b7442158d308b4051a85ad9a392e8d238612fb69c7fdf1373a5f557e9326c070781b3a5af12136faa3 SHA512 c280b28d639d730850d5f8e61af812a05d4a1aa3d22a51a092972bf93c3c9bebad51729600cbeb9fdf90f0196891eb50146391fc54f5d95f69fd89a60a6f4064
diff --git a/dev-libs/intel-metrics-library/files/00-no-nonsense-warnings.patch b/dev-libs/intel-metrics-library/files/00-no-nonsense-warnings.patch
new file mode 100644
index 0000000..d9bfed7
--- /dev/null
+++ b/dev-libs/intel-metrics-library/files/00-no-nonsense-warnings.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -626,2 +626,5 @@
+         -Wno-unused-but-set-parameter # disable parameter set but not used warning
++        -Wno-unused-parameter         # allow some jank that other allows missed
++        -Wno-extern-c-compat
++        -Wno-nonnull
+         )
diff --git a/dev-libs/intel-metrics-library/files/01-fix-clang22-null-string-return.patch b/dev-libs/intel-metrics-library/files/01-fix-clang22-null-string-return.patch
new file mode 100644
index 0000000..53d4446
--- /dev/null
+++ b/dev-libs/intel-metrics-library/files/01-fix-clang22-null-string-return.patch
@@ -0,0 +1,11 @@
+--- a/instrumentation/metrics_library/traits/kernel_interface/linux/ml_io_control.h
++++ b/instrumentation/metrics_library/traits/kernel_interface/linux/ml_io_control.h
+@@ -310,7 +310,7 @@
+             if( fstat( m_DrmFile, &fileInfo ) )
+             {
+                 log.Error( "Failed to stat drm file descriptor" );
+-                return nullptr;
++                return {};
+             }
+ 
+             const int32_t majorNumber = major( fileInfo.st_rdev );
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.200-r1.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.218.ebuild
similarity index 56%
rename from dev-libs/intel-metrics-library/intel-metrics-library-1.0.200-r1.ebuild
rename to dev-libs/intel-metrics-library/intel-metrics-library-1.0.218.ebuild
index 1bfa450..87a6e97 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.200-r1.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.218.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,17 +11,22 @@ inherit cmake
 
 DESCRIPTION="User mode driver helper library that provides access to GPU performance counters"
 HOMEPAGE="https://github.com/intel/metrics-library"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${MY_P}"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~X86"
+KEYWORDS="~amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+#	sed -e '/-Werror/d' -i CMakeLists.txt || die
 	sed -e 's/add_definitions/add_compile_options/g' -i CMakeLists.txt || die
+	sed -e 's/-Ofast/-O3 -ffast-math/g' -i CMakeLists.txt || die
+	eapply "${FILESDIR}/00-no-nonsense-warnings.patch"
+	eapply "${FILESDIR}/01-fix-clang22-null-string-return.patch"
+
 	cmake_src_prepare
 }
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.200-r1 b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.200-r1
deleted file mode 100644
index 119f3b6..0000000
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.200-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.28.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libdrm
-DESCRIPTION=User mode driver helper library that provides access to GPU performance counters
-EAPI=8
-HOMEPAGE=https://github.com/intel/metrics-library
-INHERIT=cmake
-KEYWORDS=~amd64 ~X86
-LICENSE=MIT
-RDEPEND=x11-libs/libdrm
-SLOT=0/1.0.200
-SRC_URI=https://github.com/intel/metrics-library/archive/refs/tags/metrics-library-1.0.200.tar.gz
-_eclasses_=toolchain-funcs	98d9f464d912ae6b7316fb8a3721f5db	flag-o-matic	a7afe42e95fb46ce9691605acfb24672	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	3a59a39e97af0f7c03f49cf3c22f262b	xdg-utils	42869b3c8d86a70ef3cf75165a395e09	cmake	22e4e58d68692975dc74424dc9b12fb7
-_md5_=e6d5f74695946c36f85426178e9f1acc
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.218 b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.218
new file mode 100644
index 0000000..f514824
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.218
@@ -0,0 +1,14 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.28.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libdrm
+DESCRIPTION=User mode driver helper library that provides access to GPU performance counters
+EAPI=8
+HOMEPAGE=https://github.com/intel/metrics-library
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libdrm
+SLOT=0/1.0.218
+SRC_URI=https://github.com/intel/metrics-library/archive/refs/tags/1.0.218.tar.gz -> intel-metrics-library-1.0.218.tar.gz
+_eclasses_=toolchain-funcs	5195689ff6a73b0e789acfa09d4fbcb9	flag-o-matic	fd3558f73f6503093adee69adf41020d	multiprocessing	45d0620f25c2f063ad6276ecd9ed9399	ninja-utils	d063ea1900a793f93eb095010d6d9156	xdg-utils	42869b3c8d86a70ef3cf75165a395e09	cmake	3395ce6618fc5c7af03335471b896644
+_md5_=937d9046af4a52eaf1c738e0bc07e973