diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index e0f343c97c004..339cdc3160372 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,3 @@
 DIST extra-cmake-modules-6.18.0.tar.xz 330388 BLAKE2B aaeef9fccfd5116fb90402004984b5073b7d62db80035a6d461374d0ceeb4099439eb6500f0d04faf1f62845fb9bba97544b944bff630c61ac368404e3a507fd SHA512 b657f22a27bb968fa67092c8037698613270feb18b4a87a53e97280d8db3df38558d0eff5c7f350d9b17b4270004139a9a71a5eb0586746bf447b3a44b57b9f0
 DIST extra-cmake-modules-6.20.0.tar.xz 334164 BLAKE2B 1e6cb0037a70bc3d40e29eff5b074808c317a113e0c634a6c196ce5a0558c5dcc0ef71f512ce469be3098cea596507795aeed63580c9488266224b7898845f48 SHA512 f72fdd399c3f6b4f642df1abb0fb34b219b40e96bd9300316677051dbb1cb7debfec64e5eac14ab6e6a44b21be9571faa46e03a29b29aa1d07d73b4a3b5c6e7c
+DIST extra-cmake-modules-6.21.0.tar.xz 334524 BLAKE2B a8c5e50e93896be2f461b7cc1675759163d2352d3df3b54c9ad88390d2b91df3e680d41260cd2a95ec52944fb64611f6988958bbf63fc57b2d4161e6dca36ef3 SHA512 538becafd3b7406b35596ddf4d8cc5b3aa032cd81e313a1ddaea3264b1d87c315efdd3d426116d237cc7007447e0c8e3c8f46e61d40bf7ed5de9f3949f7a4ad5
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.21.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.21.0.ebuild
new file mode 100644
index 0000000000000..60907cdd76876
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.21.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_QA_COMPAT_SKIP=1 # bug #964519 tests/ subdir is irrelevant
+PYTHON_COMPAT=( python3_{11..14} )
+QTMIN=6.8.1
+inherit cmake frameworks.kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/libarchive[bzip2]"
+DEPEND="
+	test? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+		>=dev-qt/qtdeclarative-${QTMIN}:6
+	)
+"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		>=dev-qt/qttools-${QTMIN}:6[assistant]
+	)
+	test? (
+		>=dev-qt/qtbase-${QTMIN}:6
+		>=dev-qt/qttools-${QTMIN}:6[linguist]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
+	"${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch"
+	"${FILESDIR}/${PN}-6.5.0-disable-appstreamtest.patch"
+	"${FILESDIR}/${PN}-6.5.0-disable-git-commit-hooks.patch"
+)
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+	)
+	if use test; then
+		mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# passes, but then breaks src_install
+		ECMToolchainAndroidTest
+		# broken, bug #627806
+		ECMPoQmToolsTest
+		# can not possibly succeed in releases, bug #764953
+		KDEFetchTranslations
+	)
+	# possible race condition with multiple jobs, bug #701854
+	cmake_src_test -j1
+}