dev-qt/qtwayland: remove wayland-compositor USE flag in 5.7.1
authorMichael Palimaka <kensington@gentoo.org>
Thu, 15 Dec 2016 10:09:53 +0000 (21:09 +1100)
committerMichael Palimaka <kensington@gentoo.org>
Thu, 15 Dec 2016 10:10:23 +0000 (21:10 +1100)
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.1.ebuild

index 026b7a55c041ca8cc958c7f47690a62d58b1cad8..7d6f48891644b964330ab974959a5bf055160f2b 100644 (file)
@@ -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