From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Tue, 9 Nov 2004 22:23:34 +0000 (+0000)
Subject: LICENSE fix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e855d76c1a3507496b6b638b7da243ba0d98457;p=gentoo.git

LICENSE fix
---

diff --git a/media-libs/giflib/giflib-4.1.0-r3.ebuild b/media-libs/giflib/giflib-4.1.0-r3.ebuild
index 931952cb473e..7a92ae20d8e0 100644
--- a/media-libs/giflib/giflib-4.1.0-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.29 2004/09/23 20:16:18 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.30 2004/11/09 22:22:50 mr_bones_ Exp $
 
 inherit gnuconfig
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/libs/giflib/${P}.tar.gz
 	 ftp://prtr-13.ucsc.edu/pub/libungif/${P}.tar.gz"
 
-LICENSE="as-is | BSD"
+LICENSE="|| ( as-is BSD )"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
 IUSE="X gif"
diff --git a/media-libs/glut/glut-3.7-r2.ebuild b/media-libs/glut/glut-3.7-r2.ebuild
index 5f9ab7684b7f..10302d98f729 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-2004 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.17 2004/10/05 10:24:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r2.ebuild,v 1.18 2004/11/09 22:23:34 mr_bones_ Exp $
 
 MESA_VER="4.0.1"
 S=${WORKDIR}/Mesa-${MESA_VER}
@@ -9,8 +9,8 @@ SRC_URI="mirror://sourceforge/mesa3d/MesaLib-${MESA_VER}.tar.bz2
 	mirror://sourceforge/mesa3d/MesaDemos-${MESA_VER}.tar.bz2"
 HOMEPAGE="http://www.opengl.org/developers/documentation/glut/"
 
+LICENSE="|| ( X11 GPL-2 )"
 SLOT="0"
-LICENSE="X11 | GPL-2"
 KEYWORDS="x86 ppc sparc alpha"
 IUSE=""
 
diff --git a/media-libs/glut/glut-3.7.1.ebuild b/media-libs/glut/glut-3.7.1.ebuild
index 8fe0b841c05e..62c07edef460 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-2004 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.21 2004/10/05 10:24:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.22 2004/11/09 22:23:34 mr_bones_ Exp $
 
 inherit libtool gnuconfig eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.opengl.org/resources/libraries/"
 SRC_URI="mirror://sourceforge/mesa3d/MesaLib-${MESA_VER}.tar.bz2
 	mirror://sourceforge/mesa3d/MesaDemos-${MESA_VER}.tar.bz2"
 
-LICENSE="X11 | GPL-2"
+LICENSE="|| ( X11 GPL-2 )"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
 IUSE=""