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

[Michael Palimaka]

commit:     9b6aeed0d45473bc481cf41f2092e9b41fd8a1de
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 17:16:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 17:17:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=9b6aeed0

dev-qt/qtwayland: fix automagic dependency

Package-Manager: portage-2.2.20.1

 dev-qt/qtwayland/qtwayland-5.5.0.ebuild    | 5 ++++-
 dev-qt/qtwayland/qtwayland-5.5.1.ebuild    | 5 ++++-
 dev-qt/qtwayland/qtwayland-5.5.9999.ebuild | 5 ++++-
 dev-qt/qtwayland/qtwayland-5.6.9999.ebuild | 5 ++++-
 dev-qt/qtwayland/qtwayland-5.9999.ebuild   | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtwayland/qtwayland-5.5.0.ebuild 
b/dev-qt/qtwayland/qtwayland-5.5.0.ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.0.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.0.ebuild
@@ -19,7 +19,9 @@ DEPEND="
        >=dev-qt/qtgui-${PV}:5[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       wayland-compositor? (
+               qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
        fi
 
        qt_use_compile_test xcomposite
+       qt_use_disable_mod qml quick 
src/compositor/compositor_api/compositor_api.pri
 
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild 
b/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
@@ -19,7 +19,9 @@ DEPEND="
        >=dev-qt/qtgui-${PV}:5[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       wayland-compositor? (
+               qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
        fi
 
        qt_use_compile_test xcomposite
+       qt_use_disable_mod qml quick 
src/compositor/compositor_api/compositor_api.pri
 
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild
@@ -19,7 +19,9 @@ DEPEND="
        >=dev-qt/qtgui-${PV}:5[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       wayland-compositor? (
+               qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
        fi
 
        qt_use_compile_test xcomposite
+       qt_use_disable_mod qml quick 
src/compositor/compositor_api/compositor_api.pri
 
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild
@@ -19,7 +19,9 @@ DEPEND="
        >=dev-qt/qtgui-${PV}:5[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       wayland-compositor? (
+               qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
        fi
 
        qt_use_compile_test xcomposite
+       qt_use_disable_mod qml quick 
src/compositor/compositor_api/compositor_api.pri
 
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -19,7 +19,9 @@ DEPEND="
        >=dev-qt/qtgui-${PV}:5[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       wayland-compositor? (
+               qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+       )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
        fi
 
        qt_use_compile_test xcomposite
+       qt_use_disable_mod qml quick 
src/compositor/compositor_api/compositor_api.pri
 
        qt5-build_src_configure
 }