diff options
author | Donnie Berkholz <spyderous@gentoo.org> | 2006-05-20 06:52:50 +0000 |
---|---|---|
committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-05-20 06:52:50 +0000 |
commit | a3278684536932d11ee136858973858815fab442 (patch) | |
tree | 5af2c90d319caac7239ad2cd3ab398eace9b78d0 /media-libs/glut | |
parent | Re-add ~ppc64 that seems to have been mistakenly dropped from 1.4 series. (diff) | |
download | gentoo-2-a3278684536932d11ee136858973858815fab442.tar.gz gentoo-2-a3278684536932d11ee136858973858815fab442.tar.bz2 gentoo-2-a3278684536932d11ee136858973858815fab442.zip |
(#133481) Ensure freeglut isn't installed at the same time.
(Portage version: 2.1_rc1-r2)
Diffstat (limited to 'media-libs/glut')
-rw-r--r-- | media-libs/glut/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/glut/glut-3.7-r2.ebuild | 8 | ||||
-rw-r--r-- | media-libs/glut/glut-3.7.1.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/media-libs/glut/ChangeLog b/media-libs/glut/ChangeLog index d5647477082e..dd0d440b92ba 100644 --- a/media-libs/glut/ChangeLog +++ b/media-libs/glut/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/glut # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.24 2006/05/16 16:16:56 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.25 2006/05/20 06:52:50 spyderous Exp $ + + 20 May 2006; Donnie Berkholz <spyderous@gentoo.org>; glut-3.7-r2.ebuild, + glut-3.7.1.ebuild: + (#133481) Ensure freeglut isn't installed at the same time. 16 May 2006; Stefan Schweizer <genstef@gentoo.org> +files/glut-3.7.1-fix-GLU-linking.patch, +metadata.xml, glut-3.7.1.ebuild: diff --git a/media-libs/glut/glut-3.7-r2.ebuild b/media-libs/glut/glut-3.7-r2.ebuild index 8c3d3b351d57..ba5d88b57720 100644 --- a/media-libs/glut/glut-3.7-r2.ebuild +++ b/media-libs/glut/glut-3.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r2.ebuild,v 1.20 2006/05/13 20:19:08 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r2.ebuild,v 1.21 2006/05/20 06:52:50 spyderous Exp $ MESA_VER="4.0.1" S=${WORKDIR}/Mesa-${MESA_VER} @@ -14,8 +14,10 @@ SLOT="0" KEYWORDS="x86 ppc sparc alpha" IUSE="" -DEPEND="virtual/opengl - virtual/glu" +RDEPEND="virtual/opengl + virtual/glu + !media-libs/freeglut" +DEPEND="${RDEPEND}" src_compile() { diff --git a/media-libs/glut/glut-3.7.1.ebuild b/media-libs/glut/glut-3.7.1.ebuild index d607dad5dd38..eb3cb0c28c7f 100644 --- a/media-libs/glut/glut-3.7.1.ebuild +++ b/media-libs/glut/glut-3.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.29 2006/05/16 16:16:56 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.30 2006/05/20 06:52:50 spyderous Exp $ inherit autotools eutils @@ -15,8 +15,10 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="" -DEPEND="virtual/opengl - virtual/glu" +RDEPEND="virtual/opengl + virtual/glu + !media-libs/freeglut" +DEPEND="${RDEPEND}" S="${WORKDIR}/Mesa-${MESA_VER}" |