diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index b8c9d8b07b88b..949632ef96afa 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -26,7 +26,7 @@
 		<flag name="cdio">Enable CDDA support via <pkg>dev-libs/libcdio-paranoia</pkg></flag>
 		<flag name="doc-pdf">Build documentation in pdf format</flag>
 		<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
-		<flag name="egl">Enable EGL backend for X11 OpenGL video output (experimental)</flag>
+		<flag name="egl">Enable support for various EGL-based video outputs</flag>
 		<flag name="enca">Enable subtitles charset discovery via <pkg>app-i18n/enca</pkg></flag>
 		<flag name="jpeg">Enable support for saving screenshots in JPEG format</flag>
 		<flag name="libguess">Enable subtitles charset discovery via <pkg>app-i18n/libguess</pkg></flag>
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 2a7055630c0f0..980877c14cce0 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -28,6 +28,7 @@ DOCS+=( README.md etc/example.conf etc/input.conf )
 # See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
 LICENSE="GPL-2+ BSD ISC"
 SLOT="0"
+# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
 IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd egl +enca encode +iconv
 jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl
 oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux test uchardet v4l
@@ -35,12 +36,12 @@ vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
-	egl? ( opengl X )
+	egl? ( || ( X wayland ) )
 	enca? ( iconv )
-	lcms? ( opengl )
+	lcms? ( || ( opengl egl ) )
 	libguess? ( iconv )
 	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
+	opengl? ( X )
 	pvr? ( v4l )
 	uchardet? ( iconv )
 	v4l? ( || ( alsa oss ) )
@@ -71,6 +72,7 @@ COMMON_DEPEND="
 	iconv? ( virtual/libiconv )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
 	libass? (
 		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
 		virtual/ttf-fonts
@@ -100,7 +102,6 @@ COMMON_DEPEND="
 			x11-libs/libXdamage
 			virtual/opengl
 		)
-		lcms? ( >=media-libs/lcms-2.6:2 )
 		vaapi? ( >=x11-libs/libva-1.2.0[X] )
 		vdpau? ( >=x11-libs/libvdpau-0.2 )
 		xinerama? ( x11-libs/libXinerama )
@@ -219,10 +220,9 @@ src_configure() {
 		$(use_enable xv)
 		$(use_enable xinerama)
 		$(use_enable X xrandr)
-		$(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
-		$(use_enable egl egl-x11)
+		$(use_enable opengl gl-x11)
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
 		$(use_enable wayland gl-wayland)
-		$(use_enable opengl gl)
 		$(use_enable vdpau)
 		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
 		$(use_enable vaapi)