dev-qt/qt3d: add missing deps

Gentoo-bug: 621492
Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index 08d85fc4c2581686306c09a469957ea11be87845..b30c5e32277770fdd330d1f4b7b7ad4810dd02dd 100644 (file)
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -5,6 +5,10 @@
                <email>qt@gentoo.org</email>
                <name>Gentoo Qt Project</name>
        </maintainer>
+       <use>
+               <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+               <flag name="qml">Build QML/QtQuick bindings</flag>
+       </use>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qt3d/qt3d-5.7.1.ebuild b/dev-qt/qt3d/qt3d-5.7.1-r1.ebuild
similarity index 53%
rename from dev-qt/qt3d/qt3d-5.7.1.ebuild
rename to dev-qt/qt3d/qt3d-5.7.1-r1.ebuild
index 4d78b5a20cb8db5594c52d767cc6d5988f5b2654..17152f1a0586437ef9144639b3960633fdc407d4 100644 (file)
--- a/dev-qt/qt3d/qt3d-5.7.1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,12 +10,23 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~x86"
 fi
 
-# TODO: egl, qml, tools
-IUSE=""
+# TODO: egl, tools
+IUSE="gles2 qml"
 
 DEPEND="
+       ~dev-qt/qtconcurrent-${PV}
        ~dev-qt/qtcore-${PV}
        ~dev-qt/qtgui-${PV}
        ~dev-qt/qtnetwork-${PV}
+       sys-libs/zlib
+       qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+       qt5-build_src_prepare
+
+       if ! use qml; then
+               sed -i -e "/quick3d/s/^/#/" src/src.pro || die
+       fi
+}