amd64 stable, bug #291817

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

6 files changed, 18 insertions, 10 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index b020dce16424..8747bce9c1d6 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.272 2009/11/05 21:24:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.273 2009/11/05 21:27:46 maekke Exp $
+
+  05 Nov 2009; Markus Meier <maekke@gentoo.org> sun-jdk-1.5.0.22.ebuild,
+  sun-jdk-1.6.0.17.ebuild:
+  amd64 stable, bug #291817
 
   05 Nov 2009; Markus Meier <maekke@gentoo.org> sun-jdk-1.6.0.17.ebuild:
   x86 stable, bug #291817
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild
index 8da46feba034..ffe43f87053b 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.22.ebuild,v 1.2 2009/11/05 21:23:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild,v 1.3 2009/11/05 21:27:46 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.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild
index a522e04694d7..ab4cddd90c5f 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.17.ebuild,v 1.2 2009/11/05 21:24:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild,v 1.3 2009/11/05 21:27:46 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 derby doc examples jce nsplugin odbc"
 
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 6f77c323710a..2b6b91822a0e 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 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.162 2009/11/05 21:25:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.163 2009/11/05 21:28:43 maekke Exp $
+
+  05 Nov 2009; Markus Meier <maekke@gentoo.org> sun-jre-bin-1.5.0.22.ebuild,
+  sun-jre-bin-1.6.0.17.ebuild:
+  amd64 stable, bug #291817
 
   05 Nov 2009; Markus Meier <maekke@gentoo.org> sun-jre-bin-1.6.0.17.ebuild:
   x86 stable, bug #291817
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.22.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.22.ebuild
index 9a50d018b371..7eefa4dac944 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.22.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.22.ebuild,v 1.2 2009/11/05 21:25:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.22.ebuild,v 1.3 2009/11/05 21:28:43 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.17.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.17.ebuild
index 2dc9552e63e1..69eb14a6d94b 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.17.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.17.ebuild,v 1.2 2009/11/05 21:25:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.17.ebuild,v 1.3 2009/11/05 21:28:43 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"