gentoo auto-resync : 22:03:2024 - 13:00:51

3 files changed, 52 insertions, 2 deletions

diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 2f2b564d9a47..6c059b092a83 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -2,9 +2,11 @@ AUX qtquick3d-6.6.2-gcc14.patch 953 BLAKE2B 0119092790be34134af0989a7e4b78d565a7
 AUX qtquick3d-6.6.2-x32abi.patch 439 BLAKE2B 293bbae94e4ffcf6cbeda420a2f2af0e7fd6112c4e69ddb7dc9bb87bd82374c6435e038e114da08508312d742924f701aec5f647f60519e55728efb7feeb18e5 SHA512 4d8fdd20a6d3e06772bbf3c025651daa4d33ced61dfd8191f946b19318826c41f8f3c0eea1aae3aaeb01766715287d237eacbae1741a807bf64a242aaddb323c
 DIST qtquick3d-everywhere-src-6.6.2.tar.xz 65602548 BLAKE2B e1ee955a1f66c669d52a73513c7442b70863b6fa738f6e1716dfab1c7dc41f5f09780ec97f7c5fd6c452ed3ea9809ab0d907dbe28f0425d208508f69b61d50ac SHA512 d8b32ec1a5f9233e79612b5d9b56890c04a921edcc6369f4a047f8e58af92f5e6dc936fdde707df4afca81da53f9fb8959f03b00af24077c3dc723f3445e8123
 DIST qtquick3d-everywhere-src-6.7.0-rc.tar.xz 66178916 BLAKE2B d6f4e2044a5e9143e01f65ff8f31f901d5544ffd8056d354c96a31993e80430420085c308f19fa5074a0876138b7b29ebb193b12f82288db0d9c0a4183fdb7af SHA512 87284e56463be00e90ba7caff5b1361a80b3400110d4eb12451b4c8729b0d2a3defa861616b103e324b2281186ee2ba2aa3a19286c2ebf14e57e9689e28d4a73
-EBUILD qtquick3d-6.6.2.ebuild 1051 BLAKE2B 6c3154cd07d57e18c7b78220204486191130189c0f05ff422cd9ae77f1302c625adb6b2be4e2c4cb19d957a49c362467b174d3540a8735a115d9c8554c9b2234 SHA512 ebcac85bdb3a549ac55403cf7d8c373dd36785abaf7e454fba826500237afbb04162ca9149cae2757ee22ecbf7858958e5307574b2dea151d37efa4d1f58338c
+DIST qtquick3d-everywhere-src-6.7.0-rc2.tar.xz 66179576 BLAKE2B 7019aff203d127092c5875b7de8e82db737d3aafe7bb36bc9a097fb02ce007293a9d2af4c04b056041e66d4bd31939966c08749c6f218b8cc25c58f12851d4c0 SHA512 8ef466231889a0b82475d13c9d3c700de52802612477e16dace1b298b57a67f4ae8e868e9b49a473697df038048b67aba8d1db2f3e0cb729be0b25ed10b2d3f6
+EBUILD qtquick3d-6.6.2.ebuild 1050 BLAKE2B 3c6e182d13510ccb0ed65808d34f58dc7e73bde5c2acf5438a48ca71a79832f9e63c2a319a1ec81c3f0ca1958a929e5820428a538e0bd04eb59ef0f8cf864c5c SHA512 3f6a955b20549a66ad25ffbd170b47ee3b667b77b23431b36d9c16c7869da48e5ae52a6cbb6c24df2d816685929eb21e00d97c1d36de766911789b5eac195831
 EBUILD qtquick3d-6.6.9999.ebuild 1092 BLAKE2B 11adf3cba040eae1c334e26faa6df3a2bb92452e592267402930b2700edb99910f56eb1bbd76c9afc32db1758dcd75bfc2fbcf76760fffbb56d7db4d6d48a870 SHA512 e48fd22fea35e1a43016a278426899891bea3766e53e4879e8c680751002e542e8dd7768300bef16cabf7c39963e95f82cf1244b4319652ad390b34434dcfcfd
 EBUILD qtquick3d-6.7.0_rc.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
+EBUILD qtquick3d-6.7.0_rc2.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 EBUILD qtquick3d-6.7.9999.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 EBUILD qtquick3d-6.9999.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
index 2e694e24b23b..1e7d17bf3fa6 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.0_rc2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.0_rc2.ebuild
new file mode 100644
index 000000000000..b7438f43ac1d
--- /dev/null
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.0_rc2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="opengl vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,gui,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}
+	test? ( ~dev-qt/qtbase-${PV}:6[network] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+)
+
+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
+}