gentoo resync : 25.11.2020

4 files changed, 10 insertions, 43 deletions

diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 0239bd07dbf2..b0c5dd5cb427 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,3 @@
-DIST qt3d-everywhere-src-5.14.2.tar.xz 81576496 BLAKE2B 39077430fa58a14d0636ef56607b687636651d8fb798093d00b150ae023c462780245f06d61eac214560b336a1f445c2fbeca397c1dc7e7ee0331cc008692a3c SHA512 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8
 DIST qt3d-everywhere-src-5.15.1.tar.xz 81919836 BLAKE2B e0c617e777dc2562caaee02483bb4c9ec2fd17214ea02505942b074b82e698a82e4c81ef552705872c6c10be3cbab65a1fc3c5aff2c87637639f223583a04ae6 SHA512 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5
-EBUILD qt3d-5.14.2.ebuild 763 BLAKE2B 8166e28c320c767d99c4e81b715db4e853fc2c8a22702de554a374b27d70c12cd7574a825151081cb4cfcd12dcaee646190df99a2f764fa41b182b0a1051fbbf SHA512 114352b98e5942c3e1d7d2c63bc02d9088e1bb38e76333d680a89fddfa9b869206962d10bcf9304d8d9e4f296f2d38aa1ad20e16c77d2264e736531ca88b1261
-EBUILD qt3d-5.15.1.ebuild 766 BLAKE2B f320edc4f031be1de8461f98ff868fd9b19eb91db48bef7f45cd6d791ac006c68ccc61f6fa6fbc0396143386967210e1b0b613712c65a736f95374212461dd0c SHA512 07fd92c4ec619e542c3bd06b8f4bb764cd08e17d2d2b8cab70c4de8cd65fb02d3870aec8c76324155947f39be02125a317f69cb0ce14d31fc85ca2bd2f75a61b
-MISC metadata.xml 644 BLAKE2B 9d1a63c26345bf489b395cead548565ac4020a7b5d13b88d265ecae24a5dba02ee3529342b8bf461b2bdda34a5265d0d1469cb33d58ded0f2bb7cd548cb2ff7c SHA512 126c840c440e350c85c37143ddbdce3852e7b8eaa73964d650688d7377b251c150a82e7939c4a4c5a696a576dc50bb8edf035cb8c64d17a1536d608943f4193f
+EBUILD qt3d-5.15.1.ebuild 821 BLAKE2B 1ef2dc10bda1cd08afc37e94836a804cf6a73d0a8ebd37e59616d0cf0e81ef3c22af23c2aa8db144b91b869046c8be73bc81fc7ae32b72877968d4a6f6941331 SHA512 e4a03c7d46117ae08bccc74943efaf53a593356875c63d69a7272f1ea9ed4624cdd660665f015508ecc863c549a000fb40d7f0a1791a437187495fb20d0f08f0
+MISC metadata.xml 699 BLAKE2B 45b5458bd903a90a1da6277922d4e0077dbdbede5e4bdfed523d5926abd59147a3085ce007075afe7c50c5256f37d827d3ec6c5287fb7910031198f14c6dbc4e SHA512 c055619fd9c01e39f707dc13bfc5f805b4e3777e3ef0841d1cb52f2fa0f58eafd684a9e911ad7aa8e938f4f42a1cbad205f9cd854c4eaeaa08918db6d64e174b
diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index 5e4a34f313a0..d359595b1800 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="gamepad">Add support for gamepad hardware via <pkg>dev-qt/qtgamepad</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
+		<flag name="vulkan">Enable support for Vulkan</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qt3d/qt3d-5.14.2.ebuild b/dev-qt/qt3d/qt3d-5.14.2.ebuild
deleted file mode 100644
index 26d5cfdc5fd6..000000000000
--- a/dev-qt/qt3d/qt3d-5.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-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
-}
diff --git a/dev-qt/qt3d/qt3d-5.15.1.ebuild b/dev-qt/qt3d/qt3d-5.15.1.ebuild
index a9a8e5f27bd1..fe2c864d8f49 100644
--- a/dev-qt/qt3d/qt3d-5.15.1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.1.ebuild
@@ -7,22 +7,24 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 # TODO: tools
-IUSE="gamepad gles2-only qml"
+IUSE="gamepad gles2-only qml vulkan"
 
-DEPEND="
+RDEPEND="
 	~dev-qt/qtconcurrent-${PV}
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	~dev-qt/qtgui-${PV}:5=[vulkan=]
 	~dev-qt/qtnetwork-${PV}
 	>=media-libs/assimp-4.0.0
 	gamepad? ( ~dev-qt/qtgamepad-${PV} )
 	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
 
 src_prepare() {
 	rm -r src/3rdparty/assimp/{code,contrib,include} || die