4 files changed, 17 insertions, 70 deletions
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.18.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.18.ebuild
deleted file mode 100644
index 4130b852a9b5..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2009-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit flag-o-matic python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-IUSE="cpu_flags_x86_sse2 gles2-only +jit localstorage vulkan +widgets"
-REQUIRED_USE="jit? ( x86? ( cpu_flags_x86_sse2 ) )"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-)
-
-src_prepare() {
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	replace-flags "-Os" "-O2" # bug 840861
-
-	local myqmakeargs=(
-		--
-		-qml-debug
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch b/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch
new file mode 100644
index 000000000000..fb2ec7180157
--- /dev/null
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch
@@ -0,0 +1,15 @@
+Seems that the '5' enforces the major version and it refuses to find
+system's assimp-6.0.2 (which is perfectly usable given Qt 6.9.2 bundles
+that version without it).
+
+We don't package older ones, so drop the check as a quick workaround.
+
+https://bugreports.qt.io/browse/QTBUG-137996
+--- a/src/plugins/assetimporters/configure.cmake
++++ b/src/plugins/assetimporters/configure.cmake
+@@ -16 +16 @@
+-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp
++qt_find_package(WrapQuick3DAssimp PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp
+@@ -43 +43 @@
+-                   PACKAGES PACKAGE WrapQuick3DAssimp 5.1.6)
++                   PACKAGES PACKAGE WrapQuick3DAssimp)
diff --git a/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild
index 0ae502e79761..d9574f2c9091 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild
@@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-	"${FILESDIR}"/${PN}-6.9.2-assimp6.patch
+	"${FILESDIR}"/${PN}-6.11.0-assimp6.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index 0ae502e79761..d9574f2c9091 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-	"${FILESDIR}"/${PN}-6.9.2-assimp6.patch
+	"${FILESDIR}"/${PN}-6.11.0-assimp6.patch
 )
 
 src_configure() {