net-libs/webkit-gtk: simplify opengl vs gles2 handling, fix gst gles2 deps

webkit-gtk itself does not support both full OpenGL and GLESv2 at once yet.
ENABLE_OPENGL enables OpenGL in general, and if enabled then ENABLE_GLES2
determines which API is used - if enabled, then gles2, otherwise full GL.
Simplify REQUIRED_USE handling to enforce the opengl/gles2 conflict
separately, and have the webgl case just want either, to be future-proof
and easier to read independently.

WebGL should just always be enabled when either GL API is enabled, but
keeping it under USE flag for the time being, until an even deeper
GL/GStreamer webkitgtk cmake review, due to the webgl? ( gstreamer )
REQUIRED_USE still present.
For now just (probably) properly depend on gstreamer gles2 support for
USE="gles2 gstreamer" builds.

Bug: https://bugs.gentoo.org/500150
Package-Manager: Portage-2.3.43, Repoman-2.3.10

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 189dd47e268f5402f7fa824fc90163285c4e6df5..761afd90ed455e83b0044057a4e0fd9b921ba00d 100644 (file)
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -22,12 +22,11 @@ IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +intros
 # webgl needs gstreamer, bug #560612
 REQUIRED_USE="
        geolocation? ( introspection )
-       gles2? ( egl )
+       gles2? ( egl !opengl )
        introspection? ( gstreamer )
        nsplugin? ( X )
-       webgl? ( ^^ ( gles2 opengl ) )
-       !webgl? ( ?? ( gles2 opengl ) )
-       webgl? ( gstreamer )
+       webgl? ( gstreamer
+               || ( gles2 opengl ) )
        wayland? ( egl )
        || ( aqua wayland X )
 "
@@ -70,7 +69,7 @@ RDEPEND="
        gstreamer? (
                >=media-libs/gstreamer-1.2.3:1.0
                >=media-libs/gst-plugins-base-1.2.3:1.0
-               >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+               >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
 
        X? (
                x11-libs/libX11