diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-16 18:02:52 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-16 18:02:52 +0000 |
commit | 794200fd5a6a58708e006f52335e4fbdb106d8d8 (patch) | |
tree | 6aebbda1468283f2750374192dcc46303c23be8c | |
parent | Use emake -j1 for build, bug #297200. (diff) | |
download | gentoo-2-794200fd5a6a58708e006f52335e4fbdb106d8d8.tar.gz gentoo-2-794200fd5a6a58708e006f52335e4fbdb106d8d8.tar.bz2 gentoo-2-794200fd5a6a58708e006f52335e4fbdb106d8d8.zip |
Drop old. Stable 7.5.1 on ppc64, since it should've been stabled with the same mesa version.
(Portage version: 2.2_rc59/cvs/Linux x86_64)
-rw-r--r-- | x11-apps/mesa-progs/ChangeLog | 7 | ||||
-rw-r--r-- | x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild | 74 | ||||
-rw-r--r-- | x11-apps/mesa-progs/mesa-progs-7.3.ebuild | 81 | ||||
-rw-r--r-- | x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild | 4 |
4 files changed, 8 insertions, 158 deletions
diff --git a/x11-apps/mesa-progs/ChangeLog b/x11-apps/mesa-progs/ChangeLog index 41e87e707a89..055b49aacda9 100644 --- a/x11-apps/mesa-progs/ChangeLog +++ b/x11-apps/mesa-progs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-apps/mesa-progs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.71 2009/12/15 14:57:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.72 2009/12/16 18:02:52 scarabeus Exp $ + + 16 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -mesa-progs-6.5.2.ebuild, -mesa-progs-7.3.ebuild, mesa-progs-7.5.1.ebuild: + Drop old. Stable 7.5.1 on ppc64, since it should've been stabled with the + same mesa version. 15 Dec 2009; Raúl Porcel <armin76@gentoo.org> mesa-progs-7.5.1.ebuild: alpha/ia64/sh/sparc stable wrt #282290 diff --git a/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild b/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild deleted file mode 100644 index 5d3e6b259caf..000000000000 --- a/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild,v 1.12 2009/04/03 12:39:42 chainsaw Exp $ - -inherit toolchain-funcs - -MY_PN="${PN/m/M}" -MY_PN="${MY_PN/-progs}" -MY_P="${MY_PN}-${PV}" -LIB_P="${MY_PN}Lib-${PV}" -PROG_P="${MY_PN}Demos-${PV}" -DESCRIPTION="Mesa's OpenGL utility and demo programs (like glxgears)" -HOMEPAGE="http://mesa3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/mesa3d/${LIB_P}.tar.bz2 - mirror://sourceforge/mesa3d/${PROG_P}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="virtual/glut - virtual/opengl - virtual/glu" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/Mesa-${PV} - -pkg_setup() { - if [[ ${KERNEL} == "FreeBSD" ]]; then - CONFIG="freebsd" - elif use x86; then - CONFIG="linux-dri-x86" - elif use amd64; then - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - cd "${S}" - - # Kill this; we don't want /usr/X11R6/lib ever to be searched in this - # build. - echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} - - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} - echo "CC = $(tc-getCC)" >> ${HOSTCONF} - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} - - # Just executables here, no need to compile with -fPIC - echo "PIC_FLAGS =" >> ${HOSTCONF} -} - -src_compile() { - cd "${S}/configs" - ln -s "${CONFIG}" current - - cd "${S}/progs/xdemos" - - emake glxinfo || die "glxinfo failed" - emake glxgears || die "glxgears failed" -} - -src_install() { - dobin "${S}"/progs/xdemos/{glxgears,glxinfo} || die -} diff --git a/x11-apps/mesa-progs/mesa-progs-7.3.ebuild b/x11-apps/mesa-progs/mesa-progs-7.3.ebuild deleted file mode 100644 index 02d1e4c5b862..000000000000 --- a/x11-apps/mesa-progs/mesa-progs-7.3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.3.ebuild,v 1.11 2009/05/15 15:25:16 armin76 Exp $ - -inherit toolchain-funcs - -MY_PN="${PN/m/M}" -MY_PN="${MY_PN/-progs}" -MY_P="${MY_PN}-${PV/_/-}" -LIB_P="${MY_PN}Lib-${PV/_/-}" -PROG_P="${MY_PN}Demos-${PV/_/-}" -DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" -HOMEPAGE="http://mesa3d.sourceforge.net/" -if [[ $PV = *_rc* ]]; then - SRC_URI="http://www.mesa3d.org/beta/${LIB_P}.tar.gz - http://www.mesa3d.org/beta/${PROG_P}.tar.gz" -elif [[ $PV = 9999 ]]; then - SRC_URI="" -else - SRC_URI="mirror://sourceforge/mesa3d/${LIB_P}.tar.bz2 - mirror://sourceforge/mesa3d/${PROG_P}.tar.bz2" -fi -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="virtual/glut - virtual/opengl - virtual/glu" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if [[ ${KERNEL} == "FreeBSD" ]]; then - CONFIG="freebsd" - elif use x86; then - CONFIG="linux-dri-x86" - elif use amd64; then - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - cd "${S}" - - # Kill this; we don't want /usr/X11R6/lib ever to be searched in this - # build. - echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} - - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} - echo "CC = $(tc-getCC)" >> ${HOSTCONF} - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} - echo "LDFLAGS = ${LDFLAGS}" >> ${HOSTCONF} - - # Just executables here, no need to compile with -fPIC - echo "PIC_FLAGS =" >> ${HOSTCONF} -} - -src_compile() { - cd "${S}"/configs - ln -s ${CONFIG} current - - cd "${S}"/progs/xdemos - - emake glxinfo || die "glxinfo failed" - emake glxgears || die "glxgears failed" -} - -src_install() { - dobin "${S}"/progs/xdemos/{glxgears,glxinfo} || die -} diff --git a/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild b/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild index 6f44647e88dc..2dffbde8b276 100644 --- a/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild,v 1.7 2009/12/15 14:57:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild,v 1.8 2009/12/16 18:02:52 scarabeus Exp $ inherit toolchain-funcs @@ -22,7 +22,7 @@ else fi LICENSE="LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="" RDEPEND="virtual/glut |