diff --git a/dev-ruby/actionpack/actionpack-5.0.0.1.ebuild b/dev-ruby/actionpack/actionpack-5.0.0.1.ebuild
index cc890a93dff18..80ba7d6053c3c 100644
--- a/dev-ruby/actionpack/actionpack-5.0.0.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.0.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-5.0.0.1.ebuild b/dev-ruby/actionview/actionview-5.0.0.1.ebuild
index fae35cbc561e8..5ae2f31c06e77 100644
--- a/dev-ruby/actionview/actionview-5.0.0.1.ebuild
+++ b/dev-ruby/actionview/actionview-5.0.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~amd64-linux"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-5.0.0.1.ebuild b/dev-ruby/activemodel/activemodel-5.0.0.1.ebuild
index f4c5d2aec7882..efd0b42b82f81 100644
--- a/dev-ruby/activemodel/activemodel-5.0.0.1.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.0.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-5.0.0.1.ebuild b/dev-ruby/activesupport/activesupport-5.0.0.1.ebuild
index 623ff2d8c25f8..8ee4194c0688e 100644
--- a/dev-ruby/activesupport/activesupport-5.0.0.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.0.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/ammeter/ammeter-1.1.4.ebuild b/dev-ruby/ammeter/ammeter-1.1.4.ebuild
index 9611c04bc61ae..10763a043e70c 100644
--- a/dev-ruby/ammeter/ammeter-1.1.4.ebuild
+++ b/dev-ruby/ammeter/ammeter-1.1.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/alexrothenberg/ammeter"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 # Restrict tests since they now require the specific rspec version to be
diff --git a/dev-ruby/amq-protocol/amq-protocol-2.0.1-r1.ebuild b/dev-ruby/amq-protocol/amq-protocol-2.0.1-r1.ebuild
index b0c6aa80e22c6..3ec2d675c2dd8 100644
--- a/dev-ruby/amq-protocol/amq-protocol-2.0.1-r1.ebuild
+++ b/dev-ruby/amq-protocol/amq-protocol-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild
index be3bff13fee6b..10b540d9c8acd 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
 HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
index 3c993301ef3aa..349dfe0b52fe5 100644
--- a/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.2-r1.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.2-r1.ebuild
index 48d3ba4a74d5f..0c980867b9884 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.2-r1.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/contracts/contracts-0.14.0.ebuild b/dev-ruby/contracts/contracts-0.14.0.ebuild
index 0ac0fe20dd23a..9df001dc17f2c 100644
--- a/dev-ruby/contracts/contracts-0.14.0.ebuild
+++ b/dev-ruby/contracts/contracts-0.14.0.ebuild
@@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/ffi/ffi-1.9.14.ebuild b/dev-ruby/ffi/ffi-1.9.14.ebuild
index 33c9ca2223b7b..ab0421ad58974 100644
--- a/dev-ruby/ffi/ffi-1.9.14.ebuild
+++ b/dev-ruby/ffi/ffi-1.9.14.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" virtual/libffi"
 DEPEND+=" virtual/libffi"
diff --git a/dev-ruby/http-form_data/http-form_data-1.0.1-r1.ebuild b/dev-ruby/http-form_data/http-form_data-1.0.1-r1.ebuild
index 9c929e6a70e95..fa359b624114d 100644
--- a/dev-ruby/http-form_data/http-form_data-1.0.1-r1.ebuild
+++ b/dev-ruby/http-form_data/http-form_data-1.0.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/httprb/form_data.rb"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/listen/listen-3.1.5.ebuild b/dev-ruby/listen/listen-3.1.5.ebuild
index cfba6a995e4bb..a7ee91dc8723c 100644
--- a/dev-ruby/listen/listen-3.1.5.ebuild
+++ b/dev-ruby/listen/listen-3.1.5.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/maxitest/maxitest-2.2.0.ebuild b/dev-ruby/maxitest/maxitest-2.2.0.ebuild
index 116beb1e65a6b..5adb5063657df 100644
--- a/dev-ruby/maxitest/maxitest-2.2.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/minitest-5.10:5"
diff --git a/dev-ruby/msgpack/msgpack-1.0.1.ebuild b/dev-ruby/msgpack/msgpack-1.0.1.ebuild
index fc0ae75af735c..832bf00e19403 100644
--- a/dev-ruby/msgpack/msgpack-1.0.1.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://msgpack.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
index 2a8ca25d6afc0..1d044b9e6b6cb 100644
--- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/patron/patron-0.8.0.ebuild b/dev-ruby/patron/patron-0.8.0.ebuild
index 14a12a44cf38f..401e142bc7691 100644
--- a/dev-ruby/patron/patron-0.8.0.ebuild
+++ b/dev-ruby/patron/patron-0.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
index 1ab036d1d55bd..e886f0691b1dc 100644
--- a/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack/rack-2.0.1.ebuild b/dev-ruby/rack/rack-2.0.1.ebuild
index 3cd34d30502de..914d02338ce0e 100644
--- a/dev-ruby/rack/rack-2.0.1.ebuild
+++ b/dev-ruby/rack/rack-2.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.1-r1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.1-r1.ebuild
index 7fad8d32d29b2..0a026f0390198 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.1-r1.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild
index 19b00e4a26a98..07512c38244a0 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/loofah:0"
diff --git a/dev-ruby/railties/railties-5.0.0.1-r1.ebuild b/dev-ruby/railties/railties-5.0.0.1-r1.ebuild
index c65d0ae477904..94886f8182933 100644
--- a/dev-ruby/railties/railties-5.0.0.1-r1.ebuild
+++ b/dev-ruby/railties/railties-5.0.0.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.7-r1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.7-r1.ebuild
index fe6947deff198..54815772d59a0 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.7-r1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.9.7-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ffi"
diff --git a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.2.ebuild b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.2.ebuild
index d87dc1b68b06f..7ade24bcc202d 100644
--- a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.2.ebuild
+++ b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rspec/rspec-collection_matchers"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-expectations-3.0.0"
diff --git a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
index 07e4cff850bec..a45047d409db0 100644
--- a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
index 58165ecd5f500..4eec1b00c1d8d 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
index 55c5263c9476e..c9b98d0f07aae 100644
--- a/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rspec/rspec-its"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-core-3.0.0 >=dev-ruby/rspec-expectations-3.0.0"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
index 354afdb83848f..5051c1e0de3d3 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.5.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.5.2.ebuild
index 7c99c9ab17d81..740cc0d41af4e 100644
--- a/dev-ruby/rspec-rails/rspec-rails-3.5.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-3.5.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
index a4f52c15877f4..b6c2f80a275eb 100644
--- a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 )"
diff --git a/dev-ruby/rspec/rspec-3.5.0.ebuild b/dev-ruby/rspec/rspec-3.5.0.ebuild
index 5d6bb1cef8526..434ec93d137e1 100644
--- a/dev-ruby/rspec/rspec-3.5.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild b/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
index fc8d8ff0bda0a..a5fab2bf11f55 100644
--- a/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
+++ b/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/e2/ruby_dep"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
 IUSE=""
diff --git a/dev-ruby/thread_order/thread_order-1.1.0.ebuild b/dev-ruby/thread_order/thread_order-1.1.0.ebuild
index 994d2e174a340..db998f70cba96 100644
--- a/dev-ruby/thread_order/thread_order-1.1.0.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {