diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-05-20 06:54:06 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-05-20 06:54:06 +0000 |
| commit | e048868a30626938bc4151796f5f900488cd5813 (patch) | |
| tree | b6abafaf035de64fcd025bf5ccad06cc766efe0b /media-libs/freeglut | |
| parent | (#133481) Ensure freeglut isn't installed at the same time. (diff) | |
| download | gentoo-2-e048868a30626938bc4151796f5f900488cd5813.tar.gz gentoo-2-e048868a30626938bc4151796f5f900488cd5813.tar.bz2 gentoo-2-e048868a30626938bc4151796f5f900488cd5813.zip | |
(#133481) Ensure media-libs/glut isn't installed at the same time.
(Portage version: 2.1_rc1-r2)
Diffstat (limited to 'media-libs/freeglut')
| -rw-r--r-- | media-libs/freeglut/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/freeglut/freeglut-2.2.0.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/freeglut/freeglut-2.4.0.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog index e5819e25f649..b06c3dc202dd 100644 --- a/media-libs/freeglut/ChangeLog +++ b/media-libs/freeglut/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/freeglut # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.27 2006/05/19 18:08:47 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.28 2006/05/20 06:54:06 spyderous Exp $ + + 20 May 2006; Donnie Berkholz <spyderous@gentoo.org>; + freeglut-2.2.0.ebuild, freeglut-2.4.0.ebuild: + (#133481) Ensure media-libs/glut isn't installed at the same time. 19 May 2006; Markus Rothe <corsair@gentoo.org> freeglut-2.4.0.ebuild: Stable on ppc64; bug #133481 diff --git a/media-libs/freeglut/freeglut-2.2.0.ebuild b/media-libs/freeglut/freeglut-2.2.0.ebuild index 6fbfb03c5b78..c15f743353ea 100644 --- a/media-libs/freeglut/freeglut-2.2.0.ebuild +++ b/media-libs/freeglut/freeglut-2.2.0.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/freeglut/freeglut-2.2.0.ebuild,v 1.22 2006/05/13 20:18:15 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.2.0.ebuild,v 1.23 2006/05/20 06:54:06 spyderous Exp $ DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library" HOMEPAGE="http://freeglut.sourceforge.net/" @@ -11,8 +11,10 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc-macos ppc64 sparc x86" IUSE="" -DEPEND="virtual/opengl - virtual/glu" +RDEPEND="virtual/opengl + virtual/glu + !media-libs/freeglut" +DEPEND="${RDEPEND}" src_install() { make DESTDIR="${D}" install || die "make install failed" diff --git a/media-libs/freeglut/freeglut-2.4.0.ebuild b/media-libs/freeglut/freeglut-2.4.0.ebuild index 0dc363b31325..ddc34b654171 100644 --- a/media-libs/freeglut/freeglut-2.4.0.ebuild +++ b/media-libs/freeglut/freeglut-2.4.0.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/freeglut/freeglut-2.4.0.ebuild,v 1.6 2006/05/19 18:08:47 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0.ebuild,v 1.7 2006/05/20 06:54:06 spyderous Exp $ inherit eutils @@ -13,8 +13,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc-macos ppc64 sparc ~x86" IUSE="" -DEPEND="virtual/opengl - virtual/glu" +RDEPEND="virtual/opengl + virtual/glu + !media-libs/freeglut" +DEPEND="${RDEPEND}" src_unpack() { unpack ${A} |