8 files changed, 22 insertions, 14 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 216d64db496d..1cb14ea1af23 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.249 2008/12/06 13:32:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.250 2008/12/10 22:04:25 maekke Exp $
+
+  10 Dec 2008; Markus Meier <maekke@gentoo.org> sun-jdk-1.4.2.19.ebuild,
+  sun-jdk-1.5.0.17.ebuild, sun-jdk-1.6.0.11.ebuild:
+  amd64/x86 stable, bug #250012
 
 *sun-jdk-1.6.0.11 (06 Dec 2008)
 *sun-jdk-1.5.0.17 (06 Dec 2008)
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
index 07dc8c500f52..c7efeaade7b6 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4.2.19.ebuild,v 1.1 2008/12/06 13:32:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild,v 1.2 2008/12/10 22:04:25 maekke Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit pax-utils java-vm-2 eutils
@@ -20,7 +20,7 @@ SRC_URI="x86? ( ${At} )
 		jce? ( ${jce_policy} )"
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 # files are prestripped
 RESTRICT="fetch strip"
 IUSE="X alsa doc examples jce nsplugin odbc"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild
index 66c156512e7a..f18acbd35ae7 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.17.ebuild,v 1.1 2008/12/06 13:32:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild,v 1.2 2008/12/10 22:04:25 maekke Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -17,7 +17,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="strip"
 IUSE="X alsa doc examples jce nsplugin odbc"
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild
index e250bcd937ed..608dd90b9cfb 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.6.0.11.ebuild,v 1.1 2008/12/06 13:32:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild,v 1.2 2008/12/10 22:04:25 maekke Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
 		amd64? ( ${URL_BASE}/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="strip"
 IUSE="X alsa doc examples jce nsplugin odbc"
 
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 6464d758c4c6..643e9df7042c 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.141 2008/12/06 13:39:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.142 2008/12/10 22:01:31 maekke Exp $
+
+  10 Dec 2008; Markus Meier <maekke@gentoo.org> sun-jre-bin-1.4.2.19.ebuild,
+  sun-jre-bin-1.5.0.17.ebuild, sun-jre-bin-1.6.0.11.ebuild:
+  amd64/x86 stable, bug #250012
 
 *sun-jre-bin-1.6.0.11 (06 Dec 2008)
 *sun-jre-bin-1.5.0.17 (06 Dec 2008)
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
index 27964ca3e6ba..375710f10462 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4.2.19.ebuild,v 1.1 2008/12/06 13:39:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild,v 1.2 2008/12/10 22:01:31 maekke Exp $
 
 inherit eutils pax-utils java-vm-2
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
 SRC_URI=${At}
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 # pre stripped
 RESTRICT="fetch strip"
 IUSE="X alsa nsplugin odbc"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild
index eee6af6ab7d0..331edd679101 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.17.ebuild,v 1.1 2008/12/06 13:39:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild,v 1.2 2008/12/10 22:01:31 maekke Exp $
 
 inherit pax-utils versionator eutils java-vm-2
 
@@ -17,7 +17,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="strip"
 IUSE="X alsa nsplugin odbc"
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild
index 464d53efab07..50bcbd428261 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.6.0.11.ebuild,v 1.1 2008/12/06 13:39:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild,v 1.2 2008/12/10 22:01:31 maekke Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -19,7 +19,7 @@ SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
 		amd64? ( ${URL_BASE}/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="strip"
 IUSE="X alsa nsplugin odbc"