License Fixes. Part 2.

53 files changed, 100 insertions, 100 deletions

diff --git a/media-video/SDLcam/SDLcam-0.7.3.ebuild b/media-video/SDLcam/SDLcam-0.7.3.ebuild
index 5a10b3b68da6..0b2d4a467e5f 100644
--- a/media-video/SDLcam/SDLcam-0.7.3.ebuild
+++ b/media-video/SDLcam/SDLcam-0.7.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/media-video/SDLcam/SDLcam-0.7.3.ebuild,v 1.4 2003/02/13 13:22:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3.ebuild,v 1.5 2003/02/28 16:55:00 liquidx Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Webcam application that uses the SDL library"
 HOMEPAGE="http://raph.darktech.org/SDLcam/"
 SRC_URI="http://raph.darktech.org/SDLcam/downloads/${P}.tar.gz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 SLOT="0"
 
diff --git a/net-analyzer/trafshow/trafshow-3.1-r1.ebuild b/net-analyzer/trafshow/trafshow-3.1-r1.ebuild
index a60812734c74..ce67419336ef 100644
--- a/net-analyzer/trafshow/trafshow-3.1-r1.ebuild
+++ b/net-analyzer/trafshow/trafshow-3.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/net-analyzer/trafshow/trafshow-3.1-r1.ebuild,v 1.8 2003/02/13 13:52:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-3.1-r1.ebuild,v 1.9 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="slang"
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
 HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
 
 SLOT="3"
-LICENSE="Freeware"
+LICENSE="as-is"
 KEYWORDS="x86 sparc "
 
 DEPEND="net-libs/libpcap
diff --git a/net-dialup/freeradius/freeradius-0.8.1.ebuild b/net-dialup/freeradius/freeradius-0.8.1.ebuild
index f183af04526c..0ae619b3cf98 100644
--- a/net-dialup/freeradius/freeradius-0.8.1.ebuild
+++ b/net-dialup/freeradius/freeradius-0.8.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/net-dialup/freeradius/freeradius-0.8.1.ebuild,v 1.3 2003/02/13 13:52:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-0.8.1.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ DESCRIPTION="Free RADIUS server with MySQL support"
 SRC_URI="ftp://ftp.freeradius.org/pub/radius/freeradius.tar.gz"
 HOMEPAGE="http://www.freeradius.org"
 KEYWORDS="~x86"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="sys-devel/gcc"
diff --git a/net-dialup/ppp/ppp-2.4.1-r10.ebuild b/net-dialup/ppp/ppp-2.4.1-r10.ebuild
index 8977300eab6d..43775da5fdf5 100644
--- a/net-dialup/ppp/ppp-2.4.1-r10.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r10.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-dialup/ppp/ppp-2.4.1-r10.ebuild,v 1.5 2003/02/13 13:54:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r10.ebuild,v 1.6 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}.pppoe4
 DESCRIPTION="Point-to-point protocol - patched for pppoe"
@@ -11,7 +11,7 @@ DEPEND="virtual/glibc"
 PROVIDE="virtual/pppd"
 
 SLOT="0"
-LICENSE="BSD GPL"
+LICENSE="BSD GPL-2"
 KEYWORDS="x86 ppc sparc "
 
 src_compile() {
diff --git a/net-dialup/ppp/ppp-2.4.1-r11.ebuild b/net-dialup/ppp/ppp-2.4.1-r11.ebuild
index 618539c7f734..33245a69f939 100644
--- a/net-dialup/ppp/ppp-2.4.1-r11.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r11.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-dialup/ppp/ppp-2.4.1-r11.ebuild,v 1.7 2003/02/13 13:54:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r11.ebuild,v 1.8 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="crypt ipv6"
 S=${WORKDIR}/${P}.pppoe4
@@ -12,7 +12,7 @@ DEPEND="virtual/glibc"
 PROVIDE="virtual/pppd"
 
 SLOT="0"
-LICENSE="BSD GPL"
+LICENSE="BSD GPL-2"
 KEYWORDS="x86 ppc sparc "
 
 src_compile() {
diff --git a/net-dialup/ppp/ppp-2.4.1-r9.ebuild b/net-dialup/ppp/ppp-2.4.1-r9.ebuild
index d1f0f51b2112..433a75e36148 100644
--- a/net-dialup/ppp/ppp-2.4.1-r9.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r9.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-dialup/ppp/ppp-2.4.1-r9.ebuild,v 1.7 2003/02/13 13:54:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r9.ebuild,v 1.8 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}.pppoe4
 DESCRIPTION="Point-to-point protocol - patched for pppoe"
@@ -11,7 +11,7 @@ DEPEND="virtual/glibc"
 PROVIDE="virtual/pppd"
 
 SLOT="0"
-LICENSE="BSD GPL"
+LICENSE="BSD GPL-2"
 KEYWORDS="x86 ppc"
 
 src_compile() {
diff --git a/net-firewall/shorewall/shorewall-1.3.13.ebuild b/net-firewall/shorewall/shorewall-1.3.13.ebuild
index 819ce09d0052..9e53012fffdf 100644
--- a/net-firewall/shorewall/shorewall-1.3.13.ebuild
+++ b/net-firewall/shorewall/shorewall-1.3.13.ebuild
@@ -6,7 +6,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Full state iptables firewall"
 SRC_URI="http://www.shorewall.net/pub/shorewall/${P}.tgz"
 HOMEPAGE="http://www.shorewall.net"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 SLOT="0"
 
diff --git a/net-firewall/shorewall/shorewall-1.3.14.ebuild b/net-firewall/shorewall/shorewall-1.3.14.ebuild
index 948232b6672e..c4f961c8b68a 100644
--- a/net-firewall/shorewall/shorewall-1.3.14.ebuild
+++ b/net-firewall/shorewall/shorewall-1.3.14.ebuild
@@ -6,7 +6,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Full state iptables firewall"
 SRC_URI="http://www.shorewall.net/pub/shorewall/${P}.tgz"
 HOMEPAGE="http://www.shorewall.net"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 SLOT="0"
 IUSE=""
diff --git a/net-firewall/shorewall/shorewall-1.3.9b.ebuild b/net-firewall/shorewall/shorewall-1.3.9b.ebuild
index 95be82cba330..73f8272fce0f 100644
--- a/net-firewall/shorewall/shorewall-1.3.9b.ebuild
+++ b/net-firewall/shorewall/shorewall-1.3.9b.ebuild
@@ -6,7 +6,7 @@ DESCRIPTION="Full state iptables firewall"
 SRC_URI="http://www.shorewall.net/pub/shorewall/${P}.tgz"
 HOMEPAGE="http://www.shorewall.net/"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 SLOT="0"
 
diff --git a/net-fs/intersync/intersync-0.9.5.ebuild b/net-fs/intersync/intersync-0.9.5.ebuild
index b15d51094228..b63729efde75 100644
--- a/net-fs/intersync/intersync-0.9.5.ebuild
+++ b/net-fs/intersync/intersync-0.9.5.ebuild
@@ -4,7 +4,7 @@
 DESCRIPTION="Intermezzo is an advanced replicating networked filesystem."
 HOMEPAGE="http://www.inter-mezzo.org"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
diff --git a/net-ftp/curl/curl-7.10.2.ebuild b/net-ftp/curl/curl-7.10.2.ebuild
index 7325ea8e5a39..83e9209f561c 100644
--- a/net-ftp/curl/curl-7.10.2.ebuild
+++ b/net-ftp/curl/curl-7.10.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/net-ftp/curl/curl-7.10.2.ebuild,v 1.6 2003/02/13 14:03:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.2.ebuild,v 1.7 2003/02/28 16:55:00 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 HOMEPAGE="http://curl.haxx.se/"
 
 SLOT="0"
-LICENSE="MPL X11"
+LICENSE="MIT X11"
 KEYWORDS="x86 ppc sparc alpha"
 IUSE="ssl pic ipv6 ldap"
 
diff --git a/net-ftp/curl/curl-7.9.7.ebuild b/net-ftp/curl/curl-7.9.7.ebuild
index f626b7fa384b..62e50cdacfd7 100644
--- a/net-ftp/curl/curl-7.9.7.ebuild
+++ b/net-ftp/curl/curl-7.9.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/net-ftp/curl/curl-7.9.7.ebuild,v 1.12 2003/02/13 14:03:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.9.7.ebuild,v 1.13 2003/02/28 16:55:00 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 HOMEPAGE="http://curl.haxx.se"
 
 SLOT="0"
-LICENSE="MPL X11"
+LICENSE="MIT X11"
 KEYWORDS="x86 ppc sparc "
 IUSE="ssl"
 
diff --git a/net-irc/cyclone/cyclone-0.3.1.1.ebuild b/net-irc/cyclone/cyclone-0.3.1.1.ebuild
index ac52c39958c5..90de7a4a4d98 100644
--- a/net-irc/cyclone/cyclone-0.3.1.1.ebuild
+++ b/net-irc/cyclone/cyclone-0.3.1.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/net-irc/cyclone/cyclone-0.3.1.1.ebuild,v 1.6 2003/02/13 14:14:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/cyclone-0.3.1.1.ebuild,v 1.7 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="IRC daemon with hostname cloaking, SOCKS proxy checking and other advanced features"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.slashnet.org/pub/cyclone/server/${P}.tar.gz"
 HOMEPAGE="http://www.slashnet.org"
 SLOT="0"
 KEYWORDS="~ppc"
-LICENSE="GPL & BSD"
+LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 
 src_unpack() {
diff --git a/net-mail/procmail/procmail-3.22-r2.ebuild b/net-mail/procmail/procmail-3.22-r2.ebuild
index 9892874f8888..7700837de74f 100644
--- a/net-mail/procmail/procmail-3.22-r2.ebuild
+++ b/net-mail/procmail/procmail-3.22-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-mail/procmail/procmail-3.22-r2.ebuild,v 1.9 2003/02/13 14:36:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r2.ebuild,v 1.10 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
@@ -13,7 +13,7 @@ DEPEND="virtual/glibc
 RDEPEND="virtual/glibc"
 
 SLOT="0"
-LICENSE="Artistic | GPL"
+LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 sparc "
 
 src_compile() {
diff --git a/net-mail/procmail/procmail-3.22-r3.ebuild b/net-mail/procmail/procmail-3.22-r3.ebuild
index a868e952e074..c5bb2908a9da 100644
--- a/net-mail/procmail/procmail-3.22-r3.ebuild
+++ b/net-mail/procmail/procmail-3.22-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/net-mail/procmail/procmail-3.22-r3.ebuild,v 1.6 2003/02/13 14:36:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r3.ebuild,v 1.7 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
@@ -13,7 +13,7 @@ DEPEND="virtual/glibc
 RDEPEND="virtual/glibc"
 
 SLOT="0"
-LICENSE="Artistic | GPL"
+LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 ppc sparc "
 
 src_compile() {
diff --git a/net-mail/procmail/procmail-3.22-r4.ebuild b/net-mail/procmail/procmail-3.22-r4.ebuild
index 29ba56cdc20a..6e8ad1df1d80 100644
--- a/net-mail/procmail/procmail-3.22-r4.ebuild
+++ b/net-mail/procmail/procmail-3.22-r4.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-mail/procmail/procmail-3.22-r4.ebuild,v 1.4 2003/02/13 14:37:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r4.ebuild,v 1.5 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
@@ -15,7 +15,7 @@ RDEPEND="virtual/glibc"
 PROVIDE="virtual/mda"
 
 SLOT="0"
-LICENSE="Artistic | GPL"
+LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 ppc sparc "
 
 src_compile() {
diff --git a/net-mail/procmail/procmail-3.22-r5.ebuild b/net-mail/procmail/procmail-3.22-r5.ebuild
index 322cc2143240..0378c1e98cf0 100644
--- a/net-mail/procmail/procmail-3.22-r5.ebuild
+++ b/net-mail/procmail/procmail-3.22-r5.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-mail/procmail/procmail-3.22-r5.ebuild,v 1.9 2003/02/13 14:37:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r5.ebuild,v 1.10 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
@@ -17,7 +17,7 @@ RDEPEND="virtual/glibc"
 PROVIDE="virtual/mda"
 
 SLOT="0"
-LICENSE="Artistic | GPL"
+LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 ppc sparc alpha"
 
 src_compile() {
diff --git a/net-mail/qpopper/qpopper-4.0.4.ebuild b/net-mail/qpopper/qpopper-4.0.4.ebuild
index 031ce1a78cf4..94a530cca8f6 100644
--- a/net-mail/qpopper/qpopper-4.0.4.ebuild
+++ b/net-mail/qpopper/qpopper-4.0.4.ebuild
@@ -18,7 +18,7 @@ DEPEND="virtual/glibc \
 	  ssl? ( dev-libs/openssl )"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="qpopper | GPL-2"
 KEYWORDS="x86 sparc "
 
 src_unpack() {
diff --git a/net-misc/6tunnel/6tunnel-0.09.ebuild b/net-misc/6tunnel/6tunnel-0.09.ebuild
index 3d7fa91b43ab..761fab08c29f 100644
--- a/net-misc/6tunnel/6tunnel-0.09.ebuild
+++ b/net-misc/6tunnel/6tunnel-0.09.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/6tunnel/6tunnel-0.09.ebuild,v 1.3 2003/02/13 14:44:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/6tunnel/6tunnel-0.09.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE=""
 S=${WORKDIR}/${PN}
@@ -8,7 +8,7 @@ DESCRIPTION="TCP proxy for applications that don't speak IPv6"
 SRC_URI="ftp://amba.bydg.pdi.net/pub/wojtekka/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 DEPEND="virtual/glibc"
 
diff --git a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild b/net-misc/clockspeed/clockspeed-0.62-r1.ebuild
index aa9711055caf..8595e9a1e64f 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-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/clockspeed/clockspeed-0.62-r1.ebuild,v 1.13 2003/02/10 10:31:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r1.ebuild,v 1.14 2003/02/28 16:55:00 liquidx Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/"
 
 SLOT="0"
-LICENSE="freeware"
+LICENSE="as-is"
 KEYWORDS="x86 sparc ppc"
 
 DEPEND="sys-apps/groff"
diff --git a/net-misc/clockspeed/clockspeed-0.62-r2.ebuild b/net-misc/clockspeed/clockspeed-0.62-r2.ebuild
index 69a59415c5de..b3a058d41eb2 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r2.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-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/clockspeed/clockspeed-0.62-r2.ebuild,v 1.2 2003/02/10 10:31:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r2.ebuild,v 1.3 2003/02/28 16:55:00 liquidx Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/"
 
 SLOT="0"
-LICENSE="freeware"
+LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 DEPEND="sys-apps/groff"
diff --git a/net-misc/d4x/d4x-2.03.ebuild b/net-misc/d4x/d4x-2.03.ebuild
index 203952f702a5..f9d0b90cd365 100644
--- a/net-misc/d4x/d4x-2.03.ebuild
+++ b/net-misc/d4x/d4x-2.03.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/d4x/d4x-2.03.ebuild,v 1.6 2003/02/13 14:47:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.03.ebuild,v 1.7 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="nls esd gnome oss"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
 
 KEYWORDS="x86 sparc "
 SLOT="0"
-LICENSE="nt"
+LICENSE="Artistic"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	=dev-libs/glib-1.2*
diff --git a/net-misc/d4x/d4x-2.4_beta.ebuild b/net-misc/d4x/d4x-2.4_beta.ebuild
index 39bce59fa60a..7f6951cabdbd 100644
--- a/net-misc/d4x/d4x-2.4_beta.ebuild
+++ b/net-misc/d4x/d4x-2.4_beta.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/d4x/d4x-2.4_beta.ebuild,v 1.3 2003/02/13 14:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4_beta.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="nls esd gnome oss"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
 # Currently seems to be pretty borked
 KEYWORDS="-x86 -ppc -sparc  -alpha"
 SLOT="0"
-LICENSE="nt"
+LICENSE="Artistic"
 
 DEPEND=">=x11-libs/gtk+-2.0
 	>=dev-libs/glib-2.0
diff --git a/net-misc/esms/esms-0.9.5.ebuild b/net-misc/esms/esms-0.9.5.ebuild
index 4cef66439f7d..ba651b061d02 100644
--- a/net-misc/esms/esms-0.9.5.ebuild
+++ b/net-misc/esms/esms-0.9.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/net-misc/esms/esms-0.9.5.ebuild,v 1.10 2003/02/13 14:49:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/esms/esms-0.9.5.ebuild,v 1.11 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 
@@ -8,7 +8,7 @@ DESCRIPTION="A small console program to send messages to spanish cellular phones
 SRC_URI="mirror://sourceforge/esms/${P}.tar.gz"
 HOMEPAGE="http://esms.sourceforge.net"
 KEYWORDS="x86 sparc "
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND=">=dev-perl/libwww-perl-5.64 \
diff --git a/net-misc/gsmlib/gsmlib-1.10.ebuild b/net-misc/gsmlib/gsmlib-1.10.ebuild
index 8dbd1d348bb5..5035975bdf29 100644
--- a/net-misc/gsmlib/gsmlib-1.10.ebuild
+++ b/net-misc/gsmlib/gsmlib-1.10.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/net-misc/gsmlib/gsmlib-1.10.ebuild,v 1.3 2003/02/13 14:51:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsmlib/gsmlib-1.10.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Library and Applications to access GSM mobile phones"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pxh.de/fs/gsmlib/"
 DEPEND="virtual/glibc"
 
 SLOT="0"
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 KEYWORDS="x86 ppc sparc"
 
 src_compile() {
diff --git a/net-misc/gtkesms/gtkesms-0.0.4.ebuild b/net-misc/gtkesms/gtkesms-0.0.4.ebuild
index 3e0106924c43..f2f95f687c67 100644
--- a/net-misc/gtkesms/gtkesms-0.0.4.ebuild
+++ b/net-misc/gtkesms/gtkesms-0.0.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/net-misc/gtkesms/gtkesms-0.0.4.ebuild,v 1.9 2003/02/13 14:51:19 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gtkesms/gtkesms-0.0.4.ebuild,v 1.10 2003/02/28 16:55:00 liquidx Exp $ 
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gtk gui for esms."
 SRC_URI="mirror://sourceforge/esms/${P}.tar.gz"
 HOMEPAGE="http://esms.sourceforge.net"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc "
 DEPEND="=x11-libs/gtk+-1.2*
 		dev-perl/gtk-perl
diff --git a/net-misc/httptunnel/httptunnel-3.0.5.ebuild b/net-misc/httptunnel/httptunnel-3.0.5.ebuild
index 384ae2b445c8..4ed36b703144 100644
--- a/net-misc/httptunnel/httptunnel-3.0.5.ebuild
+++ b/net-misc/httptunnel/httptunnel-3.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/net-misc/httptunnel/httptunnel-3.0.5.ebuild,v 1.5 2003/02/13 14:53:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.0.5.ebuild,v 1.6 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
 HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
-LICENSE="GPL"
+LICENSE="GPL-2"
 DEPEND=""
 KEYWORDS="x86 sparc "
 SLOT="0"
diff --git a/net-misc/omniORB/omniORB-304-r7.ebuild b/net-misc/omniORB/omniORB-304-r7.ebuild
index 17eb79d01df4..b20490f10cfb 100644
--- a/net-misc/omniORB/omniORB-304-r7.ebuild
+++ b/net-misc/omniORB/omniORB-304-r7.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/omniORB/omniORB-304-r7.ebuild,v 1.6 2003/02/13 15:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-304-r7.ebuild,v 1.7 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${PN/ORB/}
 DESCRIPTION="a robust, high-performance CORBA 2 ORB"
@@ -16,7 +16,7 @@ DEPEND="virtual/glibc
 PLT="i586_linux_2.0_glibc2.1"
 KEYWORDS="x86 sparc "
 SLOT="0"
-LICENSE="LGPL | GPL-2"
+LICENSE="LGPL-2 GPL-2"
 
 src_unpack() {
 
diff --git a/net-misc/openvpn/openvpn-1.1.0.ebuild b/net-misc/openvpn/openvpn-1.1.0.ebuild
index 587d5eead226..f65392301d23 100644
--- a/net-misc/openvpn/openvpn-1.1.0.ebuild
+++ b/net-misc/openvpn/openvpn-1.1.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/net-misc/openvpn/openvpn-1.1.0.ebuild,v 1.9 2003/02/13 15:03:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.1.0.ebuild,v 1.10 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="ssl"
 
@@ -9,7 +9,7 @@ DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/openvpn/${P}.tar.gz"
 HOMEPAGE="http://openvpn.sourceforge.net/"
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc "
 
 DEPEND=">=dev-libs/lzo-1.07
diff --git a/net-misc/openvpn/openvpn-1.3.1.ebuild b/net-misc/openvpn/openvpn-1.3.1.ebuild
index 5eb0f54139b8..2e4dd1bd0f48 100644
--- a/net-misc/openvpn/openvpn-1.3.1.ebuild
+++ b/net-misc/openvpn/openvpn-1.3.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/net-misc/openvpn/openvpn-1.3.1.ebuild,v 1.7 2003/02/13 15:04:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.1.ebuild,v 1.8 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="ssl"
 
@@ -9,7 +9,7 @@ DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/openvpn/${P}.tar.gz"
 HOMEPAGE="http://openvpn.sourceforge.net/"
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc "
 
 DEPEND=">=dev-libs/lzo-1.07
diff --git a/net-misc/openvpn/openvpn-1.3.2.ebuild b/net-misc/openvpn/openvpn-1.3.2.ebuild
index 241f4902f821..e031437868cc 100644
--- a/net-misc/openvpn/openvpn-1.3.2.ebuild
+++ b/net-misc/openvpn/openvpn-1.3.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-misc/openvpn/openvpn-1.3.2.ebuild,v 1.2 2003/02/13 15:04:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.2.ebuild,v 1.3 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="ssl"
 
@@ -9,7 +9,7 @@ DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/openvpn/${P}.tar.gz"
 HOMEPAGE="http://openvpn.sourceforge.net/"
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc"
 
 DEPEND=">=dev-libs/lzo-1.07
diff --git a/net-misc/pimpd/pimpd-0.5.ebuild b/net-misc/pimpd/pimpd-0.5.ebuild
index 41944377ab9c..3374ae616b7a 100644
--- a/net-misc/pimpd/pimpd-0.5.ebuild
+++ b/net-misc/pimpd/pimpd-0.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/net-misc/pimpd/pimpd-0.5.ebuild,v 1.9 2003/02/13 15:04:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pimpd/pimpd-0.5.ebuild,v 1.10 2003/02/28 16:55:00 liquidx Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -8,7 +8,7 @@ DESCRIPTION="pimpd is a (hopefully) RFC1413-compliant identd server supporting L
 SRC_URI="http://cats.meow.at/~peter/pimpd-0.5.tar.gz"
 HOMEPAGE="http://cats.meow.at/~peter/pimpd.html"
 KEYWORDS="x86 sparc "
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 src_compile() {
diff --git a/net-misc/pimpd/pimpd-0.8.ebuild b/net-misc/pimpd/pimpd-0.8.ebuild
index c0140cfef918..faa7eb0659f8 100644
--- a/net-misc/pimpd/pimpd-0.8.ebuild
+++ b/net-misc/pimpd/pimpd-0.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/net-misc/pimpd/pimpd-0.8.ebuild,v 1.8 2003/02/13 15:04:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pimpd/pimpd-0.8.ebuild,v 1.9 2003/02/28 16:55:00 liquidx Exp $
 # Updated to version 0.8 by Olivier Reisch on Fri Apr 26 11:44:26 CEST 2002
 
 A=pimpd_0.8.tar.gz
@@ -9,7 +9,7 @@ DESCRIPTION="pimpd is a (hopefully) RFC1413-compliant identd server supporting L
 SRC_URI="http://cats.meow.at/~peter/${A}"
 HOMEPAGE="http://cats.meow.at/~peter/pimpd.html"
 KEYWORDS="x86 sparc "
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 src_compile() {
diff --git a/net-misc/rdate/rdate-990821.ebuild b/net-misc/rdate/rdate-990821.ebuild
index 21ab421d04fb..33aea3f6edea 100644
--- a/net-misc/rdate/rdate-990821.ebuild
+++ b/net-misc/rdate/rdate-990821.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # /home/cvsroot/gentoo-x86/net-misc/rdate,v 1.2 2001/02/15 18:17:31 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-990821.ebuild,v 1.12 2003/02/13 15:05:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-990821.ebuild,v 1.13 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="rdate uses the NTP server of your choice to syncronize/show the current time"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/network/misc/${P}.tar.gz"
 HOMEPAGE="http://www.freshmeat.net/projects/rdate"
 KEYWORDS="x86 ppc sparc alpha"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND=""
diff --git a/net-misc/shout/shout-0.8.0-r1.ebuild b/net-misc/shout/shout-0.8.0-r1.ebuild
index f130d53afd68..0d566a0e2f43 100644
--- a/net-misc/shout/shout-0.8.0-r1.ebuild
+++ b/net-misc/shout/shout-0.8.0-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/shout/shout-0.8.0-r1.ebuild,v 1.7 2003/02/13 15:06:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r1.ebuild,v 1.8 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Shout is a program for creating mp3 stream for use with icecast or shoutcast"
 SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
 HOMEPAGE="http://www.icecast.org"
 KEYWORDS="x86 sparc ~ppc"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/glibc"
diff --git a/net-misc/shout/shout-0.8.0.ebuild b/net-misc/shout/shout-0.8.0.ebuild
index 6a7fc8de183c..fc85b0e6cd41 100644
--- a/net-misc/shout/shout-0.8.0.ebuild
+++ b/net-misc/shout/shout-0.8.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-misc/shout/shout-0.8.0.ebuild,v 1.8 2003/02/13 15:07:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0.ebuild,v 1.9 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Shout is a program for creating a mp3 stream for use with icecast or shoutcast"
 SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
 HOMEPAGE="http://www.icecast.org"
 KEYWORDS="x86 sparc "
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/glibc"
diff --git a/net-misc/ytalk/ytalk-3.1.1.ebuild b/net-misc/ytalk/ytalk-3.1.1.ebuild
index 9d9ed0121ab4..f8d7b47d7325 100644
--- a/net-misc/ytalk/ytalk-3.1.1.ebuild
+++ b/net-misc/ytalk/ytalk-3.1.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/net-misc/ytalk/ytalk-3.1.1.ebuild,v 1.9 2003/02/13 15:12:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ytalk/ytalk-3.1.1.ebuild,v 1.10 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="X"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Multi-user replacement for UNIX talk"
 SRC_URI="http://www.iagora.com/~espel/ytalk/${P}.tar.gz"
 HOMEPAGE="http://www.iagora.com/~espel/ytalk/ytalk.html"
 KEYWORDS="x86 sparc  ppc"
-LICENSE="ytalk"
+LICENSE="freedist"
 SLOT="0"
 
 DEPEND="virtual/glibc
diff --git a/net-news/tin/tin-1.4.5.ebuild b/net-news/tin/tin-1.4.5.ebuild
index ca97e88b77da..7f340ce560ed 100644
--- a/net-news/tin/tin-1.4.5.ebuild
+++ b/net-news/tin/tin-1.4.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Michael Conrad Tilstra <tadpol@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/net-news/tin/tin-1.4.5.ebuild,v 1.7 2003/02/13 15:17:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/tin/tin-1.4.5.ebuild,v 1.8 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="ncurses"
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/v1.4/${P}.tar.gz"
 HOMEPAGE="http://www.tin.org/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="ncurses? ( sys-libs/ncurses )"
diff --git a/net-news/yencode/yencode-0.46.ebuild b/net-news/yencode/yencode-0.46.ebuild
index 1917327aa121..341e3853742a 100644
--- a/net-news/yencode/yencode-0.46.ebuild
+++ b/net-news/yencode/yencode-0.46.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-news/yencode/yencode-0.46.ebuild,v 1.8 2003/02/13 15:17:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/yencode/yencode-0.46.ebuild,v 1.9 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/yencode/${P}.tar.gz"
@@ -9,7 +9,7 @@ DESCRIPTION="yEnc encoder/decoder package"
 DEPEND="virtual/glibc"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 src_compile() {
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild
index 3a24834da96a..a4b0fc797d0d 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.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/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild,v 1.4 2003/02/13 15:19:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild,v 1.5 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A GTK+ Gnutella client"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc"
 
 DEPEND="=x11-libs/gtk+-1.2*"
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.ebuild
index 78ae22e9c696..1afac83f51dd 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.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/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.ebuild,v 1.1 2003/02/28 04:37:54 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.ebuild,v 1.2 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE="gnome"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-GTK1-${PV}.tar.gz"
 HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 #DEPEND="( gtk2? =x11-libs/gtk+-2* : =x11-libs/gtk+-1.2* )
diff --git a/net-p2p/gtkhx/gtkhx-0.9.3.ebuild b/net-p2p/gtkhx/gtkhx-0.9.3.ebuild
index 9c2ef21bc069..b626c5ba66a8 100644
--- a/net-p2p/gtkhx/gtkhx-0.9.3.ebuild
+++ b/net-p2p/gtkhx/gtkhx-0.9.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/net-p2p/gtkhx/gtkhx-0.9.3.ebuild,v 1.5 2003/02/13 15:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtkhx/gtkhx-0.9.3.ebuild,v 1.6 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="a GTK+ Hotline Client based off of Hx"
@@ -11,7 +11,7 @@ DEPEND="=x11-libs/gtk+-1.2*"
 RDEPEND="$DEPEND"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 src_compile() {
diff --git a/net-print/apsfilter/apsfilter-7.2.2.ebuild b/net-print/apsfilter/apsfilter-7.2.2.ebuild
index 13a14926cfe9..c22123cb603d 100644
--- a/net-print/apsfilter/apsfilter-7.2.2.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.2.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/net-print/apsfilter/apsfilter-7.2.2.ebuild,v 1.4 2003/02/13 15:23:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/apsfilter/apsfilter-7.2.2.ebuild,v 1.5 2003/02/28 16:55:00 liquidx Exp $
 
 DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
 HOMEPAGE="http://www.apsfilter.org"
 KEYWORDS="x86 ppc"
 SLOT="0"
-LICENSE="postcard-apsfilter"
+LICENSE="GPL-2"
 
 DEPEND="virtual/lpr >=app-text/ghostscript-6.53-r2
 >=app-text/psutils-1.17 >=media-gfx/imagemagick-5.4.5
diff --git a/net-www/jboss/jboss-3.0.1_rc1.ebuild b/net-www/jboss/jboss-3.0.1_rc1.ebuild
index d531ebe8e9b7..fecb88ec7e5d 100644
--- a/net-www/jboss/jboss-3.0.1_rc1.ebuild
+++ b/net-www/jboss/jboss-3.0.1_rc1.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-www/jboss/jboss-3.0.1_rc1.ebuild,v 1.4 2003/02/13 15:35:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/jboss-3.0.1_rc1.ebuild,v 1.5 2003/02/28 16:55:00 liquidx Exp $
 
 MY_P="jboss-3.0.1RC1-src"
 S=${WORKDIR}/${MY_P}
@@ -8,7 +8,7 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="The Java app-server reference implementation"
 SRC_URI=" http://belnet.dl.sourceforge.net/sourceforge/jboss/${MY_P}.tgz"
 HOMEPAGE="http://www.jboss.org"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 
 RDEPEND=">=virtual/jdk-1.3"
 
diff --git a/net-www/mplayerplug-in/mplayerplug-in-0.40.ebuild b/net-www/mplayerplug-in/mplayerplug-in-0.40.ebuild
index 24e538c44810..b810cbcd20da 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-0.40.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-0.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-0.40.ebuild,v 1.2 2003/02/19 23:39:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-0.40.ebuild,v 1.3 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_v${PV}.tar.gz
 	mirror://sourceforge/${PN}/mini.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND=">=media-video/mplayer-0.90_rc4"
diff --git a/sys-apps/ethtool/ethtool-1.7.ebuild b/sys-apps/ethtool/ethtool-1.7.ebuild
index 84e8c3abd85d..743e9306a91a 100644
--- a/sys-apps/ethtool/ethtool-1.7.ebuild
+++ b/sys-apps/ethtool/ethtool-1.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/sys-apps/ethtool/ethtool-1.7.ebuild,v 1.3 2003/02/13 15:55:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-1.7.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
 
 DESCRIPTION="Utility for examining and tuning your ethernet-based network interface"
 
@@ -8,7 +8,7 @@ HOMEPAGE="http://sourceforge.net/projects/gkernel/"
 
 SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
-LICENSE="GPL2"
+LICENSE="GPL-2"
 
 SLOT="0"
 
diff --git a/sys-apps/gzip_x86/gzip_x86-0.90.ebuild b/sys-apps/gzip_x86/gzip_x86-0.90.ebuild
index c7628ec0d14f..4ecd82b17295 100644
--- a/sys-apps/gzip_x86/gzip_x86-0.90.ebuild
+++ b/sys-apps/gzip_x86/gzip_x86-0.90.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/gzip_x86/gzip_x86-0.90.ebuild,v 1.6 2003/02/21 02:02:54 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip_x86/gzip_x86-0.90.ebuild,v 1.7 2003/02/28 16:55:00 liquidx Exp $
 
 DESCRIPTION="gzip_x86 is an optimized gzip for x86 arch.  5-45% speed increase is offered during decompression"
 HOMEPAGE="ftp://spruce.he.net/pub/jreiser"
 SRC_URI="ftp://spruce.he.net/pub/jreiser/${P}.tgz"
-LICENSE="gpl"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc -alpha -arm -hppa -mips"
 DEPEND=""
diff --git a/sys-libs/lib-compat/lib-compat-1.0-r2.ebuild b/sys-libs/lib-compat/lib-compat-1.0-r2.ebuild
index 6038fb2dc197..d885b983b70d 100644
--- a/sys-libs/lib-compat/lib-compat-1.0-r2.ebuild
+++ b/sys-libs/lib-compat/lib-compat-1.0-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/sys-libs/lib-compat/lib-compat-1.0-r2.ebuild,v 1.13 2003/02/13 16:49:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat/lib-compat-1.0-r2.ebuild,v 1.14 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
 
 SLOT="0"
 KEYWORDS="x86 ppc sparc "
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-libs/lib-compat/lib-compat-1.1.ebuild b/sys-libs/lib-compat/lib-compat-1.1.ebuild
index a18e05b77cfd..766c6c75ade0 100644
--- a/sys-libs/lib-compat/lib-compat-1.1.ebuild
+++ b/sys-libs/lib-compat/lib-compat-1.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-libs/lib-compat/lib-compat-1.1.ebuild,v 1.4 2003/02/14 16:01:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat/lib-compat-1.1.ebuild,v 1.5 2003/02/28 16:55:00 liquidx Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
 
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-libs/libmath++/libmath++-0.0.3.ebuild b/sys-libs/libmath++/libmath++-0.0.3.ebuild
index a2af71ecb2e3..a5dc5af6f9be 100644
--- a/sys-libs/libmath++/libmath++-0.0.3.ebuild
+++ b/sys-libs/libmath++/libmath++-0.0.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/sys-libs/libmath++/libmath++-0.0.3.ebuild,v 1.3 2003/02/13 16:50:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libmath++/libmath++-0.0.3.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
 
 DESCRIPTION="libmath++ is a template based math library, written in C++, for symbolic and numeric calculus applications"
 HOMEPAGE="http://www.surakware.net/projects/libmath%2B%2B/index.xml"
 SRC_URI="ftp://ftp.surakware.net/pub/unstable/releases/libmath%2B%2B/${P}.tar.gz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="x86"
 
diff --git a/sys-libs/libraw1394/libraw1394-0.9.0.ebuild b/sys-libs/libraw1394/libraw1394-0.9.0.ebuild
index 972f579c71fb..219789e54e68 100644
--- a/sys-libs/libraw1394/libraw1394-0.9.0.ebuild
+++ b/sys-libs/libraw1394/libraw1394-0.9.0.ebuild
@@ -4,7 +4,7 @@
 
 DESCRIPTION="libraw1394 provides direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface."
 HOMEPAGE="http://sourceforge.net/projects/libraw1394/"
-LICENSE="LGPL"
+LICENSE="LGPL-2.1 | GPL-2"
 SRC_URI="http://telia.dl.sourceforge.net/sourceforge/libraw1394/${PN}_${PV}.tar.gz"
 S=${WORKDIR}/${P}
 
diff --git a/x11-libs/gtk-sharp/gtk-sharp-0.7-r1.ebuild b/x11-libs/gtk-sharp/gtk-sharp-0.7-r1.ebuild
index 9270a2e38d97..bf8bed94556b 100644
--- a/x11-libs/gtk-sharp/gtk-sharp-0.7-r1.ebuild
+++ b/x11-libs/gtk-sharp/gtk-sharp-0.7-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/x11-libs/gtk-sharp/gtk-sharp-0.7-r1.ebuild,v 1.1 2003/02/27 17:18:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-sharp/gtk-sharp-0.7-r1.ebuild,v 1.2 2003/02/28 16:55:00 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gtk# is a C# language binding for the GTK2 toolkit."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gtk-sharp.sourceforge.net/"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="gnome"
 
diff --git a/x11-libs/gtk-sharp/gtk-sharp-0.8.ebuild b/x11-libs/gtk-sharp/gtk-sharp-0.8.ebuild
index 7e092eee8625..41630b820cbc 100644
--- a/x11-libs/gtk-sharp/gtk-sharp-0.8.ebuild
+++ b/x11-libs/gtk-sharp/gtk-sharp-0.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/x11-libs/gtk-sharp/gtk-sharp-0.8.ebuild,v 1.1 2003/02/27 17:18:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-sharp/gtk-sharp-0.8.ebuild,v 1.2 2003/02/28 16:55:00 liquidx Exp $
 
 # WARNING 
 # All gst-sharp hacks done in this build are nonfunctional
@@ -15,7 +15,7 @@ DESCRIPTION="Gtk# is a C# language binding for the GTK2 toolkit and GNOME librar
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gtk-sharp.sourceforge.net/"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="gnome"