dev-qt/qtwayland: Drop USE=egl

In this case, USE=egl was not enabling additional support but enabled-
instead-of GLX. Rather than complicating things with REQUIRED_USE, build
with EGL unconditionally as the use of GLX in context of Wayland is
questionable.

Gentoo-bug: 627758
Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 6ad9fdf05847c2d24d02fbd3f688ffce646d444f..5aa0b525d00923e81940cfc37b9b19b836d27e5c 100644 (file)
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -6,7 +6,6 @@
                <name>Gentoo Qt Project</name>
        </maintainer>
        <use>
-               <flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag>
                <flag name="qml">Build QML/QtQuick bindings</flag>
                <flag name="wayland-compositor">Build Qt compositor for wayland</flag>
        </use>

diff --git a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild b/dev-qt/qtwayland/qtwayland-5.6.2.ebuild
index a268ee01062cf8300c21f2986628255c81257e46..d427008009c6f668f958407e967e9775b9008322 100644 (file)
--- a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.6.2.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
 fi
 
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="qml wayland-compositor xcomposite"
 
 DEPEND="
        >=dev-libs/wayland-1.4.0
        ~dev-qt/qtcore-${PV}
-       ~dev-qt/qtgui-${PV}[egl=]
-       media-libs/mesa[egl?]
+       ~dev-qt/qtgui-${PV}[egl]
+       media-libs/mesa[egl]
        >=x11-libs/libxkbcommon-0.2.0
        wayland-compositor? (
                qml? ( ~dev-qt/qtdeclarative-${PV} )

diff --git a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild b/dev-qt/qtwayland/qtwayland-5.7.1.ebuild
index 7adc8405b7e9d93e056a14cb5afddbe8de30b0bf..b90f33e3e8ee9580fcd9106117b1a29342048c38 100644 (file)
--- a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.7.1.ebuild
@@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
-IUSE="egl xcomposite"
+IUSE="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?]
+       ~dev-qt/qtgui-${PV}[egl]
+       media-libs/mesa[egl]
        >=x11-libs/libxkbcommon-0.2.0
        xcomposite? (
                x11-libs/libX11