diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index ff44f65..f4e816e 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -27,15 +27,13 @@ fi
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
-IUSE="colord dbus +drm +egl editor examples fbdev gles2 headless ivi +opengl rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
+IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
 
 REQUIRED_USE="
-	drm? ( egl )
-	egl? ( || ( gles2 opengl ) )
-	gles2? ( !opengl )
+	drm? ( gles2 )
 	screen-sharing? ( rdp )
 	test? ( X )
-	wayland-compositor? ( egl )
+	wayland-compositor? ( gles2 )
 "
 
 RDEPEND="
@@ -61,15 +59,9 @@ RDEPEND="
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
 	)
-	egl? (
-		media-libs/mesa[gles2,wayland]
-	)
 	editor? ( x11-libs/pango )
 	gles2? (
-		media-libs/mesa[wayland]
-	)
-	opengl? (
-		media-libs/mesa[wayland]
+		media-libs/mesa[gles2,wayland]
 	)
 	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
 	rpi? (
@@ -105,7 +97,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	if use examples || use gles2 || use test; then
+	if use examples || use test; then
 		myconf="--enable-simple-clients"
 	else
 		myconf="--disable-simple-clients"
@@ -126,7 +118,7 @@ src_configure() {
 		$(use_enable X x11-compositor) \
 		$(use_enable launch weston-launch) \
 		$(use_enable colord) \
-		$(use_enable egl) \
+		$(use_enable gles2 egl) \
 		$(use_enable unwind libunwind) \
 		$(use_enable resize-optimization) \
 		$(use_enable screen-sharing) \
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a83378c..0db771a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -422,7 +422,8 @@ media-sound/clementine ios
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
 # GL/GLES support in cairo is mutually exclusive, bug #428770.
 x11-libs/cairo gles2
-dev-libs/weston gles2 rpi
+dev-libs/weston rpi
+<dev-libs/weston-1.8.0 gles2
 
 # Alexis Ballier <aballier@gentoo.org> (03 Jul 2013)
 # The idea behind using libunwind there is to avoid needing to link to libgcc_s