From: Matt Turner <mattst88@gentoo.org>
Date: Fri, 28 Aug 2015 23:56:27 +0000 (-0700)
Subject: x11-apps/mesa-progs: Remove USE=gles1.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50ffc95029fda3fb390b63015b846e0434c61076;p=gentoo.git

x11-apps/mesa-progs: Remove USE=gles1.
---

diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index d3c9bbf14df6..359aad5ebefe 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -27,15 +27,14 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="egl gles1 gles2"
+IUSE="egl gles2"
 
 RDEPEND="
-	media-libs/mesa[egl?,gles1?,gles2?]
+	media-libs/mesa[egl?,gles2?]
 	virtual/opengl
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	egl? ( media-libs/glew )
-	gles1? ( media-libs/glew )
 	gles2? ( media-libs/glew )
 	virtual/glu
 	x11-proto/xproto"
@@ -62,10 +61,6 @@ src_compile() {
 		emake -C src/egl/eglut/ libeglut_x11.la
 		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
 
-		if use gles1; then
-			emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C src/egl/opengles1/ es1_info
-			emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C src/egl/opengles1/ gears_x11
-		fi
 		if use gles2; then
 			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
 			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
@@ -78,11 +73,6 @@ src_install() {
 	if use egl; then
 		dobin src/egl/opengl/egl{info,gears_x11}
 
-		if use gles1; then
-			dobin src/egl/opengles1/es1_info
-			newbin src/egl/opengles1/gears_x11 es1gears_x11
-		fi
-
 		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
 	fi
 }
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 778c9076fa9a..d07df30c3e87 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -27,15 +27,14 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="egl gles1 gles2"
+IUSE="egl gles2"
 
 RDEPEND="
-	media-libs/mesa[egl?,gles1?,gles2?]
+	media-libs/mesa[egl?,gles2?]
 	virtual/opengl
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	egl? ( media-libs/glew )
-	gles1? ( media-libs/glew )
 	gles2? ( media-libs/glew )
 	virtual/glu
 	x11-proto/xproto"
@@ -62,10 +61,6 @@ src_compile() {
 		emake -C src/egl/eglut/ libeglut_x11.la
 		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
 
-		if use gles1; then
-			emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C src/egl/opengles1/ es1_info
-			emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C src/egl/opengles1/ gears_x11
-		fi
 		if use gles2; then
 			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
 			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
@@ -78,11 +73,6 @@ src_install() {
 	if use egl; then
 		dobin src/egl/opengl/egl{info,gears_x11}
 
-		if use gles1; then
-			dobin src/egl/opengles1/es1_info
-			newbin src/egl/opengles1/gears_x11 es1gears_x11
-		fi
-
 		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
 	fi
 }
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
index f9f35a8d8be8..1aa96b18fd4c 100644
--- a/x11-apps/mesa-progs/metadata.xml
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -4,7 +4,6 @@
 <herd>x11</herd>
 <use>
         <flag name='egl'>Build EGL utilities</flag>
-        <flag name='gles1'>Build OpenGL ES 1 utilities</flag>
         <flag name='gles2'>Build OpenGL ES 2 utilities</flag>
 </use>
 </pkgmetadata>