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

[Michael Palimaka]

commit:     3c8b2eaf72c91d1a70b427741c6c8fc55fa033d4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 10:13:12 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 10:13:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c8b2eaf

dev-qt/qtwayland: remove wayland-compositor USE flag in 5.7.9999 and later

QtWaylandCompositor is now built unconditionally since qtwayland commit 
00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild
index 026b7a5..7d6f488 100644
--- a/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.7.9999.ebuild
@@ -11,15 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl wayland-compositor xcomposite"
+IUSE="egl xcomposite"
 
 DEPEND="
        >=dev-libs/wayland-1.4.0
        ~dev-qt/qtcore-${PV}
+       ~dev-qt/qtdeclarative-${PV}
        ~dev-qt/qtgui-${PV}[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -28,10 +28,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-       if use wayland-compositor; then
-               echo "CONFIG += wayland-compositor" >> 
"${QT5_BUILD_DIR}"/.qmake.cache
-       fi
-
        qt_use_compile_test xcomposite
 
        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 026b7a5..7d6f488 100644
--- a/dev-qt/qtwayland/qtwayland-5.8.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.8.9999.ebuild
@@ -11,15 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl wayland-compositor xcomposite"
+IUSE="egl xcomposite"
 
 DEPEND="
        >=dev-libs/wayland-1.4.0
        ~dev-qt/qtcore-${PV}
+       ~dev-qt/qtdeclarative-${PV}
        ~dev-qt/qtgui-${PV}[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -28,10 +28,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-       if use wayland-compositor; then
-               echo "CONFIG += wayland-compositor" >> 
"${QT5_BUILD_DIR}"/.qmake.cache
-       fi
-
        qt_use_compile_test xcomposite
 
        qt5-build_src_configure

diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
index 026b7a5..7d6f488 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -11,15 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl wayland-compositor xcomposite"
+IUSE="egl xcomposite"
 
 DEPEND="
        >=dev-libs/wayland-1.4.0
        ~dev-qt/qtcore-${PV}
+       ~dev-qt/qtdeclarative-${PV}
        ~dev-qt/qtgui-${PV}[egl=]
        media-libs/mesa[egl?]
        >=x11-libs/libxkbcommon-0.2.0
-       wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
        xcomposite? (
                x11-libs/libX11
                x11-libs/libXcomposite
@@ -28,10 +28,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-       if use wayland-compositor; then
-               echo "CONFIG += wayland-compositor" >> 
"${QT5_BUILD_DIR}"/.qmake.cache
-       fi
-
        qt_use_compile_test xcomposite
 
        qt5-build_src_configure