gentoo Easter resync : 12.04.2020

5 files changed, 10 insertions, 45 deletions

diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index e29f99498d79..8affcd7003b0 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,5 @@
-DIST qt3d-everywhere-src-5.12.3.tar.xz 84941692 BLAKE2B 245e62dad28fb6c5e75cbefb5153fb139c8b4114fdfebd6987f82b5b2b627614d1b444bcefa002d09dcdbbb6801cace6a9ae56eac99e26d15794ff04e75ea675 SHA512 679c2dbc60fc53c1c5469369f25244bd844c2e6e723a1b451f7cbb50bfa018e6fb715214e5a5df6fb32d7c7936bb6c99d85e299fe2b76344bcf774c93ed0acd0
-DIST qt3d-everywhere-src-5.13.2.tar.xz 81537856 BLAKE2B 17e0b73467a3a0bda9436fe594ea970d2512b93eef171913f403e3af238dc23564c9cce31c1f70688e9b453fb67d24201f6915368812172fa6efdddf0b3aa041 SHA512 54bf998ee378301fa7c6e236366518266e1cb23acfecd1015658ed5e7f40f4c9c4b5ad23c96b525867f9f7d2c2d983c059f88d045314dccc2e2501e1eec37e5f
 DIST qt3d-everywhere-src-5.14.1.tar.xz 81561704 BLAKE2B 6c68a27f16c148ba6a1a80ba044fc928187df3462224060d5b2a4ce9a083521a900703c5c80327c8080cb3a41a63d84f6b7e12b4b44763fe1b1c4811f18c76f4 SHA512 ba5027a468059f482e87838d134b5f0385d14b7a4daca01671119b182955178b9c919b22e04e2d9d66f978aa3ed774ef6655636033e32949cdb9542cd44338b9
-EBUILD qt3d-5.12.3.ebuild 636 BLAKE2B 94ca00fda53ebefbb1cd31be1842a0c6503d5061d5514a64835333835c5e73c4405aa2dc62e5b283f826256302d04bb20a51fa9b0ad568df2030afeac50cee76 SHA512 20b0077b7111270e7c34c0db5f25de0a37134f329131249f27ec034557a8968bc06e450953f512f7243bd4766de83b341153d5830ab3595c9daa826bad24c7d7
-EBUILD qt3d-5.13.2.ebuild 754 BLAKE2B facb55d33a7b85a844169f2d9433f54f0dae62e81cad652ec7bcc07f1f099943d005e0b126b950cf4b9fb06a5366a1e1d73dbd0b8c7d6af37a0ec37536f3d96f SHA512 1b4c7f00402f9ea5ba773ff61b2bb6a413951143d98203df506e52cdcc9a3db2630d6a017a4b930679beb00a2ae8f233ed760621d28b0c115034d3c75f680ef4
-EBUILD qt3d-5.14.1.ebuild 756 BLAKE2B 32627c8696eabd077866711ab1c695ee9cc49d15f8b03783630b55e69badbfcaf51d6fce3b6f41c60186b7e5d1fa0ab585be16b85c7300bf380fb67cbfea955f SHA512 12a145cc31a563c45e2088d1f90b47eb5334dadb2179c816e6fdd9776f720c0c3c5f5d7b3db32f9244e387a7e99493113f445a0df35ef1bc00c6800864417923
-MISC metadata.xml 720 BLAKE2B ff7d76a8f9264dd841e0bfe40ebc03939a06f36cfbfcbfc168b4eed326153a4f3dbca993efe540eea5b41cc2b08f66aae13eb0fd68769f099bdffad755d0c886 SHA512 985f76261b21779bb3048f172b7aefc4590230511b855226fa4a1d61312c9f87ee4691a2e9212fc55032688836f8a97097d9452eb4552c775edfb74ea8b1a747
+DIST qt3d-everywhere-src-5.14.2.tar.xz 81576496 BLAKE2B 39077430fa58a14d0636ef56607b687636651d8fb798093d00b150ae023c462780245f06d61eac214560b336a1f445c2fbeca397c1dc7e7ee0331cc008692a3c SHA512 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8
+EBUILD qt3d-5.14.1-r1.ebuild 763 BLAKE2B 8166e28c320c767d99c4e81b715db4e853fc2c8a22702de554a374b27d70c12cd7574a825151081cb4cfcd12dcaee646190df99a2f764fa41b182b0a1051fbbf SHA512 114352b98e5942c3e1d7d2c63bc02d9088e1bb38e76333d680a89fddfa9b869206962d10bcf9304d8d9e4f296f2d38aa1ad20e16c77d2264e736531ca88b1261
+EBUILD qt3d-5.14.2.ebuild 766 BLAKE2B f320edc4f031be1de8461f98ff868fd9b19eb91db48bef7f45cd6d791ac006c68ccc61f6fa6fbc0396143386967210e1b0b613712c65a736f95374212461dd0c SHA512 07fd92c4ec619e542c3bd06b8f4bb764cd08e17d2d2b8cab70c4de8cd65fb02d3870aec8c76324155947f39be02125a317f69cb0ce14d31fc85ca2bd2f75a61b
+MISC metadata.xml 647 BLAKE2B b6096a7157ec0461da21e74ddcf09bae6ea919f667de1264a63ae742f9ddf4372da288234a1374db0b98b55120f0290f96ef7ef1a3a030cd4827f17fda3b07be SHA512 e0fbfc67b55f59dc476efa9f967f0a6c99444467a255ce7f467495340fd9ae2e8a980b9441ab2d35732f8875bb740417aa09a6d41b9b7bb75ea4943ca9f1b7ca
diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index bdb6f1b07cc1..dd553ffd05d4 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="gamepad">Add support for gamepad hardware via
 			<pkg>dev-qt/qtgamepad</pkg></flag>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qt3d/qt3d-5.12.3.ebuild b/dev-qt/qt3d/qt3d-5.12.3.ebuild
deleted file mode 100644
index 7144b00a5e22..000000000000
--- a/dev-qt/qt3d/qt3d-5.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
-fi
-
-# TODO: gamepad, tools
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt3d/qt3d-5.13.2.ebuild b/dev-qt/qt3d/qt3d-5.14.1-r1.ebuild
index 499aea900e53..26d5cfdc5fd6 100644
--- a/dev-qt/qt3d/qt3d-5.13.2.ebuild
+++ b/dev-qt/qt3d/qt3d-5.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,11 @@ 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 qml"
+IUSE="gamepad gles2-only qml"
 
 DEPEND="
 	~dev-qt/qtconcurrent-${PV}
@@ -20,7 +20,7 @@ DEPEND="
 	~dev-qt/qtnetwork-${PV}
 	>=media-libs/assimp-4.0.0
 	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qt3d/qt3d-5.14.1.ebuild b/dev-qt/qt3d/qt3d-5.14.2.ebuild
index 9d3a32c119fa..a9a8e5f27bd1 100644
--- a/dev-qt/qt3d/qt3d-5.14.1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.14.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # TODO: tools
-IUSE="gamepad gles2 qml"
+IUSE="gamepad gles2-only qml"
 
 DEPEND="
 	~dev-qt/qtconcurrent-${PV}
@@ -20,7 +20,7 @@ DEPEND="
 	~dev-qt/qtnetwork-${PV}
 	>=media-libs/assimp-4.0.0
 	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
 "
 RDEPEND="${DEPEND}"