gentoo auto-resync : 05:09:2023 - 16:23:54

6 files changed, 113 insertions, 46 deletions

diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index f575f373dd95..cfe4106b3cc4 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,7 @@
 DIST qt3d-everywhere-opensource-src-5.15.10.tar.xz 118262456 BLAKE2B eff3ffd0b305e005019ae59c7214f2df12509ce3fe6cde38dc315b8a3062364c714e5b7e3d33fbaa2c7a71ae19077149bbd7e13d49757044c497337ff2c16035 SHA512 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f
 DIST qt3d-everywhere-src-6.5.2.tar.xz 161691776 BLAKE2B 0bae744dda45b5af9a0c2dca98d43a2f0376cca018671cd91ffa6add8e7045c2fbcdb08f5a9966e93c70e1976f6e2b1a3670b1de6362fbe4eb7bb7c03d53a22e SHA512 f7bcc09b5c6c01e58b68cb7af67cef5f0477ec3cdcd924fd365b7411b2e5d89c307f29d099289055fb1b04b8237cc87dc071734433fa4d0bbb21eec698ed731a
 EBUILD qt3d-5.15.10.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be
-EBUILD qt3d-6.5.2.ebuild 958 BLAKE2B e00d4c63841c4f72bcf862f7dd5a68e17b565f0fdfe8acf774942de897c2c2bb857d5de67809d81db013f74d01dcbc2a0dba67b8d7ec8c247400de6529228761 SHA512 e9381edca0e4ea61c424704b2a2fa4f16a8c31d71c40e6d302176159e180125f65702237ef440cb571ec8a12424eaf8e09ca7bd491e98d3e81596bc44fad4b5d
-MISC metadata.xml 645 BLAKE2B 6534d1e6a8b8a5d8d41683988ce5001a1c92fe5eecae9fe1942c8a28985ff8a0c60318621f839ab4baa9c6738ce3dd0c4128280c6e1c5b3a8dcd86251a1e08eb SHA512 5f2b1e19665e5f9bda13f708f6f35321fbe6b8451e590a6e29275e23d6df4080d2ddb5bace49cdaeb1352117369b7e01404a64539e3d2edbda41420c95792a61
+EBUILD qt3d-6.5.2-r1.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556
+EBUILD qt3d-6.5.9999.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556
+EBUILD qt3d-6.9999.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556
+MISC metadata.xml 692 BLAKE2B 807ac52bd34ad8ea6471eb7b03703f20951c941a2b5841fa173796b4d9b3bdee1afc79fb83057a5bd6329db5cf656c0c5afdc6ece087684c14e0a581c91eed69 SHA512 5894daabb0fbee32e8fbcdc35f720f2f3225bd78ac632491d4603650db49c79c41fbe84d1cfde15870ed7a17c39c98cb5572ca5ed1da7fe5311faa7b2b750aec
diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index b81d5a37bc53..12e16d119066 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -12,6 +12,7 @@
 	<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-6.5.2-r1.ebuild b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..2a4dec0336da
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
@@ -0,0 +1,36 @@
+# 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"
+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=,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 d62b749fbe0a..000000000000
--- a/dev-qt/qt3d/qt3d-6.5.2.ebuild
+++ /dev/null
@@ -1,44 +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
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtbase-${PV}*[concurrent,gui,network,opengl,vulkan,widgets]
-	=dev-qt/qtdeclarative-${PV}*[widgets]
-	=dev-qt/qtmultimedia-${PV}*
-	=dev-qt/qtshadertools-${PV}*
-	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
new file mode 100644
index 000000000000..2a4dec0336da
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.5.9999.ebuild
@@ -0,0 +1,36 @@
+# 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"
+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=,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.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
new file mode 100644
index 000000000000..2a4dec0336da
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.9999.ebuild
@@ -0,0 +1,36 @@
+# 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"
+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=,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
+}