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

[Michael Palimaka]

commit:     5326331764a0612870c92ce1310d6a1cb8776322
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 11:33:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 11:33:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=53263317

dev-qt/qtwayland: remove qml USE flag from 5.7 and later

Due to an upstream change, qml is effectively mandatory.

Gentoo-bug: 579208

Package-Manager: portage-2.3.2

 dev-qt/qtwayland/qtwayland-5.7.9999.ebuild | 7 ++-----
 dev-qt/qtwayland/qtwayland-5.8.9999.ebuild | 7 ++-----
 dev-qt/qtwayland/qtwayland-5.9999.ebuild   | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild
index e3f382b..026b7a5 100644
--- a/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="egl wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
@@ -19,9 +19,7 @@ DEPEND="
 	~dev-qt/qtgui-${PV}[egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
-	wayland-compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV} )
-	)
+	wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
 	xcomposite? (
 		x11-libs/libX11
 		x11-libs/libXcomposite
@@ -35,7 +33,6 @@ 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.8.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.8.9999.ebuild
index e3f382b..026b7a5 100644
--- a/dev-qt/qtwayland/qtwayland-5.8.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.8.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="egl wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
@@ -19,9 +19,7 @@ DEPEND="
 	~dev-qt/qtgui-${PV}[egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
-	wayland-compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV} )
-	)
+	wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
 	xcomposite? (
 		x11-libs/libX11
 		x11-libs/libXcomposite
@@ -35,7 +33,6 @@ 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 e3f382b..026b7a5 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="egl wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
@@ -19,9 +19,7 @@ DEPEND="
 	~dev-qt/qtgui-${PV}[egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
-	wayland-compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV} )
-	)
+	wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
 	xcomposite? (
 		x11-libs/libX11
 		x11-libs/libXcomposite
@@ -35,7 +33,6 @@ 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
 }