Invalid License Cleanups. Part 1.

Also updated VIM license file.

42 files changed, 200 insertions, 206 deletions

diff --git a/app-admin/yaala/yaala-0.4.2.ebuild b/app-admin/yaala/yaala-0.4.2.ebuild
index 01abc5497af2..b9c93b55f098 100644
--- a/app-admin/yaala/yaala-0.4.2.ebuild
+++ b/app-admin/yaala/yaala-0.4.2.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/app-admin/yaala/yaala-0.4.2.ebuild,v 1.2 2003/01/22 08:06:52 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/yaala-0.4.2.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 SRC_URI="http://verplant.org/yaala/yaala-0.4.2.tar.bz2"
 HOMEPAGE="http://verplant.org/yaala/"
 DEPEND="virtual/glibc"
-LICENSE="GPLv2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 DESCRIPTION="Yet Another Log Analyzer"
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index 1bf9f53baa38..345c86ee45c6 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -7,7 +7,7 @@ S="${WORKDIR}/${PN}"
 DESCRIPTION="A Kanji code converter"
 SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz"
 HOMEPAGE=""  	#There doesn't seem to be a home page for this package!
-LICENSE="GPL2"
+LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
 
diff --git a/app-misc/tpconfig/tpconfig-3.1.3.ebuild b/app-misc/tpconfig/tpconfig-3.1.3.ebuild
index 240dfa6f901f..6336627025f1 100644
--- a/app-misc/tpconfig/tpconfig-3.1.3.ebuild
+++ b/app-misc/tpconfig/tpconfig-3.1.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/app-misc/tpconfig/tpconfig-3.1.3.ebuild,v 1.3 2003/02/13 09:10:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tpconfig/tpconfig-3.1.3.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
 HOMEPAGE="http://www.compass.com/synaptics/"
 SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
diff --git a/app-sci/predict/predict-2.2.1.ebuild b/app-sci/predict/predict-2.2.1.ebuild
index 9161db5e8342..3d2c9a76908a 100644
--- a/app-sci/predict/predict-2.2.1.ebuild
+++ b/app-sci/predict/predict-2.2.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/predict-2.2.1.ebuild,v 1.3 2003/02/13 09:24:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/predict-2.2.1.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
 DESCRIPTION="Satellite tracking and orbital prediction."
 SRC_URI="http://www.amsat.org/amsat/ftp/software/Linux/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="sys-libs/ncurses
diff --git a/app-text/cpp2latex/cpp2latex-2.2.ebuild b/app-text/cpp2latex/cpp2latex-2.2.ebuild
index 70dc8af4b36c..22c8ab3e9e7d 100644
--- a/app-text/cpp2latex/cpp2latex-2.2.ebuild
+++ b/app-text/cpp2latex/cpp2latex-2.2.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/app-text/cpp2latex/cpp2latex-2.2.ebuild,v 1.2 2003/02/13 09:33:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cpp2latex/cpp2latex-2.2.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A program to convert C++ code to LaTeX source"
@@ -11,7 +11,7 @@ DEPEND="virtual/glibc
 	app-text/tetex"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 src_unpack () {
diff --git a/app-text/latex-floatflt/latex-floatflt-1.31a.ebuild b/app-text/latex-floatflt/latex-floatflt-1.31a.ebuild
index 31c33929a597..2674bca7b6a1 100644
--- a/app-text/latex-floatflt/latex-floatflt-1.31a.ebuild
+++ b/app-text/latex-floatflt/latex-floatflt-1.31a.ebuild
@@ -8,7 +8,7 @@ S=${WORKDIR}/floatflt
 DESCRIPTION="LaTeX package used to warp figures around text"
 SRC_URI="ftp://ftp.dante.de/tex-archive/macros/latex/contrib/other/floatflt.tar.gz"
 HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/floatflt.html?action=/tex-archive/macros/latex/contrib/other/floatflt/"
-LICENSE="LPPL"
+LICENSE="LPPL-1.2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc "
 
diff --git a/app-text/latex-leaflet/latex-leaflet-19990601.ebuild b/app-text/latex-leaflet/latex-leaflet-19990601.ebuild
index a790b64347b9..3830cb2706ae 100644
--- a/app-text/latex-leaflet/latex-leaflet-19990601.ebuild
+++ b/app-text/latex-leaflet/latex-leaflet-19990601.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/app-text/latex-leaflet/latex-leaflet-19990601.ebuild,v 1.9 2003/02/13 09:40:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/latex-leaflet/latex-leaflet-19990601.ebuild,v 1.10 2003/02/28 13:18:14 liquidx Exp $
 
 inherit latex-package
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/leaflet
 DESCRIPTION="LaTeX package used to create leaflet-type brochures."
 SRC_URI="http://www.ibiblio.org/gentoo/distfiles/${P}.tar.gz"
 HOMEPAGE="ftp://ibiblio.org/pub/packages/TeX/macros/latex/contrib/supported/"
-LICENSE="LPPL"
+LICENSE="LPPL-1.2"
 SLOT="0"
 KEYWORDS="x86 sparc "
 
diff --git a/app-text/mftrace/mftrace-1.0.10.ebuild b/app-text/mftrace/mftrace-1.0.10.ebuild
index f0ae31a8c8d2..1594719869eb 100644
--- a/app-text/mftrace/mftrace-1.0.10.ebuild
+++ b/app-text/mftrace/mftrace-1.0.10.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/app-text/mftrace/mftrace-1.0.10.ebuild,v 1.3 2003/02/13 09:41:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.0.10.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 IUSE="truetype"
 
@@ -8,7 +8,7 @@ PYVER=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')
 DESCRIPTION="traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
 HOMEPAGE="http://www.cs.uu.nl/~hanwen/mftrace/"
 SRC_URI="http://www.cs.uu.nl/~hanwen/mftrace/${P}.tar.gz"
-LICENSE="GPL"
+LICENSE="GPL-1"
 # have only tested this ebuild version on x86, but old pktrace
 # ebuild had these keywords:
 KEYWORDS="x86"
diff --git a/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild b/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild
index f6ed729ab3fb..787f87435679 100644
--- a/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild
+++ b/dev-db/dbbalancer/dbbalancer-0.4.4.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-db/dbbalancer/dbbalancer-0.4.4.ebuild,v 1.2 2003/02/13 10:01:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="Load balancing multithreaded PostgreSQL connection pool.
 Also has a replication mode to keep in sync the load balanced backend
 servers." 
 HOMEPAGE="http://sourceforge.net/projects/dbbalancer"
 SRC_URI="http://easynews.dl.sourceforge.net/sourceforge/dbbalancer/dbbalancer-0.4.4.tar.gz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-db/sqsh/sqsh-2.1.ebuild b/dev-db/sqsh/sqsh-2.1.ebuild
index 06caadfcd55a..c90610586feb 100644
--- a/dev-db/sqsh/sqsh-2.1.ebuild
+++ b/dev-db/sqsh/sqsh-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-db/sqsh/sqsh-2.1.ebuild,v 1.3 2003/02/13 10:05:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Replacement for the venerable 'isql' program supplied by Sybase."
 HOMEPAGE="http://www.sqsh.org/"
-LICENSE="GPL"
+LICENSE="GPL-2"
 DEPEND="dev-db/freetds
 	readline? ( sys-libs/readline )
 	X? ( x11-base/xfree )
diff --git a/dev-java/japhar/japhar-0.10.ebuild b/dev-java/japhar/japhar-0.10.ebuild
index 37ae238ddfc9..4986afbe3ac9 100644
--- a/dev-java/japhar/japhar-0.10.ebuild
+++ b/dev-java/japhar/japhar-0.10.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-java/japhar/japhar-0.10.ebuild,v 1.5 2003/02/13 10:10:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/japhar/japhar-0.10.ebuild,v 1.6 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Free Java Virtual Machine (JVM)"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.japhar.org/pub/hungry/japhar/source/${P}.tar.gz"
 HOMEPAGE="http://www.japhar.org/"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
diff --git a/dev-java/log4j/log4j-1.2.5.ebuild b/dev-java/log4j/log4j-1.2.5.ebuild
index 02740799cc02..59c6df709745 100644
--- a/dev-java/log4j/log4j-1.2.5.ebuild
+++ b/dev-java/log4j/log4j-1.2.5.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-java/log4j/log4j-1.2.5.ebuild,v 1.5 2003/02/13 10:21:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.5.ebuild,v 1.6 2003/02/28 13:18:14 liquidx Exp $
 
 S="${WORKDIR}/jakarta-${P}"
 
 DESCRIPTION="A low-overhead robust logging package for Java"
 SRC_URI="http://jakarta.apache.org/log4j/jakarta-${P}.tar.gz"
 HOMEPAGE="http://jakarta.apache.org"
-LICENSE="Apache"
+LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="x86"
 
diff --git a/dev-java/log4j/log4j-1.2.7.ebuild b/dev-java/log4j/log4j-1.2.7.ebuild
index a0bea387a66e..3072d2555da6 100644
--- a/dev-java/log4j/log4j-1.2.7.ebuild
+++ b/dev-java/log4j/log4j-1.2.7.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-java/log4j/log4j-1.2.7.ebuild,v 1.2 2003/02/13 10:21:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.7.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 S="${WORKDIR}/jakarta-${P}"
 
 DESCRIPTION="A low-overhead robust logging package for Java"
 SRC_URI="http://jakarta.apache.org/log4j/jakarta-${P}.tar.gz"
 HOMEPAGE="http://jakarta.apache.org"
-LICENSE="Apache"
+LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="~x86"
 
diff --git a/dev-libs/gdome2/gdome2-0.7.2.ebuild b/dev-libs/gdome2/gdome2-0.7.2.ebuild
index 9d28ba1fb532..5d7a4d36d872 100644
--- a/dev-libs/gdome2/gdome2-0.7.2.ebuild
+++ b/dev-libs/gdome2/gdome2-0.7.2.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-libs/gdome2/gdome2-0.7.2.ebuild,v 1.6 2003/02/13 10:38:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/gdome2-0.7.2.ebuild,v 1.7 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="The DOM C library for the GNOME project"
 HOMEPAGE="http://phd.cs.unibo.it/gdome2/"
 SRC_URI="http://phd.cs.unibo.it/gdome2/tarball/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="LPGL-2.1"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86 sparc "
 
 RDEPEND=">=dev-libs/libxml2-2.4.21
diff --git a/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild b/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild
index a09b03f6adb3..a86c88541115 100644
--- a/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild
+++ b/gnome-base/bonobo/bonobo-1.0.19-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/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild,v 1.13 2003/02/13 12:04:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild,v 1.14 2003/02/28 13:18:14 liquidx Exp $
 
 IUSE="nls"
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 KEYWORDS="x86 ppc sparc "
-LICENSE="GPL-"
+LICENSE="GPL-2"
 
 RDEPEND=">=gnome-base/oaf-0.6.8
 	>=gnome-base/ORBit-0.5.13
diff --git a/licenses/vim b/licenses/vim
index 07827621c30b..5dcfd6d49f48 100644
--- a/licenses/vim
+++ b/licenses/vim
@@ -1,132 +1,126 @@
-This is the Vim editor license.
+License details for VIM Editor:
 
-README.txt for version 6.1 of Vim: Vi IMproved.
+*uganda.txt*    For Vim version 6.1.  Last change: 2002 Feb 04
 
 
-WHAT IS VIM
+		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
-Vim is an almost compatible version of the UNIX editor Vi.  Many new features
-have been added: multi-level undo, syntax highlighting, command line history,
-on-line help, filename completion, block operations, etc.  There is also a
-Graphical User Interface (GUI) available.  See "runtime/doc/vi_diff.txt" for
-differences with Vi.
-
-This editor is very useful for editing programs and other plain ASCII files.
-All commands are given with normal keyboard characters, so those who can type
-with ten fingers can work very fast.  Additionally, function keys can be
-defined by the user, and the mouse can be used.
-
-Vim currently runs under Amiga DOS, MS-DOS, MS-Windows 95/98/NT, Atari MiNT,
-Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of UNIX.
-Porting to other systems should not be very difficult.
-
-
-DISTRIBUTION
-
-There are separate distributions for Unix, PC, Amiga and some other systems.
-This README.txt file comes with the runtime archive.  It includes the
-documentation, syntax files and other files that are used at runtime.  To run
-Vim you must get either one of the binary archives or a source archive.
-Which one you need depends on the system you want to run it on and whether you
-want or must compile it yourself.  Check "http://vim.sf.net/download.php" for
-an overview of currently available distributions.
-
-
-DOCUMENTATION
-
-The best is to use ":help" in Vim.  If you don't have an executable yet, read
-"runtime/doc/help.txt".  It contains pointers to the other documentation
-files.  The User Manual reads like a book and is recommended to learn to use
-Vim.  See ":help user-manual".
-
-The vim tutor is a one hour training course for beginners.  Mostly it can be
-started as "vimtutor".  See ":help tutor" for more information.
-
-
-COPYING
 
+			*uganda* *Uganda* *copying* *copyright* *license*
+SUMMARY
+								*iccf* *ICCF*
 Vim is Charityware.  You can use and copy it as much as you like, but you are
-encouraged to make a donation to orphans in Uganda.  Please read the file
-"runtime/doc/uganda.txt" for details.
-
-There are no restrictions on distributing an unmodified copy of Vim.  Parts of
-Vim may also be distributed, but this text must always be included.  You are
-allowed to include executables that you made from the unmodified Vim sources,
-your own usage examples and Vim scripts.
-
-If you distribute a modified version of Vim, you are encouraged to send the
-maintainer a copy, including the source code.  Or make it available to the
-maintainer through ftp; let him know where it can be found.  If the number of
-changes is small (e.g., a modified Makefile) e-mailing the diffs will do.
-When the maintainer asks for it (in any way) you must make your changes,
-including source code, available to him.
-
-The maintainer reserves the right to include any changes in the official
-version of Vim.  This is negotiable.  You are not allowed to distribute a
-modified version of Vim when you are not willing to make the source code
-available to the maintainer.
-
-The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this changes, it
-will be announced in appropriate places (most likely www.vim.org and
-comp.editors).  When it is completely impossible to contact the maintainer,
-the obligation to send him modified source code ceases.
-
-It is not allowed to remove these restrictions from the distribution of the
-Vim sources or parts of it.  These restrictions may also be used for previous
-Vim releases instead of the text that was included with it.
-
-
-INFORMATION
-
-The latest news about Vim can be found on the Vim home page:
-	http://vim.sf.org/
-
-If you have problems, have a look at the Vim FAQ:
-	http://www.vim.org/faq/
-
-Send bug reports to:
-	Bram Moolenaar <Bram@vim.org>
-
-There are four mailing lists for Vim:
-<vim@vim.org>
-	For discussions about using existing versions of Vim: Useful mappings,
-	questions, answers, where to get a specific version, etc.
-	Archive: http://groups.yahoo.com/group/vim
-<vim-dev@vim.org>
-	For discussions about changing Vim: New features, porting, beta-test
-	versions, etc.
-	Archive: http://groups.yahoo.com/group/vimdev
-<vim-announce@vim.org>
-	Announcements about new versions of Vim; also beta-test versions and
-	ports to different systems.
-	Archive: http://groups.yahoo.com/group/vimannounce
-<vim-multibyte@vim.org>
-	For discussions about using and improving the multi-byte aspects of
-	Vim: XIM, Hangul, fontset, etc.
-	Archive: http://groups.yahoo.com/group/vim-multibyte
-<vim-mac@vim.org>
-	For discussions about using and improving Vim on the Macintosh.
-	Archive: http://groups.yahoo.com/group/vim-mac
-
-See "http://www.vim.org/mail.html"
-
-NOTE:
-- You can only send messages to these lists if you have subscribed!
-- You need to send the messages from the same location as where you subscribed
-  from (to avoid spam mail).
-- Maximum message size is 40000 characters.
-
-If you want to join a maillist, send a message to
-	<vim-help@vim.org>
-Make sure that your "From:" address is correct.  Then the list server will
-send you a help message.
-
-
-MAIN AUTHOR
-
-Send any other comments, patches, pizza and suggestions to:
-
-	Bram Moolenaar		E-mail:	Bram@vim.org
-	Clematisstraat 30
-	5925 BE  Venlo		Tel: +31 77 3872340
-	The Netherlands		Fax/voice-mail: +31 84 8508509
+encouraged to make a donation for needy children in Uganda.  Please see |kcc|
+below or visit the ICCF web site, available at these mirrors:
+
+	http://iccf-holland.org/
+	http://www.vim.org/iccf/
+	http://www.iccf.nl/
+
+The Open Publication License applies to the Vim documentation, see
+|manual-copyright|.
+
+=== begin of license ===
+
+VIM LICENSE
+
+I)  There are no restrictions on distributing unmodified copies of Vim except
+    that they must include this license text.  You can also distribute
+    unmodified parts of Vim, likewise unrestricted except that they must
+    include this license text.  You are also allowed to include executables
+    that you made from the unmodified Vim sources, plus your own usage
+    examples and Vim scripts.
+
+II) It is allowed to distribute a modified (or extended) version of Vim,
+    including executables and/or source code, when the following four
+    conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified Vim must be distributed in one of the following five ways:
+       a) If you make changes to Vim yourself, you must clearly describe in
+	  the distribution how to contact you.  When the maintainer asks you
+	  (in any way) for a copy of the modified Vim you distributed, you
+	  must make your changes, including source code, available to the
+	  maintainer without fee.  The maintainer reserves the right to
+	  include your changes in the official version of Vim.  What the
+	  maintainer will do with your changes and under what license they
+	  will be distributed is negotiable.  If there has been no negotiation
+	  then this license, or a later version, also applies to your changes.
+	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+	  changes it will be announced in appropriate places (most likely
+	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
+	  impossible to contact the maintainer, the obligation to send him
+	  your changes ceases.  Once the maintainer has confirmed that he has
+	  received your changes they will not have to be sent again.
+       b) If you have received a modified Vim that was distributed as
+	  mentioned under a) you are allowed to further distribute it
+	  unmodified, as mentioned at I).  If you make additional changes the
+	  text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+	  the modified Vim you distribute.  This may be done in the form of a
+	  context diff.  You can choose what license to use for new code you
+	  add.  The changes and their license must not restrict others from
+	  making their own changes to the official version of Vim.
+       d) When you have a modified Vim which includes changes as mentioned
+	  under c), you can distribute it without the source code for the
+	  changes if the following three conditions are met:
+	  - The license that applies to the changes permits you to distribute
+	    the changes to the Vim maintainer without fee or restriction, and
+	    permits the Vim maintainer to include the changes in the official
+	    version of Vim without fee or restriction.
+	  - You keep the changes for at least three years after last
+	    distributing the corresponding modified Vim.  When the maintainer
+	    or someone who you distributed the modified Vim to asks you (in
+	    any way) for the changes within this period, you must make them
+	    available to him.
+	  - You clearly describe in the distribution how to contact you.  This
+	    contact information must remain valid for at least three years
+	    after last distributing the corresponding modified Vim, or as long
+	    as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+	  you can distribute the modified Vim under the GNU GPL version 2 or
+	  any later version.
+    3) A message must be added, at least in the output of the ":version"
+       command and in the intro screen, such that the user of the modified Vim
+       is able to see that it was modified.  When distributing as mentioned
+       under 2)e) adding the message is only required for as far as this does
+       not conflict with the license used for the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of Vim, you are encouraged to use
+     the Vim license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL.
+     If the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <maintainer@vim.org>
+
+IV)  It is not allowed to remove this license from the distribution of the Vim
+     sources, parts of it or from a modified version.  You may use this
+     license for previous Vim releases instead of the license that they came
+     with, at your option.
+
+=== end of license ===
+
+Note:
+
+- If you are happy with Vim, please express that by reading the rest of this
+  file and consider helping needy children in Uganda.
+
+- According to Richard Stallman the Vim license is GNU GPL compatible.
+  A few minor changes have been made since he checked it, but that should not
+  make a difference.
+
+- If you link Vim with a library that goes under the GNU GPL, this limits
+  further distribution to the GNU GPL.  Also when you didn't actually change
+  anything in Vim.
+
+- Once a change is included that goes under the GNU GPL, this forces all
+  further changes to also be made under the GNU GPL or a compatible license.
+
+- If you distribute a modified version of Vim, you can include your name and
+  contact information with the "--with-modified-by" configure argument or the
+  MODIFIED_BY define.
+
+==============================================================================
diff --git a/net-im/pork/pork-0.5.0.ebuild b/net-im/pork/pork-0.5.0.ebuild
index cf333348aa75..0976b2a7efbd 100644
--- a/net-im/pork/pork-0.5.0.ebuild
+++ b/net-im/pork/pork-0.5.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/net-im/pork/pork-0.5.0.ebuild,v 1.3 2003/02/13 14:12:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.5.0.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 IUSE=""
 
 SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 DESCRIPTION="Console based AIM client that looks like ircII"
 HOMEPAGE="http://dev.ojnk.net/"
-LICENSE="GPLv2"
+LICENSE="GPL-2"
 
 KEYWORDS="~x86 ~alpha"
 SLOT="0"
diff --git a/net-misc/mknbi/mknbi-1.2.11.ebuild b/net-misc/mknbi/mknbi-1.2.11.ebuild
index 12dbb27fbffd..8f7013d50108 100644
--- a/net-misc/mknbi/mknbi-1.2.11.ebuild
+++ b/net-misc/mknbi/mknbi-1.2.11.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/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.2 2003/02/13 14:59:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 HOMEPAGE="http://etherboot.sourceforge.net"
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 
 SRC_FILE="mknbi-1.2.tar.gz"
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
index 22d1c3172223..74d86373dad3 100644
--- a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
+++ b/net-misc/netkit-bootpd/netkit-bootpd-0.17-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/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild,v 1.17 2003/02/24 19:42:04 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild,v 1.18 2003/02/28 13:18:14 liquidx Exp $
 
 MY_PN=${PN/pd/paramd}
 S=${WORKDIR}/${MY_PN}-${PV}
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.debian.org/debian/pool/main/n/netkit-bootparamd/${MY_PN}_${P
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
 KEYWORDS="x86 sparc ppc mips"
-LICENSE="bsd"
+LICENSE="BSD"
 SLOT="0"
 
 src_compile() {
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild
index f60c5ee24fdd..2c86e393f5b8 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.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/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild,v 1.13 2003/02/24 19:42:04 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild,v 1.14 2003/02/28 13:18:14 liquidx Exp $
 
 MY_PN=${PN/netkit/bsd}
 MY_PN=${MY_PN/rd/r}
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.debian.org/debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.t
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 DEPEND=">=sys-libs/glibc-2.1.3"
 KEYWORDS="x86 ppc sparc mips"
-LICENSE="bsd"
+LICENSE="BSD"
 SLOT="0"
 
 src_unpack() {
diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild
index 57e55220b56c..474fba2cb076 100644
--- a/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild
+++ b/net-misc/netkit-routed/netkit-routed-0.17-r1.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/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild,v 1.15 2003/02/24 19:42:04 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild,v 1.16 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="Netkit - routed"
 SRC_URI="http://ftp.debian.org/debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
 KEYWORDS="x86 sparc ppc mips"
-LICENSE="bsd"
+LICENSE="BSD"
 SLOT="0"
 
 src_compile() {  
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild
index 0eae0440cd4c..72e069bc0038 100644
--- a/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r2.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/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild,v 1.13 2003/02/24 19:42:04 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild,v 1.14 2003/02/28 13:18:14 liquidx Exp $
 
 A=netkit-ntalk-${PV}.tar.gz
 S=${WORKDIR}/netkit-ntalk-${PV}
@@ -8,7 +8,7 @@ DESCRIPTION="Netkit - talkd"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 KEYWORDS="x86 ppc sparc alpha mips"
-LICENSE="bsd"
+LICENSE="BSD"
 SLOT="0"
 
 DEPEND="virtual/glibc
diff --git a/net-misc/netkit-tftp/netkit-tftp-0.17-r1.ebuild b/net-misc/netkit-tftp/netkit-tftp-0.17-r1.ebuild
index 38d2a9387ac9..ef21e59f2518 100644
--- a/net-misc/netkit-tftp/netkit-tftp-0.17-r1.ebuild
+++ b/net-misc/netkit-tftp/netkit-tftp-0.17-r1.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/net-misc/netkit-tftp/netkit-tftp-0.17-r1.ebuild,v 1.11 2003/02/24 19:42:04 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-tftp/netkit-tftp-0.17-r1.ebuild,v 1.12 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="the tftp server included in netkit"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
 KEYWORDS="x86 sparc ppc mips"
-LICENSE="bsd"
+LICENSE="BSD"
 SLOT="0"
 
 src_compile() {
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild
index aa076dc3c89e..6f3cd05164f8 100644
--- a/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r6.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/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild,v 1.11 2003/02/24 19:42:04 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild,v 1.12 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}   
 DESCRIPTION="Netkit - timed"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 KEYWORDS="x86 sparc ppc mips"
-LICENSE="bsd"
+LICENSE="BSD"
 SLOT="0"
 
 DEPEND="virtual/glibc"
diff --git a/net-wireless/gtkskan/gtkskan-0.2.ebuild b/net-wireless/gtkskan/gtkskan-0.2.ebuild
index 167d0da99aad..4f62ec9c9e4f 100644
--- a/net-wireless/gtkskan/gtkskan-0.2.ebuild
+++ b/net-wireless/gtkskan/gtkskan-0.2.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/net-wireless/gtkskan/gtkskan-0.2.ebuild,v 1.3 2003/02/13 15:28:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gtkskan/gtkskan-0.2.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 IUSE="gnome"
 
@@ -9,7 +9,7 @@ DESCRIPTION="GTK+-based ESSID scanner"
 SRC_URI="mirror://sourceforge/wavelan-tools/${P}.tgz"
 HOMEPAGE="http://wavelan-tools.sf.net"
 KEYWORDS="x86 sparc "
-LICENSE="GPL-3"
+LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/glibc
diff --git a/sys-apps/memtester/memtester-2.93.1.ebuild b/sys-apps/memtester/memtester-2.93.1.ebuild
index 81e8f5082cfb..e69796a9255b 100644
--- a/sys-apps/memtester/memtester-2.93.1.ebuild
+++ b/sys-apps/memtester/memtester-2.93.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/sys-apps/memtester/memtester-2.93.1.ebuild,v 1.2 2003/02/13 16:05:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtester/memtester-2.93.1.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="Memory testing utility, ppc safe"
 
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.qcc.sk.ca/~charlesc/software/memtester/"
 
 SRC_URI="http://www.qcc.sk.ca/~charlesc/software/memtester/${P}.tar.bz2"
 
-LICENSE="GPL2"
+LICENSE="GPL-2"
 
 SLOT="0"
 
diff --git a/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild b/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
index 022275c88264..5cf8f8723393 100644
--- a/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
+++ b/sys-apps/mpi350-driver/mpi350-driver-2.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/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild,v 1.2 2003/02/13 16:07:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="Cisco's wireless drivers and utilities"
 
@@ -10,7 +10,7 @@ SRC_DOWNLOAD="http://www.cisco.com/public/sw-center/sw-wireless.shtml"
 SRC_URI="Linux-ACU-Driver-v2.0.tar.gz"
 RESTRICT="fetch"
 
-LICENSE="MPL"
+LICENSE="MPL-1.1"
 
 SLOT="0"
 KEYWORDS="~x86 -ppc -sparc"
diff --git a/sys-apps/mtx/mtx-1.2.17.ebuild b/sys-apps/mtx/mtx-1.2.17.ebuild
index 442ae170fef6..8a7fe54c1682 100644
--- a/sys-apps/mtx/mtx-1.2.17.ebuild
+++ b/sys-apps/mtx/mtx-1.2.17.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/sys-apps/mtx/mtx-1.2.17.ebuild,v 1.4 2003/02/13 16:07:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtx/mtx-1.2.17.ebuild,v 1.5 2003/02/28 13:18:14 liquidx Exp $
 
 IUSE=""
 
 DESCRIPTION="Utilities for controlling SCSI media changers and tape drives"
 HOMEPAGE="http://mtx.sourceforge.net"
-LICENSE="GPL"
+LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 SRC_URI="mirror://sourceforge/${PN}/${P}rel.tar.gz"
 S=${WORKDIR}/${P}
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild
index a84aaca164fb..ce20e979dde1 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.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/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild,v 1.10 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild,v 1.11 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a PPC-only program to map special Powerbook/iBook keys in Linux"
@@ -10,7 +10,7 @@ KEYWORDS="ppc -x86 -sparc -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
-LICENSE=GPL
+LICENSE="GPL-2"
 
 pkg_setup() {
 	if [ ${ARCH} != "ppc" ] ; then
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
index 38da258189c4..8ce60bc9e782 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.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/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.6 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.7 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a PPC-only program to map special Powerbook/iBook keys in Linux"
@@ -10,7 +10,7 @@ KEYWORDS="ppc -x86 -sparc -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
-LICENSE=GPL
+LICENSE="GPL-2"
 
 pkg_setup() {
 	if [ ${ARCH} != "ppc" ] ; then
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
index b370984d08d7..59745ccb4bda 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.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/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.3 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
@@ -10,7 +10,7 @@ KEYWORDS="~ppc ~x86 -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
-LICENSE=GPL
+LICENSE="GPL-2"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild
index 04f75b362312..a99407d41258 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.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/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild,v 1.3 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild,v 1.4 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
@@ -10,7 +10,7 @@ KEYWORDS="~ppc ~x86 -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
-LICENSE=GPL
+LICENSE="GPL-2"
 
 src_compile() {
 	./configure \
diff --git a/sys-apps/powerprefs/powerprefs-0.2.1.ebuild b/sys-apps/powerprefs/powerprefs-0.2.1.ebuild
index ab945929dd95..9f243743d7e3 100644
--- a/sys-apps/powerprefs/powerprefs-0.2.1.ebuild
+++ b/sys-apps/powerprefs/powerprefs-0.2.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/sys-apps/powerprefs/powerprefs-0.2.1.ebuild,v 1.9 2003/02/13 16:11:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.2.1.ebuild,v 1.10 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="powerprefs is a PPC-only program to interface with special Powerbook/iBook keys in Linux"
@@ -8,7 +8,7 @@ SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
 KEYWORDS="ppc -x86 -sparc "
 SLOT="0"
-LICENSE=GPL
+LICENSE="GPL-2"
 DEPEND="x11-libs/gtk+"
 RDEPEND="sys-apps/pbbuttonsd"
 
diff --git a/sys-apps/schedutils/schedutils-0.0.5.ebuild b/sys-apps/schedutils/schedutils-0.0.5.ebuild
index 403cbf217054..fb1d90009687 100644
--- a/sys-apps/schedutils/schedutils-0.0.5.ebuild
+++ b/sys-apps/schedutils/schedutils-0.0.5.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/sys-apps/schedutils/schedutils-0.0.5.ebuild,v 1.6 2003/02/13 16:13:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/schedutils/schedutils-0.0.5.ebuild,v 1.7 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="Utilities for manipulating kernel schedular parameters"
 HOMEPAGE="http://tech9.net/rml/"
 KEYWORDS="x86 -ppc"
-LICENSE=GPL-2
+LICENSE="GPL-2"
 
 RDEPEND="virtual/glibc"
 DEPEND="$RDEPEND"
diff --git a/sys-apps/tic98/tic98-1.01.ebuild b/sys-apps/tic98/tic98-1.01.ebuild
index e24bfb978d67..fddd63b5142c 100644
--- a/sys-apps/tic98/tic98-1.01.ebuild
+++ b/sys-apps/tic98/tic98-1.01.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/sys-apps/tic98/tic98-1.01.ebuild,v 1.4 2003/02/13 16:18:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tic98/tic98-1.01.ebuild,v 1.5 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="tic98 is a compressor for black-and-white images, in particular scanned documents. It gets very good compression, better than AT&T's DjVu system.  tic98 also includes ppmd text compression (ppmd) and number compression (b_gamma_enc)"
 HOMEPAGE="http://www.cs.waikato.ac.nz/~singlis/"
 SRC_URI="http://www.cs.waikato.ac.nz/~singlis/${P}.tar.gz"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
diff --git a/sys-devel/autoproject/autoproject-0.16.ebuild b/sys-devel/autoproject/autoproject-0.16.ebuild
index c7c2fb5c6fbe..afe9468cb354 100644
--- a/sys-devel/autoproject/autoproject-0.16.ebuild
+++ b/sys-devel/autoproject/autoproject-0.16.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2002 Dan Hopkins <drhop12@earthlink.net>
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoproject/autoproject-0.16.ebuild,v 1.2 2002/10/23 14:07:47 jrray Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoproject/autoproject-0.16.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Used to start a programming project using autoconf, automake, and optionally a command line parser generator"
 SRC_URI="http://www.ibiblio.org/pub/Linux/devel/${P}.tar.gz
 	http://www.mv.com/ipusers/vanzandt/${P}.tar.gz"
 HOMEPAGE="http://www.mv.com/ipusers/vanzandt/"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
 DEPEND="sys-devel/automake"
 SLOT="0"
diff --git a/sys-devel/gcc-compat/gcc-compat-1.4.ebuild b/sys-devel/gcc-compat/gcc-compat-1.4.ebuild
index 1d967ae33b19..9161d2c25731 100644
--- a/sys-devel/gcc-compat/gcc-compat-1.4.ebuild
+++ b/sys-devel/gcc-compat/gcc-compat-1.4.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/sys-devel/gcc-compat/gcc-compat-1.4.ebuild,v 1.4 2003/02/13 16:31:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-compat/gcc-compat-1.4.ebuild,v 1.5 2003/02/28 13:18:14 liquidx Exp $
 
 DESCRIPTION="This is a compatability layer for use when upgrading to profile $PV"
 HOMEPAGE="http://www.gentoo.org"
 SRC_URI=""
-LICENSE="gpl-2"
+LICENSE="GPL-2"
 
 # Only ONE version of this should exist on a system
 # This is ABSOLUTELY Machine non-specific
diff --git a/sys-devel/gecc/gecc-20021019.ebuild b/sys-devel/gecc/gecc-20021019.ebuild
index 18ab11f19298..1bdd4c322876 100644
--- a/sys-devel/gecc/gecc-20021019.ebuild
+++ b/sys-devel/gecc/gecc-20021019.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/sys-devel/gecc/gecc-20021019.ebuild,v 1.5 2003/02/13 16:32:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gecc/gecc-20021019.ebuild,v 1.6 2003/02/28 13:18:14 liquidx Exp $
 
 # comprehensive list of any and all USE flags leveraged in the build, 
 # with the exception of any ARCH specific flags, i.e. ppc sparc sparc64
@@ -9,7 +9,7 @@ IUSE=""
 DESCRIPTION="gecc is a tool to speed up compilation of C/C++ sources. It distributes the compilation on a cluster of compilation nodes. It also caches the object files to save some unneeded work."
 HOMEPAGE="http://gecc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="gpl"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 DEPEND="sys-devel/gcc"
diff --git a/sys-kernel/arm-sources/arm-sources-2.4.19.ebuild b/sys-kernel/arm-sources/arm-sources-2.4.19.ebuild
index 52b62f17fee4..f7d48f57eb92 100644
--- a/sys-kernel/arm-sources/arm-sources-2.4.19.ebuild
+++ b/sys-kernel/arm-sources/arm-sources-2.4.19.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/arm-sources/arm-sources-2.4.19.ebuild,v 1.1 2003/02/26 23:25:14 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/arm-sources/arm-sources-2.4.19.ebuild,v 1.2 2003/02/28 13:18:14 liquidx Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 IUSE=""
 DEPEND=""
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 ETYPE="sources"
 inherit kernel
diff --git a/sys-libs/slang/slang-1.4.5-r1.ebuild b/sys-libs/slang/slang-1.4.5-r1.ebuild
index 810f0a7ff140..669bb1cb9793 100644
--- a/sys-libs/slang/slang-1.4.5-r1.ebuild
+++ b/sys-libs/slang/slang-1.4.5-r1.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/sys-libs/slang/slang-1.4.5-r1.ebuild,v 1.11 2003/02/13 16:52:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.5-r1.ebuild,v 1.12 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Console display library used by most text viewer"
 SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${P}.tar.gz"
-LICENSE="GPL-2 or Artistic"
+LICENSE="GPL-2 | Artistic"
 KEYWORDS="x86 ppc sparc "
 SLOT="0"
 HOMEPAGE="http://space.mit.edu/~davis/slang/"
diff --git a/sys-libs/slang/slang-1.4.5-r2.ebuild b/sys-libs/slang/slang-1.4.5-r2.ebuild
index 79507751aa6d..3493cdee7c22 100644
--- a/sys-libs/slang/slang-1.4.5-r2.ebuild
+++ b/sys-libs/slang/slang-1.4.5-r2.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/sys-libs/slang/slang-1.4.5-r2.ebuild,v 1.15 2003/02/20 22:00:24 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.5-r2.ebuild,v 1.16 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Console display library used by most text viewer"
 SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${P}.tar.gz"
-LICENSE="GPL-2 or Artistic"
+LICENSE="GPL-2 | Artistic"
 KEYWORDS="x86 ppc sparc alpha mips hppa arm"
 SLOT="0"
 HOMEPAGE="http://space.mit.edu/~davis/slang/"
diff --git a/sys-libs/slang/slang-1.4.8.ebuild b/sys-libs/slang/slang-1.4.8.ebuild
index c5360056f33d..124859331bcc 100644
--- a/sys-libs/slang/slang-1.4.8.ebuild
+++ b/sys-libs/slang/slang-1.4.8.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/sys-libs/slang/slang-1.4.8.ebuild,v 1.1 2003/02/22 16:46:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.8.ebuild,v 1.2 2003/02/28 13:18:14 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Console display library used by most text viewer"
 SRC_URI="ftp://ftp.jedsoft.org/pub/davis/slang/v1.4/${P}.tar.bz2"
-LICENSE="GPL-2 or Artistic"
+LICENSE="GPL-2 | Artistic"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 SLOT="0"
 HOMEPAGE="http://space.mit.edu/~davis/slang/"