dev-qt/qt3d: optional qml+vulkan, tidy features/deps (qt6)

Most of these features are ON by default and add no deps, do not
believe much sense in keeping track of. And opengl+vulkan are
qtbase's features to handle and flipping can have unexpected
consequences.

system_zlib is only for bundled assimp and is default ON either
way (also taken from qtbase).

Technically we could make shadertools optional too but the RHI
renderer is the default+recommended in Qt6 and there is probably
little worth in exposing a USE.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

4 files changed, 46 insertions, 73 deletions

diff --git a/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..5f149084ae57
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2023 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"
+fi
+
+IUSE="qml vulkan"
+
+RDEPEND="
+	=dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan=,widgets]
+	=dev-qt/qtshadertools-${PV}*:6
+	media-libs/assimp:=
+	qml? ( =dev-qt/qtdeclarative-${PV}*:6[widgets] )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		-DQT_FEATURE_qt3d_system_assimp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qt3d/qt3d-6.5.2.ebuild b/dev-qt/qt3d/qt3d-6.5.2.ebuild
deleted file mode 100644
index a3eb24978595..000000000000
--- a/dev-qt/qt3d/qt3d-6.5.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2023 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"
-fi
-
-RDEPEND="
-	=dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan,widgets]
-	=dev-qt/qtdeclarative-${PV}*:6[widgets]
-	=dev-qt/qtmultimedia-${PV}*:6
-	=dev-qt/qtshadertools-${PV}*:6
-	media-libs/assimp:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/vulkan-headers
-"
-
-# No qtgamepad branching since 6.3.
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_opengl=ON
-		-DQT_FEATURE_qt3d_animation=ON
-		-DQT_FEATURE_qt3d_extras=ON
-		-DQT_FEATURE_qt3d_input=ON
-		-DQT_FEATURE_qt3d_logic=ON
-		-DQT_FEATURE_qt3d_render=ON
-		-DQT_FEATURE_qt3d_rhi_renderer=ON
-		-DQT_FEATURE_qt3d_system_assimp=ON
-		-DQT_FEATURE_regularexpression=ON
-		-DQT_FEATURE_system_zlib=ON
-		-DQT_FEATURE_vulkan=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qt3d/qt3d-6.5.9999.ebuild b/dev-qt/qt3d/qt3d-6.5.9999.ebuild
index a3eb24978595..5f149084ae57 100644
--- a/dev-qt/qt3d/qt3d-6.5.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.5.9999.ebuild
@@ -11,32 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="qml vulkan"
+
 RDEPEND="
-	=dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan,widgets]
-	=dev-qt/qtdeclarative-${PV}*:6[widgets]
-	=dev-qt/qtmultimedia-${PV}*:6
+	=dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan=,widgets]
 	=dev-qt/qtshadertools-${PV}*:6
 	media-libs/assimp:=
+	qml? ( =dev-qt/qtdeclarative-${PV}*:6[widgets] )
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/vulkan-headers
+	vulkan? ( dev-util/vulkan-headers )
 "
 
-# No qtgamepad branching since 6.3.
 src_configure() {
 	local mycmakeargs=(
-		-DQT_FEATURE_opengl=ON
-		-DQT_FEATURE_qt3d_animation=ON
-		-DQT_FEATURE_qt3d_extras=ON
-		-DQT_FEATURE_qt3d_input=ON
-		-DQT_FEATURE_qt3d_logic=ON
-		-DQT_FEATURE_qt3d_render=ON
-		-DQT_FEATURE_qt3d_rhi_renderer=ON
+		$(cmake_use_find_package qml Qt6Qml)
 		-DQT_FEATURE_qt3d_system_assimp=ON
-		-DQT_FEATURE_regularexpression=ON
-		-DQT_FEATURE_system_zlib=ON
-		-DQT_FEATURE_vulkan=ON
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
index a3eb24978595..5f149084ae57 100644
--- a/dev-qt/qt3d/qt3d-6.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9999.ebuild
@@ -11,32 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="qml vulkan"
+
 RDEPEND="
-	=dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan,widgets]
-	=dev-qt/qtdeclarative-${PV}*:6[widgets]
-	=dev-qt/qtmultimedia-${PV}*:6
+	=dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan=,widgets]
 	=dev-qt/qtshadertools-${PV}*:6
 	media-libs/assimp:=
+	qml? ( =dev-qt/qtdeclarative-${PV}*:6[widgets] )
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/vulkan-headers
+	vulkan? ( dev-util/vulkan-headers )
 "
 
-# No qtgamepad branching since 6.3.
 src_configure() {
 	local mycmakeargs=(
-		-DQT_FEATURE_opengl=ON
-		-DQT_FEATURE_qt3d_animation=ON
-		-DQT_FEATURE_qt3d_extras=ON
-		-DQT_FEATURE_qt3d_input=ON
-		-DQT_FEATURE_qt3d_logic=ON
-		-DQT_FEATURE_qt3d_render=ON
-		-DQT_FEATURE_qt3d_rhi_renderer=ON
+		$(cmake_use_find_package qml Qt6Qml)
 		-DQT_FEATURE_qt3d_system_assimp=ON
-		-DQT_FEATURE_regularexpression=ON
-		-DQT_FEATURE_system_zlib=ON
-		-DQT_FEATURE_vulkan=ON
 	)
 
 	qt6-build_src_configure