--- ./mesa-11.2.2.ebuild	2016-06-21 17:53:11.538865055 -0400
+++ /tmp/mesa-11.2.2.ebuild	2016-07-21 06:55:14.716167507 -0400
@@ -45,19 +45,21 @@
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
 	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
+	wayland +X xa xvmc kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
+	dri3?	( X )
 	gles1?  ( egl )
 	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( X gallium )
+	vaapi? ( X gallium )
+	vdpau? ( X gallium )
 	wayland? ( egl gbm )
 	xa?  ( gallium )
+	xvmc? ( X gallium )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( classic )
 	video_cards_i915?   ( || ( classic gallium ) )
@@ -87,13 +89,15 @@
 	>=app-eselect/eselect-opengl-1.3.0
 	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+		dri3? ( >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] )
+	)
 	llvm? ( !kernel_FreeBSD? (
 		video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
 		!video_cards_r600? (
@@ -139,15 +143,17 @@
 	)
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+		dri3? (
+			>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+			>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+		)
+		>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+		>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+		>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+		>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	)
 "
 [[ ${PV} == 9999 ]] && DEPEND+="
 	sys-devel/bison
@@ -212,7 +218,7 @@
 	fi
 
 	if use egl; then
-		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+		myconf+=" --with-egl-platforms=$(use X && echo "x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
 	fi
 
 	if use gallium; then
@@ -278,7 +284,7 @@
 	ECONF_SOURCE="${S}" \
 	econf \
 		--enable-dri \
-		--enable-glx \
+		$(use_enable X glx) \
 		--enable-shared-glapi \
 		--disable-shader-cache \
 		$(use_enable !bindist texture-float) \