Automated cleanup of LICENSE

50 files changed, 149 insertions, 77 deletions

diff --git a/app-misc/xbatt/ChangeLog b/app-misc/xbatt/ChangeLog
index 3ba261205d32..dde358ace285 100644
--- a/app-misc/xbatt/ChangeLog
+++ b/app-misc/xbatt/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-misc/xbatt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xbatt/ChangeLog,v 1.2 2003/02/12 05:10:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xbatt/ChangeLog,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 *xbatt-1.2.1 (1 Feb 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> xbatt-1.2.1.ebuild:
+  Automated cleanup of LICENSE
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/app-misc/xbatt/xbatt-1.2.1.ebuild b/app-misc/xbatt/xbatt-1.2.1.ebuild
index 5f38437c2a07..e4689f041468 100644
--- a/app-misc/xbatt/xbatt-1.2.1.ebuild
+++ b/app-misc/xbatt/xbatt-1.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/app-misc/xbatt/xbatt-1.2.1.ebuild,v 1.7 2003/02/13 09:13:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xbatt/xbatt-1.2.1.ebuild,v 1.8 2003/03/27 05:28:19 vladimir Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Notebook battery indicataor for X"
@@ -8,7 +8,7 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${P}.tar.gz"
 HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
 
 SLOT="0"
-LICENSE="as-is|BSD"
+LICENSE="as-is | BSD"
 KEYWORDS="x86 ppc"
 
 DEPEND="virtual/x11"
diff --git a/dev-libs/dvutil/ChangeLog b/dev-libs/dvutil/ChangeLog
index bbc2075a7a37..55c627ff64f9 100644
--- a/dev-libs/dvutil/ChangeLog
+++ b/dev-libs/dvutil/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-admin/addpatches
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.1 2003/03/06 18:54:14 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 *dvutil-0.13.3 (06 Mar 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> dvutil-0.13.3.ebuild:
+  Automated cleanup of LICENSE
+
   06 Mar 2002; Pieter Van den Abeele<pvdabeel@gentoo.org> :
 
   Created an ebuild - also tested on ppc
diff --git a/dev-libs/dvutil/dvutil-0.13.3.ebuild b/dev-libs/dvutil/dvutil-0.13.3.ebuild
index 728324aee050..ae9a79b7a7d6 100644
--- a/dev-libs/dvutil/dvutil-0.13.3.ebuild
+++ b/dev-libs/dvutil/dvutil-0.13.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/dvutil/dvutil-0.13.3.ebuild,v 1.2 2003/03/13 10:04:05 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-0.13.3.ebuild,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 A=dvutil-${PV}.tar.gz
 S=${WORKDIR}/dvutil-${PV}
@@ -8,7 +8,7 @@ DESCRIPTION="dvutil provides some general C++ utility classes for files, directo
 SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/download/${A}"
 HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/html/"
 KEYWORDS="x86 ppc"
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 
 IUSE=""
diff --git a/media-libs/giblib/ChangeLog b/media-libs/giblib/ChangeLog
index cc036ae87a41..983817660d64 100644
--- a/media-libs/giblib/ChangeLog
+++ b/media-libs/giblib/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for media-libs/giblib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/ChangeLog,v 1.7 2003/03/25 05:20:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/ChangeLog,v 1.8 2003/03/27 05:28:19 vladimir Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *giblib-1.2.2 (13 Aug 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> giblib-1.2.1.ebuild,
+  giblib-1.2.2.ebuild:
+  Automated cleanup of LICENSE
+
   25 Mar 2003; Aron Griffis <agriffis@gentoo.org> giblib-1.2.2.ebuild:
   Add ~alpha to KEYWORDS
 
diff --git a/media-libs/giblib/giblib-1.2.1.ebuild b/media-libs/giblib/giblib-1.2.1.ebuild
index 3758d8a227f2..5d603f0c85f4 100644
--- a/media-libs/giblib/giblib-1.2.1.ebuild
+++ b/media-libs/giblib/giblib-1.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/media-libs/giblib/giblib-1.2.1.ebuild,v 1.8 2003/03/17 18:59:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.1.ebuild,v 1.9 2003/03/27 05:28:19 vladimir Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Giblib, graphics library"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.linuxbrit.co.uk/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="as-is|BSD"
+LICENSE="as-is | BSD"
 KEYWORDS="x86 sparc "
 
 DEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-libs/giblib/giblib-1.2.2.ebuild b/media-libs/giblib/giblib-1.2.2.ebuild
index 3d69c0802a96..452a7201735d 100644
--- a/media-libs/giblib/giblib-1.2.2.ebuild
+++ b/media-libs/giblib/giblib-1.2.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/media-libs/giblib/giblib-1.2.2.ebuild,v 1.8 2003/03/25 05:20:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.2.ebuild,v 1.9 2003/03/27 05:28:19 vladimir Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Giblib, graphics library"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.linuxbrit.co.uk/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="as-is|BSD"
+LICENSE="as-is | BSD"
 KEYWORDS="x86 ppc sparc ~alpha"
 
 DEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 31feb2feaad2..0364e1a7f67d 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for media-libs/giflib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.7 2003/03/11 11:36:34 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.8 2003/03/27 05:28:19 vladimir Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *giflib-4.1.0-r3 (14 Apr 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> giflib-4.1.0-r3.ebuild:
+  Automated cleanup of LICENSE
+
   11 Mar 2003; Guy Martin <gmsoft@gentoo.org> giflib-4.1.0-r3.ebuild :
   Added hppa to keywords.
 
diff --git a/media-libs/giflib/giflib-4.1.0-r3.ebuild b/media-libs/giflib/giflib-4.1.0-r3.ebuild
index f991c9246225..3a2daf8dba1b 100644
--- a/media-libs/giflib/giflib-4.1.0-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.0-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-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.16 2003/03/11 11:36:34 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.17 2003/03/27 05:28:19 vladimir Exp $
 
 inherit gnuconfig
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/libs/giflib/${P}.tar.gz
 DEPEND="X? ( virtual/x11 )"
 
 SLOT="0"
-LICENSE="as-is|BSD"
+LICENSE="as-is | BSD"
 KEYWORDS="x86 ppc sparc alpha hppa"
 
 src_unpack() {
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 27a18e5610cb..844286587aad 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.47 2003/03/23 22:05:42 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.48 2003/03/27 05:28:19 vladimir Exp $
 
 *xine-lib-1_beta9 (23 Mar 2003)
 
@@ -166,6 +166,10 @@
 
 *xine-lib-0.9.13 (06 Aug 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> xine-lib-0.9.12-r2.ebuild,
+  xine-lib-0.9.13.ebuild:
+  Automated cleanup of LICENSE
+
   01 Dec 2002; Martin Holzer <mholzer@gentoo.org> xine-0.9.13.ebuild : 
   Updated SRC_URI to pull from SF mirrors.
 
diff --git a/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild b/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild
index b1127680d1fd..215966261ae2 100644
--- a/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.12-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/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild,v 1.7 2003/02/13 12:56:48 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild,v 1.8 2003/03/27 05:28:19 vladimir Exp $ 
 
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
 
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc "
 
 src_unpack() {
diff --git a/media-libs/xine-lib/xine-lib-0.9.13.ebuild b/media-libs/xine-lib/xine-lib-0.9.13.ebuild
index bfdb0e0e312c..d79da40f096b 100644
--- a/media-libs/xine-lib/xine-lib-0.9.13.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.13.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/xine-lib/xine-lib-0.9.13.ebuild,v 1.6 2003/02/13 12:57:00 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13.ebuild,v 1.7 2003/03/27 05:28:19 vladimir Exp $ 
 
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
 
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc "
 
 src_unpack() {
diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 01fe1d424235..2767a9edbb81 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.1 2003/03/01 14:39:16 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 *rosegarden-4.0.8.5 (01 Mar 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> rosegarden-4.0.8.5.ebuild:
+  Automated cleanup of LICENSE
+
   01 Mar 2003; jje <jje@gentoo.org> rosegarden-4.0.8.5.ebuild files/digest-rosegarden-4.0.8.5 :
   Initial revision, unable to fully test as i don't have the midi hardware.
   
diff --git a/media-sound/rosegarden/rosegarden-4.0.8.5.ebuild b/media-sound/rosegarden/rosegarden-4.0.8.5.ebuild
index d76ab08fdd03..95325e9f7953 100644
--- a/media-sound/rosegarden/rosegarden-4.0.8.5.ebuild
+++ b/media-sound/rosegarden/rosegarden-4.0.8.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/media-sound/rosegarden/rosegarden-4.0.8.5.ebuild,v 1.1 2003/03/01 14:39:16 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.8.5.ebuild,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 
 DESCRIPTION="MIDI and audio sequencer and notation editor."
 HOMEPAGE="http://www.all-day-breakfast.com/rosegarden/"
 SRC_URI="http://belnet.dl.sourceforge.net/sourceforge/rosegarden/rosegarden-4-0.8.5.tar.gz"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
diff --git a/net-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog
index 2b52db3d7ffc..ea1309228f92 100644
--- a/net-misc/keychain/ChangeLog
+++ b/net-misc/keychain/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/keychain
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.10 2003/02/12 08:25:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.11 2003/03/27 05:28:19 vladimir Exp $
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> keychain-2.0.2.ebuild :
+  Automated cleanup of LICENSE
 
   19 Dec 2002; Martin Holzer <mholzer@gentoo.org> keychain-2.0.2.ebuild Changelog :
   Fixed Homepage url (#12455).
diff --git a/net-misc/keychain/keychain-2.0.2.ebuild b/net-misc/keychain/keychain-2.0.2.ebuild
index 8042a65622b4..902d9c930e06 100644
--- a/net-misc/keychain/keychain-2.0.2.ebuild
+++ b/net-misc/keychain/keychain-2.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-misc/keychain/keychain-2.0.2.ebuild,v 1.7 2003/03/11 20:50:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.0.2.ebuild,v 1.8 2003/03/27 05:28:19 vladimir Exp $
 
 DESCRIPTION="A front-end to ssh-agent"
 HOMEPAGE="http://www.gentoo.org/proj/en/keychain.xml"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/keychain.xml"
 SRC_URI="http://www.ibiblio.org/gentoo/distfiles/${P}.tar.bz2"
 S=${WORKDIR}/${P}
 KEYWORDS="x86 ppc sparc "
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/glibc"
diff --git a/net-misc/sendfile/ChangeLog b/net-misc/sendfile/ChangeLog
index 033e26956414..dfa20c3225f1 100644
--- a/net-misc/sendfile/ChangeLog
+++ b/net-misc/sendfile/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for net-misc/sendfile
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sendfile/ChangeLog,v 1.3 2003/02/12 08:32:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sendfile/ChangeLog,v 1.4 2003/03/27 05:28:19 vladimir Exp $
 
 *sendfile-2.1a (29 Oct 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> sendfile-2.1a.ebuild:
+  Automated cleanup of LICENSE
+
   29 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild submitted by Christopher Sharp <csharp@freeshell.org> in #5738.
diff --git a/net-misc/sendfile/sendfile-2.1a.ebuild b/net-misc/sendfile/sendfile-2.1a.ebuild
index d882d7d8839a..4e1823405ba9 100644
--- a/net-misc/sendfile/sendfile-2.1a.ebuild
+++ b/net-misc/sendfile/sendfile-2.1a.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/sendfile/sendfile-2.1a.ebuild,v 1.2 2003/02/13 15:06:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sendfile/sendfile-2.1a.ebuild,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Sendfile is a SAFT implementation for UNIX and serves as a tool for asynchronous sending of files in the Internet"
 SRC_URI="ftp://ftp.belwue.de/pub/unix/sendfile/${P}.tar.gz"
 HOMEPAGE="http://www.belwue.de/projekte/saft/sendfile-us.html"
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 src_compile() {
diff --git a/net-www/curator/curator-2.0.ebuild b/net-www/curator/curator-2.0.ebuild
index c15a6dcbed01..a101b6a1b878 100644
--- a/net-www/curator/curator-2.0.ebuild
+++ b/net-www/curator/curator-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc. 
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/net-www/curator/curator-2.0.ebuild,v 1.1 2003/03/12 02:15:18 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/curator/curator-2.0.ebuild,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 
 #First ebuild by me
@@ -12,7 +12,7 @@ DESCRIPTION="Webpage thumbnail creator"
 SRC_URI="http://twtelecom.dl.sourceforge.net/sourceforge/curator/${MY_P}.tar.gz"
 HOMEPAGE="http://curator.sourceforge.net/"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips"
-LICENSE="GPL"
+LICENSE="GPL-2"
 DEPEND=">=dev-lang/python-2.2.1 
 		>=media-gfx/imagemagick-5.4.9"
 
diff --git a/net-zope/cmfphoto/ChangeLog b/net-zope/cmfphoto/ChangeLog
index 6e8e2c8d0c5e..03d8983d03f7 100644
--- a/net-zope/cmfphoto/ChangeLog
+++ b/net-zope/cmfphoto/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-zope/cmfphoto
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/ChangeLog,v 1.1 2003/03/08 11:12:44 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/ChangeLog,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 *cmfphoto-0.1 (08 Mar 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> cmfphoto-0.1.ebuild:
+  Automated cleanup of LICENSE
+
   08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphoto-0.1.ebuild:
   Inital import.
 
diff --git a/net-zope/cmfphoto/cmfphoto-0.1.ebuild b/net-zope/cmfphoto/cmfphoto-0.1.ebuild
index 3133ad9e3440..390addfafc99 100644
--- a/net-zope/cmfphoto/cmfphoto-0.1.ebuild
+++ b/net-zope/cmfphoto/cmfphoto-0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public Form License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/cmfphoto-0.1.ebuild,v 1.2 2003/03/08 11:19:21 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/cmfphoto-0.1.ebuild,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope product to have photos."
 HOMEPAGE="http://sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFPhoto-${PV}.tar.gz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
 RDEPEND="dev-python/Imaging-py21
 		>=net-zope/cmf-1.3
diff --git a/net-zope/cmfphotoalbum/ChangeLog b/net-zope/cmfphotoalbum/ChangeLog
index ac32b43dcadf..1a9bef604b3b 100644
--- a/net-zope/cmfphotoalbum/ChangeLog
+++ b/net-zope/cmfphotoalbum/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-www/cmfphotoalbum
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/ChangeLog,v 1.2 2003/03/08 11:38:14 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/ChangeLog,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 *cmfphotoalbum-0.1 (08 Mar 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> cmfphotoalbum-0.1.ebuild:
+  Automated cleanup of LICENSE
+
   08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphotoalbum-0.1.ebuild:
   This ebuild makes .22 obsolete, strange as that sounds. So will remove .22 to
   avoid versioning problems.
diff --git a/net-zope/cmfphotoalbum/cmfphotoalbum-0.1.ebuild b/net-zope/cmfphotoalbum/cmfphotoalbum-0.1.ebuild
index adf2cb7fd27d..72377294ca4a 100644
--- a/net-zope/cmfphotoalbum/cmfphotoalbum-0.1.ebuild
+++ b/net-zope/cmfphotoalbum/cmfphotoalbum-0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public Form License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/cmfphotoalbum-0.1.ebuild,v 1.1 2003/03/08 11:38:14 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/cmfphotoalbum-0.1.ebuild,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope/CMF product to organize e-pics into hierarchical photo album."
 HOMEPAGE="http://sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFPhotoAlbum-0.1.tar.gz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
 RDEPEND="net-zope/cmfphoto
 	    >=net-zope/btreefolder2-0.5.0
diff --git a/net-zope/localfs/ChangeLog b/net-zope/localfs/ChangeLog
index 8b757a5d8b16..3cd14ca373c7 100644
--- a/net-zope/localfs/ChangeLog
+++ b/net-zope/localfs/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-zope/localfs
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/ChangeLog,v 1.1 2003/03/26 04:43:45 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/ChangeLog,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 *localfs-1.0.0 (25 Mar 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> localfs-1.0.0.ebuild:
+  Automated cleanup of LICENSE
+
   25 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> localfs-1.0.0.ebuild:
   Initial import. Based on ebuild submitted in #15420.
 
diff --git a/net-zope/localfs/localfs-1.0.0.ebuild b/net-zope/localfs/localfs-1.0.0.ebuild
index 224a31bb8caf..7417bd956b42 100644
--- a/net-zope/localfs/localfs-1.0.0.ebuild
+++ b/net-zope/localfs/localfs-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/localfs-1.0.0.ebuild,v 1.1 2003/03/26 04:43:45 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/localfs-1.0.0.ebuild,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 inherit zproduct
 S="${WORKDIR}/lib/python/Products/"
@@ -9,7 +9,7 @@ PV_NEW=$(echo ${PV} |sed -e "s/\./-/g")
 DESCRIPTION="Zope product for accessing the local filesystem"
 HOMEPAGE="http://sourceforge.net/projects/localfs/"
 SRC_URI="mirror://sourceforge/localfs/LocalFS-${PV_NEW}.tgz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index ff19dbc8badd..8c30f83bf434 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.10 2003/02/12 09:23:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.11 2003/03/27 05:28:19 vladimir Exp $
 
 *lesstif-0.93.40 (08 Feb 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> lesstif-0.93.36-r3.ebuild,
+  lesstif-0.93.36.ebuild, lesstif-0.93.40.ebuild:
+  Automated cleanup of LICENSE
+
   08 Feb 2003; Seemant Kulleen <seemant@gentoo.org> lesstif-0.93.40.ebuild
   files/digest-lesstif-0.93.40 :
 
diff --git a/x11-libs/lesstif/lesstif-0.93.36-r3.ebuild b/x11-libs/lesstif/lesstif-0.93.36-r3.ebuild
index 38fd74a86d9b..08850bf555c7 100644
--- a/x11-libs/lesstif/lesstif-0.93.36-r3.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.36-r3.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/x11-libs/lesstif/lesstif-0.93.36-r3.ebuild,v 1.2 2003/02/14 23:32:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.36-r3.ebuild,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 DESCRIPTION="An OSF/Motif(R) clone"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.lesstif.org/"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
 
diff --git a/x11-libs/lesstif/lesstif-0.93.36.ebuild b/x11-libs/lesstif/lesstif-0.93.36.ebuild
index da558925bdb2..ce17cf084ad1 100644
--- a/x11-libs/lesstif/lesstif-0.93.36.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.36.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/x11-libs/lesstif/lesstif-0.93.36.ebuild,v 1.5 2003/02/14 23:32:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.36.ebuild,v 1.6 2003/03/27 05:28:19 vladimir Exp $
 
 DESCRIPTION="An OSF/Motif(R) clone"
 HOMEPAGE="http://www.lesstif.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 KEYWORDS="x86 sparc"
 SLOT="0"
 
diff --git a/x11-libs/lesstif/lesstif-0.93.40.ebuild b/x11-libs/lesstif/lesstif-0.93.40.ebuild
index b9186a87c0ad..96bd6c6d92c8 100644
--- a/x11-libs/lesstif/lesstif-0.93.40.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.40.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/x11-libs/lesstif/lesstif-0.93.40.ebuild,v 1.2 2003/02/14 23:32:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.40.ebuild,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 DESCRIPTION="An OSF/Motif(R) clone"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.lesstif.org/"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
 
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.4.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.4.ebuild
index 835217a8dd49..ddac15995180 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.4.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.4.ebuild
@@ -6,7 +6,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="OpenGL virtual desktop switching"
 HOMEPAGE="http://desk3d.sourceforge.net/"
 SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
diff --git a/x11-misc/3ddesktop/ChangeLog b/x11-misc/3ddesktop/ChangeLog
index f8b833b574c5..e18527b77323 100644
--- a/x11-misc/3ddesktop/ChangeLog
+++ b/x11-misc/3ddesktop/ChangeLog
@@ -3,7 +3,10 @@
 # $Header
 
 *3ddesktop-0.2.4 (01 Dec 2002)
-  
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> 3ddesktop-0.2.4.ebuild:
+  Automated cleanup of LICENSE
+
   01 Dec 2002; Matt Keadle <mkeadle@gentoo.org> 3ddesktop-0.2.4.ebuild
   files/digest-3ddesktop-0.2.4:
 
diff --git a/x11-misc/wayv/ChangeLog b/x11-misc/wayv/ChangeLog
index 25f21439e643..0e4de443cb67 100644
--- a/x11-misc/wayv/ChangeLog
+++ b/x11-misc/wayv/ChangeLog
@@ -1,3 +1,9 @@
 2/16/03 19:23 zhen@gentoo.org/ZhEN
 Initial package ebuild. This package is a nice little utility 
 that enables mouse gesturing for X.
+
+*wayv-0.2 (26 Mar 2003)
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> wayv-0.2.ebuild:
+  Automated cleanup of LICENSE
+
diff --git a/x11-misc/wayv/wayv-0.2.ebuild b/x11-misc/wayv/wayv-0.2.ebuild
index 426fd98aae17..11355bfb9faa 100644
--- a/x11-misc/wayv/wayv-0.2.ebuild
+++ b/x11-misc/wayv/wayv-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/x11-misc/wayv/wayv-0.2.ebuild,v 1.1 2003/02/17 00:26:42 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wayv/wayv-0.2.ebuild,v 1.2 2003/03/27 05:28:19 vladimir Exp $
 
 PKG=${P/-0.2/.0.2}
 MY_P=${P/-0.2}
@@ -8,7 +8,7 @@ MY_P=${P/-0.2}
 DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X"
 HOMEPAGE="http://www.stressbunny.com/wayv"
 SRC_URI="http://cvs.gentoo.org/~zhen/${PKG}.tar.gz"
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
diff --git a/x11-misc/xrootconsole/ChangeLog b/x11-misc/xrootconsole/ChangeLog
index f37961a64eec..b2bc616a9302 100644
--- a/x11-misc/xrootconsole/ChangeLog
+++ b/x11-misc/xrootconsole/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for x11-misc/xrootconsole
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/ChangeLog,v 1.4 2003/02/12 09:34:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/ChangeLog,v 1.5 2003/03/27 05:28:19 vladimir Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *xrootconsole-0.4 (28 May 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> xrootconsole-0.4.ebuild:
+  Automated cleanup of LICENSE
+
   28 May 2002; J.Alberto S.L. <bass@gentoo.org> xrootconsole-0.4.ebuild:
 	First relase.
 
diff --git a/x11-misc/xrootconsole/xrootconsole-0.4.ebuild b/x11-misc/xrootconsole/xrootconsole-0.4.ebuild
index 4f354727f0b5..8cf93f67b81a 100644
--- a/x11-misc/xrootconsole/xrootconsole-0.4.ebuild
+++ b/x11-misc/xrootconsole/xrootconsole-0.4.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-misc/xrootconsole/xrootconsole-0.4.ebuild,v 1.5 2003/02/13 17:21:12 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/xrootconsole-0.4.ebuild,v 1.6 2003/03/27 05:28:19 vladimir Exp $ 
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ SRC_URI="http://de-fac.to/bob/xrootconsole/${P}.tar.gz"
 
 HOMEPAGE="http://de-fac.to/bob/xrootconsole/"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND="x11-base/xfree"
 RDEPEMD="${DEPEND}"
diff --git a/x11-plugins/gkrellmss/ChangeLog b/x11-plugins/gkrellmss/ChangeLog
index 51b93273188a..a759add3ef28 100644
--- a/x11-plugins/gkrellmss/ChangeLog
+++ b/x11-plugins/gkrellmss/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-plugins/gkrellmss
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/ChangeLog,v 1.2 2003/02/13 20:42:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/ChangeLog,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 *gkrellmss-2.3 (12 Feb 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> gkrellmss-2.3.ebuild:
+  Automated cleanup of LICENSE
+
   12 Feb 2003; Seemant Kulleen <seemant@gentoo.org> ChangeLog
   gkrellmss-2.3.ebuild files/gkrellmss-2.3-gentoo.diff
   files/digest-gkrellmss-2.3 :
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
index d0f7013cd5bb..7d0586430d23 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.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/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild,v 1.3 2003/02/25 03:07:22 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild,v 1.4 2003/03/27 05:28:19 vladimir Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ DEPEND="=app-admin/gkrellm-2*
 	media-sound/esound"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 src_unpack() {
diff --git a/x11-plugins/i8krellm/ChangeLog b/x11-plugins/i8krellm/ChangeLog
index f64d4ec357fd..b1eba33fdd35 100644
--- a/x11-plugins/i8krellm/ChangeLog
+++ b/x11-plugins/i8krellm/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for x11-plugins/i8krellm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/ChangeLog,v 1.2 2003/02/13 13:54:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/ChangeLog,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 *i8krellm-2.3 (13 Feb 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> i8krellm-2.2.ebuild,
+  i8krellm-2.3.ebuild:
+  Automated cleanup of LICENSE
+
   13 Feb 2003; Seemant Kulleen <seemant@gentoo.org> i8krellm-2.3.ebuild files/digest-i8krellm-2.3 :
   version bump thanks to Christoph Hornung <hornung@cs.tu-berlin.de> in bug #15627
 
diff --git a/x11-plugins/i8krellm/i8krellm-2.2.ebuild b/x11-plugins/i8krellm/i8krellm-2.2.ebuild
index 08d95524a4c7..936ebbda38cd 100644
--- a/x11-plugins/i8krellm/i8krellm-2.2.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.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/x11-plugins/i8krellm/i8krellm-2.2.ebuild,v 1.2 2003/02/13 17:32:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/i8krellm-2.2.ebuild,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 IUSE="gtk2"
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
 HOMEPAGE="http://www.coding-zone.com/i8krellm.phtml"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
 
 DEPEND="app-admin/gkrellm
diff --git a/x11-plugins/i8krellm/i8krellm-2.3.ebuild b/x11-plugins/i8krellm/i8krellm-2.3.ebuild
index 3cec0fea12fa..876393a32827 100644
--- a/x11-plugins/i8krellm/i8krellm-2.3.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.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/x11-plugins/i8krellm/i8krellm-2.3.ebuild,v 1.2 2003/02/13 20:18:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/i8krellm-2.3.ebuild,v 1.3 2003/03/27 05:28:19 vladimir Exp $
 
 IUSE="gtk2"
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
 HOMEPAGE="http://www.coding-zone.com/i8krellm.phtml"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
 
 DEPEND="app-admin/gkrellm
diff --git a/x11-plugins/wmtimer/ChangeLog b/x11-plugins/wmtimer/ChangeLog
index 9c4796de7183..a5581f3cfb43 100644
--- a/x11-plugins/wmtimer/ChangeLog
+++ b/x11-plugins/wmtimer/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-plugins/wmtimer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.4 2003/02/12 15:47:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.5 2003/03/27 05:28:19 vladimir Exp $
 
 * wmtimer-2.4 (12 August 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> wmtimer-2.4.ebuild :
+  Automated cleanup of LICENSE
+
   07 Oct 2002; Nick Hadaway <raker@gentoo.org> wmtimer-2.4.ebuild :
   Adding missing dependancy on x11-libs/gtk+-1.2*
 
diff --git a/x11-plugins/wmtimer/wmtimer-2.4.ebuild b/x11-plugins/wmtimer/wmtimer-2.4.ebuild
index 82e43fa957fa..4e4bdcc8e9ec 100644
--- a/x11-plugins/wmtimer/wmtimer-2.4.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.4.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-plugins/wmtimer/wmtimer-2.4.ebuild,v 1.6 2003/02/13 17:32:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.4.ebuild,v 1.7 2003/03/27 05:28:19 vladimir Exp $
 
 S=${WORKDIR}/${P}
 S2=${S}/wmtimer
@@ -10,7 +10,7 @@ SRC_URI="http://home.dwave.net/~jking/wmtimer/${P}.tar.gz"
 HOMEPAGE="http://home.dwave.net/~jking/wmtimer/"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
diff --git a/x11-terms/root-tail/ChangeLog b/x11-terms/root-tail/ChangeLog
index 6b8a29c33bae..732492794531 100644
--- a/x11-terms/root-tail/ChangeLog
+++ b/x11-terms/root-tail/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-terms/root-tail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/ChangeLog,v 1.3 2003/02/12 09:45:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/ChangeLog,v 1.4 2003/03/27 05:28:19 vladimir Exp $
 
 *root-tail-0.0.10 (1 Feb 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> root-tail-0.0.10.ebuild:
+  Automated cleanup of LICENSE
+
   21 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> root-tail-0.0.10.ebuild :
 
   Added ppc to KEYWORDS.
diff --git a/x11-terms/root-tail/root-tail-0.0.10.ebuild b/x11-terms/root-tail/root-tail-0.0.10.ebuild
index 23278f145b8c..ea581cadba71 100644
--- a/x11-terms/root-tail/root-tail-0.0.10.ebuild
+++ b/x11-terms/root-tail/root-tail-0.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/x11-terms/root-tail/root-tail-0.0.10.ebuild,v 1.11 2003/02/13 17:36:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-0.0.10.ebuild,v 1.12 2003/03/27 05:28:19 vladimir Exp $
 
 
 S=${WORKDIR}/${P}
@@ -9,7 +9,7 @@ SRC_URI="http://www.goof.com/pcg/marc/data/${P}.tar.gz"
 HOMEPAGE="http://www.var.cx/root-tail/"
 SLOT="0"
 KEYWORDS="x86 ppc"
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-themes/gtk-theme-switch/ChangeLog b/x11-themes/gtk-theme-switch/ChangeLog
index 639c082e52b9..b3ffdb02be78 100644
--- a/x11-themes/gtk-theme-switch/ChangeLog
+++ b/x11-themes/gtk-theme-switch/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for x11-themes/gtk-theme-switch
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/ChangeLog,v 1.3 2003/03/16 18:40:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/ChangeLog,v 1.4 2003/03/27 05:28:19 vladimir Exp $
 
   16 Mar 2003; foser <foser@gentoo.org> gtk-theme-switch*.ebuild :
   Fixed KEYWORDS, removed *
 
 *gtk-theme-switch-2.0.0_rc2 (9 Jun 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org>
+  gtk-theme-switch-1.0.1.ebuild, gtk-theme-switch-2.0.0_rc2.ebuild:
+  Automated cleanup of LICENSE
+
   9 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
   gtk-theme-switch-2.0.0_rc2.ebuild files/digest-gtk-theme-switch-2.0.0_rc2:
 
diff --git a/x11-themes/gtk-theme-switch/gtk-theme-switch-1.0.1.ebuild b/x11-themes/gtk-theme-switch/gtk-theme-switch-1.0.1.ebuild
index 0098bb8f1303..3184f4c7c062 100644
--- a/x11-themes/gtk-theme-switch/gtk-theme-switch-1.0.1.ebuild
+++ b/x11-themes/gtk-theme-switch/gtk-theme-switch-1.0.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/x11-themes/gtk-theme-switch/gtk-theme-switch-1.0.1.ebuild,v 1.7 2003/03/16 18:40:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/gtk-theme-switch-1.0.1.ebuild,v 1.8 2003/03/27 05:28:19 vladimir Exp $
 S=${WORKDIR}/${P}
 
 DESCRIPTION="Application for easy change of GTK-Themes"
@@ -9,7 +9,7 @@ SRC_URI="http://www.muhri.net/${P}.tar.gz"
 
 HOMEPAGE="http://www.muhri.net/nav.php3?node=gts"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND="=x11-libs/gtk+-1.2*"
 SLOT="1.2"
diff --git a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild
index 3189fc8908bd..40fc1c63a006 100644
--- a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild
+++ b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.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-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild,v 1.7 2003/03/16 18:40:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild,v 1.8 2003/03/27 05:28:19 vladimir Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Application for easy change of GTK-Themes"
 SRC_URI="http://www.muhri.net/${MY_P}.tar.gz"
 HOMEPAGE="http://www.muhri.net/nav.php3?node=gts"
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND="=x11-libs/gtk+-2*"
 SLOT="2"
diff --git a/x11-themes/sawfish-themes/ChangeLog b/x11-themes/sawfish-themes/ChangeLog
index 5bf3f03c1cdc..0224846504e3 100644
--- a/x11-themes/sawfish-themes/ChangeLog
+++ b/x11-themes/sawfish-themes/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for x11-themes/sawfish-themes
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/sawfish-themes/ChangeLog,v 1.3 2003/02/12 09:50:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/sawfish-themes/ChangeLog,v 1.4 2003/03/27 05:28:19 vladimir Exp $
 
 *sawfish-themes-0.0.1-r3 (29 Jun 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org>
+  sawfish-themes-0.0.1-r1.ebuild, sawfish-themes-0.0.1-r3.ebuild:
+  Automated cleanup of LICENSE
+
   29 Jun 2002; Seemant Kulleen <seemant@gentoo.org> sawfish-themes-0.0.1-r3
   files/digest-sawfish-themes-0.0.1-r3 ChangeLog :
 
diff --git a/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r1.ebuild b/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r1.ebuild
index 2c0136645680..47b749c6eb4b 100644
--- a/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r1.ebuild
+++ b/x11-themes/sawfish-themes/sawfish-themes-0.0.1-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-themes/sawfish-themes/sawfish-themes-0.0.1-r1.ebuild,v 1.5 2003/02/13 17:45:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r1.ebuild,v 1.6 2003/03/27 05:28:19 vladimir Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Some nice themes for sawfish"
 SRC_URI="http://ftp1.sourceforge.net/pub/mirrors/themes.org/sawmill/Adept-0.28.tar.gz http://ftp1.sourceforge.net/pub/mirrors/themes.org/sawmill/Eazel-blue-0.30.tar.gz"
 HOMEPAGE="http://www.themes.org"
 DEPEND=">=x11-wm/sawfish-1.0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc alpha"
 
diff --git a/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild b/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild
index ae1d0b8e7afe..b3936178a16e 100644
--- a/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild
+++ b/x11-themes/sawfish-themes/sawfish-themes-0.0.1-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/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild,v 1.7 2003/02/13 17:45:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild,v 1.8 2003/03/27 05:28:19 vladimir Exp $
 
 DESCRIPTION="Some nice themes for Sawfish"
 S=${WORKDIR}
@@ -63,7 +63,7 @@ HOMEPAGE="http://themes.freshmeat.net/"
 RDEPEND="=x11-wm/sawfish-1*"
 
 SLOT="1"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc alpha"
 
 src_compile() {