Stable for x86, wrt bug #417909

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

50 files changed, 152 insertions, 75 deletions

diff --git a/dev-java/ant-antlr/ChangeLog b/dev-java/ant-antlr/ChangeLog
index f51ba437b543..7e359a796a76 100644
--- a/dev-java/ant-antlr/ChangeLog
+++ b/dev-java/ant-antlr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-antlr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.40 2012/06/11 09:28:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.41 2012/06/11 13:00:20 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-antlr-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-antlr-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild b/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild
index 6be02bbbfa91..a2e6884e8b8c 100644
--- a/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild,v 1.2 2012/06/11 09:28:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild,v 1.3 2012/06/11 13:00:20 johu Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-java/antlr-2.7.5-r3:0[java]"
diff --git a/dev-java/ant-apache-bcel/ChangeLog b/dev-java/ant-apache-bcel/ChangeLog
index a509a45fd9e0..f40e2f15be53 100644
--- a/dev-java/ant-apache-bcel/ChangeLog
+++ b/dev-java/ant-apache-bcel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-apache-bcel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.30 2012/06/11 09:28:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.31 2012/06/11 13:03:01 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-apache-bcel-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-apache-bcel-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild
index 8228ceeec16e..c4cf377078f6 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild,v 1.2 2012/06/11 09:28:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild,v 1.3 2012/06/11 13:03:01 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="bcel"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/bcel-5.1-r3:0"
diff --git a/dev-java/ant-apache-bsf/ChangeLog b/dev-java/ant-apache-bsf/ChangeLog
index 00f2d78794f5..a01b95999e6a 100644
--- a/dev-java/ant-apache-bsf/ChangeLog
+++ b/dev-java/ant-apache-bsf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-apache-bsf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.40 2012/06/11 09:29:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.41 2012/06/11 12:59:27 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-apache-bsf-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-apache-bsf-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild
index 4ee61888a61c..b438d49b61d0 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild,v 1.2 2012/06/11 09:29:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild,v 1.3 2012/06/11 12:59:27 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-log4j/ChangeLog b/dev-java/ant-apache-log4j/ChangeLog
index dbef7e662611..dc6584ab36e9 100644
--- a/dev-java/ant-apache-log4j/ChangeLog
+++ b/dev-java/ant-apache-log4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-apache-log4j
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.30 2012/06/11 09:29:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.31 2012/06/11 12:58:28 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-apache-log4j-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-apache-log4j-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild
index d4c5e7249bdd..592e46b2b97e 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild,v 1.2 2012/06/11 09:29:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild,v 1.3 2012/06/11 12:58:28 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
diff --git a/dev-java/ant-apache-oro/ChangeLog b/dev-java/ant-apache-oro/ChangeLog
index d0b5c3f05fcf..d571ef0e24b5 100644
--- a/dev-java/ant-apache-oro/ChangeLog
+++ b/dev-java/ant-apache-oro/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-apache-oro
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.30 2012/06/11 09:30:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.31 2012/06/11 13:15:33 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-apache-oro-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-apache-oro-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild
index 12f55c737cf3..1e884807c750 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild,v 1.2 2012/06/11 09:30:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild,v 1.3 2012/06/11 13:15:33 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
diff --git a/dev-java/ant-apache-regexp/ChangeLog b/dev-java/ant-apache-regexp/ChangeLog
index 313ffad3861a..e84fa948c5d1 100644
--- a/dev-java/ant-apache-regexp/ChangeLog
+++ b/dev-java/ant-apache-regexp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-apache-regexp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.30 2012/06/11 09:30:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.31 2012/06/11 13:02:09 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-apache-regexp-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org>
   ant-apache-regexp-1.8.4.ebuild:
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild
index f3e187020a5d..b6cac74ac4ba 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild,v 1.2 2012/06/11 09:30:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild,v 1.3 2012/06/11 13:02:09 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
diff --git a/dev-java/ant-apache-resolver/ChangeLog b/dev-java/ant-apache-resolver/ChangeLog
index a45d5f4157af..69cc0015e881 100644
--- a/dev-java/ant-apache-resolver/ChangeLog
+++ b/dev-java/ant-apache-resolver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-resolver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.30 2012/06/11 09:31:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.31 2012/06/11 13:13:39 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org>
+  ant-apache-resolver-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org>
   ant-apache-resolver-1.8.4.ebuild:
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild
index 3444e90b8954..c40b1532ce87 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild,v 1.2 2012/06/11 09:31:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild,v 1.3 2012/06/11 13:13:39 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
diff --git a/dev-java/ant-apache-xalan2/ChangeLog b/dev-java/ant-apache-xalan2/ChangeLog
index 45e9b838278b..59e55f9c9a37 100644
--- a/dev-java/ant-apache-xalan2/ChangeLog
+++ b/dev-java/ant-apache-xalan2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-apache-xalan2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.15 2012/06/11 09:31:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.16 2012/06/11 12:56:31 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-apache-xalan2-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org>
   ant-apache-xalan2-1.8.4.ebuild:
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild
index b0d0133a02dd..94fa781d774b 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild,v 1.2 2012/06/11 09:31:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild,v 1.3 2012/06/11 12:56:31 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-java/xalan"
diff --git a/dev-java/ant-commons-logging/ChangeLog b/dev-java/ant-commons-logging/ChangeLog
index 7827425c43bc..29501f1aa2b2 100644
--- a/dev-java/ant-commons-logging/ChangeLog
+++ b/dev-java/ant-commons-logging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-commons-logging
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.30 2012/06/11 09:32:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.31 2012/06/11 13:09:53 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org>
+  ant-commons-logging-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org>
   ant-commons-logging-1.8.4.ebuild:
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild
index 3f00a4c3aed3..84ea603a1bce 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild,v 1.2 2012/06/11 09:32:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild,v 1.3 2012/06/11 13:09:53 johu Exp $
 
 EAPI="4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
diff --git a/dev-java/ant-commons-net/ChangeLog b/dev-java/ant-commons-net/ChangeLog
index b2868c9d7f0e..c0e00fc5207b 100644
--- a/dev-java/ant-commons-net/ChangeLog
+++ b/dev-java/ant-commons-net/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-commons-net
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.30 2012/06/11 09:32:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.31 2012/06/11 13:11:44 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-commons-net-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-commons-net-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild
index 5cdbb04c2683..e0e495a1f79d 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild,v 1.2 2012/06/11 09:32:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild,v 1.3 2012/06/11 13:11:44 johu Exp $
 
 EAPI="4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 503be228f2a6..53e90f1122c8 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.118 2012/06/11 09:33:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.119 2012/06/11 13:04:06 johu 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.
 
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-core-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
+
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-core-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
 
diff --git a/dev-java/ant-core/ant-core-1.8.4.ebuild b/dev-java/ant-core/ant-core-1.8.4.ebuild
index 4b4939a4cae4..40133b33de59 100644
--- a/dev-java/ant-core/ant-core-1.8.4.ebuild
+++ b/dev-java/ant-core/ant-core-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.4.ebuild,v 1.3 2012/06/11 09:33:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.4.ebuild,v 1.4 2012/06/11 13:04:06 johu Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/ant-jai/ChangeLog b/dev-java/ant-jai/ChangeLog
index d8da7e4a5c52..ca799c640433 100644
--- a/dev-java/ant-jai/ChangeLog
+++ b/dev-java/ant-jai/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-jai
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.26 2012/06/11 09:33:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.27 2012/06/11 13:05:53 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-jai-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-jai-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-jai/ant-jai-1.8.4.ebuild b/dev-java/ant-jai/ant-jai-1.8.4.ebuild
index e11a645b5020..2c65130ee373 100644
--- a/dev-java/ant-jai/ant-jai-1.8.4.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.8.4.ebuild,v 1.2 2012/06/11 09:33:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.8.4.ebuild,v 1.3 2012/06/11 13:05:53 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 # unmigrated, has textrels and there's also some source one now too
diff --git a/dev-java/ant-javamail/ChangeLog b/dev-java/ant-javamail/ChangeLog
index c75b18157d4b..656b86f4d531 100644
--- a/dev-java/ant-javamail/ChangeLog
+++ b/dev-java/ant-javamail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-javamail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.32 2012/06/11 09:34:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.33 2012/06/11 13:01:13 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-javamail-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-javamail-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild b/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild
index 78a3d591b5e3..97ff9194266f 100644
--- a/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild,v 1.2 2012/06/11 09:34:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild,v 1.3 2012/06/11 13:01:13 johu Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="--virtual javamail"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="java-virtuals/javamail
diff --git a/dev-java/ant-jdepend/ChangeLog b/dev-java/ant-jdepend/ChangeLog
index a9d3fda67fbc..a40ebd9b8841 100644
--- a/dev-java/ant-jdepend/ChangeLog
+++ b/dev-java/ant-jdepend/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-jdepend
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.30 2012/06/11 09:34:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.31 2012/06/11 13:14:42 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-jdepend-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-jdepend-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild
index 74d6d3c4896b..106f88343eb8 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild,v 1.2 2012/06/11 09:34:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild,v 1.3 2012/06/11 13:14:42 johu Exp $
 
 EAPI="4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/jdepend-2.9-r2:0"
diff --git a/dev-java/ant-jmf/ChangeLog b/dev-java/ant-jmf/ChangeLog
index a2ddbcfd175d..61c8ec672a59 100644
--- a/dev-java/ant-jmf/ChangeLog
+++ b/dev-java/ant-jmf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-jmf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.30 2012/06/11 09:35:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.31 2012/06/11 13:04:57 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-jmf-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-jmf-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild b/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild
index f07346f0ef03..840494557292 100644
--- a/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild,v 1.2 2012/06/11 09:35:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild,v 1.3 2012/06/11 13:04:57 johu Exp $
 
 EAPI="4"
 
@@ -11,5 +11,5 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)."
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-java/ant-jsch/ChangeLog b/dev-java/ant-jsch/ChangeLog
index ccb9edbd183a..7cd8ae170494 100644
--- a/dev-java/ant-jsch/ChangeLog
+++ b/dev-java/ant-jsch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-jsch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.34 2012/06/11 09:35:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.35 2012/06/11 12:57:32 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-jsch-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-jsch-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild b/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild
index 8117e9196752..a7f9ab79b701 100644
--- a/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild,v 1.2 2012/06/11 09:35:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild,v 1.3 2012/06/11 12:57:32 johu Exp $
 
 EAPI="4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-java/jsch-0.1.37:0"
diff --git a/dev-java/ant-junit/ChangeLog b/dev-java/ant-junit/ChangeLog
index 0632673bfb45..d7bf98667bdc 100644
--- a/dev-java/ant-junit/ChangeLog
+++ b/dev-java/ant-junit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-junit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.32 2012/06/11 09:36:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.33 2012/06/11 13:08:05 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-junit-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-junit-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-junit/ant-junit-1.8.4.ebuild b/dev-java/ant-junit/ant-junit-1.8.4.ebuild
index 32ab26064175..376b1983af27 100644
--- a/dev-java/ant-junit/ant-junit-1.8.4.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.8.4.ebuild,v 1.2 2012/06/11 09:36:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.8.4.ebuild,v 1.3 2012/06/11 13:08:05 johu Exp $
 
 EAPI="4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-java/junit:0"
diff --git a/dev-java/ant-junit4/ChangeLog b/dev-java/ant-junit4/ChangeLog
index 31c6eb6a08ef..e916b2356ca5 100644
--- a/dev-java/ant-junit4/ChangeLog
+++ b/dev-java/ant-junit4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-junit4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.21 2012/06/11 09:36:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.22 2012/06/11 12:53:07 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-junit4-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-junit4-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild b/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild
index 1f3ef593ecfb..4b900a0a86b0 100644
--- a/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild,v 1.2 2012/06/11 09:36:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild,v 1.3 2012/06/11 12:53:07 johu Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME="junit-4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-java/junit:4
diff --git a/dev-java/ant-nodeps/ChangeLog b/dev-java/ant-nodeps/ChangeLog
index 30eb115d7e23..a323a0a07d67 100644
--- a/dev-java/ant-nodeps/ChangeLog
+++ b/dev-java/ant-nodeps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-nodeps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.36 2012/06/11 09:37:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.37 2012/06/11 13:12:45 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-nodeps-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-nodeps-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild
index fff30fe7a054..d936cbf9fff2 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild,v 1.2 2012/06/11 09:37:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild,v 1.3 2012/06/11 13:12:45 johu Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
 inherit ant-tasks
 
 DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4" #jar
diff --git a/dev-java/ant-swing/ChangeLog b/dev-java/ant-swing/ChangeLog
index 63f1e645af7f..a10dd5313f9a 100644
--- a/dev-java/ant-swing/ChangeLog
+++ b/dev-java/ant-swing/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-swing
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.31 2012/06/11 09:37:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.32 2012/06/11 13:10:48 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-swing-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-swing-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-swing/ant-swing-1.8.4.ebuild b/dev-java/ant-swing/ant-swing-1.8.4.ebuild
index d1ac44e0a853..c65582818f1c 100644
--- a/dev-java/ant-swing/ant-swing-1.8.4.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.8.4.ebuild,v 1.2 2012/06/11 09:37:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.8.4.ebuild,v 1.3 2012/06/11 13:10:48 johu Exp $
 
 EAPI="4"
 # no extra deps
@@ -10,5 +10,5 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Swing."
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-java/ant-testutil/ChangeLog b/dev-java/ant-testutil/ChangeLog
index a4e2cc65458c..13b81a7d2f45 100644
--- a/dev-java/ant-testutil/ChangeLog
+++ b/dev-java/ant-testutil/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-testutil
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.14 2012/06/11 09:38:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.15 2012/06/11 13:08:57 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-testutil-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-testutil-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild b/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild
index 0de16d861aa2..587d15f71f8c 100644
--- a/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild,v 1.2 2012/06/11 09:38:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild,v 1.3 2012/06/11 13:08:57 johu Exp $
 
 EAPI="4"
 
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="virtual/jdk:1.6
 	dev-java/junit:4
diff --git a/dev-java/ant-trax/ChangeLog b/dev-java/ant-trax/ChangeLog
index b9d134ebcbfc..030cf07c5a30 100644
--- a/dev-java/ant-trax/ChangeLog
+++ b/dev-java/ant-trax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-trax
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.32 2012/06/11 09:38:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.33 2012/06/11 12:55:28 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-trax-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-trax-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant-trax/ant-trax-1.8.4.ebuild b/dev-java/ant-trax/ant-trax-1.8.4.ebuild
index 2cc2d0fb7d3e..167f1a7d0861 100644
--- a/dev-java/ant-trax/ant-trax-1.8.4.ebuild
+++ b/dev-java/ant-trax/ant-trax-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.8.4.ebuild,v 1.2 2012/06/11 09:38:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.8.4.ebuild,v 1.3 2012/06/11 12:55:28 johu Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4" #jar
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 97d59f93ee96..8e9a5a1685e2 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.135 2012/06/11 09:27:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.136 2012/06/11 12:54:25 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> ant-1.8.4.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ant-1.8.4.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/ant/ant-1.8.4.ebuild b/dev-java/ant/ant-1.8.4.ebuild
index 20f122660c86..5fca9b7fb682 100644
--- a/dev-java/ant/ant-1.8.4.ebuild
+++ b/dev-java/ant/ant-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.8.4.ebuild,v 1.2 2012/06/11 09:27:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.8.4.ebuild,v 1.3 2012/06/11 12:54:25 johu Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="~dev-java/ant-core-${PV}"
diff --git a/dev-java/commons-compress/ChangeLog b/dev-java/commons-compress/ChangeLog
index 3c93ae3c7f45..0878cbedf92a 100644
--- a/dev-java/commons-compress/ChangeLog
+++ b/dev-java/commons-compress/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-compress
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/ChangeLog,v 1.7 2012/06/11 09:39:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/ChangeLog,v 1.8 2012/06/11 13:07:01 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> commons-compress-1.4.1.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> commons-compress-1.4.1.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/commons-compress/commons-compress-1.4.1.ebuild b/dev-java/commons-compress/commons-compress-1.4.1.ebuild
index 9f6d3dfc9880..340774120227 100644
--- a/dev-java/commons-compress/commons-compress-1.4.1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/commons-compress-1.4.1.ebuild,v 1.2 2012/06/11 09:39:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/commons-compress-1.4.1.ebuild,v 1.3 2012/06/11 13:07:01 johu Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="dev-java/xz-java"
diff --git a/dev-java/xz-java/ChangeLog b/dev-java/xz-java/ChangeLog
index 6180fe34d272..aa032d3bfd3e 100644
--- a/dev-java/xz-java/ChangeLog
+++ b/dev-java/xz-java/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xz-java
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xz-java/ChangeLog,v 1.2 2012/06/11 09:39:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xz-java/ChangeLog,v 1.3 2012/06/11 13:06:25 johu Exp $
+
+  11 Jun 2012; Johannes Huber <johu@gentoo.org> xz-java-1.0.ebuild:
+  Stable for x86, wrt bug #417909
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> xz-java-1.0.ebuild:
   Stable for amd64, wrt bug #417909
diff --git a/dev-java/xz-java/xz-java-1.0.ebuild b/dev-java/xz-java/xz-java-1.0.ebuild
index 215db43eb77a..1c87e297d49b 100644
--- a/dev-java/xz-java/xz-java-1.0.ebuild
+++ b/dev-java/xz-java/xz-java-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xz-java/xz-java-1.0.ebuild,v 1.2 2012/06/11 09:39:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xz-java/xz-java-1.0.ebuild,v 1.3 2012/06/11 13:06:25 johu Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://tukaani.org/xz/${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""