summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-10-11 17:34:59 +0200
committerMichał Górny <mgorny@gentoo.org>2019-10-11 17:34:59 +0200
commit9bfc012dae9f21468ac7f4891f96c2e7aa88b77a (patch)
treed7522be83295e70a64b608d9a61350b10ff05fce
parentdev-qt: Remove *-fbsd KEYWORDS (diff)
downloadgentoo-9bfc012dae9f21468ac7f4891f96c2e7aa88b77a.tar.gz
gentoo-9bfc012dae9f21468ac7f4891f96c2e7aa88b77a.tar.bz2
gentoo-9bfc012dae9f21468ac7f4891f96c2e7aa88b77a.zip
dev-ruby: Remove *-fbsd KEYWORDS
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild2
-rw-r--r--dev-ruby/ascii85/ascii85-1.0.3.ebuild2
-rw-r--r--dev-ruby/bacon/bacon-1.2.0-r2.ebuild2
-rw-r--r--dev-ruby/bcat/bcat-0.6.2-r3.ebuild2
-rw-r--r--dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild2
-rw-r--r--dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild2
-rw-r--r--dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild2
-rw-r--r--dev-ruby/builder/builder-3.2.3.ebuild2
-rw-r--r--dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild2
-rw-r--r--dev-ruby/bundler-audit/bundler-audit-0.6.1.ebuild2
-rw-r--r--dev-ruby/bundler/bundler-1.16.1.ebuild2
-rw-r--r--dev-ruby/bundler/bundler-1.16.6.ebuild2
-rw-r--r--dev-ruby/bundler/bundler-1.17.3.ebuild2
-rw-r--r--dev-ruby/chronic/chronic-0.10.2.ebuild2
-rw-r--r--dev-ruby/cri/cri-2.15.5.ebuild2
-rw-r--r--dev-ruby/cri/cri-2.15.6.ebuild2
-rw-r--r--dev-ruby/cri/cri-2.15.7.ebuild2
-rw-r--r--dev-ruby/cri/cri-2.15.9.ebuild2
-rw-r--r--dev-ruby/daemons/daemons-1.2.6.ebuild2
-rw-r--r--dev-ruby/daemons/daemons-1.3.0.ebuild2
-rw-r--r--dev-ruby/daemons/daemons-1.3.1.ebuild2
-rw-r--r--dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild2
-rw-r--r--dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild2
-rw-r--r--dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild2
-rw-r--r--dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild2
-rw-r--r--dev-ruby/diff-lcs/diff-lcs-1.3.ebuild2
-rw-r--r--dev-ruby/fakefs/fakefs-0.19.2.ebuild2
-rw-r--r--dev-ruby/fakefs/fakefs-0.20.0.ebuild2
-rw-r--r--dev-ruby/fakefs/fakefs-0.20.1.ebuild2
-rw-r--r--dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild2
-rw-r--r--dev-ruby/fattr/fattr-2.3.0.ebuild2
-rw-r--r--dev-ruby/fattr/fattr-2.4.0.ebuild2
-rw-r--r--dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild2
-rw-r--r--dev-ruby/flexmock/flexmock-2.3.6.ebuild2
-rw-r--r--dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild2
-rw-r--r--dev-ruby/hoe/hoe-3.16.0.ebuild2
-rw-r--r--dev-ruby/hoe/hoe-3.17.1.ebuild2
-rw-r--r--dev-ruby/hoe/hoe-3.17.2.ebuild2
-rw-r--r--dev-ruby/hoe/hoe-3.18.0.ebuild2
-rw-r--r--dev-ruby/hoe/hoe-3.18.1.ebuild2
-rw-r--r--dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild2
-rw-r--r--dev-ruby/httpclient/httpclient-2.8.3.ebuild2
-rw-r--r--dev-ruby/json/json-1.8.6-r1.ebuild2
-rw-r--r--dev-ruby/json/json-2.1.0-r1.ebuild2
-rw-r--r--dev-ruby/json/json-2.1.0.ebuild2
-rw-r--r--dev-ruby/json/json-2.2.0.ebuild2
-rw-r--r--dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild2
-rw-r--r--dev-ruby/libxml/libxml-2.9.0.ebuild2
-rw-r--r--dev-ruby/liquid/liquid-2.6.2.ebuild2
-rw-r--r--dev-ruby/metaclass/metaclass-0.0.4.ebuild2
-rw-r--r--dev-ruby/mime-types-data/mime-types-data-3.2019.0331.ebuild2
-rw-r--r--dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild2
-rw-r--r--dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild2
-rw-r--r--dev-ruby/mime-types/mime-types-1.25.1.ebuild2
-rw-r--r--dev-ruby/mime-types/mime-types-2.99.2.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-4.7.5-r2.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-5.10.3.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-5.11.3.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-5.12.0.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-5.12.2.ebuild2
-rw-r--r--dev-ruby/msgpack/msgpack-1.2.10.ebuild2
-rw-r--r--dev-ruby/msgpack/msgpack-1.3.0.ebuild2
-rw-r--r--dev-ruby/msgpack/msgpack-1.3.1.ebuild2
-rw-r--r--dev-ruby/multi_json/multi_json-1.13.1.ebuild2
-rw-r--r--dev-ruby/mustache/mustache-1.0.5.ebuild2
-rw-r--r--dev-ruby/mustache/mustache-1.1.0.ebuild2
-rw-r--r--dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild2
-rw-r--r--dev-ruby/net-telnet/net-telnet-0.2.0.ebuild2
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.10.4.ebuild2
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.8.4.ebuild2
-rw-r--r--dev-ruby/pg/pg-0.21.0.ebuild2
-rw-r--r--dev-ruby/pg/pg-1.0.0.ebuild2
-rw-r--r--dev-ruby/pg/pg-1.1.4.ebuild2
-rw-r--r--dev-ruby/polyglot/polyglot-0.3.5.ebuild2
-rw-r--r--dev-ruby/power_assert/power_assert-1.1.1.ebuild2
-rw-r--r--dev-ruby/power_assert/power_assert-1.1.2.ebuild2
-rw-r--r--dev-ruby/power_assert/power_assert-1.1.3.ebuild2
-rw-r--r--dev-ruby/power_assert/power_assert-1.1.4.ebuild2
-rw-r--r--dev-ruby/power_assert/power_assert-1.1.5.ebuild2
-rw-r--r--dev-ruby/racc/racc-1.4.14.ebuild2
-rw-r--r--dev-ruby/rack/rack-1.6.11.ebuild2
-rw-r--r--dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild2
-rw-r--r--dev-ruby/rake-compiler/rake-compiler-1.0.8.ebuild2
-rw-r--r--dev-ruby/rake/rake-12.3.1.ebuild2
-rw-r--r--dev-ruby/rake/rake-12.3.2.ebuild2
-rw-r--r--dev-ruby/rake/rake-12.3.3.ebuild2
-rw-r--r--dev-ruby/rake/rake-13.0.0.ebuild2
-rw-r--r--dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-5.1.0.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-6.1.1.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-6.1.2.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-6.2.0.ebuild2
-rw-r--r--dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild2
-rw-r--r--dev-ruby/rexical/rexical-1.0.5-r3.ebuild2
-rw-r--r--dev-ruby/rexical/rexical-1.0.7.ebuild2
-rw-r--r--dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild2
-rw-r--r--dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild2
-rw-r--r--dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild2
-rw-r--r--dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild2
-rw-r--r--dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild2
-rw-r--r--dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild2
-rw-r--r--dev-ruby/rspec/rspec-2.99.0.ebuild2
-rw-r--r--dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild2
-rw-r--r--dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild2
-rw-r--r--dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild2
-rw-r--r--dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild2
-rw-r--r--dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild2
-rw-r--r--dev-ruby/ruby2ruby/ruby2ruby-2.4.3.ebuild2
-rw-r--r--dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild2
-rw-r--r--dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild2
-rw-r--r--dev-ruby/ruby_parser/ruby_parser-3.14.0.ebuild2
-rw-r--r--dev-ruby/rubygems/rubygems-2.7.10.ebuild2
-rw-r--r--dev-ruby/rubygems/rubygems-2.7.9.ebuild2
-rw-r--r--dev-ruby/rubygems/rubygems-3.0.3.ebuild2
-rw-r--r--dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild2
-rw-r--r--dev-ruby/rubygems/rubygems-3.0.6.ebuild2
-rw-r--r--dev-ruby/rubyzip/rubyzip-1.2.2.ebuild2
-rw-r--r--dev-ruby/rubyzip/rubyzip-1.2.3.ebuild2
-rw-r--r--dev-ruby/rubyzip/rubyzip-1.2.4.ebuild2
-rw-r--r--dev-ruby/rubyzip/rubyzip-1.3.0.ebuild2
-rw-r--r--dev-ruby/rubyzip/rubyzip-2.0.0.ebuild2
-rw-r--r--dev-ruby/session/session-3.2.0.ebuild2
-rw-r--r--dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild2
-rw-r--r--dev-ruby/sexp_processor/sexp_processor-4.12.1.ebuild2
-rw-r--r--dev-ruby/sexp_processor/sexp_processor-4.13.0.ebuild2
-rw-r--r--dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild2
-rw-r--r--dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild2
-rw-r--r--dev-ruby/spork/spork-0.9.2-r2.ebuild2
-rw-r--r--dev-ruby/syntax/syntax-1.2.2.ebuild2
-rw-r--r--dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild2
-rw-r--r--dev-ruby/test-unit/test-unit-3.2.7.ebuild2
-rw-r--r--dev-ruby/test-unit/test-unit-3.3.1.ebuild2
-rw-r--r--dev-ruby/test-unit/test-unit-3.3.2.ebuild2
-rw-r--r--dev-ruby/test-unit/test-unit-3.3.3.ebuild2
-rw-r--r--dev-ruby/test-unit/test-unit-3.3.4.ebuild2
-rw-r--r--dev-ruby/timecop/timecop-0.8.1.ebuild2
-rw-r--r--dev-ruby/timecop/timecop-0.9.1.ebuild2
-rw-r--r--dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild2
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild2
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild2
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild2
-rw-r--r--dev-ruby/yard/yard-0.9.20.ebuild2
-rw-r--r--dev-ruby/zentest/zentest-4.11.1.ebuild2
-rw-r--r--dev-ruby/zentest/zentest-4.11.2.ebuild2
-rw-r--r--dev-ruby/zentest/zentest-4.12.0.ebuild2
146 files changed, 146 insertions, 146 deletions
diff --git a/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild b/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
index a1adb044cc31..8e40be003b2d 100644
--- a/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
+++ b/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/datawraith/ascii85gem"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/ascii85/ascii85-1.0.3.ebuild b/dev-ruby/ascii85/ascii85-1.0.3.ebuild
index 74be1124c4b7..c0a7a24dc2dd 100644
--- a/dev-ruby/ascii85/ascii85-1.0.3.ebuild
+++ b/dev-ruby/ascii85/ascii85-1.0.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/datawraith/ascii85gem"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
index 329623b0b7cc..7de444e63633 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://chneukirchen.org/repos/bacon"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc 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/rdoc )"
diff --git a/dev-ruby/bcat/bcat-0.6.2-r3.ebuild b/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
index 003a4dc0803a..93f9236d83cd 100644
--- a/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/bcat"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
# Collides on /usr/bin/bcat, bug 418301
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 3c7e313f372d..a23e40f3c08c 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
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~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/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild
index 774897c69c35..0e5740a2ea39 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~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/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
index 929efd4d33e7..ff3605358cfa 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~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/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index 03fd11cf1634..ab20d903f33d 100644
--- a/dev-ruby/builder/builder-3.2.3.ebuild
+++ b/dev-ruby/builder/builder-3.2.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://onestepback.org/"
LICENSE="MIT"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild
index 56e93e5a0a42..e94212927181 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rubysec/bundler-audit"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
#tests are trying to download AND have some odd failures
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.6.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.6.1.ebuild
index 10d056040bb7..12400e481ca1 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.6.1.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.6.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rubysec/bundler-audit"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
#tests are trying to download AND have some odd failures
diff --git a/dev-ruby/bundler/bundler-1.16.1.ebuild b/dev-ruby/bundler/bundler-1.16.1.ebuild
index 59b671f488f0..56a0a9e071de 100644
--- a/dev-ruby/bundler/bundler-1.16.1.ebuild
+++ b/dev-ruby/bundler/bundler-1.16.1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+doc test"
ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-1.16.6.ebuild b/dev-ruby/bundler/bundler-1.16.6.ebuild
index a42efb0f3a6e..ffe47f941a71 100644
--- a/dev-ruby/bundler/bundler-1.16.6.ebuild
+++ b/dev-ruby/bundler/bundler-1.16.6.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+doc test"
ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-1.17.3.ebuild b/dev-ruby/bundler/bundler-1.17.3.ebuild
index 4053b30a5d18..d9b30d91afb5 100644
--- a/dev-ruby/bundler/bundler-1.17.3.ebuild
+++ b/dev-ruby/bundler/bundler-1.17.3.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+doc test"
ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/chronic/chronic-0.10.2.ebuild b/dev-ruby/chronic/chronic-0.10.2.ebuild
index 83456930f863..6cc3e8ab1652 100644
--- a/dev-ruby/chronic/chronic-0.10.2.ebuild
+++ b/dev-ruby/chronic/chronic-0.10.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Chronic is a natural language date/time parser written in pure Ruby
HOMEPAGE="https://github.com/mojombo/chronic"
LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/cri/cri-2.15.5.ebuild b/dev-ruby/cri/cri-2.15.5.ebuild
index 121074120806..43822a9171c7 100644
--- a/dev-ruby/cri/cri-2.15.5.ebuild
+++ b/dev-ruby/cri/cri-2.15.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
HOMEPAGE="https://rubygems.org/gems/cri"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/cri/cri-2.15.6.ebuild b/dev-ruby/cri/cri-2.15.6.ebuild
index 121074120806..43822a9171c7 100644
--- a/dev-ruby/cri/cri-2.15.6.ebuild
+++ b/dev-ruby/cri/cri-2.15.6.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
HOMEPAGE="https://rubygems.org/gems/cri"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/cri/cri-2.15.7.ebuild b/dev-ruby/cri/cri-2.15.7.ebuild
index 121074120806..43822a9171c7 100644
--- a/dev-ruby/cri/cri-2.15.7.ebuild
+++ b/dev-ruby/cri/cri-2.15.7.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
HOMEPAGE="https://rubygems.org/gems/cri"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/cri/cri-2.15.9.ebuild b/dev-ruby/cri/cri-2.15.9.ebuild
index 121074120806..43822a9171c7 100644
--- a/dev-ruby/cri/cri-2.15.9.ebuild
+++ b/dev-ruby/cri/cri-2.15.9.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
HOMEPAGE="https://rubygems.org/gems/cri"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/daemons/daemons-1.2.6.ebuild b/dev-ruby/daemons/daemons-1.2.6.ebuild
index f9541d84a5b3..95799d2b1558 100644
--- a/dev-ruby/daemons/daemons-1.2.6.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples"
all_ruby_prepare() {
diff --git a/dev-ruby/daemons/daemons-1.3.0.ebuild b/dev-ruby/daemons/daemons-1.3.0.ebuild
index c11106d3dddc..2c9d05d6381d 100644
--- a/dev-ruby/daemons/daemons-1.3.0.ebuild
+++ b/dev-ruby/daemons/daemons-1.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples"
all_ruby_prepare() {
diff --git a/dev-ruby/daemons/daemons-1.3.1.ebuild b/dev-ruby/daemons/daemons-1.3.1.ebuild
index 993386b96395..1e89805c4424 100644
--- a/dev-ruby/daemons/daemons-1.3.1.ebuild
+++ b/dev-ruby/daemons/daemons-1.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples"
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
index 2b7957f10758..cea9a7d76afa 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
index 2645ff701740..be0fdc090718 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
index aa7778cb36c8..cc04c59b80d3 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
index 6d58ce349d0e..df99e515b0c7 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index e46e2d2d75b5..9937dae0f610 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
LICENSE="|| ( MIT Ruby GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/fakefs/fakefs-0.19.2.ebuild b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
index f3c2663d2458..38ad70a86a5e 100644
--- a/dev-ruby/fakefs/fakefs-0.19.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-0.20.0.ebuild b/dev-ruby/fakefs/fakefs-0.20.0.ebuild
index e529ce1f1e18..4f87cbb7339b 100644
--- a/dev-ruby/fakefs/fakefs-0.20.0.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.20.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-0.20.1.ebuild b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
index e529ce1f1e18..4f87cbb7339b 100644
--- a/dev-ruby/fakefs/fakefs-0.20.1.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
index c8d176efc958..079beb1f2386 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/rack )"
diff --git a/dev-ruby/fattr/fattr-2.3.0.ebuild b/dev-ruby/fattr/fattr-2.3.0.ebuild
index 2a0c2f23d0f5..3b786a689bd7 100644
--- a/dev-ruby/fattr/fattr-2.3.0.ebuild
+++ b/dev-ruby/fattr/fattr-2.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ahoward/fattr"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
each_ruby_test() {
diff --git a/dev-ruby/fattr/fattr-2.4.0.ebuild b/dev-ruby/fattr/fattr-2.4.0.ebuild
index 2608fea03154..e640825cc05c 100644
--- a/dev-ruby/fattr/fattr-2.4.0.ebuild
+++ b/dev-ruby/fattr/fattr-2.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ahoward/fattr"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
each_ruby_test() {
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
index ba3368437496..21f077491add 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
@@ -14,7 +14,7 @@ inherit multilib ruby-fakegem
DESCRIPTION="FastCGI library for Ruby"
HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
LICENSE="Ruby"
DEPEND+=" dev-libs/fcgi"
diff --git a/dev-ruby/flexmock/flexmock-2.3.6.ebuild b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
index 9480ecc65b84..b77e8231e91d 100644
--- a/dev-ruby/flexmock/flexmock-2.3.6.ebuild
+++ b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="flexmock"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~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 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
index 7dc7d7495da8..4ddddfb0fac0 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/seattlerb/hoe-seattlerb"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/hoe/hoe-3.16.0.ebuild b/dev-ruby/hoe/hoe-3.16.0.ebuild
index a6c609b2b33d..f364dd853275 100644
--- a/dev-ruby/hoe/hoe-3.16.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.16.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.17.1.ebuild b/dev-ruby/hoe/hoe-3.17.1.ebuild
index 97eae8a9094b..b83e7ee54736 100644
--- a/dev-ruby/hoe/hoe-3.17.1.ebuild
+++ b/dev-ruby/hoe/hoe-3.17.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.17.2.ebuild b/dev-ruby/hoe/hoe-3.17.2.ebuild
index daae06b70ab2..2267b1b7e3dc 100644
--- a/dev-ruby/hoe/hoe-3.17.2.ebuild
+++ b/dev-ruby/hoe/hoe-3.17.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.18.0.ebuild b/dev-ruby/hoe/hoe-3.18.0.ebuild
index 2e01454d1f5e..09811c75d60a 100644
--- a/dev-ruby/hoe/hoe-3.18.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.18.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.18.1.ebuild b/dev-ruby/hoe/hoe-3.18.1.ebuild
index b73f4d8d066b..877de98a25eb 100644
--- a/dev-ruby/hoe/hoe-3.18.1.ebuild
+++ b/dev-ruby/hoe/hoe-3.18.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
index 37b4e3442dc9..40d8ab477f20 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/httpclient/httpclient-2.8.3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
index 67d4a172c85d..c26f863a9f25 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild b/dev-ruby/json/json-1.8.6-r1.ebuild
index 642bdbdac71d..9368dbf0e671 100644
--- a/dev-ruby/json/json-1.8.6-r1.ebuild
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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/json/json-2.1.0-r1.ebuild b/dev-ruby/json/json-2.1.0-r1.ebuild
index 74c58ff51b81..cfac1024c4d7 100644
--- a/dev-ruby/json/json-2.1.0-r1.ebuild
+++ b/dev-ruby/json/json-2.1.0-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="Ruby"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="2"
IUSE=""
diff --git a/dev-ruby/json/json-2.1.0.ebuild b/dev-ruby/json/json-2.1.0.ebuild
index 0c96b2f44491..5ed953f6b777 100644
--- a/dev-ruby/json/json-2.1.0.ebuild
+++ b/dev-ruby/json/json-2.1.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="Ruby"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="2"
IUSE=""
diff --git a/dev-ruby/json/json-2.2.0.ebuild b/dev-ruby/json/json-2.2.0.ebuild
index 23dd9b0de55c..c7d0735f909f 100644
--- a/dev-ruby/json/json-2.2.0.ebuild
+++ b/dev-ruby/json/json-2.2.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="Ruby"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="2"
IUSE=""
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
index 2e7cec56d9ea..d1f88aa53ab2 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/libxml/libxml-2.9.0.ebuild b/dev-ruby/libxml/libxml-2.9.0.ebuild
index 0d60009df211..428a770181e3 100644
--- a/dev-ruby/libxml/libxml-2.9.0.ebuild
+++ b/dev-ruby/libxml/libxml-2.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/xml4r/libxml-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~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 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/libxml2"
diff --git a/dev-ruby/liquid/liquid-2.6.2.ebuild b/dev-ruby/liquid/liquid-2.6.2.ebuild
index cf42aa9c4b8c..944d89c31008 100644
--- a/dev-ruby/liquid/liquid-2.6.2.ebuild
+++ b/dev-ruby/liquid/liquid-2.6.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.liquidmarkup.org/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
IUSE=""
ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
diff --git a/dev-ruby/metaclass/metaclass-0.0.4.ebuild b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
index 30366f63d6ce..1a49376543fa 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2019.0331.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2019.0331.ebuild
index f9a7bb2eccab..124e3c30d812 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2019.0331.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2019.0331.ebuild
@@ -19,5 +19,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild
index 1b219150f2e1..cdd0f1ad2d35 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
index 1b219150f2e1..cdd0f1ad2d35 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/mime-types/mime-types-1.25.1.ebuild b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
index e6db30968360..516924aeb0f7 100644
--- a/dev-ruby/mime-types/mime-types-1.25.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/mime-types/"
LICENSE="MIT Artistic GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~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 ~ia64 ppc 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/minitest:5 )"
diff --git a/dev-ruby/mime-types/mime-types-2.99.2.ebuild b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
index 1e48a7c773fd..663b07fdb3c2 100644
--- a/dev-ruby/mime-types/mime-types-2.99.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
LICENSE="MIT Artistic GPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc 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/minitest:5 )"
diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index 9186b641bc9c..7397bdd3279c 100644
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.10.3.ebuild b/dev-ruby/minitest/minitest-5.10.3.ebuild
index 683ee160490d..6efe2c6d2256 100644
--- a/dev-ruby/minitest/minitest-5.10.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.10.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.11.3.ebuild b/dev-ruby/minitest/minitest-5.11.3.ebuild
index 255fb224a312..3e128abcfd78 100644
--- a/dev-ruby/minitest/minitest-5.11.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.11.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.12.0.ebuild b/dev-ruby/minitest/minitest-5.12.0.ebuild
index f32b6e9bead5..a3e50f68ee5e 100644
--- a/dev-ruby/minitest/minitest-5.12.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.12.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.12.2.ebuild b/dev-ruby/minitest/minitest-5.12.2.ebuild
index f32b6e9bead5..a3e50f68ee5e 100644
--- a/dev-ruby/minitest/minitest-5.12.2.ebuild
+++ b/dev-ruby/minitest/minitest-5.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/msgpack/msgpack-1.2.10.ebuild b/dev-ruby/msgpack/msgpack-1.2.10.ebuild
index 2fb63620569b..2a5c4ed7c274 100644
--- a/dev-ruby/msgpack/msgpack-1.2.10.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.2.10.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://msgpack.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE="doc"
all_ruby_prepare() {
diff --git a/dev-ruby/msgpack/msgpack-1.3.0.ebuild b/dev-ruby/msgpack/msgpack-1.3.0.ebuild
index 822d7d1185dd..387a0163f9f7 100644
--- a/dev-ruby/msgpack/msgpack-1.3.0.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://msgpack.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE="doc"
all_ruby_prepare() {
diff --git a/dev-ruby/msgpack/msgpack-1.3.1.ebuild b/dev-ruby/msgpack/msgpack-1.3.1.ebuild
index 25f1ba919b78..2c3dd30da97d 100644
--- a/dev-ruby/msgpack/msgpack-1.3.1.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.3.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://msgpack.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE="doc"
all_ruby_prepare() {
diff --git a/dev-ruby/multi_json/multi_json-1.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
index da4329ed04f2..1af108d4c8ea 100644
--- a/dev-ruby/multi_json/multi_json-1.13.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
HOMEPAGE="https://github.com/intridea/multi_json"
LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~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/mustache/mustache-1.0.5.ebuild b/dev-ruby/mustache/mustache-1.0.5.ebuild
index a22b041c9db5..969b2795e677 100644
--- a/dev-ruby/mustache/mustache-1.0.5.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
IUSE=""
ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/mustache/mustache-1.1.0.ebuild b/dev-ruby/mustache/mustache-1.1.0.ebuild
index dac6491d9dab..e0aecc3821ec 100644
--- a/dev-ruby/mustache/mustache-1.1.0.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
index 353154de745d..e00546f14152 100644
--- a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="|| ( Ruby-BSD BSD-2 )"
SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
index 1a8bbaedbe75..f3d734cc07be 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="|| ( Ruby-BSD BSD-2 )"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
index 3838c467ecf9..0442ab589dd3 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.nokogiri.org/"
LICENSE="MIT"
SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~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/nokogiri/nokogiri-1.8.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
index a7cdd2b51859..20c882ff2f74 100644
--- a/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.nokogiri.org/"
LICENSE="MIT"
SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~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/pg/pg-0.21.0.ebuild b/dev-ruby/pg/pg-0.21.0.ebuild
index a54007476b16..1ccf3eb56f94 100644
--- a/dev-ruby/pg/pg-0.21.0.ebuild
+++ b/dev-ruby/pg/pg-0.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/pg/pg-1.0.0.ebuild b/dev-ruby/pg/pg-1.0.0.ebuild
index dbbd6e9e775f..199ef0824212 100644
--- a/dev-ruby/pg/pg-1.0.0.ebuild
+++ b/dev-ruby/pg/pg-1.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/pg/pg-1.1.4.ebuild b/dev-ruby/pg/pg-1.1.4.ebuild
index 8bd2d9802d5e..a7c4f0a9a248 100644
--- a/dev-ruby/pg/pg-1.1.4.ebuild
+++ b/dev-ruby/pg/pg-1.1.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/polyglot/polyglot-0.3.5.ebuild b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
index e91fd98f7053..a8efe928b1b6 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Polyglot provides support for fully-custom DSLs"
HOMEPAGE="http://polyglot.rubyforge.org/"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~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/power_assert/power_assert-1.1.1.ebuild b/dev-ruby/power_assert/power_assert-1.1.1.ebuild
index 892be1449fca..6fa1787994e4 100644
--- a/dev-ruby/power_assert/power_assert-1.1.1.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.2.ebuild b/dev-ruby/power_assert/power_assert-1.1.2.ebuild
index d7094d7ebe93..f0298fc6e908 100644
--- a/dev-ruby/power_assert/power_assert-1.1.2.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.3.ebuild b/dev-ruby/power_assert/power_assert-1.1.3.ebuild
index ac1f12c73ec7..32d2a049c96b 100644
--- a/dev-ruby/power_assert/power_assert-1.1.3.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.4.ebuild b/dev-ruby/power_assert/power_assert-1.1.4.ebuild
index 636377560786..5dcb4085d5b2 100644
--- a/dev-ruby/power_assert/power_assert-1.1.4.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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/power_assert/power_assert-1.1.5.ebuild b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
index c79d9077379e..88baddde2b67 100644
--- a/dev-ruby/power_assert/power_assert-1.1.5.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 1f48b014e3d6..60cbea342b78 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/rack/rack-1.6.11.ebuild b/dev-ruby/rack/rack-1.6.11.ebuild
index 1805ef2e37db..b3501524df2d 100644
--- a/dev-ruby/rack/rack-1.6.11.ebuild
+++ b/dev-ruby/rack/rack-1.6.11.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rack.github.com/"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc 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 ${PN}-1.6-rewindable-ruby23.patch )
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild
index 8557f3df146e..cdb31526f20c 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild
@@ -17,7 +17,7 @@ LICENSE="MIT"
SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~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/rake-compiler/rake-compiler-1.0.8.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.8.ebuild
index 1c37feb616f3..0ccc304bef84 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.0.8.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.0.8.ebuild
@@ -17,7 +17,7 @@ LICENSE="MIT"
SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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/rake/rake-12.3.1.ebuild b/dev-ruby/rake/rake-12.3.1.ebuild
index 3a8fac384dd6..3ea356166b2f 100644
--- a/dev-ruby/rake/rake-12.3.1.ebuild
+++ b/dev-ruby/rake/rake-12.3.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-12.3.2.ebuild b/dev-ruby/rake/rake-12.3.2.ebuild
index fd7a9d42b88a..1db61dc6279d 100644
--- a/dev-ruby/rake/rake-12.3.2.ebuild
+++ b/dev-ruby/rake/rake-12.3.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-12.3.3.ebuild b/dev-ruby/rake/rake-12.3.3.ebuild
index a65e0ab0ae4b..d9d8710da0d8 100644
--- a/dev-ruby/rake/rake-12.3.3.ebuild
+++ b/dev-ruby/rake/rake-12.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-13.0.0.ebuild b/dev-ruby/rake/rake-13.0.0.ebuild
index 87784d9ab795..217d6fabbdc6 100644
--- a/dev-ruby/rake/rake-13.0.0.ebuild
+++ b/dev-ruby/rake/rake-13.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
index 28e30f07be3a..316e1addce23 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rtomayko/rdiscount"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
index 376d590165e2..fbbb3abe2d41 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/rdoc/rdoc-5.1.0.ebuild b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
index fc8b7303f2dc..a45e060eb775 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/rdoc/rdoc-6.1.1.ebuild b/dev-ruby/rdoc/rdoc-6.1.1.ebuild
index 199b9c46cd97..4f08dec6ad6e 100644
--- a/dev-ruby/rdoc/rdoc-6.1.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~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/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
index 8a8a4b4aaad6..30dccad0893d 100644
--- a/dev-ruby/rdoc/rdoc-6.1.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc"
diff --git a/dev-ruby/rdoc/rdoc-6.2.0.ebuild b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
index a3decb6aa3f9..e8d9b1397a75 100644
--- a/dev-ruby/rdoc/rdoc-6.2.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc"
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild
index 4f90940a75eb..191d9d353872 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/uwabami/rdtool"
LICENSE="Ruby GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
IUSE="emacs"
RDEPEND="${RDEPEND} emacs? ( virtual/emacs )"
diff --git a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
index a580c3ffa346..0a8b9b58f6a5 100644
--- a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
LICENSE="LGPL-2" # plus exception
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~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/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index 2e83f6f81ffa..3b435e81161c 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
LICENSE="LGPL-2" # plus exception
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~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/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
index 20f293c3ab7f..9fee4b3b0fa2 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
@@ -19,7 +19,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
index aa652bbfc94c..4e1758ed6bc8 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index aa652bbfc94c..4e1758ed6bc8 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index 3d8d64036b5e..185e565a5fc6 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index 91635a06d902..1ccac87ba937 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc 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/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index 14fb4e6a03c4..876214da2038 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index 31d9170c4fbc..a45719681c20 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc 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/ruby-dict/ruby-dict-0.9.4-r4.ebuild b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild
index 1b4cec261189..d333cb46cc3d 100644
--- a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild
+++ b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.caliban.org/files/ruby/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
RUBY_PATCHES=( "${PN}-ruby19.patch" )
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
index f2a31a2b0907..5ab14555862c 100644
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
+++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
DEPEND="${DEPEND} sys-apps/file test? ( >=sys-apps/file-5.30 )"
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
index af0511dbb7d4..b1ae93a641e1 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
IUSE="test"
diff --git a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
index f18b19866b41..004674447113 100644
--- a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
+++ b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/caiges/Ruby-RC4"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
index 1e01880cc9f5..8f6e77311763 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_rdepend "
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.3.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.3.ebuild
index c909c1fb777d..4884ba9d5395 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.3.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_rdepend "
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index 7eba78503ce8..f59e3fc1b7d5 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
index f43c6d39391a..9fea24c8891e 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ia64 ~ppc ~ppc64 ~sparc ~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/sexp_processor-4.9.0:4
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.0.ebuild
index 28723147b1c2..36c19efb7fc0 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.0.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ia64 ~ppc ~ppc64 ~sparc ~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/sexp_processor-4.9.0:4
diff --git a/dev-ruby/rubygems/rubygems-2.7.10.ebuild b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
index 32b53a378bf0..2abea0e5ee4a 100644
--- a/dev-ruby/rubygems/rubygems-2.7.10.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
diff --git a/dev-ruby/rubygems/rubygems-2.7.9.ebuild b/dev-ruby/rubygems/rubygems-2.7.9.ebuild
index 632eb8f13263..2f8d1b24d392 100644
--- a/dev-ruby/rubygems/rubygems-2.7.9.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
index 79490d5e46cf..487d9b16695f 100644
--- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
diff --git a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
index 34c2df4ae1b0..434413cd6d88 100644
--- a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
diff --git a/dev-ruby/rubygems/rubygems-3.0.6.ebuild b/dev-ruby/rubygems/rubygems-3.0.6.ebuild
index 9987aaa8187d..1f974d767941 100644
--- a/dev-ruby/rubygems/rubygems-3.0.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
index a5c305e6159e..9cfe3199e130 100644
--- a/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
LICENSE="Ruby"
SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.3.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.3.ebuild
index 165e218f146b..7f864a046e0d 100644
--- a/dev-ruby/rubyzip/rubyzip-1.2.3.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
LICENSE="Ruby"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.4.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.4.ebuild
index f43c15702d6c..c4e67bbb1c68 100644
--- a/dev-ruby/rubyzip/rubyzip-1.2.4.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.2.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
LICENSE="Ruby"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
index f43c15702d6c..c4e67bbb1c68 100644
--- a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
LICENSE="Ruby"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-ruby/rubyzip/rubyzip-2.0.0.ebuild b/dev-ruby/rubyzip/rubyzip-2.0.0.ebuild
index aa1ce0c98e0b..a876a5b8e416 100644
--- a/dev-ruby/rubyzip/rubyzip-2.0.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
LICENSE="Ruby"
SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index 0074f5c3fb75..be2ceb51799e 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
# by author.
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test"
DEPEND+=" test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) )"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
index bb2afd42c639..e38e46d1a497 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.12.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.12.1.ebuild
index da5ca5017d9a..02fb2ab7b997 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.12.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.12.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.13.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.13.0.ebuild
index b8f41f044369..8ce072937fd0 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.13.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.13.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
index e6184c8dc2c1..89a61cffd951 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/robbyrussell/shorturl/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-macos"
IUSE=""
# All tests require network connectivity.
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
index 9b6c217afa9e..750c5f519c4f 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
@@ -18,7 +18,7 @@ RUBY_S="thoughtbot-${PN}-*"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
# tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/spork/spork-0.9.2-r2.ebuild b/dev-ruby/spork/spork-0.9.2-r2.ebuild
index 7115fc1a15ed..2a7f32929128 100644
--- a/dev-ruby/spork/spork-0.9.2-r2.ebuild
+++ b/dev-ruby/spork/spork-0.9.2-r2.ebuild
@@ -16,6 +16,6 @@ DESCRIPTION="Spork is Tim Harper's implementation of test server"
HOMEPAGE="https://github.com/sporkrb/spork"
LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index f139d4b8ce9b..c2670433e227 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test doc"
ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
index d513a0591184..6c8130fed4cb 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
HOMEPAGE="https://flori.github.io/term-ansicolor/"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~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 ia64 ppc ppc64 ~sparc x86 ~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/test-unit/test-unit-3.2.7.ebuild b/dev-ruby/test-unit/test-unit-3.2.7.ebuild
index 18098e79954f..a0e2fe979481 100644
--- a/dev-ruby/test-unit/test-unit-3.2.7.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.2.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.1.ebuild b/dev-ruby/test-unit/test-unit-3.3.1.ebuild
index da020d3b86e0..5249d1cfb57b 100644
--- a/dev-ruby/test-unit/test-unit-3.3.1.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.2.ebuild b/dev-ruby/test-unit/test-unit-3.3.2.ebuild
index 11b3090e469e..f389d21f53ee 100644
--- a/dev-ruby/test-unit/test-unit-3.3.2.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.3.ebuild b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
index 45fa46d7a4a2..b83e3320bb3c 100644
--- a/dev-ruby/test-unit/test-unit-3.3.3.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.4.ebuild b/dev-ruby/test-unit/test-unit-3.3.4.ebuild
index 644815042734..4e96e19564b8 100644
--- a/dev-ruby/test-unit/test-unit-3.3.4.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/timecop/timecop-0.8.1.ebuild b/dev-ruby/timecop/timecop-0.8.1.ebuild
index 224e12a09298..b916263317e0 100644
--- a/dev-ruby/timecop/timecop-0.8.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.8.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
IUSE=""
# Missing testdep activesupport
diff --git a/dev-ruby/timecop/timecop-0.9.1.ebuild b/dev-ruby/timecop/timecop-0.9.1.ebuild
index 32ae668084d8..7e28559b5be0 100644
--- a/dev-ruby/timecop/timecop-0.9.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE=""
# Missing testdep activesupport
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
index 9ecbdd985be0..e2f6da16a570 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
index b91568acef13..d61d216ebf27 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
index d9cb6a9d9beb..a0212b69b6e2 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
index 984b8f365735..47d14e0c38d7 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yard/yard-0.9.20.ebuild b/dev-ruby/yard/yard-0.9.20.ebuild
index 5c5880dae066..ee11a25a3ff4 100644
--- a/dev-ruby/yard/yard-0.9.20.ebuild
+++ b/dev-ruby/yard/yard-0.9.20.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
index 546db06d651c..5d0e4964fff1 100644
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~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/zentest/zentest-4.11.2.ebuild b/dev-ruby/zentest/zentest-4.11.2.ebuild
index ab766d32f51a..5691149a3ef3 100644
--- a/dev-ruby/zentest/zentest-4.11.2.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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/zentest/zentest-4.12.0.ebuild b/dev-ruby/zentest/zentest-4.12.0.ebuild
index cee4f383b6c0..c150bd979c87 100644
--- a/dev-ruby/zentest/zentest-4.12.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.12.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""