[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/

[Michael Palimaka]

commit:     94b5f2eb1a25b873b26cecd8bef84ead8669cb2d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 15:07:11 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 15:09:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb

dev-qt/qt3d: 5.9 updates

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qt3d/qt3d-5.9.1.ebuild    | 6 ++----
 dev-qt/qt3d/qt3d-5.9.9999.ebuild | 6 ++----
 dev-qt/qt3d/qt3d-5.9999.ebuild   | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild
index f3fae18f..be0ee17e 100644
--- a/dev-qt/qt3d/qt3d-5.9.1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild
@@ -27,9 +27,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
        rm -r src/3rdparty/assimp/{code,contrib,include} || die
 
-       qt5-build_src_prepare
+       qt_use_disable_mod qml quick src/src.pro
 
-       if ! use qml; then
-               sed -i -e "/quick3d/s/^/#/" src/src.pro || die
-       fi
+       qt5-build_src_prepare
 }

diff --git a/dev-qt/qt3d/qt3d-5.9.9999.ebuild b/dev-qt/qt3d/qt3d-5.9.9999.ebuild
index f3fae18f..be0ee17e 100644
--- a/dev-qt/qt3d/qt3d-5.9.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-5.9.9999.ebuild
@@ -27,9 +27,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
        rm -r src/3rdparty/assimp/{code,contrib,include} || die
 
-       qt5-build_src_prepare
+       qt_use_disable_mod qml quick src/src.pro
 
-       if ! use qml; then
-               sed -i -e "/quick3d/s/^/#/" src/src.pro || die
-       fi
+       qt5-build_src_prepare
 }

diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild
index f3fae18f..be0ee17e 100644
--- a/dev-qt/qt3d/qt3d-5.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-5.9999.ebuild
@@ -27,9 +27,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
        rm -r src/3rdparty/assimp/{code,contrib,include} || die
 
-       qt5-build_src_prepare
+       qt_use_disable_mod qml quick src/src.pro
 
-       if ! use qml; then
-               sed -i -e "/quick3d/s/^/#/" src/src.pro || die
-       fi
+       qt5-build_src_prepare
 }