diff --git a/dev-libs/efl/efl-1.26.1.ebuild b/dev-libs/efl/efl-1.26.1-r1.ebuild
similarity index 98%
rename from dev-libs/efl/efl-1.26.1.ebuild
rename to dev-libs/efl/efl-1.26.1-r1.ebuild
index 2ffe8a53d6e69..8528716bda387 100644
--- a/dev-libs/efl/efl-1.26.1.ebuild
+++ b/dev-libs/efl/efl-1.26.1-r1.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
 	drm? ( wayland )
 	examples? ( eet svg )
 	ibus? ( glib )
+	opengl? ( X )
 	pulseaudio? ( sound )
 	xim? ( X )
 	xpresent? ( X )"
@@ -50,6 +51,7 @@ RDEPEND="${LUA_DEPS}
 	sys-libs/zlib
 	virtual/jpeg
 	X? (
+		!opengl? ( media-libs/mesa[egl(+),gles2] )
 		media-libs/freetype
 		x11-libs/libX11
 		x11-libs/libXScrnSaver
@@ -221,6 +223,8 @@ src_configure() {
 		emesonargs+=( -D opengl=es-egl )
 	elif ! use wayland && use opengl; then
 		emesonargs+=( -D opengl=full )
+	elif ! use wayland && use X && ! use opengl; then
+		emesonargs+=( -D opengl=es-egl )
 	else
 		emesonargs+=( -D opengl=none )
 	fi