9 files changed, 198 insertions, 73 deletions
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 062dd560f1d2..60dd15a7409f 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,2 +1,3 @@
-DIST qt3d-everywhere-src-5.14.1.tar.xz 81561704 BLAKE2B 6c68a27f16c148ba6a1a80ba044fc928187df3462224060d5b2a4ce9a083521a900703c5c80327c8080cb3a41a63d84f6b7e12b4b44763fe1b1c4811f18c76f4 SHA512 ba5027a468059f482e87838d134b5f0385d14b7a4daca01671119b182955178b9c919b22e04e2d9d66f978aa3ed774ef6655636033e32949cdb9542cd44338b9
-DIST qt3d-everywhere-src-5.14.2.tar.xz 81576496 BLAKE2B 39077430fa58a14d0636ef56607b687636651d8fb798093d00b150ae023c462780245f06d61eac214560b336a1f445c2fbeca397c1dc7e7ee0331cc008692a3c SHA512 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8
+DIST qt3d-everywhere-opensource-src-5.15.13.tar.xz 118272832 BLAKE2B 35726c265e4abae44549e6ace3994bd7b82e522b5b1aa2dab835ade79c1fba531940ddc62c9c0c8b3ceda3d7b173ae45806e46c20428fc71c209971335d6c687 SHA512 30bb061b13f91a8137e961948431b0ca697135a62c8f601eb0c65dc46f0a1f3e7d850141952f0b673a80002e8493289860d9b86840406e3e72fab4eb515688ad
+DIST qt3d-everywhere-src-6.7.0.tar.xz 141570596 BLAKE2B d9731f48157cbeb7e4fb5d1307cd09866bc4eb00f68f42299e1b35ce7ab4ec494418c50fae3513907d41d083e2fb13ff955b31e201e4235abb0d13c4e837c880 SHA512 538027077f9729b91ecc3a4de4a14be212236d0bc4b1f4533a558753b6cb7aa23e1c169c921fa71d61d5f9cffbb85a0535000bf677ca09962ca62cbfcc60e70d
+DIST qt3d-everywhere-src-6.7.1.tar.xz 141586868 BLAKE2B da49dcc7345d422eef4dce1d849514647f96a50d7a6c6ff64e130317aa406258d64a61a04aa0dc96cdd9e6b8d09a3ea2c64c8e9a3aafe6ecc0c96746b9dac899 SHA512 0fe8f2c0e843332978651c5063d35148e7aea3f8e68b10279e731d6fb4a2b48478e8db3d5a3badf797334dcca04ee24f33935e235a97e8e9ee1f95f2d52f2443
diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index dd553ffd05d4..12e16d119066 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="gamepad">Add support for gamepad hardware via
-			<pkg>dev-qt/qtgamepad</pkg></flag>
+		<flag name="gamepad">Add support for gamepad hardware via <pkg>dev-qt/qtgamepad</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qt3d</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qt3d/qt3d-5.14.1-r1.ebuild b/dev-qt/qt3d/qt3d-5.14.1-r1.ebuild
deleted file mode 100644
index 26d5cfdc5fd6..000000000000
--- a/dev-qt/qt3d/qt3d-5.14.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt3d/qt3d-5.14.2.ebuild b/dev-qt/qt3d/qt3d-5.14.2.ebuild
deleted file mode 100644
index 26d5cfdc5fd6..000000000000
--- a/dev-qt/qt3d/qt3d-5.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt3d/qt3d-5.15.13.ebuild b/dev-qt/qt3d/qt3d-5.15.13.ebuild
new file mode 100644
index 000000000000..268e053052df
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.15.13.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+fi
+inherit qt5-build
+
+DESCRIPTION="3D rendering module for the Qt5 framework"
+
+# TODO: tools
+IUSE="gamepad gles2-only qml vulkan"
+
+RDEPEND="
+	=dev-qt/qtconcurrent-${QT5_PV}*
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
+	=dev-qt/qtnetwork-${QT5_PV}*
+	>=media-libs/assimp-4.0.0:=
+	gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/src/{code,contrib,include} || die
+
+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-system-assimp
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qt3d/qt3d-6.7.0.ebuild b/dev-qt/qt3d/qt3d-6.7.0.ebuild
new file mode 100644
index 000000000000..5a57453f16ff
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="3D rendering module for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="gles2-only qml vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		-DQT_FEATURE_qt3d_system_assimp=ON
+		-DQT_UNITY_BUILD=OFF # fails to build
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qt3d/qt3d-6.7.1.ebuild b/dev-qt/qt3d/qt3d-6.7.1.ebuild
new file mode 100644
index 000000000000..5e1b7809f57e
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="3D rendering module for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="gles2-only qml vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		-DQT_FEATURE_qt3d_system_assimp=ON
+		-DQT_UNITY_BUILD=OFF # fails to build
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qt3d/qt3d-6.7.9999.ebuild b/dev-qt/qt3d/qt3d-6.7.9999.ebuild
new file mode 100644
index 000000000000..5e1b7809f57e
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.7.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="3D rendering module for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="gles2-only qml vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		-DQT_FEATURE_qt3d_system_assimp=ON
+		-DQT_UNITY_BUILD=OFF # fails to build
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
new file mode 100644
index 000000000000..5e1b7809f57e
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="3D rendering module for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="gles2-only qml vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		-DQT_FEATURE_qt3d_system_assimp=ON
+		-DQT_UNITY_BUILD=OFF # fails to build
+	)
+
+	qt6-build_src_configure
+}