[gentoo-commits] proj/x11:master commit in: profiles/, x11-apps/mesa-progs/

[Matt Turner]

commit:     23c7d44442db32bdf3a96dfcf5d0625b3703701c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Aug 28 23:46:20 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 23:46:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=23c7d444

x11-apps/mesa-progs: Delete (moved to main tree).

 profiles/package.mask                      |   1 -
 x11-apps/mesa-progs/mesa-progs-9999.ebuild | 105 -----------------------------
 x11-apps/mesa-progs/metadata.xml           |  10 ---
 3 files changed, 116 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 3935b4c..5dab1b5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,7 +2,6 @@
 =dev-libs/libevdev-9999
 =dev-libs/wayland-9999
 =dev-libs/weston-9999
-=x11-apps/mesa-progs-9999
 =x11-apps/mkfontdir-9999
 =x11-apps/mkfontscale-9999
 =x11-apps/radeontop-9999

diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
deleted file mode 100644
index a873219..0000000
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}

diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
deleted file mode 100644
index c679837..0000000
--- a/x11-apps/mesa-progs/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<use>
-	<flag name='egl'>Enable EGL support.</flag>
-	<flag name='gles1'>Enable GLESv1 support.</flag>
-	<flag name='gles2'>Enable GLESv2 support.</flag>
-</use>
-</pkgmetadata>