Changed from "GPL2 or later" to "GPL2"

43 files changed, 82 insertions, 82 deletions

diff --git a/dev-java/ant/ant-1.4.1-r3.ebuild b/dev-java/ant/ant-1.4.1-r3.ebuild
index 0d299bcc4c88..b84723a058ca 100644
--- a/dev-java/ant/ant-1.4.1-r3.ebuild
+++ b/dev-java/ant/ant-1.4.1-r3.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/dev-java/ant/ant-1.4.1-r3.ebuild,v 1.6 2002/08/26 17:27:19 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r3.ebuild,v 1.7 2002/10/04 05:10:20 vapier Exp $
 
 S=${WORKDIR}/jakarta-ant-${PV}
 DESCRIPTION="Build system for Java"
diff --git a/dev-java/ant/ant-1.5.ebuild b/dev-java/ant/ant-1.5.ebuild
index 7d5fa94de441..4912bba09e51 100644
--- a/dev-java/ant/ant-1.5.ebuild
+++ b/dev-java/ant/ant-1.5.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/dev-java/ant/ant-1.5.ebuild,v 1.1 2002/09/08 15:26:27 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.ebuild,v 1.2 2002/10/04 05:10:23 vapier Exp $
 
 S=${WORKDIR}/jakarta-ant-${PV}
 DESCRIPTION="Build system for Java"
diff --git a/dev-java/antlr/antlr-2.7.1-r3.ebuild b/dev-java/antlr/antlr-2.7.1-r3.ebuild
index a940f8400423..93a997de36d6 100644
--- a/dev-java/antlr/antlr-2.7.1-r3.ebuild
+++ b/dev-java/antlr/antlr-2.7.1-r3.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/dev-java/antlr/antlr-2.7.1-r3.ebuild,v 1.4 2002/08/01 17:02:32 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.1-r3.ebuild,v 1.5 2002/10/04 05:10:25 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A parser generator for Java, C++ and Sather, written in Java"
diff --git a/dev-java/antlr/antlr-2.7.2_alpha2.ebuild b/dev-java/antlr/antlr-2.7.2_alpha2.ebuild
index c13661a33c40..98a18e0556a0 100644
--- a/dev-java/antlr/antlr-2.7.2_alpha2.ebuild
+++ b/dev-java/antlr/antlr-2.7.2_alpha2.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/dev-java/antlr/antlr-2.7.2_alpha2.ebuild,v 1.3 2002/08/01 17:02:32 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.2_alpha2.ebuild,v 1.4 2002/10/04 05:10:27 vapier Exp $
 
 S=${WORKDIR}/${PN}-2.7.2a2
 DESCRIPTION="A parser generator for Java, C++ and Sather, written in Java"
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
index 694d496692e0..1561ffe21be2 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.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/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.12 2002/09/14 18:10:53 murphy Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.13 2002/10/04 05:10:30 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
index 93b0de50b316..d440dee0bcd4 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.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/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.13 2002/09/08 16:10:07 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.14 2002/10/04 05:10:32 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/dbconnectionbroker/dbconnectionbroker-1.0.13.ebuild b/dev-java/dbconnectionbroker/dbconnectionbroker-1.0.13.ebuild
index dd481176e2bc..70431105698a 100644
--- a/dev-java/dbconnectionbroker/dbconnectionbroker-1.0.13.ebuild
+++ b/dev-java/dbconnectionbroker/dbconnectionbroker-1.0.13.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/dev-java/dbconnectionbroker/dbconnectionbroker-1.0.13.ebuild,v 1.1 2002/07/08 20:13:31 blizzy Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbconnectionbroker/dbconnectionbroker-1.0.13.ebuild,v 1.2 2002/10/04 05:10:35 vapier Exp $
 
 A="DbConnectionBroker${PV}.tar"
 S=${WORKDIR}
diff --git a/dev-java/fesi/fesi-1.ebuild b/dev-java/fesi/fesi-1.ebuild
index cd88f145831e..202980418615 100644
--- a/dev-java/fesi/fesi-1.ebuild
+++ b/dev-java/fesi/fesi-1.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/dev-java/fesi/fesi-1.ebuild,v 1.9 2002/09/20 20:47:51 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi/fesi-1.ebuild,v 1.10 2002/10/04 05:10:37 vapier Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="JavaScript Interpreter written in Java"
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
index 8265b87cdd81..429cc3fe36fa 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.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/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.8 2002/09/07 13:16:09 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.9 2002/10/04 05:10:39 vapier Exp $
 
 . /usr/portage/eclass/java.eclass
 inherit java
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
index 9ec2dd118c64..44eec55a2574 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.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/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.9 2002/09/07 13:16:09 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.10 2002/10/04 05:10:42 vapier Exp $
 
 . /usr/portage/eclass/java.eclass
 inherit java
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild
index 5fe482ecdcbe..fcc329fd8f84 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.0-r3.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/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild,v 1.6 2002/09/07 13:14:10 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild,v 1.7 2002/10/04 05:10:44 vapier Exp $
 
 At=IBMJava2-JRE-13.tgz
 S=${WORKDIR}/IBMJava2-13
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
index 51c7d5b4d992..7365e49da36e 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.1-r1.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/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild,v 1.7 2002/09/07 13:14:10 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild,v 1.8 2002/10/04 05:10:46 vapier Exp $
 
 At=IBMJava2-JRE-131.tgz
 S=${WORKDIR}/IBMJava2-131
diff --git a/dev-java/jad/jad-1.5.8d.ebuild b/dev-java/jad/jad-1.5.8d.ebuild
index 921109ad4bc5..67afe0e69285 100644
--- a/dev-java/jad/jad-1.5.8d.ebuild
+++ b/dev-java/jad/jad-1.5.8d.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/dev-java/jad/jad-1.5.8d.ebuild,v 1.4 2002/08/01 17:39:24 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jad/jad-1.5.8d.ebuild,v 1.5 2002/10/04 05:10:49 vapier Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Jad - the fast JAva Decompiler"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.2.ebuild
index 753f8d3333bc..7d3e1e771508 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Copyright 2002 Jordan Armstrong <jordan@papercrane.net>
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License v2
 
 A="jakarta-regexp-${PV}.tar.gz"
 S=${WORKDIR}/jakarta-regexp-${PV}
diff --git a/dev-java/japhar/japhar-0.10.ebuild b/dev-java/japhar/japhar-0.10.ebuild
index 123f0149d70c..c498d703cc31 100644
--- a/dev-java/japhar/japhar-0.10.ebuild
+++ b/dev-java/japhar/japhar-0.10.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/dev-java/japhar/japhar-0.10.ebuild,v 1.3 2002/08/01 17:48:04 karltk Exp $
+# 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.4 2002/10/04 05:10:54 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Free Java Virtual Machine (JVM)"
diff --git a/dev-java/java-config/java-config-0.2.6.ebuild b/dev-java/java-config/java-config-0.2.6.ebuild
index a27c64863152..c333f40cd645 100644
--- a/dev-java/java-config/java-config-0.2.6.ebuild
+++ b/dev-java/java-config/java-config-0.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2001-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-0.2.6.ebuild,v 1.1 2002/09/23 00:17:43 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-0.2.6.ebuild,v 1.2 2002/10/04 05:10:56 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gentoo-specific configuration for Java"
diff --git a/dev-java/java-gnome/java-gnome-0.7.1.ebuild b/dev-java/java-gnome/java-gnome-0.7.1.ebuild
index 5521d58d73c9..dda4ad16a4a1 100644
--- a/dev-java/java-gnome/java-gnome-0.7.1.ebuild
+++ b/dev-java/java-gnome/java-gnome-0.7.1.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/dev-java/java-gnome/java-gnome-0.7.1.ebuild,v 1.7 2002/09/20 20:53:03 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.7.1.ebuild,v 1.8 2002/10/04 05:10:58 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="This is a sample skeleton ebuild file"
diff --git a/dev-java/java-gtk/java-gtk-0.7.1.ebuild b/dev-java/java-gtk/java-gtk-0.7.1.ebuild
index 7b6e1e18c8fd..fa18e50c29f1 100644
--- a/dev-java/java-gtk/java-gtk-0.7.1.ebuild
+++ b/dev-java/java-gtk/java-gtk-0.7.1.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/dev-java/java-gtk/java-gtk-0.7.1.ebuild,v 1.7 2002/09/20 20:54:07 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gtk/java-gtk-0.7.1.ebuild,v 1.8 2002/10/04 05:11:01 vapier Exp $
 
 S=${WORKDIR}/java-gnome-${PV}
 DESCRIPTION="GTK+ bindings for Java"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
index cf95ee16bc57..3eba2570d2c5 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
@@ -1,5 +1,5 @@
 # Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License v2
 
 At="j2sdk-1_3_1-doc.zip"
 S="${WORKDIR}/docs"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.0.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.0.ebuild
index 7f68dc481840..57e74d0218db 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.0.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.4.0.ebuild
@@ -1,5 +1,5 @@
 # Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License v2
 
 At="j2sdk-1_4_0-doc.zip"
 S="${WORKDIR}/docs"
diff --git a/dev-java/jdom/jdom-1.0_beta8-r1.ebuild b/dev-java/jdom/jdom-1.0_beta8-r1.ebuild
index c23e001dcda8..2528f943cf2c 100644
--- a/dev-java/jdom/jdom-1.0_beta8-r1.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta8-r1.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/dev-java/jdom/jdom-1.0_beta8-r1.ebuild,v 1.2 2002/08/01 18:04:16 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta8-r1.ebuild,v 1.3 2002/10/04 05:11:08 vapier Exp $
 
 P="jdom-b8"
 A="jdom-b8.tar.gz"
diff --git a/dev-java/jikes/jikes-1.15.ebuild b/dev-java/jikes/jikes-1.15.ebuild
index 5247d46aefd5..1863d66fa039 100644
--- a/dev-java/jikes/jikes-1.15.ebuild
+++ b/dev-java/jikes/jikes-1.15.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/dev-java/jikes/jikes-1.15.ebuild,v 1.6 2002/09/20 20:55:40 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/jikes-1.15.ebuild,v 1.7 2002/10/04 05:11:10 vapier Exp $
 
 DESCRIPTION="IBM's open source, high performance Java compiler"
 HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/jikes/"
diff --git a/dev-java/jikes/jikes-1.16.ebuild b/dev-java/jikes/jikes-1.16.ebuild
index 9ac8ae76a942..b3a18ce49ee3 100644
--- a/dev-java/jikes/jikes-1.16.ebuild
+++ b/dev-java/jikes/jikes-1.16.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/dev-java/jikes/jikes-1.16.ebuild,v 1.3 2002/09/20 20:55:40 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/jikes-1.16.ebuild,v 1.4 2002/10/04 05:11:12 vapier Exp $
 
 DESCRIPTION="IBM's open source, high performance Java compiler"
 HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/jikes/"
diff --git a/dev-java/junit/junit-3.7-r1.ebuild b/dev-java/junit/junit-3.7-r1.ebuild
index d14f087dfeb2..12ef08af62e4 100644
--- a/dev-java/junit/junit-3.7-r1.ebuild
+++ b/dev-java/junit/junit-3.7-r1.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/dev-java/junit/junit-3.7-r1.ebuild,v 1.2 2002/08/01 18:19:29 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.7-r1.ebuild,v 1.3 2002/10/04 05:11:15 vapier Exp $
 
 NP="junit3.7"
 S=${WORKDIR}/${NP}
diff --git a/dev-java/kaffe/kaffe-1.0.6-r3.ebuild b/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
index e9e45ddef3e3..78b9ca1f14e5 100644
--- a/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
+++ b/dev-java/kaffe/kaffe-1.0.6-r3.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/dev-java/kaffe/kaffe-1.0.6-r3.ebuild,v 1.4 2002/08/01 11:58:59 seemant Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.6-r3.ebuild,v 1.5 2002/10/04 05:11:17 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A cleanroom, open source Java VM and class libraries"
diff --git a/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild b/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild
index 7115742158c9..6acd54d19632 100644
--- a/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild
+++ b/dev-java/kaffe/kaffe-1.0.7_rc1-r1.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/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild,v 1.2 2002/08/01 11:58:59 seemant Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild,v 1.3 2002/10/04 05:11:19 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/kissme-classpath/kissme-classpath-0.19.ebuild b/dev-java/kissme-classpath/kissme-classpath-0.19.ebuild
index ea81a6b2ee5f..a9ac406a31fb 100644
--- a/dev-java/kissme-classpath/kissme-classpath-0.19.ebuild
+++ b/dev-java/kissme-classpath/kissme-classpath-0.19.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/dev-java/kissme-classpath/kissme-classpath-0.19.ebuild,v 1.6 2002/08/01 18:40:31 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kissme-classpath/kissme-classpath-0.19.ebuild,v 1.7 2002/10/04 05:11:24 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU Classpath specifically tailored to kissme"
diff --git a/dev-java/kissme/kissme-0.19.ebuild b/dev-java/kissme/kissme-0.19.ebuild
index 75c29adba6c6..0ea6abfcc3ae 100644
--- a/dev-java/kissme/kissme-0.19.ebuild
+++ b/dev-java/kissme/kissme-0.19.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/dev-java/kissme/kissme-0.19.ebuild,v 1.6 2002/09/20 20:58:53 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kissme/kissme-0.19.ebuild,v 1.7 2002/10/04 05:11:22 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tiny, JITless JVM"
diff --git a/dev-java/log4j/log4j-1.1.3.ebuild b/dev-java/log4j/log4j-1.1.3.ebuild
index b138cb91db0f..4fe2cf6307d2 100644
--- a/dev-java/log4j/log4j-1.1.3.ebuild
+++ b/dev-java/log4j/log4j-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright (c) Jordan Armstrong, 2002
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.1.3.ebuild,v 1.4 2002/08/01 18:31:28 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.1.3.ebuild,v 1.5 2002/10/04 05:11:27 vapier Exp $
 
 MY_P="jakarta-${P}"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-java/log4j/log4j-1.2.5.ebuild b/dev-java/log4j/log4j-1.2.5.ebuild
index 3f918bdd9f17..1c25e17b2e10 100644
--- a/dev-java/log4j/log4j-1.2.5.ebuild
+++ b/dev-java/log4j/log4j-1.2.5.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/dev-java/log4j/log4j-1.2.5.ebuild,v 1.1 2002/07/08 17:32:44 blizzy Exp $
+# 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.2 2002/10/04 05:11:29 vapier Exp $
 
 S="${WORKDIR}/jakarta-${P}"
 
diff --git a/dev-java/makeme/makeme-0.02-r1.ebuild b/dev-java/makeme/makeme-0.02-r1.ebuild
index e8fcb6232199..516f331afeaa 100644
--- a/dev-java/makeme/makeme-0.02-r1.ebuild
+++ b/dev-java/makeme/makeme-0.02-r1.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/dev-java/makeme/makeme-0.02-r1.ebuild,v 1.7 2002/08/01 18:43:45 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r1.ebuild,v 1.8 2002/10/04 05:11:31 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Make utility written in Java"
diff --git a/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild b/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild
index 15092fdacffc..5c1718500861 100644
--- a/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild
+++ b/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.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/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild,v 1.8 2002/09/20 20:59:58 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild,v 1.9 2002/10/04 05:11:34 vapier Exp $
 
 MY_P=${P/-/.}
 MY_P=mm.${MY_P/.3/c}
diff --git a/dev-java/mysql-jdbc/mysql-jdbc-2.0.14.ebuild b/dev-java/mysql-jdbc/mysql-jdbc-2.0.14.ebuild
index 0c9a0eb18450..e0cb63867396 100644
--- a/dev-java/mysql-jdbc/mysql-jdbc-2.0.14.ebuild
+++ b/dev-java/mysql-jdbc/mysql-jdbc-2.0.14.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/dev-java/mysql-jdbc/mysql-jdbc-2.0.14.ebuild,v 1.1 2002/07/08 17:48:11 blizzy Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mysql-jdbc/mysql-jdbc-2.0.14.ebuild,v 1.2 2002/10/04 05:11:36 vapier Exp $
 
 A="mm.mysql-${PV}-you-must-unjar-me.jar"
 S=${WORKDIR}/mm.mysql-${PV}
diff --git a/dev-java/randomguid/randomguid-1.2.ebuild b/dev-java/randomguid/randomguid-1.2.ebuild
index 61078e4ec5ff..bcd8eb83b3ab 100644
--- a/dev-java/randomguid/randomguid-1.2.ebuild
+++ b/dev-java/randomguid/randomguid-1.2.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/dev-java/randomguid/randomguid-1.2.ebuild,v 1.1 2002/07/08 18:05:05 blizzy Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/randomguid/randomguid-1.2.ebuild,v 1.2 2002/10/04 05:11:39 vapier Exp $
 
 A="RandomGUID.tar"
 S=${WORKDIR}
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild
index a05cb68dfb73..8e6c6d396578 100644
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild
@@ -1,5 +1,5 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License v2
 # /space/gentoo/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.ebuild,v 1.2 2002/01/18 16:06:26 karltk Exp
 
 At=j2sdkee-1_3_1-linux.tar.gz
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild
index f475fa060762..570f462706e9 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License v2
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Daniel Mettler <mettlerd@icu.unizh.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild,v 1.3 2002/09/08 00:29:32 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild,v 1.4 2002/10/04 05:11:43 vapier Exp $
 
 P=sun-jdk-1.4.0
 S=${WORKDIR}/j2sdk
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
index 02a317625c69..69e63274629c 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.04.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/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild,v 1.4 2002/09/07 13:13:01 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild,v 1.5 2002/10/04 05:11:46 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
index 32ea644bc187..c8301088e56f 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r5.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/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild,v 1.6 2002/09/07 13:13:01 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild,v 1.7 2002/10/04 05:11:48 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
index 691af85b4eec..709700c50849 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r6.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/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild,v 1.2 2002/09/27 03:02:52 mkennedy Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild,v 1.3 2002/10/04 05:11:50 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
index 301121af9181..fcf0a4a46066 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1_beta.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/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild,v 1.5 2002/09/07 13:13:01 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild,v 1.6 2002/10/04 05:11:53 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
index fee6c88ef6ab..f8d97bbb38af 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.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/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild,v 1.4 2002/09/27 03:02:52 mkennedy Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild,v 1.5 2002/10/04 05:11:55 vapier Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
diff --git a/dev-java/xerces/xerces-2.0.1.ebuild b/dev-java/xerces/xerces-2.0.1.ebuild
index f931ce306a3e..d6fe1bca3e23 100644
--- a/dev-java/xerces/xerces-2.0.1.ebuild
+++ b/dev-java/xerces/xerces-2.0.1.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/dev-java/xerces/xerces-2.0.1.ebuild,v 1.4 2002/08/01 18:27:30 karltk Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.0.1.ebuild,v 1.5 2002/10/04 05:11:58 vapier Exp $
 
 S=${WORKDIR}/xerces-${PV//./_}
 DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
diff --git a/dev-java/xt/xt-1.ebuild b/dev-java/xt/xt-1.ebuild
index a6865c1aa875..b286327a2a36 100644
--- a/dev-java/xt/xt-1.ebuild
+++ b/dev-java/xt/xt-1.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/dev-java/xt/xt-1.ebuild,v 1.9 2002/09/20 21:07:35 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-1.ebuild,v 1.10 2002/10/04 05:12:00 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Java Implementation of XSL-Transformations"