License Fixes. Part 2.

64 files changed, 558 insertions, 114 deletions

diff --git a/dev-libs/pilot-link/pilot-link-0.11.1-r1.ebuild b/dev-libs/pilot-link/pilot-link-0.11.1-r1.ebuild
index 604adf0addf8..e7af520c57fe 100644
--- a/dev-libs/pilot-link/pilot-link-0.11.1-r1.ebuild
+++ b/dev-libs/pilot-link/pilot-link-0.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.1-r1.ebuild,v 1.7 2003/02/13 10:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.1-r1.ebuild,v 1.8 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A suite of tools contains a series of conduits for moving
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pilot-link.org/"
 DEPEND="virtual/glibc"
 
 SLOT="0"
-LICENSE="GPL-2 | LGPL"
+LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="x86 ppc sparc "
 
 src_compile() {
diff --git a/dev-libs/pilot-link/pilot-link-0.11.3.ebuild b/dev-libs/pilot-link/pilot-link-0.11.3.ebuild
index 02b74543c453..580746f6fcee 100644
--- a/dev-libs/pilot-link/pilot-link-0.11.3.ebuild
+++ b/dev-libs/pilot-link/pilot-link-0.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.3.ebuild,v 1.7 2003/02/13 10:49:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.3.ebuild,v 1.8 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A suite of tools contains a series of conduits for moving
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pilot-link.org/"
 DEPEND="virtual/glibc"
 
 SLOT="0"
-LICENSE="GPL-2 | LGPL"
+LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="x86 ppc sparc "
 
 src_compile() {
diff --git a/dev-libs/pilot-link/pilot-link-0.11.5-r1.ebuild b/dev-libs/pilot-link/pilot-link-0.11.5-r1.ebuild
index 70909692e902..34e9c9ee00d5 100644
--- a/dev-libs/pilot-link/pilot-link-0.11.5-r1.ebuild
+++ b/dev-libs/pilot-link/pilot-link-0.11.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.5-r1.ebuild,v 1.4 2003/02/13 10:49:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.5-r1.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
 HOMEPAGE="http://www.pilot-link.org/"
 
 SLOT="0"
-LICENSE="GPL-2 | LGPL"
+LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="x86 ~ppc ~sparc "
 IUSE="perl java tcltk python pic png readline"
 
diff --git a/dev-libs/pilot-link/pilot-link-0.11.5.ebuild b/dev-libs/pilot-link/pilot-link-0.11.5.ebuild
index 882fa68a3b1d..7a7e0f4927aa 100644
--- a/dev-libs/pilot-link/pilot-link-0.11.5.ebuild
+++ b/dev-libs/pilot-link/pilot-link-0.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.5.ebuild,v 1.3 2003/02/13 10:49:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.5.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
@@ -9,7 +9,7 @@ SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
 HOMEPAGE="http://www.pilot-link.org/"
 
 SLOT="0"
-LICENSE="GPL-2 | LGPL"
+LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="~x86 ~ppc ~sparc "
 IUSE="perl java tcltk python pic png readline"
 
diff --git a/dev-libs/pilot-link/pilot-link-0.11.7.ebuild b/dev-libs/pilot-link/pilot-link-0.11.7.ebuild
index df6eb0ff7b00..00031766d74d 100644
--- a/dev-libs/pilot-link/pilot-link-0.11.7.ebuild
+++ b/dev-libs/pilot-link/pilot-link-0.11.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.7.ebuild,v 1.2 2003/02/13 10:49:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.7.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
 HOMEPAGE="http://www.pilot-link.org/"
 
 SLOT="0"
-LICENSE="GPL-2 | LGPL"
+LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="perl java tcltk python pic png readline"
 
diff --git a/dev-lisp/sbcl/sbcl-0.6.12.ebuild b/dev-lisp/sbcl/sbcl-0.6.12.ebuild
index 5e4bcd470c2a..a96888bd637f 100644
--- a/dev-lisp/sbcl/sbcl-0.6.12.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.6.12.ebuild,v 1.10 2003/02/13 10:54:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.6.12.ebuild,v 1.11 2003/02/28 16:54:59 liquidx Exp $
 
 
 S=${WORKDIR}/${P}
@@ -14,7 +14,7 @@ HOMEPAGE="http://sbcl.sourceforge.net/"
 
 PROVIDE="virtual/commonlisp"
 
-LICENSE="PD"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86"
 
diff --git a/dev-perl/Common/Common-1.0.4.ebuild b/dev-perl/Common/Common-1.0.4.ebuild
index e19e7e1a665e..a05974919c9e 100644
--- a/dev-perl/Common/Common-1.0.4.ebuild
+++ b/dev-perl/Common/Common-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 damien krotkine <dams@gentoo.org>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Common/Common-1.0.4.ebuild,v 1.4 2002/12/15 10:44:12 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Common/Common-1.0.4.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 ECVS_ANON="no"
 ECVS_USER="anoncvs"
@@ -18,7 +18,7 @@ HOMEPAGE="http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/perl-MDK-Common/"
 SRC_URI=""
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="dev-lang/ocaml
diff --git a/dev-php/phpsysinfo/phpsysinfo-2.1.ebuild b/dev-php/phpsysinfo/phpsysinfo-2.1.ebuild
index 6481f806747f..abf499327581 100644
--- a/dev-php/phpsysinfo/phpsysinfo-2.1.ebuild
+++ b/dev-php/phpsysinfo/phpsysinfo-2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/phpsysinfo-2.1.ebuild,v 1.2 2003/02/13 11:31:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/phpsysinfo-2.1.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP."
 HOMEPAGE="http://phpsysinfo.sourceforge.net/"
 SRC_URI="mirror://sourceforge/phpsysinfo/phpSysInfo-${PV}.tar.gz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-python/PyQt/PyQt-3.5-r1.ebuild b/dev-python/PyQt/PyQt-3.5-r1.ebuild
index 677ad1ed08ef..c1abdbe6f767 100644
--- a/dev-python/PyQt/PyQt-3.5-r1.ebuild
+++ b/dev-python/PyQt/PyQt-3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.5-r1.ebuild,v 1.2 2003/02/26 18:33:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.5-r1.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S="${WORKDIR}/PyQt-x11-gpl-${PV}"
 DESCRIPTION="PyQt is a set of Python bindings for the QT 3.x Toolkit"
@@ -8,7 +8,7 @@ SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-${PV}.tar.
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="virtual/glibc
diff --git a/dev-python/PyQt/PyQt-3.5.ebuild b/dev-python/PyQt/PyQt-3.5.ebuild
index ee8abd16a116..a532b486521a 100644
--- a/dev-python/PyQt/PyQt-3.5.ebuild
+++ b/dev-python/PyQt/PyQt-3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.5.ebuild,v 1.2 2003/02/13 11:32:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.5.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S="${WORKDIR}/PyQt-x11-gpl-${PV}"
 DESCRIPTION="PyQt is a set of Python bindings for the QT 3.x Toolkit"
@@ -8,7 +8,7 @@ SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-${PV}.tar.
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="virtual/glibc
diff --git a/dev-python/mod_python/mod_python-2.7.8.ebuild b/dev-python/mod_python/mod_python-2.7.8.ebuild
index 9643123d8d1b..a97ad3afe698 100644
--- a/dev-python/mod_python/mod_python-2.7.8.ebuild
+++ b/dev-python/mod_python/mod_python-2.7.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.8.ebuild,v 1.5 2003/02/13 11:35:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.8.ebuild,v 1.6 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="Python module for Apache"
 SRC_URI="http://www.modpython.org/dist/${P}.tgz"
 HOMEPAGE="http://www.modpython.org/"
 
-LICENSE="AS-IS"
+LICENSE="as-is"
 KEYWORDS="~x86"
 SLOT="0"
 
diff --git a/dev-python/sip/sip-3.5.ebuild b/dev-python/sip/sip-3.5.ebuild
index aa1ed2ed5ea9..8b3c5759c557 100644
--- a/dev-python/sip/sip-3.5.ebuild
+++ b/dev-python/sip/sip-3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.5.ebuild,v 1.4 2003/02/13 11:39:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.5.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 MY_P="${PN}-x11-gpl-${PV}"
 DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
@@ -8,7 +8,7 @@ SRC_URI="http://www.river-bank.demon.co.uk/download/sip/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="virtual/glibc
diff --git a/dev-ruby/amstd/amstd-1.9.5.ebuild b/dev-ruby/amstd/amstd-1.9.5.ebuild
index 06d4aaf52823..d3e29ce2943f 100644
--- a/dev-ruby/amstd/amstd-1.9.5.ebuild
+++ b/dev-ruby/amstd/amstd-1.9.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amstd/amstd-1.9.5.ebuild,v 1.9 2003/02/13 11:40:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amstd/amstd-1.9.5.ebuild,v 1.10 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard libraries for Ruby"
 SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${P}.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 alpha"
 SLOT="0"
 
diff --git a/dev-ruby/amstd/amstd-2.0.0.ebuild b/dev-ruby/amstd/amstd-2.0.0.ebuild
index c94a1206deb9..aa3cffccba15 100644
--- a/dev-ruby/amstd/amstd-2.0.0.ebuild
+++ b/dev-ruby/amstd/amstd-2.0.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amstd/amstd-2.0.0.ebuild,v 1.2 2003/02/13 11:40:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amstd/amstd-2.0.0.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Ruby utility collection by Minero Aoki"
 SRC_URI="http://www.loveruby.net/archive/amstd/${P}.tar.gz"
 HOMEPAGE="http://www.loveruby.net/en/amstd.html"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 alpha"
 SLOT="0"
 
diff --git a/dev-ruby/eruby/eruby-0.9.7.ebuild b/dev-ruby/eruby/eruby-0.9.7.ebuild
index 5969dcb6a0eb..f23783786c64 100644
--- a/dev-ruby/eruby/eruby-0.9.7.ebuild
+++ b/dev-ruby/eruby/eruby-0.9.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintaner: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-0.9.7.ebuild,v 1.6 2003/02/13 11:40:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-0.9.7.ebuild,v 1.7 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="eRuby interprets a Ruby code embedded text file."
 SRC_URI="http://www.modruby.net/archive/eruby-${PV}.tar.gz"
 HOMEPAGE="http://www.modruby.net"
-LICENSE="GPL-2/LGPL-2.1"
+LICENSE="GPL-2 | LGPL-2.1"
 KEYWORDS="x86"
 SLOT="0"
 
diff --git a/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild b/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
index d2ee058a109a..bdcf512804b4 100644
--- a/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild,v 1.6 2003/02/13 11:40:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild,v 1.7 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/mod_ruby-${PV}
 DESCRIPTION="A Ruby Module for Apache"
 SRC_URI="http://www.modruby.net/archive/mod_ruby-${PV}.tar.gz"
 HOMEPAGE="http://www.modruby.net"
-LICENSE="GPL-2/LGPL-2.1"
+LICENSE="GPL-2 | LGPL-2.1"
 KEYWORDS="x86"
 SLOT="0"
 
diff --git a/dev-ruby/racc/racc-1.2.4.ebuild b/dev-ruby/racc/racc-1.2.4.ebuild
index 183f73707562..b034e2d717d9 100644
--- a/dev-ruby/racc/racc-1.2.4.ebuild
+++ b/dev-ruby/racc/racc-1.2.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.2.4.ebuild,v 1.8 2003/02/13 11:40:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.2.4.ebuild,v 1.9 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="LALR parser generator for Ruby"
 SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${P}.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86"
 SLOT="0"
 
diff --git a/dev-ruby/racc/racc-1.4.1.ebuild b/dev-ruby/racc/racc-1.4.1.ebuild
index e4b7ca78cf5e..50f5d26809d7 100644
--- a/dev-ruby/racc/racc-1.4.1.ebuild
+++ b/dev-ruby/racc/racc-1.4.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.1.ebuild,v 1.4 2003/02/13 11:40:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.1.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}-all
 DESCRIPTION="LALR parser generator for Ruby"
 SRC_URI="http://www.loveruby.net/archive/racc/${P}-all.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 alpha"
 SLOT="0"
 
diff --git a/dev-ruby/racc/racc-1.4.3.ebuild b/dev-ruby/racc/racc-1.4.3.ebuild
index ad62b4932eda..6c3829023619 100644
--- a/dev-ruby/racc/racc-1.4.3.ebuild
+++ b/dev-ruby/racc/racc-1.4.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.3.ebuild,v 1.2 2003/02/13 11:40:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.3.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}-all
 DESCRIPTION="LALR parser generator for Ruby"
 SRC_URI="http://www.loveruby.net/archive/racc/${P}-all.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="~x86"
 SLOT="0"
 
diff --git a/dev-ruby/strscan/strscan-0.5.8.ebuild b/dev-ruby/strscan/strscan-0.5.8.ebuild
index 1d02e42f0ef4..7c7ce28a047f 100644
--- a/dev-ruby/strscan/strscan-0.5.8.ebuild
+++ b/dev-ruby/strscan/strscan-0.5.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/strscan-0.5.8.ebuild,v 1.8 2003/02/13 11:45:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/strscan-0.5.8.ebuild,v 1.9 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Fast string scanning library for Ruby"
 SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${P}.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86"
 SLOT="0"
 
diff --git a/dev-ruby/yamlrb/yamlrb-0.47.ebuild b/dev-ruby/yamlrb/yamlrb-0.47.ebuild
index 5a6af5b195d7..6ac3100d6ffc 100644
--- a/dev-ruby/yamlrb/yamlrb-0.47.ebuild
+++ b/dev-ruby/yamlrb/yamlrb-0.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yamlrb/yamlrb-0.47.ebuild,v 1.2 2003/02/13 11:45:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yamlrb/yamlrb-0.47.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Machine parsable data serialization format designed for human readability."
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/yaml4r/${P}.tar.gz"
 HOMEPAGE="http://yaml4r.sourceforge.net/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND=">=dev-lang/ruby-1.6"
diff --git a/dev-tcltk/bwidget/bwidget-1.4.1.ebuild b/dev-tcltk/bwidget/bwidget-1.4.1.ebuild
index d673cf30464d..1899d443d594 100644
--- a/dev-tcltk/bwidget/bwidget-1.4.1.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.4.1.ebuild,v 1.3 2003/02/13 11:45:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.4.1.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="The BWidget toolkit is a high-level widget set for Tcl/Tk. It contains widgets such as progress bars, 3D separators, various manager widgets for toplevels, frames, paned or scrolled windows, button boxes, notebooks or dialogs as well as composite widgets such as comboboxes, spin boxes and tree widgets. The BWidget toolkit is completely written in Tcl so no compiled extension library is required"
 
@@ -8,7 +8,7 @@ MY_PN=${PN/bw/BW}
 MY_P=${MY_PN}-${PV}
 HOMEPAGE="http://tcllib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tcllib/${MY_P}.tar.gz"
-LICENSE="LICENSE.txt"
+LICENSE="BWidget"
 SLOT="0"
 KEYWORDS="x86 ppc"
 DEPEND="dev-lang/tk 
diff --git a/dev-util/gnustep-back/gnustep-back-0.7.9.ebuild b/dev-util/gnustep-back/gnustep-back-0.7.9.ebuild
index 2acdee16cba5..90690dd68f95 100644
--- a/dev-util/gnustep-back/gnustep-back-0.7.9.ebuild
+++ b/dev-util/gnustep-back/gnustep-back-0.7.9.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/gnustep-back-0.7.9.ebuild,v 1.3 2003/02/13 11:53:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/gnustep-back-0.7.9.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep GUI backend"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc "
 DEPEND=">=dev-util/gnustep-gui-0.7.9
diff --git a/dev-util/gnustep-back/gnustep-back-0.8.0.ebuild b/dev-util/gnustep-back/gnustep-back-0.8.0.ebuild
index a1c5477acc8b..6be091160f60 100644
--- a/dev-util/gnustep-back/gnustep-back-0.8.0.ebuild
+++ b/dev-util/gnustep-back/gnustep-back-0.8.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/gnustep-back-0.8.0.ebuild,v 1.3 2003/02/13 11:53:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/gnustep-back-0.8.0.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep GUI backend"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc "
 DEPEND=">=dev-util/gnustep-gui-0.8.0
diff --git a/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild b/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild
index 0152412066fe..8899e35ee297 100644
--- a/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild
+++ b/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild,v 1.4 2003/02/15 01:01:02 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 inherit base
 
 DESCRIPTION="GNUstep GUI backend"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc"
 DEPEND="=dev-util/gnustep-gui-${PV}*
diff --git a/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild b/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild
index fa8f3629176a..0b070f62f724 100644
--- a/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild
+++ b/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild,v 1.4 2003/02/13 11:53:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep base package"
 HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 DEPEND=">=dev-util/gnustep-make-1.3.4"
 RDEPEND="virtual/glibc"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
diff --git a/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild b/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild
index 5c38375562cb..ff20bc1eb037 100644
--- a/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild
+++ b/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild,v 1.6 2003/02/13 11:53:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild,v 1.7 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep base package"
 HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 DEPEND=">=dev-util/gnustep-make-1.3.4"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 KEYWORDS="x86 -ppc -sparc "
diff --git a/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild b/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild
index 56c8758cfb64..5e9b9a51ae88 100644
--- a/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild
+++ b/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild,v 1.3 2003/02/13 11:54:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep base package"
 HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 DEPEND=">=dev-util/gnustep-make-1.4.0
 	>=dev-libs/libxml2-2.4.23"
 RDEPEND="virtual/glibc"
diff --git a/dev-util/gnustep-base/gnustep-base-1.5.1.ebuild b/dev-util/gnustep-base/gnustep-base-1.5.1.ebuild
index bc4620f17eb6..5552c853951b 100644
--- a/dev-util/gnustep-base/gnustep-base-1.5.1.ebuild
+++ b/dev-util/gnustep-base/gnustep-base-1.5.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.5.1.ebuild,v 1.3 2003/02/13 11:54:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.5.1.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 IUSE=""
 DESCRIPTION="GNUstep base package"
 HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 DEPEND=">=dev-util/gnustep-make-1.5.1
 	>=dev-libs/libxml2-2.4.23"
 RDEPEND="virtual/glibc"
diff --git a/dev-util/gnustep-gui/gnustep-gui-0.7.9.ebuild b/dev-util/gnustep-gui/gnustep-gui-0.7.9.ebuild
index be20a621f0b3..2379abcec434 100644
--- a/dev-util/gnustep-gui/gnustep-gui-0.7.9.ebuild
+++ b/dev-util/gnustep-gui/gnustep-gui-0.7.9.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-gui/gnustep-gui-0.7.9.ebuild,v 1.3 2003/02/13 11:54:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-gui/gnustep-gui-0.7.9.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep AppKit implementation"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc "
 DEPEND=">=dev-util/gnustep-base-1.3.4
diff --git a/dev-util/gnustep-gui/gnustep-gui-0.8.0.ebuild b/dev-util/gnustep-gui/gnustep-gui-0.8.0.ebuild
index 5d3894bd80ed..2f420687f665 100644
--- a/dev-util/gnustep-gui/gnustep-gui-0.8.0.ebuild
+++ b/dev-util/gnustep-gui/gnustep-gui-0.8.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-gui/gnustep-gui-0.8.0.ebuild,v 1.3 2003/02/13 11:54:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-gui/gnustep-gui-0.8.0.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep AppKit implementation"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc "
 DEPEND=">=dev-util/gnustep-base-1.4.0
diff --git a/dev-util/gnustep-gui/gnustep-gui-0.8.3.ebuild b/dev-util/gnustep-gui/gnustep-gui-0.8.3.ebuild
index 1c7c844ba902..e616fac389d3 100644
--- a/dev-util/gnustep-gui/gnustep-gui-0.8.3.ebuild
+++ b/dev-util/gnustep-gui/gnustep-gui-0.8.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-gui/gnustep-gui-0.8.3.ebuild,v 1.5 2003/02/15 00:58:42 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-gui/gnustep-gui-0.8.3.ebuild,v 1.6 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep AppKit implementation"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc"
 DEPEND=">=dev-util/gnustep-base-1.5.1
diff --git a/dev-util/gnustep-make/gnustep-make-1.2.1.ebuild b/dev-util/gnustep-make/gnustep-make-1.2.1.ebuild
index 0326ad0cf443..9c1da45f9a10 100644
--- a/dev-util/gnustep-make/gnustep-make-1.2.1.ebuild
+++ b/dev-util/gnustep-make/gnustep-make-1.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.2.1.ebuild,v 1.9 2003/02/13 11:54:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.2.1.ebuild,v 1.10 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep makefile package (stable)"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 sparc "
 
diff --git a/dev-util/gnustep-make/gnustep-make-1.3.3.ebuild b/dev-util/gnustep-make/gnustep-make-1.3.3.ebuild
index 7399ac643b08..1b51d99b85da 100644
--- a/dev-util/gnustep-make/gnustep-make-1.3.3.ebuild
+++ b/dev-util/gnustep-make/gnustep-make-1.3.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.3.3.ebuild,v 1.8 2003/02/13 11:54:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.3.3.ebuild,v 1.9 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep makefile package (unstable)"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 sparc "
 
diff --git a/dev-util/gnustep-make/gnustep-make-1.3.4-r1.ebuild b/dev-util/gnustep-make/gnustep-make-1.3.4-r1.ebuild
index adf778d75cac..f6a7d075ad43 100644
--- a/dev-util/gnustep-make/gnustep-make-1.3.4-r1.ebuild
+++ b/dev-util/gnustep-make/gnustep-make-1.3.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.3.4-r1.ebuild,v 1.4 2003/02/13 11:54:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.3.4-r1.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep makefile package (unstable)"
 HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 DEPEND="virtual/glibc
 	>=sys-devel/gcc-3.1
 	>=dev-libs/ffcall-1.8d
diff --git a/dev-util/gnustep-make/gnustep-make-1.3.4.ebuild b/dev-util/gnustep-make/gnustep-make-1.3.4.ebuild
index 1e0fd7412b8f..ec7d787f6793 100644
--- a/dev-util/gnustep-make/gnustep-make-1.3.4.ebuild
+++ b/dev-util/gnustep-make/gnustep-make-1.3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.3.4.ebuild,v 1.6 2003/02/13 11:54:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.3.4.ebuild,v 1.7 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep makefile package (unstable)"
 HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 DEPEND="virtual/glibc
 	>=sys-devel/gcc-3.1
 	>=dev-libs/ffcall-1.8d
diff --git a/dev-util/gnustep-make/gnustep-make-1.4.0.ebuild b/dev-util/gnustep-make/gnustep-make-1.4.0.ebuild
index 3e841c77089c..39ce95917498 100644
--- a/dev-util/gnustep-make/gnustep-make-1.4.0.ebuild
+++ b/dev-util/gnustep-make/gnustep-make-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.4.0.ebuild,v 1.3 2003/02/13 11:55:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.4.0.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="GNUstep makefile package (unstable)"
 HOMEPAGE="http://www.gnustep.org"
@@ -16,7 +16,7 @@ DEPEND="virtual/glibc
 	>=dev-libs/libxml2-2.4.22
 	>=x11-wm/WindowMaker-0.80.1"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 sparc "
 SLOT="0"
 
diff --git a/dev-util/gnustep-make/gnustep-make-1.5.1.ebuild b/dev-util/gnustep-make/gnustep-make-1.5.1.ebuild
index 6f3af47a7aca..d24f52f298e4 100644
--- a/dev-util/gnustep-make/gnustep-make-1.5.1.ebuild
+++ b/dev-util/gnustep-make/gnustep-make-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.5.1.ebuild,v 1.3 2003/02/13 11:55:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-make/gnustep-make-1.5.1.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 IUSE=""
 DESCRIPTION="GNUstep makefile package (unstable)"
@@ -16,7 +16,7 @@ DEPEND="virtual/glibc
 	>=dev-libs/libxml2-2.4.22
 	>=media-libs/audiofile-0.2.3
 	>=x11-wm/WindowMaker-0.80.1"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 ~sparc"
 SLOT="0"
 
diff --git a/fresco-base/fresco-cvs/fresco-cvs-20021020.ebuild b/fresco-base/fresco-cvs/fresco-cvs-20021020.ebuild
index 7050b7fb9b37..84d26bbd3b7e 100644
--- a/fresco-base/fresco-cvs/fresco-cvs-20021020.ebuild
+++ b/fresco-base/fresco-cvs/fresco-cvs-20021020.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-cvs/fresco-cvs-20021020.ebuild,v 1.3 2003/02/13 12:03:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-cvs/fresco-cvs-20021020.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 ECVS_SERVER="cvs.fresco.org:/cvs/fresco"
 ECVS_MODULE="Fresco"
@@ -14,7 +14,7 @@ MY_PN="${PN/fresco-cvs/Fresco}"
 S="${WORKDIR}/${MY_PN}"
 DESCRIPTION="fresco -- A free X11 replacement which is under heavy development. CVS ebuild."
 HOMEPAGE="http://www2.fresco.org"
-LICENSE="fresco"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
 PATCH="gcc-3.2.patch"
diff --git a/fresco-base/fresco-cvs/fresco-cvs-20030127.ebuild b/fresco-base/fresco-cvs/fresco-cvs-20030127.ebuild
index 90389762a6b8..3b97794e7f41 100644
--- a/fresco-base/fresco-cvs/fresco-cvs-20030127.ebuild
+++ b/fresco-base/fresco-cvs/fresco-cvs-20030127.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-cvs/fresco-cvs-20030127.ebuild,v 1.3 2003/02/19 07:43:53 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-cvs/fresco-cvs-20030127.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 ECVS_SERVER="cvs.fresco.org:/cvs/fresco"
 ECVS_MODULE="Fresco"
@@ -14,7 +14,7 @@ MY_PN="${PN/fresco-cvs/Fresco}"
 S="${WORKDIR}/${MY_PN}"
 DESCRIPTION="fresco -- A free X11 replacement which is under heavy development. CVS ebuild."
 HOMEPAGE="http://www2.fresco.org"
-LICENSE="fresco"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
 PATCH="gcc-3.2.patch"
diff --git a/fresco-base/fresco-cvs/fresco-cvs-20030220.ebuild b/fresco-base/fresco-cvs/fresco-cvs-20030220.ebuild
index 0b70a6e1a108..ca3973be5dca 100644
--- a/fresco-base/fresco-cvs/fresco-cvs-20030220.ebuild
+++ b/fresco-base/fresco-cvs/fresco-cvs-20030220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-cvs/fresco-cvs-20030220.ebuild,v 1.2 2003/02/20 14:33:02 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-cvs/fresco-cvs-20030220.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 ECVS_SERVER="cvs.fresco.org:/cvs/fresco"
 ECVS_MODULE="Fresco"
@@ -14,7 +14,7 @@ MY_PN="${PN/fresco-cvs/Fresco}"
 S="${WORKDIR}/${MY_PN}"
 DESCRIPTION="fresco -- A free X11 replacement which is under heavy development. CVS ebuild."
 HOMEPAGE="http://www2.fresco.org"
-LICENSE="fresco"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
 	
diff --git a/fresco-base/fresco-env/fresco-env-1.0.ebuild b/fresco-base/fresco-env/fresco-env-1.0.ebuild
index a30513599d3b..be0dd719d6f5 100644
--- a/fresco-base/fresco-env/fresco-env-1.0.ebuild
+++ b/fresco-base/fresco-env/fresco-env-1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-env/fresco-env-1.0.ebuild,v 1.3 2003/02/13 12:03:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco-env/fresco-env-1.0.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}
 DESCRIPTION="fresco-env -- dependency setup for fresco"
 HOMEPAGE="http://www2.fresco.org"
 KEYWORDS="x86"
 SLOT="0"
-LICENSE="fresco"
+LICENSE="LGPL-2.1"
 
 src_install() {
 	mkdir -p etc/env.d
diff --git a/fresco-base/fresco/fresco-20020808.ebuild b/fresco-base/fresco/fresco-20020808.ebuild
index 6f56935e5775..5135104d45be 100644
--- a/fresco-base/fresco/fresco-20020808.ebuild
+++ b/fresco-base/fresco/fresco-20020808.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco/fresco-20020808.ebuild,v 1.2 2003/02/13 12:03:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/fresco-base/fresco/fresco-20020808.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 MY_PN="${PN/fresco/Fresco}"
 S="${WORKDIR}/${MY_PN}"
 DESCRIPTION="fresco -- A free X11 replacement which is under heavy development"
 HOMEPAGE="http://www2.fresco.org"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="fresco"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86"
 	
diff --git a/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r1.ebuild
index 74e0771c6637..b7c3e118f00b 100644
--- a/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r1.ebuild,v 1.11 2003/02/13 12:07:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r1.ebuild,v 1.12 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gnome-applets"
@@ -17,7 +17,7 @@ DEPEND="${RDEPEND}
         >=dev-util/intltool-0.11"
 
 SLOT="1"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc "
 
 src_compile() {
diff --git a/licenses/BWidget b/licenses/BWidget
new file mode 100644
index 000000000000..1e3010976a1d
--- /dev/null
+++ b/licenses/BWidget
@@ -0,0 +1,41 @@
+BWidget ToolKit

+Copyright (c) 1998-1999 UNIFIX. 

+Copyright (c) 2001-2002 ActiveState Corp. 

+

+The following terms apply to all files associated with the software

+unless explicitly disclaimed in individual files.

+

+The authors hereby grant permission to use, copy, modify, distribute,

+and license this software and its documentation for any purpose, provided

+that existing copyright notices are retained in all copies and that this

+notice is included verbatim in any distributions. No written agreement,

+license, or royalty fee is required for any of the authorized uses.

+Modifications to this software may be copyrighted by their authors

+and need not follow the licensing terms described here, provided that

+the new terms are clearly indicated on the first page of each file where

+they apply.

+

+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY

+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES

+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY

+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGE.

+

+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,

+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE

+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE

+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR

+MODIFICATIONS.

+

+GOVERNMENT USE: If you are acquiring this software on behalf of the

+U.S. government, the Government shall have only "Restricted Rights"

+in the software and related documentation as defined in the Federal 

+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you

+are acquiring the software on behalf of the Department of Defense, the

+software shall be classified as "Commercial Computer Software" and the

+Government shall have only "Restricted Rights" as defined in Clause

+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the

+authors grant the U.S. Government and others acting in its behalf

+permission to use and distribute the software in accordance with the

+terms specified in this license. 

diff --git a/licenses/Moria b/licenses/Moria
new file mode 100644
index 000000000000..101c524a4e36
--- /dev/null
+++ b/licenses/Moria
@@ -0,0 +1,12 @@
+Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
+
+This software may be copied and distributed for educational, research,
+and not for profit purposes provided that this copyright and statement
+are included in all such copies.  Other copyrights may also apply.
+
+All changes made by Ben Harrison, Robert Ruehlmann, and many other Angband
+developers are also available under the GNU GENERAL PUBLIC LICENSE.
+Note that this doesn't influence the current distribution, since parts of
+the source are still only available under the old Moria/Angband license.
+Until all parts of Angband are distributed under the GPL the only valid
+license remains the original Moria/Angband license.
diff --git a/licenses/dbgphp b/licenses/dbgphp
new file mode 100644
index 000000000000..994743625914
--- /dev/null
+++ b/licenses/dbgphp
@@ -0,0 +1,19 @@
+The DBG License, version 1.01
+Copyright (c) 2000, 2001, Dmitri Dmitrienko.
+All rights reserved.
+
+
+Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+  3. The name "DBG" must not be used to endorse or promote products derived from this software without prior permission from the Author.  
+  4. Author may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. Once covered code has been published under a particular version of the license, you may always continue to use it under the terms of that version. You may also choose to use such covered code under the terms of any subsequent version of the license published by the Author. No one other than the Author has the right to modify the terms applicable to covered code created under this License.
+  5. Redistributions of any form whatsoever must retain the following    acknowledgment: "This product includes DBG, freely available from http://dd.cron.ru/dbg/"
+
+THIS SOFTWARE IS PROVIDED BY DMITRI DMITRIENKO ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DMITRI DMITRIENKO OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+Author of DBG can be contacted via Email at dd@cron.ru. For more information the DBG project, please see Web site http://dd.cron.ru/dbg/ 
+
diff --git a/licenses/hylafax b/licenses/hylafax
new file mode 100644
index 000000000000..d67133692a93
--- /dev/null
+++ b/licenses/hylafax
@@ -0,0 +1,111 @@
+
+	    HylaFAX Facsimile Software
+
+	Copyright (c) 1990-1996 Sam Leffler
+	Copyright (c) 1991-1996 Silicon Graphics, Inc.
+	HylaFAX is a trademark of Silicon Graphics, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and 
+its documentation for any purpose is hereby granted without fee, provided
+that (i) the above copyright notices and this permission notice appear in
+all copies of the software and related documentation, and (ii) the names of
+Sam Leffler and Silicon Graphics may not be used in any advertising or
+publicity relating to the software without the specific, prior written
+permission of Sam Leffler and Silicon Graphics.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+
+IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+OF THIS SOFTWARE.
+

+
+Acknowledgements

+----------------

+The regular expression support is based on Henry Spencer's POSIX 1003.2

+compliant regex package that has ``Copyright 1992, 1993, 1994 Henry

+Spencer.  All rights reserved.'' Consult regex/COPYRIGHT for the full

+copyright notice associated with this software.

+

+The code to read PCF fonts is distantly related to the X11R5 code

+that is ``Copyright 1990 Massachusetts Institute of Technology''; consult

+faxd/PCFFont.c++ for the full copyright notice.

+

+The textfmt program is distantly related to the lptops program written

+by Nelson Beebe; there was no copyright notice on the version of the code

+that textfmt grew out of.

+

+The config.guess and config.sub scripts are part of the GNU autoconf

+package and covered by the GNU Public License (GPL).  Several ideas

+in the configure script are directly "borrowed" from autoconf (and I

+have tried to maintain as much compatibility as possible).

+

+The PCF font etc/lutRS18.pcf included for use with tag lines is a

+compiled version of a LucidaTypewriter font that was contributed to X11

+by Bigelow & Holmes.  Redistribution of this font requires inclusion of

+this copyright notice:

+

+

+    NOTICE TO USER: The source code, including the glyphs or icons 

+    forming a par of the OPEN LOOK TM Graphic User Interface, on this 

+    tape and in these files is copyrighted under U.S. and international

+    laws. Sun Microsystems, Inc. of Mountain View, California owns

+    the copyright and has design patents pending on many of the icons. 

+    AT&T is the owner of the OPEN LOOK trademark associated with the

+    materials on this tape. Users and possessors of this source code 

+    are hereby granted a nonexclusive, royalty-free copyright and 

+    design patent license to use this code in individual and 

+    commercial software. A royalty-free, nonexclusive trademark

+    license to refer to the code and output as "OPEN LOOK" compatible 

+    is available from AT&T if, and only if, the appearance of the 

+    icons or glyphs is not changed in any manner except as absolutely

+    necessary to accommodate the standard resolution of the screen or

+    other output device, the code and output is not changed except as 

+    authorized herein, and the code and output is validated by AT&T. 

+    Bigelow & Holmes is the owner of the Lucida (R) trademark for the

+    fonts and bit-mapped images associated with the materials on this 

+    tape. Users are granted a royalty-free, nonexclusive license to use

+    the trademark only to identify the fonts and bit-mapped images if, 

+    and only if, the fonts and bit-mapped images are not modified in any

+    way by the user. 

+

+

+    Any use of this source code must include, in the user documentation 

+    and internal comments to the code, notices to the end user as  

+    follows:

+

+

+    (c) Copyright 1989 Sun Microsystems, Inc. Sun design patents

+    pending in the U.S. and foreign countries. OPEN LOOK is a 

+    trademark of AT&T. Used by written permission of the owners.

+

+

+    (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered 

+    trademark of Bigelow & Holmes. Permission to use the Lucida 

+    trademark is hereby granted only in association with the images 

+    and fonts described in this file.

+

+

+

+    SUN MICROSYSTEMS, INC., AT&T, AND BIGELOW & HOLMES

+    MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY OF

+    THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" 

+    WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. 

+    SUN  MICROSYSTEMS, INC., AT&T AND BIGELOW  & HOLMES, 

+    SEVERALLY AND INDIVIDUALLY, DISCLAIM ALL WARRANTIES 

+    WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED

+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

+    PARTICULAR PURPOSE. IN NO EVENT SHALL SUN MICROSYSTEMS,

+    INC., AT&T OR BIGELOW & HOLMES BE LIABLE FOR ANY

+    SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,

+    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA      

+    OR PROFITS, WHETHER IN AN ACTION OF  CONTRACT, NEGLIGENCE

+    OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+    WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.

+

+

diff --git a/licenses/qpopper b/licenses/qpopper
new file mode 100644
index 000000000000..46a1d3eaceac
--- /dev/null
+++ b/licenses/qpopper
@@ -0,0 +1,141 @@
+Qpopper(tm) is licensed by QUALCOMM Incorporated under the following
+    terms and conditions.  ANY USE OF QPOPPER CONSTITUTES AGREEMENT TO
+    THESE TERMS.
+
+1.  Warranty Disclaimer.  QPOPPER SOFTWARE IS PROVIDED TO THE USER "AS
+    IS." QUALCOMM MAKES NO WARRANTIES, EITHER EXPRESS OR IMPLIED, WITH
+    RESPECT TO THE QPOPPER SOFTWARE AND/OR ASSOCIATED MATERIALS
+    PROVIDED TO THE USER, INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR AGAINST
+    INFRINGEMENT.  QUALCOMM does not warrant that the functions
+    contained in the software will meet your requirements, or that the
+    operation of the software will be uninterrupted or error-free, or
+    that defects in the software will be corrected.  Furthermore,
+    QUALCOMM does not warrant or make any representations regarding
+    the use or the results of the use of the software or any
+    documentation provided therewith in terms of their correctness,
+    accuracy, reliability, or otherwise.  No oral or written
+    information or advice given by QUALCOMM or a QUALCOMM
+    representative shall create a warranty or in any way increase the
+    scope of this warranty.
+
+2.  Limitation of Liability.  QUALCOMM AND ITS LICENSORS ARE NOT LIABLE
+    FOR ANY CLAIMS OR DAMAGES WHATSOEVER ARISING IN CONNECTION WITH
+    THE QPOPPER SOFTWARE, INCLUDING WITHOUT LIMITATION PROPERTY
+    DAMAGE, PERSONAL INJURY, INTELLECTUAL PROPERTY INFRINGEMENT, LOSS
+    OF PROFITS, OR INTERRUPTION OF BUSINESS, OR FOR ANY SPECIAL,
+    CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER
+    ARISING OUT OF BREACH OF WARRANTY, CONTRACT, TORT (INCLUDING
+    NEGLIGENCE), STRICT LIABILITY, OR OTHERWISE.
+
+3.  Using and Distributing Qpopper.  If a party agrees to these terms
+    and conditions, such party may copy and use Qpopper for any
+    purpose, and distribute unmodified complete copies of Qpopper to
+    any third party provided that such third party must agree to these
+    terms and conditions prior to any use of Qpopper.  Failure to
+    include these license terms when distributing Qpopper shall be a
+    material breach of this agreement, and the party committing such
+    breach shall defend and indemnify QUALCOMM Incorporated against
+    all claims, losses, liabilities, damages, costs and expenses,
+    including attorney's fees, which QUALCOMM may incur in connection
+    with such breach.
+
+4.  Modifying Qpopper.  Qpopper consists of (i) intellectual property
+    owned by QUALCOMM Incorporated, and (ii) intellectual property
+    owned by the Regents of the University of California.  Any
+    modifications to the U.C.-owned portions of Qpopper are subject to
+    the provisions of Section 7 below.  A party to this agreement may
+    create derivative works of the QUALCOMM-owned portions of the
+    Qpopper software, distribute such derivative works to third
+    parties, and permit such third parties to copy and use such
+    derivative works subject to the following restrictions: 
+    
+    (a)  The protocol greeting banner and the CAPA IMPLEMENTATION
+         response tag must include clear notification that Qpopper has
+         been modified (for example,
+         "FooPopper-by-Foo-Networks-hacked-from-Qpopper-4.0"). 
+    
+    (b)  Detailed notification of all modifications must be clearly and
+         conspicuously included within the modified source files, and 
+         in a separate document.  All of the source files and the 
+         document describing the changes must be distributed with the
+         modified software. 
+    
+    (c)  When distributing the modified software the distributing party
+         must clearly and conspicuously communicate to all recipients
+         that the modified software is produced by the party that
+         modified the software and is not a QUALCOMM product. 
+
+    (d)  The term "Qpopper" shall not be used in connection with the
+         modified software except in a purely factual manner when
+         describing the history or development of the software.
+
+    (e)  The modified software must be licensed to end users using a
+         license agreement which expressly states that portions of the
+         modified software are based on code owned by QUALCOMM 
+         Incorporated, that such QUALCOMM code is only provided on the
+         terms stated in this agreement, and that QUALCOMM bears no 
+         responsibility whatsoever for any modifications to the QUALCOMM
+         code.
+
+    (f)  The modifying party shall defend and indemnify QUALCOMM 
+         Incorporated against all claims, losses, liabilities, damages,
+         costs and expenses, including attorney's fees, which QUALCOMM
+         may incur in connection with any intellectual property 
+         infringement or similar claim related to the modified 
+         software, if such claim is related to that party's 
+         modifications.
+
+5.  Notices.  QUALCOMM is a registered trademark and registered service
+    mark of QUALCOMM Incorporated.  Qpopper is a trademark of QUALCOMM
+    Incorporated.  QUALCOMM does not grant any party the right to use
+    such marks on any modified version of the Qpopper software.  All
+    other trademarks and service marks are the property of their
+    respective owners.  The Qpopper software, excluding the portions
+    owned by the Regents of the University of California, is Copyright
+    1993-2001 QUALCOMM Incorporated.  All rights not expressly granted
+    herein are reserved by QUALCOMM.
+
+6.  General.  This agreement is governed and interpreted in accordance
+    with the laws of the State of California without giving effect to
+    its conflict of laws provisions.  Any claim arising out of or
+    related to this agreement must be brought exclusively in the state
+    or federal courts located in San Diego County, California.  The
+    United Nations Convention on Contracts for the International Sale
+    of Goods is expressly disclaimed.  If any provision of this
+    agreement shall be invalid, the validity of the  remaining
+    provisions of this agreement shall not be affected.  This
+    agreement is the entire and exclusive agreement between QUALCOMM
+    and any user of the Qpopper software with respect to the software
+    and supersedes all prior agreements (whether written or oral) and
+    other communications related to the software.
+
+7.  IMPORTANT.
+
+    This software program contains code, and/or derivatives or
+    modifications of code originating from the software program
+    "Popper." Popper is (c) Copyright 1989-1991 The Regents of the
+    University of California, All Rights Reserved.  Popper was 
+    created by Austin Shelton, Information Systems and Technology,
+    University of California, Berkeley.  Permission from the Regents of
+    the University of California to use, copy, modify, and distribute
+    the "Popper" software contained herein for any purpose, without
+    fee, and without a written agreement is hereby granted, provided
+    that the above copyright notice and this paragraph and the 
+    following two paragraphs appear in all copies.  HOWEVER, ADDITIONAL
+    PERMISSIONS MAY BE NECESSARY FROM OTHER PERSONS OR ENTITIES, TO
+    USE DERIVATIVES OR MODIFICATIONS OF POPPER.
+
+    IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
+    PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THE
+    POPPER SOFTWARE, OR ITS DERIVATIVES OR MODIFICATIONS, AND ITS
+    DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
+    ADVISED OF THE POSSIBLITY OF SUCH DAMAGE.
+
+    THE UNIVERSITY OF CALIFORNIA, SPECIFICALLY DISCLAIMS ANY 
+    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE 
+    POPPER SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE
+    UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE
+    MAINTENANCE, SUPPORT, UPDATES, ENCHANCEMENTS, OR MODIFICATIONS.
diff --git a/licenses/slirp b/licenses/slirp
new file mode 100644
index 000000000000..2e868624fbc4
--- /dev/null
+++ b/licenses/slirp
@@ -0,0 +1,64 @@
+Slirp was written by Danny Gasparovski.
+Copyright (c), 1995,1996 All Rights Reserved.
+
+Slirp is maintained by Kelly Price <tygris+slirp@erols.com>
+
+Slirp is free software; "free" as in you don't have to pay for it, and you
+are free to do whatever you want with it.  I do not accept any donations,
+monetary or otherwise, for Slirp.  Instead, I would ask you to pass this
+potential donation to your favorite charity.  In fact, I encourage
+*everyone* who finds Slirp useful to make a small donation to their
+favorite charity (for example, GreenPeace).  This is not a requirement, but
+a suggestion from someone who highly values the service they provide.
+
+The copyright terms and conditions:
+
+---BEGIN---
+
+ Copyright (c) 1995,1996 Danny Gasparovski.  All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgment:
+      This product includes software developed by Danny Gasparovski.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ DANNY GASPAROVSKI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---END---
+
+This basically means you can do anything you want with the software, except
+1) call it your own, and 2) claim warranty on it.  There is no warranty for
+this software.  None.  Nada.  If you lose a million dollars while using
+Slirp, that's your loss not mine.  So, ***USE AT YOUR OWN RISK!***.
+
+If these conditions cannot be met due to legal restrictions (E.g. where it
+is against the law to give out Software without warranty), you must cease
+using the software and delete all copies you have.
+
+Slirp uses code that is copyrighted by the following people/organizations:
+
+Juha Pirkola.
+Gregory M. Christy.
+The Regents of the University of California.
+Carnegie Mellon University.
+The Australian National University.
+RSA Data Security, Inc.
+
+Please read the top of each source file for the details on the various
+copyrights.
diff --git a/licenses/sslwrap b/licenses/sslwrap
new file mode 100644
index 000000000000..83a186a922af
--- /dev/null
+++ b/licenses/sslwrap
@@ -0,0 +1,56 @@
+Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+All rights reserved.
+
+This package is an SSL implementation written
+by Eric Young (eay@cryptsoft.com).
+The implementation was written so as to conform with Netscapes SSL.
+
+This library is free for commercial and non-commercial use as long as
+the following conditions are aheared to.  The following conditions
+apply to all code found in this distribution, be it the RC4, RSA,
+lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+included with this distribution is covered by the same copyright terms
+except that the holder is Tim Hudson (tjh@cryptsoft.com).
+
+Copyright remains Eric Young's, and as such any Copyright notices in
+the code are not to be removed.
+If this package is used in a product, Eric Young should be given attribution
+as the author of the parts of the library used.
+This can be in the form of a textual message at program startup or
+in documentation (online or textual) provided with the package.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   "This product includes cryptographic software written by
+    Eric Young (eay@cryptsoft.com)"
+   The word 'cryptographic' can be left out if the rouines from the library
+   being used are not cryptographic related :-).
+4. If you include any Windows specific code (or a derivative thereof) from 
+   the apps directory (application code) you must include an acknowledgement:
+   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+
+THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+The licence and distribution terms for any publically available version or
+derivative of this code cannot be changed.  i.e. this code cannot simply be
+copied and put under another distribution licence
+[including the GNU Public Licence.]
+
diff --git a/media-libs/libexif-gtk/libexif-gtk-0.3.3.ebuild b/media-libs/libexif-gtk/libexif-gtk-0.3.3.ebuild
index 3b562d480a53..05d039f9b69f 100644
--- a/media-libs/libexif-gtk/libexif-gtk-0.3.3.ebuild
+++ b/media-libs/libexif-gtk/libexif-gtk-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif-gtk/libexif-gtk-0.3.3.ebuild,v 1.2 2003/02/13 12:48:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif-gtk/libexif-gtk-0.3.3.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/libexif/${P}.tar.gz"
 HOMEPAGE="http://libexif.sf.net/"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="dev-util/pkgconfig
diff --git a/media-libs/libexif/libexif-0.5.8.ebuild b/media-libs/libexif/libexif-0.5.8.ebuild
index 06467c76d729..6cdc41ea75a7 100644
--- a/media-libs/libexif/libexif-0.5.8.ebuild
+++ b/media-libs/libexif/libexif-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.5.8.ebuild,v 1.2 2003/02/13 12:47:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.5.8.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libexif.sf.net/"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="dev-util/pkgconfig"
diff --git a/media-libs/libexif/libexif-0.5.9.ebuild b/media-libs/libexif/libexif-0.5.9.ebuild
index 384ee23b07fc..15193bdd5049 100644
--- a/media-libs/libexif/libexif-0.5.9.ebuild
+++ b/media-libs/libexif/libexif-0.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.5.9.ebuild,v 1.2 2003/02/13 12:48:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.5.9.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libexif.sf.net/"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="dev-util/pkgconfig"
diff --git a/media-libs/libmnote/libmnote-0.5.6.ebuild b/media-libs/libmnote/libmnote-0.5.6.ebuild
index fa519eda5483..4c7e65cbfed0 100644
--- a/media-libs/libmnote/libmnote-0.5.6.ebuild
+++ b/media-libs/libmnote/libmnote-0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmnote/libmnote-0.5.6.ebuild,v 1.2 2003/02/13 12:49:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmnote/libmnote-0.5.6.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/libexif/${P}.tar.gz"
 HOMEPAGE="http://libexif.sf.net/"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="dev-util/pkgconfig
diff --git a/media-plugins/live/live-2003.01.28.ebuild b/media-plugins/live/live-2003.01.28.ebuild
index 51bdd0120f6b..ee6b625cdbf2 100644
--- a/media-plugins/live/live-2003.01.28.ebuild
+++ b/media-plugins/live/live-2003.01.28.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2003.01.28.ebuild,v 1.3 2003/02/13 12:58:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2003.01.28.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
 
 HOMEPAGE="http://www.live.com/"
 MY_P=${P/-/.}
 SRC_URI="http://www.live.com/liveMedia/public/${MY_P}.tar.gz"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
diff --git a/media-plugins/xine-d4d/xine-d4d-0.3.2-r1.ebuild b/media-plugins/xine-d4d/xine-d4d-0.3.2-r1.ebuild
index dc475bd7c608..6d1b04e7634b 100644
--- a/media-plugins/xine-d4d/xine-d4d-0.3.2-r1.ebuild
+++ b/media-plugins/xine-d4d/xine-d4d-0.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d4d/xine-d4d-0.3.2-r1.ebuild,v 1.2 2003/02/13 12:59:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d4d/xine-d4d-0.3.2-r1.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S="${WORKDIR}/${PN/-/_}_plugin-${PV}"
 DESCRIPTION="Captain CSS plugin for the xine media player"
@@ -10,7 +10,7 @@ SRC_URI="http://members.fortunecity.de/captaincss/d4d${PV//./}.txt"
 DEPEND="~media-libs/xine-lib-0.9.12"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 src_unpack() {
diff --git a/media-plugins/xine-d4d/xine-d4d-0.3.2-r2.ebuild b/media-plugins/xine-d4d/xine-d4d-0.3.2-r2.ebuild
index 80256278599c..05e449d3f089 100644
--- a/media-plugins/xine-d4d/xine-d4d-0.3.2-r2.ebuild
+++ b/media-plugins/xine-d4d/xine-d4d-0.3.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d4d/xine-d4d-0.3.2-r2.ebuild,v 1.3 2003/02/13 12:59:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d4d/xine-d4d-0.3.2-r2.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="Captain CSS plugin for the xine media player."
 HOMEPAGE="http://members.fortunecity.de/captaincss/"
-LICENSE="LGPL"
+LICENSE="GPL-2"
 
 DEPEND="=media-libs/xine-lib-0.9*"
 
diff --git a/media-plugins/xine-d5d/xine-d5d-0.2.7-r1.ebuild b/media-plugins/xine-d5d/xine-d5d-0.2.7-r1.ebuild
index 8842cf9bbba9..76d3240ecf82 100644
--- a/media-plugins/xine-d5d/xine-d5d-0.2.7-r1.ebuild
+++ b/media-plugins/xine-d5d/xine-d5d-0.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d5d/xine-d5d-0.2.7-r1.ebuild,v 1.5 2003/02/13 12:59:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d5d/xine-d5d-0.2.7-r1.ebuild,v 1.6 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Captain CSS menu plugin for the xine media player"
@@ -10,7 +10,7 @@ SRC_URI="http://debianlinux.net/${P}.tgz"
 DEPEND="=media-libs/xine-lib-0.9*"
 
 SLOT="0"
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 src_unpack() {
diff --git a/media-plugins/xine-d5d/xine-d5d-0.2.7.ebuild b/media-plugins/xine-d5d/xine-d5d-0.2.7.ebuild
index 00c37869f5a7..971bf7138c50 100644
--- a/media-plugins/xine-d5d/xine-d5d-0.2.7.ebuild
+++ b/media-plugins/xine-d5d/xine-d5d-0.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d5d/xine-d5d-0.2.7.ebuild,v 1.2 2003/02/13 12:59:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-d5d/xine-d5d-0.2.7.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Captain CSS menu plugin for the xine media player"
@@ -10,7 +10,7 @@ SRC_URI="http://members.fortunecity.de/captaincss/d5d${PV//./}.txt"
 DEPEND="~media-libs/xine-lib-0.9.12"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 src_unpack() {
diff --git a/media-sound/beast-data/beast-data-0.3.ebuild b/media-sound/beast-data/beast-data-0.3.ebuild
index 5bf618e602fe..44d5ea836c4b 100644
--- a/media-sound/beast-data/beast-data-0.3.ebuild
+++ b/media-sound/beast-data/beast-data-0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast-data/beast-data-0.3.ebuild,v 1.4 2003/02/13 13:08:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast-data/beast-data-0.3.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
 
 DESCRIPTION="BEAST - the Bedevilled Sound Engine (datafiles)"
 HOMEPAGE="http://beast.gtk.org"
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND=">=media-sound/beast-0.4.1"
 
diff --git a/media-sound/saydate/saydate-0.3.0.ebuild b/media-sound/saydate/saydate-0.3.0.ebuild
index ed64971bd081..ce9acc8fe8e5 100644
--- a/media-sound/saydate/saydate-0.3.0.ebuild
+++ b/media-sound/saydate/saydate-0.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/saydate/saydate-0.3.0.ebuild,v 1.2 2003/02/13 13:18:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/saydate/saydate-0.3.0.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A Linux shell program that talks the date and system uptime."
 HOMEPAGE="http://unihedron.com/projects/saydate/saydate.php"
 SRC_URI="http://unihedron.com/projects/saydate/${P}.tar.gz"
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
diff --git a/media-sound/sox/sox-12.17.3-r1.ebuild b/media-sound/sox/sox-12.17.3-r1.ebuild
index 578306e3c8e4..51bd9986a805 100644
--- a/media-sound/sox/sox-12.17.3-r1.ebuild
+++ b/media-sound/sox/sox-12.17.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.3-r1.ebuild,v 1.6 2003/02/13 13:19:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.3-r1.ebuild,v 1.7 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The swiss army knife of sound processing programs"
@@ -9,7 +9,7 @@ SRC_URI="http://download.sourceforge.net/sox/${P}.tar.gz"
 
 KEYWORDS="x86 ppc"
 SLOT="0"
-LICENSE="LPGL-2.1"
+LICENSE="LGPL-2.1"
 
 DEPEND="virtual/glibc"
 
diff --git a/media-sound/sox/sox-12.17.3-r3.ebuild b/media-sound/sox/sox-12.17.3-r3.ebuild
index 35d275d6df70..71dd913b4599 100644
--- a/media-sound/sox/sox-12.17.3-r3.ebuild
+++ b/media-sound/sox/sox-12.17.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.3-r3.ebuild,v 1.2 2003/02/13 13:19:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.3-r3.ebuild,v 1.3 2003/02/28 16:54:59 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The swiss army knife of sound processing programs"
@@ -9,7 +9,7 @@ SRC_URI="http://download.sourceforge.net/sox/${P}.tar.gz"
 
 KEYWORDS="x86 ppc alpha ~sparc "
 SLOT="0"
-LICENSE="LPGL-2.1"
+LICENSE="LGPL-2.1"
 
 DEPEND="virtual/glibc"