LICENSE fix

diff --git a/net-libs/gnutls/gnutls-1.0.14.ebuild b/net-libs/gnutls/gnutls-1.0.14.ebuild
index c25d6ebfc25ebdd61939639761a691379905fe56..caed8cf647e4c8328f5fd0952a2d2c1746c4bf39 100644 (file)
--- 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 94504fa2d722296c6802ec5d37645afcd5b38694..d46cb065cf7ea621c720f1bcf13b7455bd67855d 100644 (file)
--- 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 749c3aebcfa84583782e93da4dd0eda058e1af0f..8847f35272d679fef92ec22294526880a0eadbdf 100644 (file)
--- 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
 }