License fixes.

14 files changed, 44 insertions, 33 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index a4be0bbc5b41..1566ea3f0647 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.33 2003/04/14 08:34:10 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.34 2003/05/24 06:35:35 absinthe Exp $
+
+  24 May 2003; Dylan Carlson <absinthe@gentoo.org>
+  blackdown-jdk-1.3.1-r10.ebuild, blackdown-jdk-1.3.1-r7.ebuild,
+  blackdown-jdk-1.3.1-r8.ebuild, blackdown-jdk-1.3.1-r9.ebuild,
+  blackdown-jdk-1.4.1.ebuild:
+
+  License fixes.
 
 *blackdown-jdk-1.3.1-r10 (23 Mar 2003)
 
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index ee0cf781be36..f9b846102d7d 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,9 +1,9 @@
-MD5 90c845036c8e7285e7693b85ca9dcf6c blackdown-jdk-1.3.1-r9.ebuild 2260
-MD5 b01d61f4b6fc485034929526905780a1 blackdown-jdk-1.3.1-r8.ebuild 2246
-MD5 25300f40246d239f954114dea92f439e blackdown-jdk-1.3.1-r10.ebuild 2367
-MD5 2a99e8b8096fd38fb20adb06097e2fa2 blackdown-jdk-1.4.1.ebuild 2356
-MD5 ecc2635403c7470c42b5e70703643236 ChangeLog 6465
-MD5 cdd1b6964d24fcf8e6b18645c3c845ad blackdown-jdk-1.3.1-r7.ebuild 2423
+MD5 ec7dfdc5e8b85ec2cdbeac84c0715aed blackdown-jdk-1.3.1-r9.ebuild 2262
+MD5 0648ff3b7d90ae24de07528804a10b22 blackdown-jdk-1.3.1-r8.ebuild 2248
+MD5 2df37f260177dc9f759a30f2fa4ca7f5 blackdown-jdk-1.3.1-r10.ebuild 2367
+MD5 7ad7a4663f21da60836b0b05a259d32d blackdown-jdk-1.4.1.ebuild 2358
+MD5 63f2c324139a856663421c312d111a40 ChangeLog 6696
+MD5 05b007e32660db1fd667fb4327aa44d4 blackdown-jdk-1.3.1-r7.ebuild 2425
 MD5 b5ec5d310907ff1401afeb2a9d3f4c54 files/blackdown-jdk-1.3.1 669
 MD5 99702a6a6fc52870b2c0135bf4611a5e files/blackdown-jdk-1.4.1 671
 MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r10 80
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
index 3a66ede4afc6..8db0373d3a3d 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.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/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.1 2003/03/23 20:11:03 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.2 2003/05/24 06:35:35 absinthe Exp $
 
 IUSE="doc"
 
@@ -19,7 +19,7 @@ PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
 SLOT="1.3"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 
 # other arches need to chase down their new updates when they become available
 KEYWORDS="ppc"
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 4aeeadd1f9ab..cb8f53dbe0a0 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-2003 Gentoo Technologies, Inc.
 # 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.18 2003/02/13 10:07:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.19 2003/05/24 06:35:35 absinthe Exp $
 
 IUSE="doc"
 
@@ -21,7 +21,7 @@ PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
 SLOT="1.3"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 ppc sparc"
 
 src_unpack () {
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
index ab71df441ec6..3ff6b7f6064a 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.4 2003/02/13 10:07:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.5 2003/05/24 06:35:35 absinthe Exp $
 
 IUSE="doc"
 
@@ -21,7 +21,7 @@ PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
 SLOT="1.3"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 src_unpack () {
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
index bc7b54857673..2a987198999f 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.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/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild,v 1.2 2003/02/13 10:07:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild,v 1.3 2003/05/24 06:35:35 absinthe Exp $
 
 IUSE="doc"
 
@@ -19,7 +19,7 @@ PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
 SLOT="1.3"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 
 # other arches need to chase down their new updates when they become available
 KEYWORDS="ppc"
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
index 3d82f8e18a5e..543c08060025 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.3 2003/04/14 08:34:10 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.4 2003/05/24 06:35:35 absinthe Exp $
 
 IUSE="doc"
 
@@ -21,7 +21,7 @@ SRC_URI="${SRC_URI} sparc? ( ${J_URI}/sparc/${JREV}/j2sdk-${PV}-${JREV}-linux-sp
 HOMEPAGE="http://www.blackdown.org"
 
 SLOT="1.4.1"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 -ppc sparc"
 
 DEPEND="virtual/glibc
diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index dc08fed13dc7..ff3234dbc95b 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.19 2003/04/14 08:34:10 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.20 2003/05/24 06:37:35 absinthe Exp $
+
+  24 May 2003; Dylan Carlson <absinthe@gentoo.org>
+  blackdown-jre-1.3.1-r7.ebuild, blackdown-jre-1.3.1-r8.ebuild,
+  blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild:
+
+  License fixes.
 
 *blackdown-jre-1.4.1 (18 Feb 2003)
 
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 252332bf4bce..0712b51b9354 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,8 +1,8 @@
-MD5 00e0e8ec9b63395ae93e08b5718a3523 blackdown-jre-1.3.1-r7.ebuild 2161
-MD5 091dcdbb6dd671f6f73f3e457fc5d8ff blackdown-jre-1.4.1.ebuild 2058
-MD5 e56eeb7bcd37c65101c610cefd3865bb blackdown-jre-1.3.1-r9.ebuild 2166
-MD5 adf3f974112a936747d64c6b130bdb1e blackdown-jre-1.3.1-r8.ebuild 1990
-MD5 3cb72b93170413f27c8cba6872d86288 ChangeLog 3153
+MD5 9291bcdda8bd46485ec51a998c39cdac blackdown-jre-1.3.1-r7.ebuild 2163
+MD5 0fda9f37c5f1cc75fca89c91ae64219c blackdown-jre-1.4.1.ebuild 2060
+MD5 91bd2d398b106447b61747a5272a65d3 blackdown-jre-1.3.1-r9.ebuild 2168
+MD5 512e0b5949af4a13cf62cda80a989efa blackdown-jre-1.3.1-r8.ebuild 1992
+MD5 3e508b3b599359291a6e31dc4cfe109e ChangeLog 3350
 MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r7 240
 MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r8 240
 MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
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 997acbf5b121..b5cf632d2973 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-2003 Gentoo Technologies, Inc.
 # 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.22 2003/02/13 10:07:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.23 2003/05/24 06:37:35 absinthe Exp $
 
 inherit java
 
@@ -16,7 +16,7 @@ RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 SLOT="0"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 ppc sparc"
 
 src_unpack () {
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild
index 61d027d45ec0..8e125f944b49 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild,v 1.5 2003/02/13 10:07:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild,v 1.6 2003/05/24 06:37:35 absinthe Exp $
 
 inherit java nsplugins
 
@@ -16,7 +16,7 @@ RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 SLOT="0"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 src_unpack () {
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
index 15fb4916c0c0..acc9594c5dc1 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.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/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.2 2003/02/13 10:07:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.3 2003/05/24 06:37:35 absinthe Exp $
 
 IUSE=""
 
@@ -18,7 +18,7 @@ RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 SLOT="0"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 
 # other arches will need to chase this down when its released for them
 KEYWORDS="ppc"
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
index b91ad9445485..fedc675d882e 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.2 2003/04/14 08:34:10 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.3 2003/05/24 06:37:35 absinthe Exp $
 
 inherit java nsplugins gcc
 
@@ -24,7 +24,7 @@ RDEPEND="$RDEPEND $DEPEND"
 PROVIDE="virtual/jre-1.4.1
 	virtual/java-scheme-2"
 SLOT="0"
-LICENSE="sun-bcla"
+LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 sparc"
 
 src_unpack () {
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1
index 6df842aee3ad..5883f68530df 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1
@@ -1,3 +1 @@
 MD5 bea9c5869c084815bee026d466094995 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
-MD5 29f856a10aae9f296a09a3f9deaf01b7 j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
-MD5 3857975cd3b7ebcbe544ba0a46308e0c j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579