Version bump, bug #517372. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

3 files changed, 113 insertions, 50 deletions

diff --git a/x11-apps/mesa-progs/ChangeLog b/x11-apps/mesa-progs/ChangeLog
index 778628d43543..77395695b7f5 100644
--- a/x11-apps/mesa-progs/ChangeLog
+++ b/x11-apps/mesa-progs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mesa-progs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.106 2013/10/08 05:02:43 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.107 2014/09/14 18:50:32 chithanh Exp $
+
+*mesa-progs-8.2.0 (14 Sep 2014)
+
+  14 Sep 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +mesa-progs-8.2.0.ebuild, -mesa-progs-8.0.1.ebuild:
+  Version bump, bug #517372. Remove old.
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> mesa-progs-8.1.0.ebuild:
   Stable for x86, wrt bug #475480
diff --git a/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild b/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild
deleted file mode 100644
index 10ba02eeca49..000000000000
--- a/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild,v 1.8 2011/05/16 07:55:20 mgorny Exp $
-
-EAPI=3
-
-MY_PN=${PN/progs/demos}
-MY_P=${MY_PN}-${PV}
-EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}"
-
-if [[ ${PV} = 9999* ]]; then
-	    GIT_ECLASS="git"
-fi
-
-inherit toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/opengl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# We're not using the complete buildsystem to avoid dependencies
-	# unnecessary for our two little tools.
-	:
-}
-
-src_compile() {
-	tc-export CC
-	emake LDLIBS='-lX11 -lGL -lm' src/xdemos/{glxgears,glxinfo} || die
-}
-
-src_install() {
-	dobin src/xdemos/{glxgears,glxinfo} || die
-}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
new file mode 100644
index 000000000000..cc4f320d4b65
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v 1.1 2014/09/14 18:50:32 chithanh Exp $
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+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}
+	virtual/glu
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_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
+}
+
+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
+
+	if use egl; then
+		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+		emake -C src/egl/eglut/ libeglut_screen.la libeglut_x11.la
+		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+		emake LDLIBS="-lGL -lEGL -lm" -C src/egl/opengl/ eglgears_screen
+
+		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
+			emake LDLIBS="-lGLESv1_CM -lEGL -lm" -C src/egl/opengles1/ gears_screen
+		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
+			emake LDLIBS="-lGLESv2 -lEGL -lm" -C src/egl/opengles2/ es2gears_screen
+		fi
+	fi
+}
+
+src_install() {
+	dobin src/xdemos/{glxgears,glxinfo}
+	if use egl; then
+		dobin src/egl/opengl/egl{info,gears_{screen,x11}}
+
+		if use gles1; then
+			dobin src/egl/opengles1/es1_info
+			newbin src/egl/opengles1/gears_screen es1gears_screen
+			newbin src/egl/opengles1/gears_x11 es1gears_x11
+		fi
+
+		use gles2 && dobin src/egl/opengles2/es2{_info,gears_{screen,x11}}
+	fi
+}