*/*: Depend on media-libs/mesa[X(+)]

This changes any package that depends on media-libs/mesa (though not virtual/opengl) to depend on media-libs/mesa[X(+)] instead. Bug: https://bugs.gentoo.org/560096 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Philipp Ammann <philipp.ammann@posteo.de>
gentoo · Jun 26, 2019 · 680c15e · 680c15e
1 parent 649e2d1
commit 680c15e
Show file tree

Hide file tree

Showing 94 changed files with 95 additions and 90 deletions.
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]

diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
 "

diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
 "

diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -20,7 +20,7 @@ IUSE="ocl-icd ocl20"
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 COMMON="app-eselect/eselect-opencl
-	media-libs/mesa[${MULTILIB_USEDEP}]
+	media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 	<sys-devel/clang-8.0.0:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	>=media-libs/libvpx-1.5:=[svc]
 	media-libs/libwebp:=
-	media-libs/mesa[egl]
+	media-libs/mesa[egl,X(+)]
 	media-libs/opus
 	sys-apps/dbus
 	sys-apps/pciutils

diff --git a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
@@ -47,7 +47,7 @@ RDEPEND=">=virtual/jdk-1.7
 	>=media-libs/fontconfig-2.10.92
 	>=media-libs/freetype-2.5.5
 	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
+	>=media-libs/mesa-10.2.8[X(+)]
 	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
 	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1

diff --git a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/fontconfig-2.10.92
 	>=media-libs/freetype-2.5.5
 	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
+	>=media-libs/mesa-10.2.8[X(+)]
 	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
 	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1

diff --git a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/fontconfig-2.10.92
 	>=media-libs/freetype-2.5.5
 	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
+	>=media-libs/mesa-10.2.8[X(+)]
 	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
 	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1

diff --git a/dev-util/apitrace/apitrace-8.0.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	app-arch/brotli:=
 	media-libs/libpng:0=
-	media-libs/mesa[egl?,${MULTILIB_USEDEP}]
+	media-libs/mesa[egl?,X(+),${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	sys-process/procps:=
 	x11-libs/libX11

diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre:3
 	dev-libs/tinyxml
 	media-libs/freetype:2
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	virtual/glu:0
 "
 RDEPEND="${COMMON_DEPEND}

diff --git a/games-board/gambit/gambit-1.0.4.ebuild b/games-board/gambit/gambit-1.0.4.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 

diff --git a/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	x11-libs/libX11
 	>=gnome-base/gnome-desktop-3.18:3=
 	>=dev-libs/json-glib-0.10
-	media-libs/mesa[egl,gles2]
+	media-libs/mesa[egl,gles2,X(+)]
 	media-libs/libepoxy
 	x11-libs/libXcomposite
 

diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 
 	${PYTHON_DEPS}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 "
 # Runtime-only deps are probably incomplete and approximate.
 # Introspection deps generated using:

diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild
@@ -58,7 +58,7 @@ DEPEND="
 
 	${PYTHON_DEPS}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 "
 # Runtime-only deps are probably incomplete and approximate.
 # Introspection deps generated using:

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	ieee1394? ( sys-libs/libraw1394 )
 	opengl? (
 		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
+		media-libs/mesa[gles2?,X(+)]
 		!gles2? ( media-libs/glu )
 	)
 	pci? ( sys-apps/pciutils )

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.16.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.16.2.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	ieee1394? ( sys-libs/libraw1394 )
 	opengl? (
 		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
+		media-libs/mesa[gles2?,X(+)]
 		!gles2? ( media-libs/glu )
 	)
 	pci? ( sys-apps/pciutils )

diff --git a/kde-plasma/kwin/kwin-5.15.5.ebuild b/kde-plasma/kwin/kwin-5.15.5.ebuild
@@ -54,7 +54,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland]
+	media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
 	virtual/libudev:=
 	x11-libs/libICE
 	x11-libs/libSM

diff --git a/kde-plasma/kwin/kwin-5.16.2.ebuild b/kde-plasma/kwin/kwin-5.16.2.ebuild
@@ -54,7 +54,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland]
+	media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
 	virtual/libudev:=
 	x11-libs/libICE
 	x11-libs/libSM

diff --git a/media-gfx/asymptote/asymptote-2.41-r1.ebuild b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.4-r5:0=
 	>=sys-libs/readline-4.3-r5:0=
 	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8 )
+	opengl? ( >=media-libs/mesa-8[X(+)] )
 	offscreen? ( media-libs/mesa[osmesa] )
 	svg? ( app-text/dvisvgm )
 	sigsegv? ( dev-libs/libsigsegv )

diff --git a/media-gfx/asymptote/asymptote-2.47.ebuild b/media-gfx/asymptote/asymptote-2.47.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.4-r5:0=
 	>=sys-libs/readline-4.3-r5:0=
 	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8 )
+	opengl? ( >=media-libs/mesa-8[X(+)] )
 	offscreen? ( media-libs/mesa[osmesa] )
 	svg? ( app-text/dvisvgm )
 	sigsegv? ( dev-libs/libsigsegv )

diff --git a/media-gfx/asymptote/asymptote-2.48-r1.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.4-r5:0=
 	>=sys-libs/readline-4.3-r5:0=
 	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
 	offscreen? ( media-libs/mesa[osmesa] )
 	svg? ( app-text/dvisvgm )
 	sigsegv? ( dev-libs/libsigsegv )

diff --git a/media-gfx/asymptote/asymptote-2.49.ebuild b/media-gfx/asymptote/asymptote-2.49.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.4-r5:0=
 	>=sys-libs/readline-4.3-r5:0=
 	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
 	offscreen? ( media-libs/mesa[osmesa] )
 	svg? ( app-text/dvisvgm )
 	sigsegv? ( dev-libs/libsigsegv )

diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
 	>=media-libs/freetype-2.0
 	media-libs/libepoxy
 	media-libs/libexif
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	virtual/jpeg:*
 	virtual/ttf-fonts
 	x11-libs/cairo[opengl]

diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
 	>=media-libs/freetype-2.0
 	media-libs/libepoxy
 	media-libs/libexif
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	virtual/jpeg:*
 	virtual/ttf-fonts
 	x11-libs/cairo[opengl]

diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
 	>=media-libs/freetype-2.0
 	media-libs/libepoxy
 	media-libs/libexif
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	virtual/jpeg:*
 	virtual/ttf-fonts
 	x11-libs/cairo[opengl]

diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
@@ -24,7 +24,7 @@ CDEPEND="
 	media-libs/libexif
 	media-libs/libpng:*
 	media-libs/libwebp
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	media-libs/tiff:*
 	net-misc/curl
 	virtual/jpeg:*

diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXt
 	media-libs/glu
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	media-libs/freeglut
 	amd64? ( abi_x86_32? (
 		>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]

diff --git a/media-libs/libepoxy/libepoxy-1.5.3.ebuild b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
@@ -26,7 +26,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test +X"
 
-RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
+RDEPEND="media-libs/mesa[egl,X(+)?,${MULTILIB_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	${RDEPEND}
 	>=dev-util/meson-0.47.0

diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -26,7 +26,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test +X"
 
-RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
+RDEPEND="media-libs/mesa[egl,X(+)?,${MULTILIB_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	${RDEPEND}
 	>=dev-util/meson-0.47.0

diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="debug openmp video_cards_nvidia"
 RDEPEND="media-fonts/dejavu
 	>=media-libs/ftgl-2.1.3_rc5
 	media-libs/freetype:2
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	media-libs/glew:=
 	sys-libs/zlib
 	video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )"

diff --git a/media-libs/libprojectm/libprojectm-3.1.0-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.0-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="gles2 qt5 sdl"
 
 RDEPEND="gles2? ( media-libs/mesa[gles2] )
 	media-libs/glm
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5

diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="gles2 qt5 sdl"
 
 RDEPEND="gles2? ( media-libs/mesa[gles2] )
 	media-libs/glm
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5

diff --git a/media-libs/sg/sg-1.5.ebuild b/media-libs/sg/sg-1.5.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	x11-libs/libXaw
 	x11-libs/motif
 	|| (
-		( media-libs/mesa x11-libs/libGLw )
+		( media-libs/mesa[X(+)] x11-libs/libGLw )
 		media-libs/opengl-apple
 		)"
 DEPEND="

diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
 GST_REQ="1.14.1"
 GL_DEPS="
 	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
-	media-libs/mesa[gles2?,egl?,${MULTILIB_USEDEP}]
+	media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
 "
 RDEPEND="
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]

diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
 GST_REQ="${PV}"
 GL_DEPS="
 	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
-	media-libs/mesa[gles2?,egl?,${MULTILIB_USEDEP}]
+	media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
 "
 RDEPEND="
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]

diff --git a/media-radio/ax25-tools/ax25-tools-0.0.10_rc4.ebuild b/media-radio/ax25-tools/ax25-tools-0.0.10_rc4.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 DEPEND="dev-libs/libax25
 	X? ( x11-libs/libX11
-		media-libs/mesa )"
+		media-libs/mesa[X(+)] )"
 RDEPEND=${DEPEND}
 
 src_configure() {

diff --git a/media-sound/spotify/spotify-1.0.72-r1.ebuild b/media-sound/spotify/spotify-1.0.72-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	media-libs/alsa-lib
 	media-libs/harfbuzz
 	media-libs/fontconfig
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	net-misc/curl[ssl,curl_ssl_openssl]
 	net-print/cups[ssl]
 	x11-libs/gtk+:2

diff --git a/media-sound/spotify/spotify-1.1.5-r1.ebuild b/media-sound/spotify/spotify-1.1.5-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/harfbuzz
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	net-misc/curl[ssl]
 	net-print/cups[ssl]
 	|| ( media-sound/pulseaudio media-sound/apulse )

diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
+	media-libs/mesa[egl,X(+)]
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
 	mysql? ( virtual/mysql )

diff --git a/media-tv/kodi/kodi-17.6-r10.ebuild b/media-tv/kodi/kodi-17.6-r10.ebuild
@@ -72,7 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
+	media-libs/mesa[egl,X(+)]
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]

diff --git a/media-tv/kodi/kodi-17.6-r11.ebuild b/media-tv/kodi/kodi-17.6-r11.ebuild
@@ -72,7 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
+	media-libs/mesa[egl,X(+)]
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]

diff --git a/media-tv/kodi/kodi-17.6-r6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
+	media-libs/mesa[egl,X(+)]
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]

diff --git a/media-tv/kodi/kodi-17.6-r7.ebuild b/media-tv/kodi/kodi-17.6-r7.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
+	media-libs/mesa[egl,X(+)]
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]

diff --git a/media-tv/kodi/kodi-17.6-r8.ebuild b/media-tv/kodi/kodi-17.6-r8.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
+	media-libs/mesa[egl,X(+)]
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]