gentoo resync : 29.12.2022

3 files changed, 53 insertions, 4 deletions

diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index a0fd9f550ad3..d49e36b05fc2 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,4 +1,7 @@
-DIST qt3d-5.15.3-gentoo-kde-1.tar.xz 19244 BLAKE2B 3274f171719204af30272e4c20fd509f180a48bd7f179d1656dfc2d638154ed51efc0952c371e6ca707e035142ab0d1e074f4587ca47673673150265f88305fd SHA512 d453cc8eb91214165c3257fa9379efcd1f2c3e4c605895df82366006a9405b37a1222f93334e7925aebf27c5118d576e0ab1b3e24d27aef68cc51f114bc9fbfc
-DIST qt3d-everywhere-opensource-src-5.15.3.tar.xz 81930768 BLAKE2B 4ead826b786074993b8c536b4b7c8d781126d402ea55da116201b3d1ea859c83b9d46618b7705b14371064fc41d8aa249efbc5db62f0e9e88fb1424c03bc7a45 SHA512 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c
-EBUILD qt3d-5.15.3.ebuild 978 BLAKE2B f8bfa7715f6332d88ac7bc7f1c442e9fefb4854ab86f6e01e17c14ee76713439abea34e4f85f106da020d1fa81980ee8921b6229b60ee3a37c64d81252aec0a4 SHA512 fdf5f615c968291535b76197b9b5d7b945e309372a21d9d05dfdbd5bb071182bde0aa6ccbc310e8b9f3b5dcb01983cc0d6476ad0927b9b06932ed218322bb76d
+DIST qt3d-5.15.4-gentoo-kde-1.tar.xz 18844 BLAKE2B 2ed592d7bbf5bb4c0adee70ac74fd46207e78e769b19d083d6317d1d561618135769914ac8b4e9d266c28b09764e89fe5dbbe2237c81ff48b27efff99a0ee5a1 SHA512 bca5329a68a1ffc5b679db847a1b327e746170fb194a091feb1a61dbf6fe30b3af1cf9c9c57a3a1b16c6af4a0529bbb309eb2bd269613d65f666203164562cd4
+DIST qt3d-5.15.5-gentoo-kde-1.tar.xz 17820 BLAKE2B 1c8d47a478926a4d9db81ead014ed078061e4ae19b80e581df2adecab1d6c8f29a1e2ef548e4267f29d351f8df5b5be53c4648c78ca5e40463e20f7c257d8211 SHA512 3b7b3f2eff33c7ccff31e9ef9dc8ad916ac365749ba50adc04ab1600de5a4f793eab58859ba18cd3244ceb5e9172f1fc70f02fdca5da3239ae657d3d116a2959
+DIST qt3d-everywhere-opensource-src-5.15.4.tar.xz 81923836 BLAKE2B 60ca6a00bec8c20e1b2c209e4d15dd5b2e836eb578c98a90dbf02db89d5fc07642106cc0248a1fb356694793f5fdb5e3b6ab9898bc4e87730c379cbd3d1d8a48 SHA512 cb2ea961109a153e78147450310408f4f573186d12412ebdd71511eb273ca78113d3aede583ec8aa44fe19f5268bb6fab3386c5501142ad6a22e10890ce52f62
+DIST qt3d-everywhere-opensource-src-5.15.5.tar.xz 81935728 BLAKE2B ccbc802ff29b6b8230d544ea1a68770b1e207933a714fbddf69114bcafa4d599ddfb76c938aa27bdc644a8a6106a39b7f4f906d63926510675ca6c79f6b6ab5e SHA512 92c1af2ff6c3d5c8f570f93c06ae58ec14ab8c8bcbf08fdd8ef8babc497d0883c2322b163035aaa743b7e27774d9b1e97a1d4271f6b8fbea0a480985aae13fd6
+EBUILD qt3d-5.15.4-r1.ebuild 980 BLAKE2B 9f4d84ee6689755353fd499c939fed86fb0f74ad03191d8440b3a1fdec463a4ad606f7139efa681ab82f967c76aba4e8581157f2b79cec942c8799a36614eff8 SHA512 a1c31558e7c17195d336876ede7f8b6adaee21afe988b773b1e8472deaf845ca9513966ebe9858ac78e8a619b200915e3b404332c77dc7a925a9be61ed72f551
+EBUILD qt3d-5.15.5.ebuild 983 BLAKE2B 62d7104de9ba103301c2eb08fa12773824f35ffd93796e1b8f0d7acae560a95df9a114861ba3ac0d00e52c7fa8f6f1541522e0ab6407b386d9a90a2a05e3cb02 SHA512 f0252e15888f8dfa7cce4828564dd1a53e72097b252e3e36a23c8b80fe618eb16bfa554c52e296f03cbeddd062a29844dc603786f712e46ce60f1685bf436a0f
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.3.ebuild b/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
index 66503e8aaf6b..0b8ba72cc7f2 100644
--- a/dev-qt/qt3d/qt3d-5.15.3.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	=dev-qt/qtcore-${QT5_PV}*
 	=dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
 	=dev-qt/qtnetwork-${QT5_PV}*
-	>=media-libs/assimp-4.0.0
+	>=media-libs/assimp-4.0.0:=
 	gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
 	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
 "
diff --git a/dev-qt/qt3d/qt3d-5.15.5.ebuild b/dev-qt/qt3d/qt3d-5.15.5.ebuild
new file mode 100644
index 000000000000..f885392a724b
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.15.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="3D rendering module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+# TODO: tools
+IUSE="gamepad gles2-only qml vulkan"
+
+RDEPEND="
+	=dev-qt/qtconcurrent-${QT5_PV}*
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
+	=dev-qt/qtnetwork-${QT5_PV}*
+	>=media-libs/assimp-4.0.0:=
+	gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-system-assimp
+	)
+	qt5-build_src_configure
+}