[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-cg-toolkit/, media-plugins/gst-plugins-vaapi/, ...

[Matt Turner]

commit:     97c3d2d26f9cc06c46d0c479f67b446214177463
Author:     Philipp Ammann <philipp.ammann <AT> posteo <DOT> de>
AuthorDate: Wed Jun 26 19:30:45 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 22:59:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c3d2d2

*/*: 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
Signed-off-by: Philipp Ammann <philipp.ammann <AT> posteo.de>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild        | 2 +-
 .../gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild        | 2 +-
 .../gallium-nine-standalone/gallium-nine-standalone-9999.ebuild       | 2 +-
 dev-libs/beignet/beignet-1.3.2-r3.ebuild                              | 2 +-
 dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild                          | 2 +-
 dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild                          | 2 +-
 dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild    | 2 +-
 dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild    | 2 +-
 dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild     | 2 +-
 dev-util/apitrace/apitrace-8.0.ebuild                                 | 2 +-
 dev-util/gource/gource-0.49.ebuild                                    | 2 +-
 games-board/gambit/gambit-1.0.4.ebuild                                | 2 +-
 gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild               | 2 +-
 gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild                   | 2 +-
 gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild                   | 2 +-
 kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild                      | 2 +-
 kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild                      | 2 +-
 kde-plasma/kwin/kwin-5.15.5.ebuild                                    | 2 +-
 kde-plasma/kwin/kwin-5.16.4.ebuild                                    | 2 +-
 media-gfx/asymptote/asymptote-2.41-r1.ebuild                          | 2 +-
 media-gfx/asymptote/asymptote-2.47.ebuild                             | 2 +-
 media-gfx/asymptote/asymptote-2.48-r1.ebuild                          | 2 +-
 media-gfx/asymptote/asymptote-2.49.ebuild                             | 2 +-
 media-gfx/fbida/fbida-2.12.ebuild                                     | 2 +-
 media-gfx/fbida/fbida-2.13-r1.ebuild                                  | 2 +-
 media-gfx/fbida/fbida-2.14.ebuild                                     | 2 +-
 media-gfx/fbida/fbida-9999.ebuild                                     | 2 +-
 media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild      | 2 +-
 media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild                    | 2 +-
 media-libs/libprojectm/libprojectm-3.1.0-r1.ebuild                    | 2 +-
 media-libs/libprojectm/libprojectm-9999.ebuild                        | 2 +-
 media-libs/sg/sg-1.5.ebuild                                           | 2 +-
 media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild       | 2 +-
 media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild       | 2 +-
 media-radio/ax25-tools/ax25-tools-0.0.10_rc4.ebuild                   | 2 +-
 media-sound/spotify/spotify-1.0.72-r1.ebuild                          | 2 +-
 media-sound/spotify/spotify-1.1.10-r1.ebuild                          | 2 +-
 media-tv/kodi/kodi-17.3-r1.ebuild                                     | 2 +-
 media-tv/kodi/kodi-17.6-r10.ebuild                                    | 2 +-
 media-tv/kodi/kodi-17.6-r11.ebuild                                    | 2 +-
 media-tv/kodi/kodi-17.6-r6.ebuild                                     | 2 +-
 media-tv/kodi/kodi-17.6-r7.ebuild                                     | 2 +-
 media-tv/kodi/kodi-17.6-r8.ebuild                                     | 2 +-
 media-tv/kodi/kodi-17.6-r9.ebuild                                     | 2 +-
 media-tv/kodi/kodi-17.6.ebuild                                        | 2 +-
 media-tv/kodi/kodi-18.0.ebuild                                        | 2 +-
 media-tv/kodi/kodi-18.0_rc2.ebuild                                    | 2 +-
 media-tv/kodi/kodi-18.0_rc3.ebuild                                    | 2 +-
 media-tv/kodi/kodi-18.0_rc4.ebuild                                    | 2 +-
 media-tv/kodi/kodi-18.0_rc5.ebuild                                    | 2 +-
 media-tv/kodi/kodi-18.1.ebuild                                        | 2 +-
 media-tv/kodi/kodi-18.1_rc1.ebuild                                    | 2 +-
 media-tv/kodi/kodi-18.2.ebuild                                        | 2 +-
 media-tv/kodi/kodi-18.2_rc1.ebuild                                    | 2 +-
 media-tv/kodi/kodi-18.3.ebuild                                        | 2 +-
 media-tv/kodi/kodi-9999.ebuild                                        | 2 +-
 media-video/movit/movit-1.2.0.ebuild                                  | 2 +-
 media-video/movit/movit-1.6.1.ebuild                                  | 2 +-
 media-video/movit/movit-1.6.2.ebuild                                  | 2 +-
 .../simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild        | 2 +-
 media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild     | 2 +-
 net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild            | 2 +-
 net-misc/anydesk/anydesk-4.0.1-r1.ebuild                              | 2 +-
 net-misc/anydesk/anydesk-5.0.0.ebuild                                 | 2 +-
 sci-chemistry/molmol/molmol-2k_p2-r5.ebuild                           | 4 ++--
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild                   | 2 +-
 sci-electronics/kicad/kicad-4.0.7.ebuild                              | 2 +-
 sci-electronics/kicad/kicad-5.0.1.ebuild                              | 2 +-
 sci-electronics/kicad/kicad-5.1.0-r1.ebuild                           | 2 +-
 sci-electronics/kicad/kicad-5.1.2-r1.ebuild                           | 2 +-
 sci-electronics/kicad/kicad-5.1.4.ebuild                              | 2 +-
 sci-geosciences/mapserver/mapserver-7.0.5.ebuild                      | 2 +-
 sci-geosciences/mapserver/mapserver-7.0.7.ebuild                      | 2 +-
 sci-geosciences/mapserver/mapserver-7.2.2.ebuild                      | 2 +-
 sci-visualization/gfsview/gfsview-20120706-r1.ebuild                  | 2 +-
 sys-apps/kmscon/kmscon-8.ebuild                                       | 1 +
 virtual/opencl/opencl-0-r5.ebuild                                     | 2 +-
 virtual/opencl/opencl-0-r6.ebuild                                     | 2 +-
 virtual/opencl/opencl-1.ebuild                                        | 2 +-
 virtual/opencl/opencl-2.ebuild                                        | 2 +-
 x11-apps/radeon-profile/radeon-profile-20190311.ebuild                | 2 +-
 x11-apps/radeon-profile/radeon-profile-20190603.ebuild                | 2 +-
 x11-apps/radeon-profile/radeon-profile-99999999.ebuild                | 2 +-
 x11-libs/cairo/cairo-1.16.0-r3.ebuild                                 | 2 +-
 x11-libs/cairo/cairo-9999.ebuild                                      | 2 +-
 x11-libs/gtk+/gtk+-3.24.1.ebuild                                      | 1 +
 x11-libs/gtk+/gtk+-3.24.10.ebuild                                     | 1 +
 x11-libs/gtk+/gtk+-3.24.4-r1.ebuild                                   | 1 +
 x11-libs/gtk+/gtk+-3.24.8.ebuild                                      | 1 +
 x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild                              | 2 +-
 x11-plugins/e16-epplets/e16-epplets-0.16.ebuild                       | 2 +-
 x11-terms/kitty/kitty-0.14.2.ebuild                                   | 2 +-
 x11-terms/kitty/kitty-9999.ebuild                                     | 2 +-
 x11-wm/e16/e16-1.0.19.ebuild                                          | 2 +-
 94 files changed, 95 insertions(+), 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
index 852055dc803..b71e4405330 100644
--- 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
index 868d83cdbb6..3c025087d82 100644
--- 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
index 868d83cdbb6..3c025087d82 100644
--- 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
index 132de5924f5..ffa7b2b286a 100644
--- 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:=[static-analyzer,${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
index d2e02e66be2..42855d0017a 100644
--- 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-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
index 1739c23e3a2..204d8659fa8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
@@ -40,7 +40,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
index 008bd20b140..09471fbd560 100644
--- 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
index 8a6b5cc3520..060c081b0e8 100644
--- 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
index 655d30a45bd..239a3b30918 100644
--- 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
index 2e34348ebc2..d37d8c20af6 100644
--- 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
index 29159bcde85..2674015bbd8 100644
--- 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
index 28abd503a2c..e078316f6b2 100644
--- 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
index 5d6662abd90..c621f020617 100644
--- 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
index 0d9a66872aa..f91c4c2c4a3 100644
--- 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
index 4f7da3b101b..703ffb03c57 100644
--- 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
index 29d4e8ca12f..62bb4f1e95d 100644
--- 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.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
index 1324db9623c..7bfec63201e 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.16.4.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
index 74b33bcceaa..7ba683de77c 100644
--- 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.4.ebuild b/kde-plasma/kwin/kwin-5.16.4.ebuild
index 5d2e7361e62..79cb991cb41 100644
--- a/kde-plasma/kwin/kwin-5.16.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.16.4.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
index a685b5b6a91..217c37ad125 100644
--- 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
index ed3c4ae957a..a22f7884257 100644
--- 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
index 6a39f53426e..24ae7be985c 100644
--- 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
index 60224c1dae4..d424b071ff4 100644
--- 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
index 60d4488e76c..1a827276e2e 100644
--- 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
index d61d08b8625..64860913dbe 100644
--- 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
index 2783b914577..7f663d4f342 100644
--- 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
index b1a1c6b1f62..417d2d86c1b 100644
--- 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
index 2966f90aff3..93cd75d8d7a 100644
--- 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/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 92450c70cc2..9f4e4a71fda 100644
--- 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
index bd704657cdc..5d0889f4dea 100644
--- 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
index 26589f45393..d7628bbc1c4 100644
--- 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
index d45b893fa2b..ba5e44642aa 100644
--- 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
index d4dbc76c468..c3c7c035b24 100644
--- 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
index 940d685060f..79f8f43c479 100644
--- 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
index a278888764d..ea8cbe259bf 100644
--- 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
index da0339466e1..ef72a8936d6 100644
--- 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.10-r1.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild
index ccbd6996994..3089e3b8847 100644
--- a/media-sound/spotify/spotify-1.1.10-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.10-r1.ebuild
@@ -27,7 +27,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
index 17b5bb57e1e..fd33fd85b95 100644
--- 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
index 240a7f8fc80..f7b60b768a6 100644
--- 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
index 85edb1db039..30817ba59e8 100644
--- 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
index c2446a8bac1..c0c368f27a5 100644
--- 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
index cd7898f209d..92c27377195 100644
--- 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
index add7aad92ba..04b5dde24bb 100644
--- 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]

diff --git a/media-tv/kodi/kodi-17.6-r9.ebuild b/media-tv/kodi/kodi-17.6-r9.ebuild
index 8c702b973d4..7e72f8b7ab8 100644
--- a/media-tv/kodi/kodi-17.6-r9.ebuild
+++ b/media-tv/kodi/kodi-17.6-r9.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.ebuild b/media-tv/kodi/kodi-17.6.ebuild
index fe74f13692d..989f73609c3 100644
--- a/media-tv/kodi/kodi-17.6.ebuild
+++ b/media-tv/kodi/kodi-17.6.ebuild
@@ -69,7 +69,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-18.0.ebuild b/media-tv/kodi/kodi-18.0.ebuild
index b840a567c2e..f9473d30cd9 100644
--- a/media-tv/kodi/kodi-18.0.ebuild
+++ b/media-tv/kodi/kodi-18.0.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.0_rc2.ebuild b/media-tv/kodi/kodi-18.0_rc2.ebuild
index 00b10dacb86..8de21cc0785 100644
--- a/media-tv/kodi/kodi-18.0_rc2.ebuild
+++ b/media-tv/kodi/kodi-18.0_rc2.ebuild
@@ -86,7 +86,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.0_rc3.ebuild b/media-tv/kodi/kodi-18.0_rc3.ebuild
index f981572f1b7..317663803c6 100644
--- a/media-tv/kodi/kodi-18.0_rc3.ebuild
+++ b/media-tv/kodi/kodi-18.0_rc3.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.0_rc4.ebuild b/media-tv/kodi/kodi-18.0_rc4.ebuild
index f981572f1b7..317663803c6 100644
--- a/media-tv/kodi/kodi-18.0_rc4.ebuild
+++ b/media-tv/kodi/kodi-18.0_rc4.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.0_rc5.ebuild b/media-tv/kodi/kodi-18.0_rc5.ebuild
index 6cf19aad7b2..2867bb4a2b2 100644
--- a/media-tv/kodi/kodi-18.0_rc5.ebuild
+++ b/media-tv/kodi/kodi-18.0_rc5.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.1.ebuild b/media-tv/kodi/kodi-18.1.ebuild
index 46debc7cf61..899c513845a 100644
--- a/media-tv/kodi/kodi-18.1.ebuild
+++ b/media-tv/kodi/kodi-18.1.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.1_rc1.ebuild b/media-tv/kodi/kodi-18.1_rc1.ebuild
index b840a567c2e..f9473d30cd9 100644
--- a/media-tv/kodi/kodi-18.1_rc1.ebuild
+++ b/media-tv/kodi/kodi-18.1_rc1.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.2.ebuild b/media-tv/kodi/kodi-18.2.ebuild
index 56587d4ef8a..6956d36d8dd 100644
--- a/media-tv/kodi/kodi-18.2.ebuild
+++ b/media-tv/kodi/kodi-18.2.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.2_rc1.ebuild b/media-tv/kodi/kodi-18.2_rc1.ebuild
index 56587d4ef8a..6956d36d8dd 100644
--- a/media-tv/kodi/kodi-18.2_rc1.ebuild
+++ b/media-tv/kodi/kodi-18.2_rc1.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-18.3.ebuild b/media-tv/kodi/kodi-18.3.ebuild
index 7b766b21c2f..6ee3c6e0063 100644
--- a/media-tv/kodi/kodi-18.3.ebuild
+++ b/media-tv/kodi/kodi-18.3.ebuild
@@ -86,7 +86,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=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]

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index fbdf505b14b..9e46a9c2f04 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -88,7 +88,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl] )
+	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]

diff --git a/media-video/movit/movit-1.2.0.ebuild b/media-video/movit/movit-1.2.0.ebuild
index 8ee6a7f71a4..0408883d3b5 100644
--- a/media-video/movit/movit-1.2.0.ebuild
+++ b/media-video/movit/movit-1.2.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[X(+)]
 	>=dev-cpp/eigen-3.2.0:3
 	media-libs/libepoxy
 	sci-libs/fftw

diff --git a/media-video/movit/movit-1.6.1.ebuild b/media-video/movit/movit-1.6.1.ebuild
index 173963dd3bf..4da6285ade1 100644
--- a/media-video/movit/movit-1.6.1.ebuild
+++ b/media-video/movit/movit-1.6.1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[X(+)]
 	>=dev-cpp/eigen-3.2.0:3
 	media-libs/libepoxy
 	>=sci-libs/fftw-3

diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
index c6ffe6046ef..d5ae1e840cb 100644
--- a/media-video/movit/movit-1.6.2.ebuild
+++ b/media-video/movit/movit-1.6.2.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[X(+)]
 	>=dev-cpp/eigen-3.2.0:3
 	media-libs/libepoxy
 	>=sci-libs/fftw-3

diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
index 852caf0a6ba..ebea68fc269 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
+	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
 	|| (
 		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]

diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 852caf0a6ba..ebea68fc269 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
+	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
 	|| (
 		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]

diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild
index 93142bc7435..a65e2044f15 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/nss
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	net-print/cups
 	x11-libs/gtk+:3[X]
 	x11-libs/libXScrnSaver

diff --git a/net-misc/anydesk/anydesk-4.0.1-r1.ebuild b/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
index 0d1c769a03b..5f3f5977062 100644
--- a/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
+++ b/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glu
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-auth/polkit
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf

diff --git a/net-misc/anydesk/anydesk-5.0.0.ebuild b/net-misc/anydesk/anydesk-5.0.0.ebuild
index d6ab3121665..6bd890da645 100644
--- a/net-misc/anydesk/anydesk-5.0.0.ebuild
+++ b/net-misc/anydesk/anydesk-5.0.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glu
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-auth/polkit
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index a09bfe07847..074130cf13d 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -29,9 +29,9 @@ IUSE=""
 
 RDEPEND="
 	|| (
-		(	media-libs/mesa
+		(	media-libs/mesa[X(+)]
 			x11-libs/libGLw )
-		media-libs/mesa[motif] )
+		media-libs/mesa[motif,X(+)] )
 	media-libs/libpng:0=
 	media-libs/tiff:0
 	sys-libs/zlib

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
index 17f69a8387a..9b08f966da9 100644
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="flash"
 
 RDEPEND="
 	media-libs/glew:0=
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	flash? ( media-libs/ming )"
 DEPEND="${RDEPEND}

diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7.ebuild
index dd5b21104e1..2ed5780e7a1 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	)
 	media-libs/glew:0=
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-libs/zlib
 	x11-libs/cairo"
 DEPEND="${COMMON_DEPEND}

diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
index 5d1508385fd..e04b292fa1e 100644
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-5.0.1.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)

diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index c7eca78142e..6780bf0336d 100644
--- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)

diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
index 0505a9fa436..a35800d88ee 100644
--- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)

diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
index c739de95232..6cf2d51c218 100644
--- a/sci-electronics/kicad/kicad-5.1.4.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)

diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
index 262043174b9..e0d969774e1 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	opengl? (
 		media-libs/ftgl
-		media-libs/mesa
+		media-libs/mesa[X(+)]
 	)
 	perl? ( dev-lang/perl:= )
 	postgis? ( dev-db/postgis )

diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
index 3d9b414957e..27ff52df21b 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	opengl? (
 		media-libs/ftgl
-		media-libs/mesa
+		media-libs/mesa[X(+)]
 	)
 	oracle? (
 		dev-db/oracle-instantclient:=

diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
index 643020ee754..7d9720fe06c 100644
--- a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	opengl? (
 		media-libs/ftgl
-		media-libs/mesa
+		media-libs/mesa[X(+)]
 	)
 	oracle? (
 		dev-db/oracle-instantclient:=

diff --git a/sci-visualization/gfsview/gfsview-20120706-r1.ebuild b/sci-visualization/gfsview/gfsview-20120706-r1.ebuild
index 21f6f50c057..7a896c558ff 100644
--- a/sci-visualization/gfsview/gfsview-20120706-r1.ebuild
+++ b/sci-visualization/gfsview/gfsview-20120706-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="static-libs"
 RDEPEND="
 	sci-libs/gerris
 	media-libs/ftgl
-	media-libs/mesa[osmesa]
+	media-libs/mesa[osmesa,X(+)]
 	x11-libs/gtk+:2
 	>=x11-libs/gtkglext-1.0.6
 	x11-libs/startup-notification

diff --git a/sys-apps/kmscon/kmscon-8.ebuild b/sys-apps/kmscon/kmscon-8.ebuild
index ca585cfb9a2..047da638752 100644
--- a/sys-apps/kmscon/kmscon-8.ebuild
+++ b/sys-apps/kmscon/kmscon-8.ebuild
@@ -19,6 +19,7 @@ COMMON_DEPEND="
 	>=virtual/udev-172
 	x11-libs/libxkbcommon
 	dev-libs/libtsm
+	media-libs/mesa[X(+)]
 	drm? ( x11-libs/libdrm
 		>=media-libs/mesa-8.0.3[egl,gbm] )
 	gles2? ( >=media-libs/mesa-8.0.3[gles2] )

diff --git a/virtual/opencl/opencl-0-r5.ebuild b/virtual/opencl/opencl-0-r5.ebuild
index 2fc414440c6..246bb65a899 100644
--- a/virtual/opencl/opencl-0-r5.ebuild
+++ b/virtual/opencl/opencl-0-r5.ebuild
@@ -14,7 +14,7 @@ IUSE="${CARDS[@]/#/video_cards_}"
 # amdgpu-pro-opencl and intel-ocl-sdk are amd64-only
 RDEPEND="app-eselect/eselect-opencl
 	|| (
-		>=media-libs/mesa-9.1.6[opencl,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}]
 		video_cards_amdgpu? (
 			abi_x86_64? ( !abi_x86_32? ( dev-libs/amdgpu-pro-opencl ) ) )
 		video_cards_i965? (

diff --git a/virtual/opencl/opencl-0-r6.ebuild b/virtual/opencl/opencl-0-r6.ebuild
index 355667fe3e2..867581ba9c7 100644
--- a/virtual/opencl/opencl-0-r6.ebuild
+++ b/virtual/opencl/opencl-0-r6.ebuild
@@ -14,7 +14,7 @@ IUSE="${CARDS[@]/#/video_cards_}"
 # amdgpu-pro-opencl and intel-ocl-sdk are amd64-only
 RDEPEND="app-eselect/eselect-opencl
 	|| (
-		>=media-libs/mesa-9.1.6[opencl,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}]
 		video_cards_amdgpu? (
 			abi_x86_64? ( !abi_x86_32? ( dev-libs/amdgpu-pro-opencl ) ) )
 		video_cards_i965? (

diff --git a/virtual/opencl/opencl-1.ebuild b/virtual/opencl/opencl-1.ebuild
index 1edfbbce531..0983ac0b2a0 100644
--- a/virtual/opencl/opencl-1.ebuild
+++ b/virtual/opencl/opencl-1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="app-eselect/eselect-opencl
 		video_cards_i965? ( || (
 			abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) )
 			dev-libs/beignet ) )
-		>=media-libs/mesa-9.1.6[opencl,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}]
 		video_cards_amdgpu? ( dev-libs/amdgpu-pro-opencl )
 		video_cards_nvidia? (
 			>=x11-drivers/nvidia-drivers-290.10-r2[uvm] )

diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild
index a8f42249bb9..0d7d5035b03 100644
--- a/virtual/opencl/opencl-2.ebuild
+++ b/virtual/opencl/opencl-2.ebuild
@@ -17,7 +17,7 @@ RDEPEND="app-eselect/eselect-opencl
 		video_cards_i965? ( || (
 			abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) )
 			dev-libs/beignet ) )
-		>=media-libs/mesa-9.1.6[opencl,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}]
 		video_cards_amdgpu? ( || (
 			dev-libs/rocm-opencl-runtime
 			dev-libs/amdgpu-pro-opencl ) )

diff --git a/x11-apps/radeon-profile/radeon-profile-20190311.ebuild b/x11-apps/radeon-profile/radeon-profile-20190311.ebuild
index de8838c90ba..ad6e34fec99 100644
--- a/x11-apps/radeon-profile/radeon-profile-20190311.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-20190311.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-qt/qtconcurrent:5
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	x11-libs/libdrm
 "
 

diff --git a/x11-apps/radeon-profile/radeon-profile-20190603.ebuild b/x11-apps/radeon-profile/radeon-profile-20190603.ebuild
index de8838c90ba..ad6e34fec99 100644
--- a/x11-apps/radeon-profile/radeon-profile-20190603.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-20190603.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-qt/qtconcurrent:5
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	x11-libs/libdrm
 "
 

diff --git a/x11-apps/radeon-profile/radeon-profile-99999999.ebuild b/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
index de8838c90ba..ad6e34fec99 100644
--- a/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-qt/qtconcurrent:5
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	x11-libs/libdrm
 "
 

diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 5b9b8adaa41..6c8fc8546e0 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
 	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 2145909816d..cc6873271ec 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
 	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]

diff --git a/x11-libs/gtk+/gtk+-3.24.1.ebuild b/x11-libs/gtk+/gtk+-3.24.1.ebuild
index d1d0caea0f2..b06c229a87d 100644
--- a/x11-libs/gtk+/gtk+-3.24.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.1.ebuild
@@ -51,6 +51,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]

diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index 6a435ba6df4..5f80a015c44 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]

diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
index d4f976a52b1..cbc785377ab 100644
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
@@ -51,6 +51,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]

diff --git a/x11-libs/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
index 37ea639ea40..2d9a9b11f63 100644
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]

diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
index 0e1a4f94e36..1157f402671 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	>=media-libs/glew-1.5.1:=
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	>=media-gfx/imagemagick-6.4:=
 	>=x11-misc/xscreensaver-5.08-r2
 	bzip2? ( app-arch/bzip2 )

diff --git a/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
index 130edb03350..680729e5514 100644
--- a/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
+++ b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
@@ -18,7 +18,7 @@ BDEPEND="
 CDEPEND="
 	cdaudio? ( media-libs/libcdaudio )
 	libgtop? ( gnome-base/libgtop )
-	opengl? ( media-libs/glu media-libs/mesa )
+	opengl? ( media-libs/glu media-libs/mesa[X(+)] )
 	>=media-libs/imlib2-1.2.0
 	x11-libs/libX11
 	x11-libs/libXext

diff --git a/x11-terms/kitty/kitty-0.14.2.ebuild b/x11-terms/kitty/kitty-0.14.2.ebuild
index 9a7deb4fa06..9973e320b0b 100644
--- a/x11-terms/kitty/kitty-0.14.2.ebuild
+++ b/x11-terms/kitty/kitty-0.14.2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	imagemagick? ( virtual/imagemagick-tools )
 "
 DEPEND="${RDEPEND}
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-libs/ncurses
 	virtual/pkgconfig
 "

diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index f9a458abd9a..623cddae6fb 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	imagemagick? ( virtual/imagemagick-tools )
 "
 DEPEND="${RDEPEND}
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-libs/ncurses
 	virtual/pkgconfig
 "

diff --git a/x11-wm/e16/e16-1.0.19.ebuild b/x11-wm/e16/e16-1.0.19.ebuild
index f76feca9f8b..8f543706ab6 100644
--- a/x11-wm/e16/e16-1.0.19.ebuild
+++ b/x11-wm/e16/e16-1.0.19.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	dbus? ( sys-apps/dbus )
 	doc? ( app-doc/e16-docs )
 	nls? ( virtual/libintl )
-	opengl? ( media-libs/glu media-libs/mesa )
+	opengl? ( media-libs/glu media-libs/mesa[X(+)] )
 	pango? ( x11-libs/pango[X] )
 	sound? (
 		|| ( media-sound/pulseaudio media-sound/apulse[sdk] )