LICENSE fix

9 files changed, 19 insertions, 23 deletions

diff --git a/net-libs/gnutls/gnutls-1.0.14.ebuild b/net-libs/gnutls/gnutls-1.0.14.ebuild
index c25d6ebfc25e..caed8cf647e4 100644
--- a/net-libs/gnutls/gnutls-1.0.14.ebuild
+++ b/net-libs/gnutls/gnutls-1.0.14.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/net-libs/gnutls/gnutls-1.0.14.ebuild,v 1.5 2004/07/24 04:43:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.14.ebuild,v 1.6 2004/11/09 22:26:53 mr_bones_ Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
 
 IUSE="zlib doc crypt"
-LICENSE="LGPL-2.1 | GPL-2"
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
 
 SLOT="0"
diff --git a/net-libs/gnutls/gnutls-1.0.17.ebuild b/net-libs/gnutls/gnutls-1.0.17.ebuild
index 94504fa2d722..d46cb065cf7e 100644
--- a/net-libs/gnutls/gnutls-1.0.17.ebuild
+++ b/net-libs/gnutls/gnutls-1.0.17.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/net-libs/gnutls/gnutls-1.0.17.ebuild,v 1.13 2004/11/05 00:39:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.17.ebuild,v 1.14 2004/11/09 22:26:53 mr_bones_ Exp $
 
 inherit eutils gnuconfig
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
 
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 | GPL-2"
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="zlib doc crypt"
diff --git a/net-libs/libical-moz/libical-moz-0.23.ebuild b/net-libs/libical-moz/libical-moz-0.23.ebuild
index 749c3aebcfa8..8847f35272d6 100644
--- a/net-libs/libical-moz/libical-moz-0.23.ebuild
+++ b/net-libs/libical-moz/libical-moz-0.23.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/net-libs/libical-moz/libical-moz-0.23.ebuild,v 1.12 2004/07/15 00:54:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libical-moz/libical-moz-0.23.ebuild,v 1.13 2004/11/09 22:28:42 mr_bones_ Exp $
 
 S=${WORKDIR}/libical-0.23-moz
 DESCRIPTION="libical is used by the mozilla calendar component"
@@ -9,22 +9,18 @@ HOMEPAGE="http://www.mozilla.org/projects/calendar/installation.html"
 
 DEPEND="virtual/libc"
 
+LICENSE="|| ( MPL-1.1 LGPL-2 )"
 SLOT="0"
-LICENSE="MPL-1.1 | LGPL-2"
 KEYWORDS="x86 sparc alpha"
 IUSE=""
 
 src_compile() {
-
 	cd ${S}
 	./autogen.sh --prefix=/usr --disable-python-bindings || die
 	emake || die
-
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
-
 	dodoc AUTHORS ChangeLog LICENSE NEWS README TEST THANKS TODO
 }
diff --git a/net-misc/bwwhois/bwwhois-3.2.ebuild b/net-misc/bwwhois/bwwhois-3.2.ebuild
index 9519d4f16b03..5836eb1ad5f3 100644
--- a/net-misc/bwwhois/bwwhois-3.2.ebuild
+++ b/net-misc/bwwhois/bwwhois-3.2.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/net-misc/bwwhois/bwwhois-3.2.ebuild,v 1.7 2004/07/15 02:41:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bwwhois/bwwhois-3.2.ebuild,v 1.8 2004/11/09 22:29:29 mr_bones_ Exp $
 
 inherit perl-module
 
@@ -11,8 +11,8 @@ DESCRIPTION="Perl-based whois client designed to work with the new Shared Regist
 SRC_URI="http://whois.bw.org/dist/${MY_P}.tgz"
 HOMEPAGE="http://whois.bw.org/"
 
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 IUSE=""
 
diff --git a/net-misc/bwwhois/bwwhois-3.4.ebuild b/net-misc/bwwhois/bwwhois-3.4.ebuild
index a1313a3c1894..46cab3ae45b7 100644
--- a/net-misc/bwwhois/bwwhois-3.4.ebuild
+++ b/net-misc/bwwhois/bwwhois-3.4.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/net-misc/bwwhois/bwwhois-3.4.ebuild,v 1.7 2004/07/15 02:41:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bwwhois/bwwhois-3.4.ebuild,v 1.8 2004/11/09 22:29:29 mr_bones_ Exp $
 
 inherit perl-module
 
@@ -11,8 +11,8 @@ DESCRIPTION="Perl-based whois client designed to work with the new Shared Regist
 SRC_URI="http://whois.bw.org/dist/${MY_P}.tgz"
 HOMEPAGE="http://whois.bw.org/"
 
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 ~ppc ~sparc alpha ~amd64"
 IUSE=""
 
diff --git a/sys-devel/ac-archive/ac-archive-0.5.57.ebuild b/sys-devel/ac-archive/ac-archive-0.5.57.ebuild
index 4a71b891d969..2a3a153f51cf 100644
--- a/sys-devel/ac-archive/ac-archive-0.5.57.ebuild
+++ b/sys-devel/ac-archive/ac-archive-0.5.57.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/sys-devel/ac-archive/ac-archive-0.5.57.ebuild,v 1.2 2004/07/18 11:36:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ac-archive/ac-archive-0.5.57.ebuild,v 1.3 2004/11/09 22:30:05 mr_bones_ Exp $
 
 inherit fixheadtails
 
@@ -8,7 +8,7 @@ DESCRIPTION="The Autoconf Macro Archive"
 HOMEPAGE="http://ac-archive.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ac-archive/${P}.tar.bz2"
 
-LICENSE="BSD | GPL-2"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
index 0b808499b860..deef2061055a 100644
--- a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
+++ b/sys-fs/lvm-user/lvm-user-1.0.7-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/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild,v 1.7 2004/10/03 09:52:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild,v 1.8 2004/11/09 22:30:51 mr_bones_ Exp $
 
 inherit flag-o-matic eutils
 
@@ -9,7 +9,7 @@ DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2"
+LICENSE=" || ( GPL-2 LGPL-2 )"
 SLOT="0"
 KEYWORDS="~x86 -ppc ~sparc alpha ~hppa ~amd64"
 IUSE="static"
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
index 4f9724d61dac..a49237d6d068 100644
--- a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
+++ b/sys-fs/lvm-user/lvm-user-1.0.7.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/sys-fs/lvm-user/lvm-user-1.0.7.ebuild,v 1.6 2004/10/03 09:52:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7.ebuild,v 1.7 2004/11/09 22:30:51 mr_bones_ Exp $
 
 inherit flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2"
+LICENSE=" || ( GPL-2 LGPL-2 )"
 SLOT="0"
 KEYWORDS="x86 -ppc sparc hppa amd64"
 IUSE="static"
diff --git a/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild
index 504ed4d76ba1..12e25a7480ad 100644
--- a/sys-libs/pwdb/pwdb-0.62.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62.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/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.16 2004/11/05 01:40:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.17 2004/11/09 22:31:20 mr_bones_ Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.firstlinux.com/cgi-bin/package/content.cgi?ID=6886"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	http://nl.lunar-linux.org/lunar/sources/sources/${P}.tar.gz"
 
-LICENSE="BSD | GPL-2"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="selinux"