[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/

["Matt Turner" <mattst88@gentoo.org>]

commit:     a2d728ad45686976b7857170316c1aa9578f3c7d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 23:46:47 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 23:57:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2d728ad

x11-apps/mesa-progs: Sync ebuilds.

 x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 10 ++++++----
 x11-apps/mesa-progs/mesa-progs-9999.ebuild  | 24 +++++-------------------
 2 files changed, 11 insertions(+), 23 deletions(-)

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 0b5692d..81090ed 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -19,22 +19,24 @@ DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
+	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="egl gles1 gles2"
 
 RDEPEND="
-	media-libs/freeglut
-	media-libs/glew
 	media-libs/mesa[egl?,gles1?,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"
 
@@ -49,7 +51,7 @@ src_unpack() {
 src_prepare() {
 	base_src_prepare
 
-	eautoreconf
+	[[ $PV = 9999* ]] && eautoreconf
 }
 
 src_compile() {

diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 4ecd9ec..657291f 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -30,13 +30,13 @@ SLOT="0"
 IUSE="egl gles1 gles2"
 
 RDEPEND="
-	egl? ( media-libs/glew )
-	gles1? ( media-libs/glew )
-	gles2? ( media-libs/glew )
 	media-libs/mesa[egl?,gles1?,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"
 
@@ -51,25 +51,11 @@ src_unpack() {
 src_prepare() {
 	base_src_prepare
 
-	eautoreconf
-}
-
-src_configure() {
-	# We're not using the complete buildsystem if we only want to build
-	# glxinfo and glxgears.
-	if use egl || use gles1 || use gles2; then
-		default_src_configure
-	fi
+	[[ $PV = 9999* ]] && eautoreconf
 }
 
 src_compile() {
-	if ! use egl && ! use gles1 && ! use gles2; then
-		tc-export CC
-		emake LDLIBS='-lX11 -lGL' src/xdemos/glxinfo
-		emake LDLIBS='-lX11 -lGL -lm' src/xdemos/glxgears
-	else
-		emake -C src/xdemos glxgears glxinfo
-	fi
+	emake -C src/xdemos glxgears glxinfo
 
 	if use egl; then
 		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo