gentoo resync : 09.07.2022

3 files changed, 2 insertions, 51 deletions

diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index d49e36b05fc2..bf50c4b0dacd 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,4 @@
-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
+EBUILD qt3d-5.15.5.ebuild 980 BLAKE2B 9f4d84ee6689755353fd499c939fed86fb0f74ad03191d8440b3a1fdec463a4ad606f7139efa681ab82f967c76aba4e8581157f2b79cec942c8799a36614eff8 SHA512 a1c31558e7c17195d336876ede7f8b6adaee21afe988b773b1e8472deaf845ca9513966ebe9858ac78e8a619b200915e3b404332c77dc7a925a9be61ed72f551
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild b/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
deleted file mode 100644
index 0b8ba72cc7f2..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
-}
diff --git a/dev-qt/qt3d/qt3d-5.15.5.ebuild b/dev-qt/qt3d/qt3d-5.15.5.ebuild
index f885392a724b..0b8ba72cc7f2 100644
--- a/dev-qt/qt3d/qt3d-5.15.5.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 # TODO: tools