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

5 files changed, 98 insertions, 10 deletions

diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 621e83c37a93..de1246f708ea 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,3 +1,5 @@
 DIST qtquick3d-everywhere-src-6.5.2.tar.xz 59171420 BLAKE2B 91012368061acf6c4057362a380fea2e3fdc46cf63644a667d7b05450fbbeb8c8dae3765c5617fec8c8a1fd3f880fad21c8e6524c3240f040c9dfdbb80869423 SHA512 2a26f4fa4e4d88b4205813a8bba1c83811354e5ad5e7aa832fd46c5956b46d15e690c359d83f85018c1430e15edd151207411a50227855de4fc8451db710ace2
-EBUILD qtquick3d-6.5.2.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139
-MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
+EBUILD qtquick3d-6.5.2-r1.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7
+EBUILD qtquick3d-6.5.9999.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7
+EBUILD qtquick3d-6.9999.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7
+MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/metadata.xml b/dev-qt/qtquick3d/metadata.xml
index ae8aa9597f20..8712e36848d5 100644
--- a/dev-qt/qtquick3d/metadata.xml
+++ b/dev-qt/qtquick3d/metadata.xml
@@ -8,6 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtquick3d</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
index 92a82e63dc8d..91662e367108 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
@@ -10,18 +10,25 @@ DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
-	# Don't clone qtquick3d-assimp.
-	EGIT_SUBMODULES=()
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
 
-DEPEND="
-	=dev-qt/qtbase-${PV}*[concurrent,network,widgets]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtshadertools-${PV}*
-	=dev-qt/qtquicktimeline-${PV}*
+IUSE="opengl vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtquicktimeline-${PV}:6
+	~dev-qt/qtshadertools-${PV}:6
 	media-libs/assimp:=
+	sys-libs/zlib:=
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# collada support is disabled in system media-libs/assimp (bug #891787)
+	tst_qquick3dassetimport
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
new file mode 100644
index 000000000000..91662e367108
--- /dev/null
+++ b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="opengl vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtquicktimeline-${PV}:6
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# collada support is disabled in system media-libs/assimp (bug #891787)
+	tst_qquick3dassetimport
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_system_assimp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
new file mode 100644
index 000000000000..91662e367108
--- /dev/null
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="opengl vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtquicktimeline-${PV}:6
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# collada support is disabled in system media-libs/assimp (bug #891787)
+	tst_qquick3dassetimport
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_system_assimp=ON
+	)
+
+	qt6-build_src_configure
+}