gentoo auto-resync : 09:06:2024 - 00:08:13

3 files changed, 2 insertions, 52 deletions

diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 7e2342c8cafb..ac4d3e50e2b6 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,9 +1,7 @@
 AUX qtquick3d-6.6.2-gcc14.patch 953 BLAKE2B 0119092790be34134af0989a7e4b78d565a741e3a72f0ae76c48106f68fb6867b3395706951e93e86343d3214c5d02b3b21eea175c1460e8c38d44c8f36ec605 SHA512 13352dc71f986888e5017f2e4a6267e1bc10c81c419d607de673212cb7d16132566e11a040c6ebfa5bde9834043eb1b38d6723f890c707af76f6490c1a8b3ffa
 AUX qtquick3d-6.6.2-x32abi.patch 439 BLAKE2B 293bbae94e4ffcf6cbeda420a2f2af0e7fd6112c4e69ddb7dc9bb87bd82374c6435e038e114da08508312d742924f701aec5f647f60519e55728efb7feeb18e5 SHA512 4d8fdd20a6d3e06772bbf3c025651daa4d33ced61dfd8191f946b19318826c41f8f3c0eea1aae3aaeb01766715287d237eacbae1741a807bf64a242aaddb323c
-DIST qtquick3d-everywhere-src-6.7.0.tar.xz 66175916 BLAKE2B 6e351845fd1056a1ee3cbb1f66a715c6a23b3eb2e09812e9cf262930404b3d0a6aaf52e619ac9bff502f3f07df2c54716baf262d6ffbe4cb77658d6090cd1765 SHA512 1262fccbbf7bd31aa122837998f3a903c191e70a270a2a678842e6f8209336b39f5523582e7b4ab88f0db98e357993c34f857ae2a34c7e7ac29597377459576b
 DIST qtquick3d-everywhere-src-6.7.1.tar.xz 66184636 BLAKE2B c0ae24f0a1b635c0b71e1223e5cfd2d74184b68239d4a89ebf60c9563e1577d856cc3003bf365ee6d2e4a0550eb71a851c6f96c9d0dbd555bf114d0ba524a644 SHA512 a26da739a949011c33c989456658c6f91dbc991a2570d7ac2abc78189c3daa78d5e7ea25e0f3f5828e6f9dececbd5c18b2cc67cf9d16badd36c98781fd882a44
-EBUILD qtquick3d-6.7.0.ebuild 1050 BLAKE2B 3c6e182d13510ccb0ed65808d34f58dc7e73bde5c2acf5438a48ca71a79832f9e63c2a319a1ec81c3f0ca1958a929e5820428a538e0bd04eb59ef0f8cf864c5c SHA512 3f6a955b20549a66ad25ffbd170b47ee3b667b77b23431b36d9c16c7869da48e5ae52a6cbb6c24df2d816685929eb21e00d97c1d36de766911789b5eac195831
-EBUILD qtquick3d-6.7.1.ebuild 1048 BLAKE2B 65a7bcd52250ec3268b009eb0478e3bb7c7d3d06ed975949cb58de9cc12a0f115ca49b14535b6fadb181926b23e6d4a19fdfd70dc41853ed6bc0a97ffee58c5c SHA512 b122df5b3ad00b90d4e4a388548251d57c4c063dfa159018969a59e0864917cc64bc5e14c55afa90493d9f302ee14dd3bd366a623d092ded6a5f6c11167fe8ba
+EBUILD qtquick3d-6.7.1.ebuild 1047 BLAKE2B c95b6028f1967242aedddbc0c7eb6128d313fc1ea44c3bd01be11b395cd3c1fdd6598d7c12cdf2854dc952edfc5ed92940b3f476e7c32ec0a3c4487ff17a2359 SHA512 637298baafa97ce7450f542659dcffd615d438ecf80619f18f45c4277298be9426bcda7758508641e0b2f1d5c8714b72896b99c605f4c6834effd2ff7409a299
 EBUILD qtquick3d-6.7.9999.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 EBUILD qtquick3d-6.8.9999.ebuild 1243 BLAKE2B 3bf8d21ce425412d2f0b3e59244ce75f88c4222bce3f84c4c6470c5449868b3d30f7bc03a32a101b8e5e143a40e299df815e05915d665f2d64861cc216892260 SHA512 f299004e44f3ae5e0f0cfc85c5dde20c6ca8fcd82cfd8c17f1fa8207bf02ee177d20a369882961031c054fcfdef6cdcca6ea8cdad73ef63b515cc60a498f21be
 EBUILD qtquick3d-6.9999.ebuild 1243 BLAKE2B 3bf8d21ce425412d2f0b3e59244ce75f88c4222bce3f84c4c6470c5449868b3d30f7bc03a32a101b8e5e143a40e299df815e05915d665f2d64861cc216892260 SHA512 f299004e44f3ae5e0f0cfc85c5dde20c6ca8fcd82cfd8c17f1fa8207bf02ee177d20a369882961031c054fcfdef6cdcca6ea8cdad73ef63b515cc60a498f21be
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.0.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.0.ebuild
deleted file mode 100644
index 1e7d17bf3fa6..000000000000
--- a/dev-qt/qtquick3d/qtquick3d-6.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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
-}
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
index 76a066f3aa26..4efd1a2ee293 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.1.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