summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-10-14 16:00:14 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-10-14 16:00:14 +0000
commit499d9643cc950005a457eea2200eeeb1eb67317f (patch)
treebbdbc157ae599d0978b67934236bd7c6004965dd /dev-java
parentStable on ppc wrt bug 151290 (diff)
downloadhistorical-499d9643cc950005a457eea2200eeeb1eb67317f.tar.gz
historical-499d9643cc950005a457eea2200eeeb1eb67317f.tar.bz2
historical-499d9643cc950005a457eea2200eeeb1eb67317f.zip
Stabilizing on amd64 as part of new Java system, bug #147254.
Package-Manager: portage-2.1.2_pre2-r6
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-core/ChangeLog5
-rw-r--r--dev-java/ant-core/ant-core-1.6.5-r14.ebuild4
-rw-r--r--dev-java/ant-tasks/ChangeLog5
-rw-r--r--dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild4
-rw-r--r--dev-java/ant/ChangeLog5
-rw-r--r--dev-java/ant/ant-1.6.5.ebuild4
-rw-r--r--dev-java/blackdown-jdk/ChangeLog6
-rw-r--r--dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild4
-rw-r--r--dev-java/eclipse-ecj/ChangeLog6
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-3.1-r13.ebuild4
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild4
-rw-r--r--dev-java/gnu-jaxp/ChangeLog5
-rw-r--r--dev-java/gnu-jaxp/gnu-jaxp-1.3-r1.ebuild4
-rw-r--r--dev-java/ibm-jdk-bin/ChangeLog6
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild4
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3.ebuild4
-rw-r--r--dev-java/ibm-jre-bin/ChangeLog6
-rw-r--r--dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild4
-rw-r--r--dev-java/java-config/ChangeLog6
-rw-r--r--dev-java/java-config/java-config-1.3.7.ebuild4
-rw-r--r--dev-java/java-config/java-config-2.0.30.ebuild4
-rw-r--r--dev-java/java-sdk-docs/ChangeLog6
-rw-r--r--dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0-r12
-rw-r--r--dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild6
-rw-r--r--dev-java/javatoolkit/ChangeLog6
-rw-r--r--dev-java/javatoolkit/javatoolkit-0.1.9-r1.ebuild4
-rw-r--r--dev-java/jikes/ChangeLog5
-rw-r--r--dev-java/jikes/jikes-1.22-r13.ebuild4
-rw-r--r--dev-java/jrockit-jdk-bin/ChangeLog6
-rw-r--r--dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06-r1.ebuild4
-rw-r--r--dev-java/kaffe/ChangeLog5
-rw-r--r--dev-java/kaffe/kaffe-1.1.7-r3.ebuild4
-rw-r--r--dev-java/sun-jce-bin/ChangeLog5
-rw-r--r--dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild4
-rw-r--r--dev-java/sun-jdk/ChangeLog5
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild4
-rw-r--r--dev-java/sun-jre-bin/ChangeLog6
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild4
38 files changed, 120 insertions, 58 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 08ca2b2c91b3..f9195d197f97 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for dev-java/ant-core
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.53 2006/10/14 02:18:18 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.54 2006/10/14 15:56:58 nichoj Exp $
# Ant-core blocks lower/older versions of ant-tasks,
# since it will not run when there is a version mismatch betwean the 2 packages
# Please unemerge ant-tasks when updating ant-core.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> ant-core-1.6.5-r14.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> ant-core-1.6.5-r14.ebuild:
Stabilizing on ppc64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org> ant-core-1.6.5-r14.ebuild:
diff --git a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
index 0cdbe8fe95d4..95c73beb065d 100644
--- a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.5 2006/10/14 02:18:18 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.6 2006/10/14 15:56:58 nichoj Exp $
inherit java-pkg-2 eutils toolchain-funcs java-ant-2
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
IUSE="doc source"
DEPEND="${RDEPEND}
diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 9ca6d3380dd1..8b40ad12face 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/ant-tasks
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.36 2006/10/14 02:25:39 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.37 2006/10/14 15:57:06 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> ant-tasks-1.6.5-r2.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> ant-tasks-1.6.5-r2.ebuild:
Stabilizing on ppc64 as part of new Java system, bug #147254.
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild
index 9194b69b377d..9b9617df2197 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild,v 1.7 2006/10/14 02:25:39 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild,v 1.8 2006/10/14 15:57:06 nichoj Exp $
inherit java-pkg-2 eutils
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index bceee88010ab..eeae317b1735 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/ant
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.97 2006/10/14 02:02:07 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.98 2006/10/14 15:58:09 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> ant-1.6.5.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org> ant-1.6.5.ebuild:
New java stable on x86; bug #147254
diff --git a/dev-java/ant/ant-1.6.5.ebuild b/dev-java/ant/ant-1.6.5.ebuild
index 910e31fbccb7..30c134081b27 100644
--- a/dev-java/ant/ant-1.6.5.ebuild
+++ b/dev-java/ant/ant-1.6.5.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.5.ebuild,v 1.7 2006/10/14 02:27:49 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.5.ebuild,v 1.8 2006/10/14 15:58:09 nichoj Exp $
DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
HOMEPAGE="http://ant.apache.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
DEPEND="~dev-java/ant-tasks-${PV}
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 510e9b2824de..8273bc4b5b5e 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/blackdown-jdk
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.109 2006/10/14 01:31:39 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.110 2006/10/14 15:41:20 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ blackdown-jdk-1.4.2.03-r12.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
blackdown-jdk-1.4.2.03-r12.ebuild:
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
index 019dda765811..8fd0406744d2 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild,v 1.5 2006/10/14 01:31:39 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild,v 1.6 2006/10/14 15:41:20 nichoj Exp $
JAVA_SUPPORTS_GENERATION_1="true"
inherit java-vm-2 versionator
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.blackdown.org"
SLOT="1.4.2"
LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
IUSE="doc nsplugin"
DEPEND=">=dev-java/java-config-1.2.11
diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 9a34f29bccf1..4f08450e6bc3 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/eclipse-ecj
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.11 2006/10/14 02:04:14 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.12 2006/10/14 15:58:56 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ eclipse-ecj-3.1-r13.ebuild, eclipse-ecj-3.2.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
eclipse-ecj-3.1-r13.ebuild, eclipse-ecj-3.2.ebuild:
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.1-r13.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.1-r13.ebuild
index 0f51dc75b7a7..8da43ac03c2d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.1-r13.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.1-r13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.1-r13.ebuild,v 1.6 2006/10/14 02:30:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.1-r13.ebuild,v 1.7 2006/10/14 15:58:56 nichoj Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -10,7 +10,7 @@ DESCRIPTION="Eclipse Compiler for Java"
HOMEPAGE="http://www.eclipse.org/"
SRC_URI="mirror://gentoo/${P}-gentoo-r2.tar.bz2"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
SLOT="3.1"
IUSE="doc"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
index dbf40ca0a389..8d06a50fec2a 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild,v 1.4 2006/10/14 02:30:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild,v 1.5 2006/10/14 15:58:56 nichoj Exp $
inherit eutils java-pkg-2
@@ -8,7 +8,7 @@ DESCRIPTION="Eclipse Compiler for Java"
HOMEPAGE="http://www.eclipse.org/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
SLOT="3.2"
IUSE="doc"
diff --git a/dev-java/gnu-jaxp/ChangeLog b/dev-java/gnu-jaxp/ChangeLog
index 992899a139fa..35764dea9976 100644
--- a/dev-java/gnu-jaxp/ChangeLog
+++ b/dev-java/gnu-jaxp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/gnu-jaxp
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/ChangeLog,v 1.25 2006/10/14 02:08:47 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/ChangeLog,v 1.26 2006/10/14 16:00:14 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> gnu-jaxp-1.3-r1.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org> gnu-jaxp-1.3-r1.ebuild:
New java stable on x86; bug #147254
diff --git a/dev-java/gnu-jaxp/gnu-jaxp-1.3-r1.ebuild b/dev-java/gnu-jaxp/gnu-jaxp-1.3-r1.ebuild
index 79ac54d3b150..01a75a8aac41 100644
--- a/dev-java/gnu-jaxp/gnu-jaxp-1.3-r1.ebuild
+++ b/dev-java/gnu-jaxp/gnu-jaxp-1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/gnu-jaxp-1.3-r1.ebuild,v 1.3 2006/10/14 02:08:47 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/gnu-jaxp-1.3-r1.ebuild,v 1.4 2006/10/14 16:00:14 nichoj Exp $
inherit eutils java-pkg-2
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/classpathx/jaxp/"
SRC_URI="ftp://ftp.gnu.org/pub/gnu/classpathx/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="doc source"
# Should work with 1.3 but did not test yet after migration to gen 2
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 60fc81123544..78f05913db3f 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/ibm-jdk-bin
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.91 2006/10/14 02:07:16 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.92 2006/10/14 15:46:08 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ ibm-jdk-bin-1.4.2.6-r4.ebuild, ibm-jdk-bin-1.5.0.3.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
ibm-jdk-bin-1.4.2.6-r4.ebuild, ibm-jdk-bin-1.5.0.2.ebuild:
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
index 34c9a25cc961..2698e9ac2e46 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.6 2006/10/14 02:07:16 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.7 2006/10/14 15:46:08 nichoj Exp $
JAVA_SUPPORTS_GENERATION_1="true"
inherit java-vm-2 eutils versionator rpm
@@ -49,7 +49,7 @@ SRC_URI="x86? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
LICENSE="IBM-J1.4"
SLOT="1.4"
-KEYWORDS="-* ~amd64 ~ppc ppc64 x86"
+KEYWORDS="-* amd64 ~ppc ppc64 x86"
IUSE="X alsa doc javacomm nsplugin"
RDEPEND="
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3.ebuild
index a560760f182e..378d052ea981 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3.ebuild,v 1.1 2006/10/09 22:20:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3.ebuild,v 1.2 2006/10/14 15:46:08 nichoj Exp $
inherit java-vm-2 versionator eutils rpm
@@ -56,7 +56,7 @@ SRC_URI="x86? ( ${X86_JDK_DIST} )
ppc64? ( ${PPC64_JAVACOMM_DIST} )
)"
LICENSE="IBM-J1.5"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~ppc ~ppc64 ~x86"
RESTRICT="fetch"
RDEPEND="
diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 9d5ac170d5b8..ae88cecd171c 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/ibm-jre-bin
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.49 2006/10/14 13:23:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.50 2006/10/14 15:44:23 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ ibm-jre-bin-1.4.2.6-r5.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
ibm-jre-bin-1.4.2.6-r5.ebuild:
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild
index a11ca6544086..beb4b394e315 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild,v 1.4 2006/10/14 13:23:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild,v 1.5 2006/10/14 15:44:23 nichoj Exp $
inherit java-vm-2 eutils versionator rpm
@@ -34,7 +34,7 @@ SRC_URI="x86? ( IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm )
LICENSE="IBM-J1.4"
SLOT="1.4"
-KEYWORDS="-* ~amd64 ~ppc ppc64 x86"
+KEYWORDS="-* amd64 ~ppc ppc64 x86"
IUSE="X alsa nsplugin"
RDEPEND="
diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 1668528e3cef..29a8e016e12f 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/java-config
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.127 2006/10/14 02:01:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.128 2006/10/14 15:39:12 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> java-config-1.3.7.ebuild,
+ java-config-2.0.30.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> java-config-1.3.7.ebuild,
java-config-2.0.30.ebuild:
diff --git a/dev-java/java-config/java-config-1.3.7.ebuild b/dev-java/java-config/java-config-1.3.7.ebuild
index 489acb2eadf2..528dec168bdb 100644
--- a/dev-java/java-config/java-config-1.3.7.ebuild
+++ b/dev-java/java-config/java-config-1.3.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-1.3.7.ebuild,v 1.4 2006/10/14 02:01:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-1.3.7.ebuild,v 1.5 2006/10/14 15:39:12 nichoj Exp $
inherit base distutils eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
IUSE=""
RDEPEND="virtual/python
diff --git a/dev-java/java-config/java-config-2.0.30.ebuild b/dev-java/java-config/java-config-2.0.30.ebuild
index 2e94eddef81c..9fcc1a7eabac 100644
--- a/dev-java/java-config/java-config-2.0.30.ebuild
+++ b/dev-java/java-config/java-config-2.0.30.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.0.30.ebuild,v 1.4 2006/10/14 02:01:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.0.30.ebuild,v 1.5 2006/10/14 15:39:12 nichoj Exp $
inherit base distutils eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND="dev-lang/python"
diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index 010e4d8966fb..7d78ffa4c7bf 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/java-sdk-docs
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.41 2006/10/14 01:41:59 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.42 2006/10/14 15:51:03 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ java-sdk-docs-1.5.0-r1.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
java-sdk-docs-1.5.0.ebuild:
diff --git a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0-r1 b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0-r1
index 56645edd5de4..d11ff72f2ea4 100644
--- a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0-r1
+++ b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0-r1
@@ -1 +1,3 @@
MD5 06d108655466460e12bc9018c5fee863 jdk-1_5_0-doc-r1.zip 46191338
+RMD160 d783f2175f84d76f867b7358705a2819be5afb68 jdk-1_5_0-doc-r1.zip 46191338
+SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc jdk-1_5_0-doc-r1.zip 46191338
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
index 1022dae1d29c..f5a12011f832 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild,v 1.3 2006/10/14 01:43:42 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild,v 1.4 2006/10/14 15:51:03 nichoj Exp $
SRC_URI="jdk-1_5_0-doc-${PR}.zip"
DESCRIPTION="Javadoc for Java SDK version 1.5.0 Beta 2"
HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
LICENSE="sun-j2sl"
SLOT="1.5.0"
-KEYWORDS="-alpha ~amd64 -hppa -mips -ppc -sparc x86"
+KEYWORDS="-alpha amd64 -hppa -mips -ppc -sparc x86"
IUSE=""
DEPEND=">=app-arch/unzip-5.50-r1"
RESTRICT="fetch"
diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog
index ae26193f2c09..1ca015ba78c3 100644
--- a/dev-java/javatoolkit/ChangeLog
+++ b/dev-java/javatoolkit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/javatoolkit
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.14 2006/10/14 02:00:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.15 2006/10/14 15:38:33 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ javatoolkit-0.1.9-r1.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
javatoolkit-0.1.9-r1.ebuild:
diff --git a/dev-java/javatoolkit/javatoolkit-0.1.9-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.1.9-r1.ebuild
index 497586a32393..2c5e2d0face8 100644
--- a/dev-java/javatoolkit/javatoolkit-0.1.9-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.1.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.1.9-r1.ebuild,v 1.2 2006/10/14 02:00:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.1.9-r1.ebuild,v 1.3 2006/10/14 15:38:33 nichoj Exp $
inherit eutils python
@@ -9,7 +9,7 @@ HOMEPAGE="http://dev.gentoo.org/proj/en/java/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
DEPEND="virtual/python"
RDEPEND="virtual/python"
diff --git a/dev-java/jikes/ChangeLog b/dev-java/jikes/ChangeLog
index 28cb5ba797a1..f8930eb8858a 100644
--- a/dev-java/jikes/ChangeLog
+++ b/dev-java/jikes/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jikes
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/ChangeLog,v 1.47 2006/10/14 02:32:29 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/ChangeLog,v 1.48 2006/10/14 15:59:00 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> jikes-1.22-r13.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> jikes-1.22-r13.ebuild:
Stabilizing on ppc64 as part of new Java system, bug #147254.
diff --git a/dev-java/jikes/jikes-1.22-r13.ebuild b/dev-java/jikes/jikes-1.22-r13.ebuild
index a90906a2b507..6e29d2e7c80f 100644
--- a/dev-java/jikes/jikes-1.22-r13.ebuild
+++ b/dev-java/jikes/jikes-1.22-r13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/jikes-1.22-r13.ebuild,v 1.6 2006/10/14 02:32:29 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/jikes-1.22-r13.ebuild,v 1.7 2006/10/14 15:59:00 nichoj Exp $
inherit flag-o-matic eutils
@@ -9,7 +9,7 @@ HOMEPAGE="http://jikes.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="IBM"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=dev-java/java-config-2.0.0"
diff --git a/dev-java/jrockit-jdk-bin/ChangeLog b/dev-java/jrockit-jdk-bin/ChangeLog
index b8f142d732a7..dea07cbbcbd7 100644
--- a/dev-java/jrockit-jdk-bin/ChangeLog
+++ b/dev-java/jrockit-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jrockit-jdk-bin
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.28 2006/10/14 14:28:19 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.29 2006/10/14 15:47:14 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ jrockit-jdk-bin-1.5.0.06-r1.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
jrockit-jdk-bin-1.5.0.06-r1.ebuild:
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06-r1.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06-r1.ebuild
index fd9b84e285ff..e71c98a0a369 100644
--- a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06-r1.ebuild
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06-r1.ebuild,v 1.4 2006/10/14 14:28:19 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06-r1.ebuild,v 1.5 2006/10/14 15:47:14 nichoj Exp $
# WARNING: This is the default VM on ia64, so treat this ebuild
# with proper care.
@@ -25,7 +25,7 @@ HOMEPAGE="http://commerce.bea.com/products/weblogicjrockit/jrockit_prod_fam.jsp"
LICENSE="jrockit"
SLOT="1.5"
-KEYWORDS="~amd64 ~ia64 x86"
+KEYWORDS="amd64 ~ia64 x86"
IUSE=""
DEPEND=">=app-arch/unzip-5.50-r1"
diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 22e4013abeff..c74da13c0c40 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/kaffe
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.59 2006/10/14 01:52:19 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.60 2006/10/14 15:52:47 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> kaffe-1.1.7-r3.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org> kaffe-1.1.7-r3.ebuild:
New java stable on x86; bug #147254
diff --git a/dev-java/kaffe/kaffe-1.1.7-r3.ebuild b/dev-java/kaffe/kaffe-1.1.7-r3.ebuild
index 68a8b2fda9e1..fa24d5553842 100644
--- a/dev-java/kaffe/kaffe-1.1.7-r3.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.7-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r3.ebuild,v 1.3 2006/10/14 01:52:19 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r3.ebuild,v 1.4 2006/10/14 15:52:47 nichoj Exp $
JAVA_SUPPORTS_GENERATION_1="true"
inherit base eutils java-vm-2 flag-o-matic
@@ -35,7 +35,7 @@ RDEPEND=${DEPEND}
PDEPEND="dev-java/gjdoc"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
#X qt
IUSE="alsa esd gmp gtk nls"
diff --git a/dev-java/sun-jce-bin/ChangeLog b/dev-java/sun-jce-bin/ChangeLog
index 5341fc425b25..b1e16ae8e1fa 100644
--- a/dev-java/sun-jce-bin/ChangeLog
+++ b/dev-java/sun-jce-bin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/sun-jce-bin
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/ChangeLog,v 1.3 2006/10/14 01:46:27 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/ChangeLog,v 1.4 2006/10/14 15:52:42 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> sun-jce-bin-1.5.0.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org> sun-jce-bin-1.5.0.ebuild:
New java stable on x86; bug #147254
diff --git a/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild b/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild
index 51065eabfd18..41b5963aba31 100644
--- a/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild
+++ b/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild,v 1.3 2006/10/14 01:46:27 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild,v 1.4 2006/10/14 15:52:42 nichoj Exp $
inherit java-pkg-2 eutils
@@ -12,7 +12,7 @@ HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
SRC_URI="${jcefile}"
SLOT="1.5"
LICENSE="sun-bcla-java-vm"
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
RESTRICT="fetch"
IUSE=""
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index b8fc835db015..89423e9ee586 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/sun-jdk
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.162 2006/10/14 01:47:39 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.163 2006/10/14 15:53:30 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> sun-jdk-1.5.0.08.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
sun-jdk-1.4.2.12-r2.ebuild, sun-jdk-1.5.0.08.ebuild:
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild
index ba29a86994df..59b13cc7cc4e 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild,v 1.5 2006/10/14 01:47:39 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild,v 1.6 2006/10/14 15:53:30 nichoj Exp $
inherit java-vm-2 eutils
@@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
SLOT="1.5"
LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
RESTRICT="nostrip"
IUSE="X alsa doc examples jce nsplugin"
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index c77981067409..33be8b713691 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/sun-jre-bin
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.62 2006/10/14 01:49:58 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.63 2006/10/14 15:48:42 nichoj Exp $
+
+ 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+ sun-jre-bin-1.5.0.08-r1.ebuild:
+ Stabilizing on amd64 as part of new Java system, bug #147254.
14 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
sun-jre-bin-1.4.2.12-r2.ebuild, sun-jre-bin-1.5.0.08-r1.ebuild:
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild
index 70f2376d16c4..77fd6abb6d22 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild,v 1.5 2006/10/14 01:49:58 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild,v 1.6 2006/10/14 15:48:42 nichoj Exp $
inherit java-vm-2 eutils
@@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
SLOT="1.5"
LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
RESTRICT="nostrip"
IUSE="X alsa nsplugin"