2 files changed, 6 insertions, 13 deletions
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
index be21463cf525..5b4dc823c52e 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic meson
+inherit meson
 
 DESCRIPTION="EGLStream-based Wayland external platform"
 HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
@@ -19,20 +19,13 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	gui-libs/eglexternalplatform
-	media-libs/libglvnd"
+	>=media-libs/libglvnd-1.3.4"
 BDEPEND="dev-util/wayland-scanner"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
 )
 
-src_configure() {
-	# EGLStream is not intended for X11, always build without (bug #777558)
-	append-cppflags -DEGL_NO_X11
-
-	meson_src_configure
-}
-
 src_install() {
 	meson_src_install
 
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
index 62302305e3f4..984ad1e0b540 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 inherit meson
 
-MY_COMMIT="582b2d345abaa0e313cf16c902e602084ea59551"
+EGLWAYLAND_HASH="582b2d345abaa0e313cf16c902e602084ea59551"
 
 DESCRIPTION="EGLStream-based Wayland external platform"
 HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
-SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${EGLWAYLAND_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGLWAYLAND_HASH}"
 
 LICENSE="MIT"
 SLOT="0"