7 files changed, 17 insertions, 17 deletions
diff --git a/media-fonts/culmus/culmus-0.100-r1.ebuild b/media-fonts/culmus/culmus-0.100-r1.ebuild
index 8f076ee5e5ca..5b9ff7cd10ea 100644
--- a/media-fonts/culmus/culmus-0.100-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.100-r1.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-fonts/culmus/culmus-0.100-r1.ebuild,v 1.4 2004/09/29 06:11:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.100-r1.ebuild,v 1.5 2004/11/09 22:20:24 mr_bones_ Exp $
 
 DESCRIPTION="Hebrew Type1 fonts"
 SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
 HOMEPAGE="http://culmus.sourceforge.net/"
 KEYWORDS="x86 ppc ~amd64 alpha"
 SLOT="0"
-LICENSE="GPL-2 | LICENSE-BITSTREAM"
+LICENSE="|| ( GPL-2 LICENSE-BITSTREAM )"
 IUSE=""
 
 FONTPATH="/usr/share/fonts/${PN}"
diff --git a/media-fonts/culmus/culmus-0.93-r1.ebuild b/media-fonts/culmus/culmus-0.93-r1.ebuild
index d1b4d7d4c49a..e2d641afd59b 100644
--- a/media-fonts/culmus/culmus-0.93-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.93-r1.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-fonts/culmus/culmus-0.93-r1.ebuild,v 1.3 2004/06/24 22:27:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.93-r1.ebuild,v 1.4 2004/11/09 22:20:24 mr_bones_ Exp $
 
 DESCRIPTION="Hebrew Type1 fonts"
 SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
 HOMEPAGE="http://culmus.sourceforge.net/"
 KEYWORDS="x86 ~ppc"
 SLOT="0"
-LICENSE="GPL-2 | LICENSE-BITSTREAM"
+LICENSE="|| ( GPL-2 LICENSE-BITSTREAM )"
 IUSE=""
 
 FONTPATH="/usr/share/fonts/${PN}"
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=""
diff --git a/media-sound/pd/pd-0.37.1.ebuild b/media-sound/pd/pd-0.37.1.ebuild
index 92dc8260452e..c742af71fa00 100644
--- a/media-sound/pd/pd-0.37.1.ebuild
+++ b/media-sound/pd/pd-0.37.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-sound/pd/pd-0.37.1.ebuild,v 1.9 2004/06/25 00:16:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.37.1.ebuild,v 1.10 2004/11/09 22:24:11 mr_bones_ Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ DESCRIPTION="real-time music and multimedia environment"
 HOMEPAGE="http://www-crca.ucsd.edu/~msp/software.html"
 SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.src.tar.gz"
 
-LICENSE="BSD | as-is"
+LICENSE="|| ( BSD as-is )"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="X alsa debug"
diff --git a/net-im/caim/caim-0.03.ebuild b/net-im/caim/caim-0.03.ebuild
index 0f3695563bdd..887d1391305a 100644
--- a/net-im/caim/caim-0.03.ebuild
+++ b/net-im/caim/caim-0.03.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/caim/caim-0.03.ebuild,v 1.9 2004/06/24 22:49:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/caim/caim-0.03.ebuild,v 1.10 2004/11/09 22:24:59 mr_bones_ Exp $
 
 inherit eutils
 
-IUSE=""
 DESCRIPTION="A Console AIM Client"
 SRC_URI="http://www.mercyground.co.uk/${P}.tar.gz"
 HOMEPAGE="http://www.mercyground.co.uk"
 
-DEPEND=">=sys-libs/ncurses-5.1"
-
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-LICENSE="LGPL-2.1 | GPL-2"
 KEYWORDS="x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.1"
 
 src_unpack() {
 	unpack ${P}.tar.gz