gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-ruby
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
330 files changed, 3828 insertions, 1369 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 5fd2313d610c..d6ec25cbb750 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index c6912ab38f7b..d0fdd02aeecd 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
-EBUILD abstract-1.0.0-r3.ebuild 659 BLAKE2B 0bea2692171b9ad0dbc7da692e624b207bd6ad0bfb6082f9f0a09d7f619f010b322e5a68d6ca916c26125aa03c2a59323f14c38cc6820bb602debbf4f68d727d SHA512 25c16a6ad19ba8b69c829679d5b1537e236781584b1f0f1c19b9e8cd6a088a7bdd010cddd6685029dd4ed5caaaf525d3063509af23d39171be876086a75b256b
+EBUILD abstract-1.0.0-r3.ebuild 658 BLAKE2B ca5f7e93597ec9e5458078ef3afd60b723def74cbb4e6d24b9340e0dc36eba4198140727009a39340d4ffaadfcc3ca31d99195b09cc4fb234cdc51771899ac69 SHA512 0328d00bfbbd9a73c9c40fb004f5c07e209aae36e8d26f01ebcca4069e00c96fc5fdfaa50c4512f1fb961358c49d3e47e385cee73f5d2579f25afe507386d285
 MISC metadata.xml 326 BLAKE2B 9d949e43d77128e14b13f83c61b85efa1d766d2b09b33aa10957282273b233bb5f6785b570e08249e3acc3920e3c5327fc834e8973d252519ec0963efdc379f4 SHA512 af7919ed026803725ee33c836a16034b32eade1a09f18ad5f5a506454fcdbbd2cab3cfc0e21c494ad1380795439719f83acbae1c3cc45a3cec6b1e02cebba390
diff --git a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
index b78a1555c0f7..0806b90da8a0 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rubygems.org/gems/abstract"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 each_ruby_test() {
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 9fbd35e1f7c5..dc3d856c2f11 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actioncable-5.2.4.3.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
 EBUILD actioncable-5.2.4.4.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
 EBUILD actioncable-6.0.3.2.ebuild 923 BLAKE2B 98c5fd05b489181f579430984ad50c31df2cb639199d399be21a7abdef9b7c7dfd79512b5811b03fc6c075a0df6eb2475d4ea00c9465864ae64f334fd5134196 SHA512 4fdda8df5f99493812de3eb83e8abee9228b7f003c76e47273844940132754d2532e6ad2d32cac21490930c127b3ca7cc28c3dea34074b8b9c61561233d1c629
 EBUILD actioncable-6.0.3.3.ebuild 923 BLAKE2B 98c5fd05b489181f579430984ad50c31df2cb639199d399be21a7abdef9b7c7dfd79512b5811b03fc6c075a0df6eb2475d4ea00c9465864ae64f334fd5134196 SHA512 4fdda8df5f99493812de3eb83e8abee9228b7f003c76e47273844940132754d2532e6ad2d32cac21490930c127b3ca7cc28c3dea34074b8b9c61561233d1c629
+EBUILD actioncable-6.0.3.4.ebuild 923 BLAKE2B 98c5fd05b489181f579430984ad50c31df2cb639199d399be21a7abdef9b7c7dfd79512b5811b03fc6c075a0df6eb2475d4ea00c9465864ae64f334fd5134196 SHA512 4fdda8df5f99493812de3eb83e8abee9228b7f003c76e47273844940132754d2532e6ad2d32cac21490930c127b3ca7cc28c3dea34074b8b9c61561233d1c629
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
new file mode 100644
index 000000000000..00434362e33e
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index f2ab143bf07a..30c43705a602 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,5 +1,7 @@
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actionmailbox-6.0.3.2.ebuild 1699 BLAKE2B dd3e90bf5ec06b80ea5f7d58e014fbab76dc5febbb9ad14bac7d9555a4a41bc6feba57ddf113011760ceb4d919053068f35cd895930e32cb9a361b61d7edc774 SHA512 d807966eaed11f03f2fd74824ebe7512c70446ec1b45a89eb4f90752aa6a59c3f1f614868dce1a2a15f49a2ec21df8d5bddcb7e3550155b04a88806f63249ef5
 EBUILD actionmailbox-6.0.3.3.ebuild 1699 BLAKE2B dd3e90bf5ec06b80ea5f7d58e014fbab76dc5febbb9ad14bac7d9555a4a41bc6feba57ddf113011760ceb4d919053068f35cd895930e32cb9a361b61d7edc774 SHA512 d807966eaed11f03f2fd74824ebe7512c70446ec1b45a89eb4f90752aa6a59c3f1f614868dce1a2a15f49a2ec21df8d5bddcb7e3550155b04a88806f63249ef5
+EBUILD actionmailbox-6.0.3.4.ebuild 1699 BLAKE2B dd3e90bf5ec06b80ea5f7d58e014fbab76dc5febbb9ad14bac7d9555a4a41bc6feba57ddf113011760ceb4d919053068f35cd895930e32cb9a361b61d7edc774 SHA512 d807966eaed11f03f2fd74824ebe7512c70446ec1b45a89eb4f90752aa6a59c3f1f614868dce1a2a15f49a2ec21df8d5bddcb7e3550155b04a88806f63249ef5
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
new file mode 100644
index 000000000000..fda0608d401c
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 97ad564ca320..844d391ee58c 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actionmailer-5.2.4.3.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
 EBUILD actionmailer-5.2.4.4.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
 EBUILD actionmailer-6.0.3.2.ebuild 1249 BLAKE2B a494099c8b1dfdb56936daf22ae96348c82e403cdee4d3e754ef6980f22c39b71b60083d847b9ae815e4e93511ca2118a108cd7bbc0d64ea71a8464f24a3544e SHA512 6977bd20b5097410aa6d46258e75022ba5fc3095a796029bc3a6d0942d509b9009b38e2d6a0e41f477049365cd26d9472445ff864b51d85b516ac7f3eb2a4ffd
 EBUILD actionmailer-6.0.3.3.ebuild 1249 BLAKE2B a494099c8b1dfdb56936daf22ae96348c82e403cdee4d3e754ef6980f22c39b71b60083d847b9ae815e4e93511ca2118a108cd7bbc0d64ea71a8464f24a3544e SHA512 6977bd20b5097410aa6d46258e75022ba5fc3095a796029bc3a6d0942d509b9009b38e2d6a0e41f477049365cd26d9472445ff864b51d85b516ac7f3eb2a4ffd
+EBUILD actionmailer-6.0.3.4.ebuild 1249 BLAKE2B a494099c8b1dfdb56936daf22ae96348c82e403cdee4d3e754ef6980f22c39b71b60083d847b9ae815e4e93511ca2118a108cd7bbc0d64ea71a8464f24a3544e SHA512 6977bd20b5097410aa6d46258e75022ba5fc3095a796029bc3a6d0942d509b9009b38e2d6a0e41f477049365cd26d9472445ff864b51d85b516ac7f3eb2a4ffd
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
new file mode 100644
index 000000000000..9de7bbb7b27e
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 3786d64e9076..9293bc9c8ddd 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actionpack-5.2.4.3-r1.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
 EBUILD actionpack-5.2.4.4.ebuild 2269 BLAKE2B 1f3332bd0097c14d0fa8bfad787aea59bcd0381428eba3a848c76df10040fdeab388b6f459b4dbb9d9a764f89b660b8e78c8cc83cdecabfd40b43edc98344f69 SHA512 4117d6a821d7cd97a67fa711b99305f07c222f18e1a79ba12f8c417603457adaa1c24be80db782af1feafe52e2c494c3f5bbcc3a5b5427e83c5e3ad96ce37a90
 EBUILD actionpack-6.0.3.2-r1.ebuild 1855 BLAKE2B 85c5a127fc6499c35ca8e3af28dce3de197cc376db960355f396bfab0acd81c3b7ef51c26c3417c2f33cd5344619f8174358e28ec79dd6677def4b130657c48a SHA512 302d8500e00873b9d9825356f2c55523c1b455f6ed2fb9ad8ae11b8ea89cdfc8fbf438c16389b555d80eeeea89b3d48eb63639431d3c3b8f5afb972b2b27e0a1
 EBUILD actionpack-6.0.3.3.ebuild 1855 BLAKE2B 85c5a127fc6499c35ca8e3af28dce3de197cc376db960355f396bfab0acd81c3b7ef51c26c3417c2f33cd5344619f8174358e28ec79dd6677def4b130657c48a SHA512 302d8500e00873b9d9825356f2c55523c1b455f6ed2fb9ad8ae11b8ea89cdfc8fbf438c16389b555d80eeeea89b3d48eb63639431d3c3b8f5afb972b2b27e0a1
+EBUILD actionpack-6.0.3.4.ebuild 1855 BLAKE2B 85c5a127fc6499c35ca8e3af28dce3de197cc376db960355f396bfab0acd81c3b7ef51c26c3417c2f33cd5344619f8174358e28ec79dd6677def4b130657c48a SHA512 302d8500e00873b9d9825356f2c55523c1b455f6ed2fb9ad8ae11b8ea89cdfc8fbf438c16389b555d80eeeea89b3d48eb63639431d3c3b8f5afb972b2b27e0a1
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
new file mode 100644
index 000000000000..b9f96b9946de
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.15
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index fef2c471bda0..2eb70aad7f0b 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,5 +1,7 @@
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actiontext-6.0.3.2.ebuild 1632 BLAKE2B 44123592c0926e9d0b5d55bf9219c7770eeb4f4261a62b5ae138b21f351694204ee46e53c4875342475d45edba1d2a5561308b94df3175cf31b3f1433ee593ec SHA512 3488b55a41431d365ccfc6aeb2715effc81ddf0981cdb5d8989f22e2dd8ccbe6c21bb8fb15624e56a8d452bbc82b37f143184e2cd1cfd2d7090b59c838ad6cf4
 EBUILD actiontext-6.0.3.3.ebuild 1652 BLAKE2B bebaa44dd837ad2ec43f67f37960ff250856253d928f0b5ac2943bd58757a249378c082bd83785a1228cba51f1699624adbc0681dde11b4003eceebe5257fec6 SHA512 f6b177b8193cf608643e619f0c5373b971ef287d85a66ecf2c8e4180cd0664a8452343afc6e07d61488ff4dbe2f135fd56f7653c45980706cb5ac0e97fb47e59
+EBUILD actiontext-6.0.3.4.ebuild 1652 BLAKE2B bebaa44dd837ad2ec43f67f37960ff250856253d928f0b5ac2943bd58757a249378c082bd83785a1228cba51f1699624adbc0681dde11b4003eceebe5257fec6 SHA512 f6b177b8193cf608643e619f0c5373b971ef287d85a66ecf2c8e4180cd0664a8452343afc6e07d61488ff4dbe2f135fd56f7653c45980706cb5ac0e97fb47e59
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
new file mode 100644
index 000000000000..a228d2e2d075
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 3083f306d5e7..deb3528f9174 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -2,10 +2,12 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actionview-5.2.4.3-r1.ebuild 1956 BLAKE2B 909175946e12cbe49620f7791ebce270c0e9815368941f1f9a12cf481d5c2d505a515fd57e7c36c211bacbbd133f1f5b3d5fdcb5fdf831a61c1be0063087e59b SHA512 7d6a55945a2080120c4fa47f1e37f552701321c9fbd1007a45404d62afca15e5383cf141df3f905ca5f37e6baef3005ee1d527ad3440957a5184f945acd0851e
 EBUILD actionview-5.2.4.3.ebuild 1895 BLAKE2B 411ae4e3059ee9cd7634be51eda0fe3de03609fc2e02c9757de3bb0bc209b1167555e62590216050a9143b2fe9a5b98adfdb866b2b172594eb0884bbb050b314 SHA512 ef2e2dd6eb2b442bc7ab850219fb35c4a33782904c0af25535745d540edfaae1b1196455a950fbbb239e9cd667d0c31524248156f85204a71bd121c8b4f68c88
 EBUILD actionview-5.2.4.4.ebuild 1956 BLAKE2B 909175946e12cbe49620f7791ebce270c0e9815368941f1f9a12cf481d5c2d505a515fd57e7c36c211bacbbd133f1f5b3d5fdcb5fdf831a61c1be0063087e59b SHA512 7d6a55945a2080120c4fa47f1e37f552701321c9fbd1007a45404d62afca15e5383cf141df3f905ca5f37e6baef3005ee1d527ad3440957a5184f945acd0851e
 EBUILD actionview-6.0.3.2-r1.ebuild 2120 BLAKE2B ea715d222ecef835a5d545d6ec6227b1569a42050534d82829ab0f1206a328d914faa394d037f1d42e8aadbaa18f8df8b7b9fb46c2abd85e3c5eaacee04fed65 SHA512 667abd20fb2dbe1e6115d80c805fc4a93e2047ca28b6406934ad185af3c806457d8bba08a211c73ff03a0ce12236a5c20a2de31bb5acbd11a031e26422858838
 EBUILD actionview-6.0.3.2.ebuild 2060 BLAKE2B dc8334de7fc4060f26538a2e38febe929b0f7ddcb31370ca12e2e0d22aeabfcb425d672618ced6203b9928d5e1806b25aae74d3140c022c20711623c59827e36 SHA512 f8adaefd266ed0cd234765e74de8f587f6025c55203d2c7517bd040c4a416627452b33144a6210d0e0a226e98b5c20cc05d2203233ba193dcf42e06748eea304
 EBUILD actionview-6.0.3.3.ebuild 2120 BLAKE2B ea715d222ecef835a5d545d6ec6227b1569a42050534d82829ab0f1206a328d914faa394d037f1d42e8aadbaa18f8df8b7b9fb46c2abd85e3c5eaacee04fed65 SHA512 667abd20fb2dbe1e6115d80c805fc4a93e2047ca28b6406934ad185af3c806457d8bba08a211c73ff03a0ce12236a5c20a2de31bb5acbd11a031e26422858838
+EBUILD actionview-6.0.3.4.ebuild 2120 BLAKE2B ea715d222ecef835a5d545d6ec6227b1569a42050534d82829ab0f1206a328d914faa394d037f1d42e8aadbaa18f8df8b7b9fb46c2abd85e3c5eaacee04fed65 SHA512 667abd20fb2dbe1e6115d80c805fc4a93e2047ca28b6406934ad185af3c806457d8bba08a211c73ff03a0ce12236a5c20a2de31bb5acbd11a031e26422858838
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-6.0.3.4.ebuild b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
new file mode 100644
index 000000000000..a6b9c0c833ab
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 4fc276bdbd30..f33428573b6f 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activejob-5.2.4.3.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
 EBUILD activejob-5.2.4.4.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
 EBUILD activejob-6.0.3.2.ebuild 1124 BLAKE2B a259a0961f2964b2569cf0236b56316ce0e9cd0bce0fc2c40c38540acb71facb78e7c733b93fe864e32cd2bb2efad80dad3b78333e7c4e1b5e60c81d889dd4de SHA512 b0fae9296a278b2a3086ed85a967e9f0c5e34b70aeb28f1de2a948d89cb89f3982075bbb587c7e73554c976555e531aaa30eb70e8eabec0f157cfc2c30b2b25c
 EBUILD activejob-6.0.3.3.ebuild 1124 BLAKE2B a259a0961f2964b2569cf0236b56316ce0e9cd0bce0fc2c40c38540acb71facb78e7c733b93fe864e32cd2bb2efad80dad3b78333e7c4e1b5e60c81d889dd4de SHA512 b0fae9296a278b2a3086ed85a967e9f0c5e34b70aeb28f1de2a948d89cb89f3982075bbb587c7e73554c976555e531aaa30eb70e8eabec0f157cfc2c30b2b25c
+EBUILD activejob-6.0.3.4.ebuild 1131 BLAKE2B 1f8727feaaea67a7ed48c9ac88629b71f7ddc21222a1b0d425a90021e9963fc1a96cd701e8bc13649e3533cc38ced2afdf2fb7ae0a72fb8bfe7bd6d075995a7e SHA512 5893ead1d458b7076950d536af4cbd7998a353432f16a2bfeabd5cac2cb44f25140dc706624dc7656008f178ffa4d4f15629e2592d331e6ca4bcfa14e84df1aa
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-6.0.3.4.ebuild b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
new file mode 100644
index 000000000000..8bb3a8112946
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 0d7e12da21ea..173b47e0489c 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activemodel-5.2.4.3.ebuild 1040 BLAKE2B 8c464ea18bbb1ec9297fa0e95812a5857bbb1094115b5f556d2e010783d960518e1f7baeb905ff294e647117fd54bbdc402def3ed3e88cfd4420bde1854db72d SHA512 fe53836eac85fa0d2e567c597f60df351b1efe879936978fcee1c6437e290f1386a5b9ac424f0871e42520e5e0dbb65329f7e8298d841e58d68bdce15cc71fac
 EBUILD activemodel-5.2.4.4.ebuild 1041 BLAKE2B 26d3f88520da84b755805ef126ef7ee0828063631d8a3b92339289ba20c33832462f04bb7bd0a8d80fd7856bb22f708d9b2b4655ade2297c3afecba59c86a338 SHA512 9ce66f6763eaa829df1f9b6c2a59b3d2803b2a5d431cc71d3dd34284663be82e7b25d29d07105b870e21c9604fbeaa998f9b88fcc99b366c84ccc29b7ff3ea04
 EBUILD activemodel-6.0.3.2.ebuild 958 BLAKE2B e82f8f658447c3a704fd3987182fc70432b80144bb85fca2221631b1bf752446817ed765bfd03d6e0dbabeb66c11bdb4d66e79bef6522100c31abe88b77ca09a SHA512 2c2d494285e1c9678ffca4dd3f160bfa8c56714743b4cc96bf83e1445814c32ce93894d2c4beeb9900742afba931aa97e4c1d49d385123f96fb45b4dce546fba
 EBUILD activemodel-6.0.3.3.ebuild 958 BLAKE2B e82f8f658447c3a704fd3987182fc70432b80144bb85fca2221631b1bf752446817ed765bfd03d6e0dbabeb66c11bdb4d66e79bef6522100c31abe88b77ca09a SHA512 2c2d494285e1c9678ffca4dd3f160bfa8c56714743b4cc96bf83e1445814c32ce93894d2c4beeb9900742afba931aa97e4c1d49d385123f96fb45b4dce546fba
+EBUILD activemodel-6.0.3.4.ebuild 958 BLAKE2B e82f8f658447c3a704fd3987182fc70432b80144bb85fca2221631b1bf752446817ed765bfd03d6e0dbabeb66c11bdb4d66e79bef6522100c31abe88b77ca09a SHA512 2c2d494285e1c9678ffca4dd3f160bfa8c56714743b4cc96bf83e1445814c32ce93894d2c4beeb9900742afba931aa97e4c1d49d385123f96fb45b4dce546fba
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
new file mode 100644
index 000000000000..1494c493a78d
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 3f0ffa1f02b7..12afc797c5e3 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activerecord-5.2.4.3.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
 EBUILD activerecord-5.2.4.4.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
 EBUILD activerecord-6.0.3.2.ebuild 3062 BLAKE2B ad2c2551146105a6c5be57f2c8251b3ecf2dcf55ae840594162fda4b8b3c1e9ed31261eeb746ed8deb1c34d65a68de1e62db49af35d4ace0c58323bf3840185e SHA512 f295e6d943c4c03696ff29dfa52edef7a88dddc5447741724bd35a1479d58dd099a916f9834ee936b20551fa7e44fc484ac14637f8348a6458ed798e75f23d02
 EBUILD activerecord-6.0.3.3.ebuild 3062 BLAKE2B 10a2bd53e4ac5910695b27e9f6cb63adaa5964ce68337aa08d812c2a5e3ac582548fc2ebcdc75bcb18dac9e4a4db98a320b36f3c03c3e343f8cb15c8eec40d96 SHA512 9602513ec7f136e965aa23aca87f19f68c3db6af9d0fe26f2527701011459f5938b0efee7d4b107ff0a2ef1361b704ff71c4eeb17023e43797da8b383388c58f
+EBUILD activerecord-6.0.3.4.ebuild 3062 BLAKE2B 10a2bd53e4ac5910695b27e9f6cb63adaa5964ce68337aa08d812c2a5e3ac582548fc2ebcdc75bcb18dac9e4a4db98a320b36f3c03c3e343f8cb15c8eec40d96 SHA512 9602513ec7f136e965aa23aca87f19f68c3db6af9d0fe26f2527701011459f5938b0efee7d4b107ff0a2ef1361b704ff71c4eeb17023e43797da8b383388c58f
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
new file mode 100644
index 000000000000..1194b35b4808
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test failing related to rubygems
+	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 05da74414725..3edcc9537b55 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activestorage-5.2.4.3.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
 EBUILD activestorage-5.2.4.4.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
 EBUILD activestorage-6.0.3.2.ebuild 2014 BLAKE2B b0fc70b785cf810ede31ba404d74cb1d30a5008ec868b04d3b3c216aca9baab6614cc4db5fcb388436b46ada45c056c9f8357981a6350130af5ccc281a000d85 SHA512 5ad69b497494e8fcebeaf355be62fb5a9230718dce95c0b2587b0cdd04e1d84b690909e543fed93e830cc0311e3d2cd39144194c427383a1d39dffe4e9dc7db5
 EBUILD activestorage-6.0.3.3.ebuild 2014 BLAKE2B b0fc70b785cf810ede31ba404d74cb1d30a5008ec868b04d3b3c216aca9baab6614cc4db5fcb388436b46ada45c056c9f8357981a6350130af5ccc281a000d85 SHA512 5ad69b497494e8fcebeaf355be62fb5a9230718dce95c0b2587b0cdd04e1d84b690909e543fed93e830cc0311e3d2cd39144194c427383a1d39dffe4e9dc7db5
+EBUILD activestorage-6.0.3.4.ebuild 2014 BLAKE2B b0fc70b785cf810ede31ba404d74cb1d30a5008ec868b04d3b3c216aca9baab6614cc4db5fcb388436b46ada45c056c9f8357981a6350130af5ccc281a000d85 SHA512 5ad69b497494e8fcebeaf355be62fb5a9230718dce95c0b2587b0cdd04e1d84b690909e543fed93e830cc0311e3d2cd39144194c427383a1d39dffe4e9dc7db5
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
new file mode 100644
index 000000000000..6181b336ee05
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	   # Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/:job/,/end/ s:^:#:' \
+			-e '/:test/,/^end/ s:^:#:' \
+			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index bd9d87902170..69d6f6e5db4a 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -2,8 +2,11 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activesupport-5.2.4.3.ebuild 2523 BLAKE2B 7cef7564cbc0c057d76cf74f4dd5382a738ea204f1dadf0367fa70e30f6e8f002e252c446bbd342352e476f98623b534db00734dc4658c68145c51ad1d30b945 SHA512 158df77044882eb0fdbfdf7fb0349d74812187cc668fff6af4f44f7ee2ffbb31e1076569f19125048baec407ef6797b35ac21cdce52325a92d1feff3b0bc7922
 EBUILD activesupport-5.2.4.4.ebuild 2524 BLAKE2B 6fdcde9119c8a295d58899692434e4e6295cbfd2949fce81733d18e3df4bcb87b515d5586f5ad9f971099312910a7ac05af8262db73cfdc437f9ba90221534a8 SHA512 cf34055a10c5c3f1985042fd382def3a965614f3067c234f6c72866bda935e9d1639fb7527bf0a65ede6f8bc25aa035ac180be16807f72e4e13597cafd30ee59
 EBUILD activesupport-6.0.3.2.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
 EBUILD activesupport-6.0.3.3.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
+EBUILD activesupport-6.0.3.4-r1.ebuild 2515 BLAKE2B a41e0a2dca7478f124e82c68530194cb74abc0a088e436f1f4dc5a577849d0c29b3d17c6224be9cfad6632a74046d65418bdd597b5fb2ab61a476befeca3ff19 SHA512 cfbee85437a752c29e7ad24c2ea74c7e25472d2b6ea67703a92f8aa12e8a31849eadf49a43ef0c69b0e8216adb4a05ba0d62dd9d5616a270cb2d8017200d0476
+EBUILD activesupport-6.0.3.4.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
new file mode 100644
index 000000000000..83895aef0e7e
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/zeitwerk-2.2:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild
new file mode 100644
index 000000000000..bf4536107f91
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/zeitwerk-2.1.8:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/ascii85/Manifest b/dev-ruby/ascii85/Manifest
index b13781e0dd7e..d75e42a2fdce 100644
--- a/dev-ruby/ascii85/Manifest
+++ b/dev-ruby/ascii85/Manifest
@@ -1,3 +1,5 @@
 DIST Ascii85-1.0.3.gem 11776 BLAKE2B e08bbc089546dd3b91ff5fd85b8652dd6f5c06025c29ac67004bd7d4c7bb8fc38c77b604dd5a884970b05041e173f37eaf895f0bb9ac1947ce70e4f0cc54906c SHA512 b324ff06ea0cd46a679619a2bfca9f05c30ece9f0342f8a8d097841f3fb4dbb29cf4b6f6832742c50fe5a51895a9048308981be296466422269ce34c4d936f5c
+DIST Ascii85-1.1.0.gem 12288 BLAKE2B 637ee421b51ec8ee88f00c32acc4d05a818fe7a26ec9f512a207d5c2e8c9b99e9866b904451a2ae811f024cd26b810b3dfbc346b6d935fd135a2c2615f2453ef SHA512 f160dbc06f49aaf1c678ece5b94fab4c3878cf7fe6accc267e64505e412072cb28b9dc28ec1ed8bf01ddbd7c08c920d95fbe182f756072d614b9827f6ec50094
 EBUILD ascii85-1.0.3.ebuild 658 BLAKE2B c206728f056b8b15dcc05c6955e82cd60b4a0768f7c91aad57e2b6ed463ac64bd5ef15a4936b9ab8c6b70efea768e51ab7671b7022831dea7c6f08cdaeff3487 SHA512 8d0512f16345752ab93f2a724f42391c8c2363983d86ad624374256c4b08813303fd099dafad31c06f678da901e40fafbdeb6309bdb02759df6a4714942d81b7
+EBUILD ascii85-1.1.0.ebuild 651 BLAKE2B 811ae2170cab9d4fb0f9a814488b99a8b4ff3d8bf998a0dfd507e7ae52c64de16b71ec32eb2d7015d578c237d31473ee87cd51e84abdec408ee889a55787a8a7 SHA512 43b16b26f99253abd9ab9b9dbed9ee88f5ca65ad3e2ec470188d8f2e353b4d2f99214eb1c0aa406160be6bad1b4ce5ea55a272643cef60e9337721f1cbf9de3f
 MISC metadata.xml 347 BLAKE2B 3b0a255aa723b441f953964689464ac15e6542dbab4183a32f670408039421d294eb308c0ec37d6080cbb6ebac4c43473f67ed3eb7429880fc0cada79d7bc560 SHA512 362fbd91725d86bf6694499188bdb904b99639488b2cc87f6fa7c50392790f921abb54cc8d329cac0e3f1d4cef6d24c05eb8ab8a365ddf149a7dc23dea5f72f8
diff --git a/dev-ruby/ascii85/ascii85-1.1.0.ebuild b/dev-ruby/ascii85/ascii85-1.1.0.ebuild
new file mode 100644
index 000000000000..4bbddd140e29
--- /dev/null
+++ b/dev-ruby/ascii85/ascii85-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
+
+RUBY_FAKEGEM_NAME="Ascii85"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
+HOMEPAGE="https://github.com/datawraith/ascii85gem"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+}
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index a190bef9dbda..6c05afd718b7 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,7 +1,9 @@
 DIST asciidoctor-diagram-1.5.19.tar.gz 11707367 BLAKE2B 2088d2a7b424b9a716204e607d6e4c3bb7521b2098caad131210c163ade6f8a07872793945829d6b1e6e88a9d04126738eb439c968e99f326baddc310b48de0e SHA512 14270c8ea0e63163e01171695ecb99f5ef9667e2ec50b26e56495a1fc2c0e8af97fc784f5decb8fc75f1830581a9bc658d699af6aeee52adc20adad82cb1aed9
 DIST asciidoctor-diagram-2.0.2.tar.gz 12481283 BLAKE2B f0b12514a7b16f6ab8c3a072aa9550ecfe0c8139e8f9ec1ea660a805813f942530519e4d90357e9b28d5d0e6c48bb9aff5dc1d56bfbe1cb15095653a8311c62c SHA512 8a72ee61b7341c516d1d34610a7cd0cd6d0c8dbd4b970b79c3b313f1230a0cc79ff47fcf553c2de144bd3f1f922183f0236354651a255023ce14b04f17195ee7
 DIST asciidoctor-diagram-2.0.3.tar.gz 12483731 BLAKE2B b907ff1747b440ddabe83ca9a562ed9ad7b4b04b07d18fe7d3214f0eea035d4a9b340a121c91a7a5d1f5dc9011d6e56958b784b229a571b6cd2d902205eeda13 SHA512 19bd0263b6d159685f1d0b7955f11428bcce9afd66157903cb797499652bfd587d41d0bd8493f7e97ccf3ee32cfdebcab10c4001b50a21060a890289573adbf1
+DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
 EBUILD asciidoctor-diagram-1.5.19.ebuild 961 BLAKE2B a150cfaf63fd872b605a7abd71d00d8acd6cdbe8b82b93bc35c38b6f12aabaec2c87f77e7ed2a9be06211e53cee4d653b8aa6d9f4c9ae6691daa958280c12d05 SHA512 0595efddc4c05fcea79b51e68cb496b1a6938f334d128b0c63e9ce8631e0be9c856d1b401800093aa25aa44188942e4f3ce41a57f99ad6b6b0e0e12afec9a23a
 EBUILD asciidoctor-diagram-2.0.2.ebuild 977 BLAKE2B 195fe0b6808774c5674e4d00cf8695fa6450a98420f2ceafe689fb59c7dae4da3d09e14c9a090c413996e0682481612534a650d0f7a5159fd777638ec6356588 SHA512 b8d4eff86649bfb97a28c43013dbb7cd7a9690dbc461fbc3a06f0a38fb5263e9e3cb4f3da284087096bb67fb4531a17ae106ea05485cebc7cab36ced910584a0
 EBUILD asciidoctor-diagram-2.0.3.ebuild 993 BLAKE2B 58d7b55ff1cea292bd569a6c785771f562f112d37ca4416266e3ce7709f1cddf8facbaf2173eb7b6b46723f0c0fc0471ebb5bfd5910a1c0702ddaa768a33ed02 SHA512 294339607556f38298a2319b55c74cd8e6ff4ac7bf5568809de92d3988c864be943d5f2fa54e24259317d296cea217e7a7ad91fc9651d6c97bcd40c6661d4052
+EBUILD asciidoctor-diagram-2.0.5.ebuild 993 BLAKE2B 58d7b55ff1cea292bd569a6c785771f562f112d37ca4416266e3ce7709f1cddf8facbaf2173eb7b6b46723f0c0fc0471ebb5bfd5910a1c0702ddaa768a33ed02 SHA512 294339607556f38298a2319b55c74cd8e6ff4ac7bf5568809de92d3988c864be943d5f2fa54e24259317d296cea217e7a7ad91fc9651d6c97bcd40c6661d4052
 MISC metadata.xml 357 BLAKE2B 967e1f1518c38ff81d15df5b62943b278acf74a80938d488cca0d2489f268ba0d41ad74e78b7b53bc1fd4ed646880ed36defc9c110d5af3535970c364d8c923b SHA512 711af8ceb9724236076e02a077672296a835981c7a78e4f5f5976dc190b2df640d24933cc2d92e81f84e695f473d187a7e83d2b60c3573a675ba30b01be85db8
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
new file mode 100644
index 000000000000..9a6dfb6b1969
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
+
+	# Avoid specs for unpackaged tools
+	rm -f spec/{a2s,blockdiag,bpmn,bytefield,dpic,erd,mermaid,msc,nomnoml,pikchr,shaape,smcat,svgbob,symbolator,syntrax,umlet,vega,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index b09d4257081b..3257f55bbf42 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,3 +1,5 @@
 DIST asciidoctor-2.0.10.tar.gz 613180 BLAKE2B 46125c85276eb0c7cf4404ca04d854449233e2cd14e24687aed9f95eb64ceb6ebac3d3ed73918679b9a5b047e41d82d02383d0e08acd0df5cc9bc216f14c79a3 SHA512 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
-EBUILD asciidoctor-2.0.10.ebuild 980 BLAKE2B 6354ab319cea99da9910e2dc39a9bdc52d9c001e873cf5321a351ebb1343d1c2e6d5907472982e2553ea62f327dc4432d7bd0ea25b36eeed2795c62c0bfb235c SHA512 f3c8b9d68dadb3f5c6b2bab76ab9532352f1bd96db23c062c16bfd570b63ea10567e1c3477d4c507a2c71536c6ae576f2d28a7b47aac8fe0368f2281090db262
+DIST asciidoctor-2.0.11.tar.gz 625446 BLAKE2B 4c4a3a7e019971765efade92da39d5895f54bd3eb927eb1ecc1cc3e3998490fcdb93426c03c9fca82d777b28c6c8027f34d39289b2250254884613670eacf9d6 SHA512 eef126653fb75c4d4bce5481f9e12f1852cf5794f547e1131f2e3f5bc34c3813e32034e6890432e83fc543b4a5dcca46750d052844d7055bfe20ea4b0c4428f2
+EBUILD asciidoctor-2.0.10.ebuild 979 BLAKE2B d525fa7b8fcedad543f7611e44e15ec0b355d6276d90dffde72eb382d5420d9b8a25867c93f47bec000f2d98eb623bcc8938faa3da8bcb43179b318bdd741b3f SHA512 b92e49a6670c6a656673ae6d357fc7574103853937b5d22714b4aa4ef5070a14569f40788d8c59977b7b5a01f1c3de23480a248c0248175c965ba19fdde4f849
+EBUILD asciidoctor-2.0.11.ebuild 948 BLAKE2B 7ea5d120583b57a119a9d74e37397984fc6ae2392965d26539554409087a32d6459904a898e12361777ea8e8303db9dd0044eacd97e0ebab9690cc7241af5d47 SHA512 67d54eede232b11f22e075662e7eb36452cc56f15252ef3dd2b23aff0c2cd49df216aebe0dd844d729e4f1b5d02150dda9e0290479ffad142ef37f60f6d01ded
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
index 29c726dd5fbf..d2ca9b0b5829 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.11.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.11.ebuild
new file mode 100644
index 000000000000..15d529af89d7
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test features"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-util/cucumber
+	dev-ruby/rspec-expectations:*
+	dev-ruby/asciimath
+	dev-ruby/coderay
+	dev-ruby/concurrent-ruby
+	dev-ruby/erubis
+	dev-ruby/haml
+	dev-ruby/nokogiri
+	dev-ruby/rouge
+	dev-ruby/slim
+	dev-ruby/tilt )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/asciidoctor.1
+}
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index 0a31e0958fef..fe4e08f9dc95 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -4,7 +4,7 @@ DIST asciimath-1.0.9.gem 18944 BLAKE2B 3ccc3f594d7a0d8b6996349d85356179ef3a9052a
 DIST asciimath-2.0.0.gem 57344 BLAKE2B 18cb2ca27a626bbb241768d070c47c981ae1f3a626cd9f476e7511f04f73154a1c3742338d92540bbd78fadbf775f4db7d2558c451fc8a276002fc5adc044ece SHA512 4823e7fa2e3107765d2804d15f5250dc30572099405df988ffe13f17ed584043bb7e48794cabc9b9853997083c57af5f3d73d20223ada95d00f997363130bedd
 DIST asciimath-2.0.1.gem 58880 BLAKE2B 6c17698f6515468c1c0b17408968f492a40a90cbec5184e78da8c9b9c23f2a6887f4d8ed1c99a68ed36489d27187dd73dc6ce992efc3ce144091131e36bc5e40 SHA512 e8c63e5f6035189460ac4975bb0471ffa418ba139ab806ae46badb74c1164d2852aef3aa799a0713a01486cea5c6087add6115ea22908bf3b70d1ab5fe339768
 EBUILD asciimath-1.0.4.ebuild 528 BLAKE2B 8f70ad1757f87729558831e9028f1d0534e0826aec3c87075338ece924dfdf13703057a8af6e98d38fecd29331673ea73eb4991dac6e9f85cf762c81b6730671 SHA512 04b3ef6e9a4c04c26e706c42ca8f9b25936f14f5dc682e4ac160f88035ab4e624b49eb8fcaf926fcb14bb7ecefb52fc634e782b2a2aeac6e097bca84a2e80d28
-EBUILD asciimath-1.0.9.ebuild 463 BLAKE2B 645b5388a4350da7f272abed0a7284af4c22e59af26925dbfd6024c8d4aafb0298176ba0623168ffcdecb60513a92ee56c829d16a2333995acb64d82c7b0b4fa SHA512 9c1ee23deb683275d034238e856d210a09ea2aef749e0d42c85361ee34e4fa0ae10b46f7a79b6d859e59b4ed213f6e683233ad32b9809e140b34e104a7f58fd3
+EBUILD asciimath-1.0.9.ebuild 462 BLAKE2B ee01dcea90fb9998408256d9e36a614d31b21b6eb350340a593612251e5662d896ea837a363c1bf9b9926493c26b23897c96e7d878f7b00052bc2c3069197cbe SHA512 6e11d89c95a73bbfb9e09176e60ce095b559dc7474983c37a700d4c0c0a5c11d2ab1fed583464a7dc34cada2eaf9e2231a121a4e5fe2594cc8c68dcb20c634ec
 EBUILD asciimath-2.0.0.ebuild 517 BLAKE2B 6f6355aaab1dc196c9241a3fa86bb6cef8d7b071ae83ea0489c3fcb914243559463487a694e4f755152c88965c23c86d6d2513546ed2cf94318f59478dccdbfc SHA512 a1c369453fcb0e35afd8f170ea14e2379c1b63e8da99524fcf57058d3c30b0ea13cb8abccfaa95c4cf6de87f704d977fa3842961a9e3a76e82f0f6bb69054321
 EBUILD asciimath-2.0.1.ebuild 510 BLAKE2B b4278881c98f8b22fed5bcaa4fdab2bad20112f78e6268d423fbc08dcfca364e97c40cb7f2cbb245421f33175ad9cea0ff2444245a507d01a25453962167f24c SHA512 10d693d3ca74fd0588ce8f1a8814cc1ae0fc34bc1895935a004211052b7e5215c95f9aefa9e7284fb311d09c83ce5e17174503c2e3ef1f1ee78152f4afd6275f
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
index 9cfeb0a59e70..ac38dab0c037 100644
--- a/dev-ruby/asciimath/asciimath-1.0.9.ebuild
+++ b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/pepijnve/asciimath"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 2de92cd575d6..4c921a188c15 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,6 +1,10 @@
+DIST autoprefixer-rails-10.0.1.0.tar.gz 682273 BLAKE2B 9e3e2450726e7bdfc89b4b5c430a4c6ce0053ad7d6d041f70e93bb56d242a278476ae7c57b5baed42b4feccb7311f8134f19d8bb8565bf3959f471fa6f60400b SHA512 a27db1bfe558154ccfb4a7d1fc5a06fc8da3147c488d4a0ac589d304f3316417c92c0efd118b79ced1f7ee4c20aff0842aa1bf56402b74458892cd3578e8e8e4
+DIST autoprefixer-rails-10.0.1.1.tar.gz 684843 BLAKE2B 06cbfe473f29acc24544f7fff23adb5d7419b2bfc7b06a809f04e656fd1b5c961a9fb1379da63ae76c8b2626044ce6f91a5a378ed2569f1631fd2d0e23c021f1 SHA512 1b22fa901e7d54fa465ce04cadb81e6391a75b6f6719b075a33ec3b7183c07c008420baa5ffdccf6880472af3fa75fac5b9c03769dd04e748e4e8cdb644b45b7
 DIST autoprefixer-rails-9.8.5.gem 231424 BLAKE2B 94e695613784c954d6402b144edd08dfbec0018a02ffafe2c2e6deecc010c2193137e8ea97f00bbac35881eaf4129403cef9db78736f9618f76bcfd8df5e0598 SHA512 5ef382ba88b1adeb51b41e818bcc3364740809f3576db5228a73eca83829248a618c2e886f68c057d46a68861b6f1ef408f12ec6597f272533c8797273d2e324
 DIST autoprefixer-rails-9.8.6.3.gem 231936 BLAKE2B 63f201a73ace0d8f328281521137712f21715bba3fd7c8d098fe81b161d00cd215d6cc89ed786bd79689b81e1b20198d594e307794de527c9cfc0fadb50ccc9d SHA512 f00cfe85742202a1f0fbe672c3279adbe7b3f97155a3696ed274c6987d4f3283895a2f75d4ec6b1709861d72277ec3cf9f0608ad568f5c32ac8df693dc105f8a
 DIST autoprefixer-rails-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
+EBUILD autoprefixer-rails-10.0.1.0.ebuild 1022 BLAKE2B 53d195a7519b0dc8b5d70ed92f7f53c939d36d27272e639957b00a8f0f9f6d792ed812fd7511fedeeadfd7684a87f9182bdb33aa2082a28b701e90e471fef5d8 SHA512 bb322f730d707c081483efe71263551c824d34bee5cd4958905ae4ac374ef6656a92c49456393bc21686f3cc561ca69ddd5e615b2813bc4926453e0a2e3b3ac8
+EBUILD autoprefixer-rails-10.0.1.1.ebuild 1022 BLAKE2B 53d195a7519b0dc8b5d70ed92f7f53c939d36d27272e639957b00a8f0f9f6d792ed812fd7511fedeeadfd7684a87f9182bdb33aa2082a28b701e90e471fef5d8 SHA512 bb322f730d707c081483efe71263551c824d34bee5cd4958905ae4ac374ef6656a92c49456393bc21686f3cc561ca69ddd5e615b2813bc4926453e0a2e3b3ac8
 EBUILD autoprefixer-rails-9.8.5.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
 EBUILD autoprefixer-rails-9.8.6.3.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
 EBUILD autoprefixer-rails-9.8.6.5.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.0.ebuild
new file mode 100644
index 000000000000..8fb38afae29a
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/ s:^:#:" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.1.ebuild
new file mode 100644
index 000000000000..8fb38afae29a
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/ s:^:#:" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/aws-sdk-core/Manifest b/dev-ruby/aws-sdk-core/Manifest
index 7f784788096e..79c5b645dff3 100644
--- a/dev-ruby/aws-sdk-core/Manifest
+++ b/dev-ruby/aws-sdk-core/Manifest
@@ -1,5 +1,5 @@
 DIST aws-sdk-core-3.94.0.gem 270848 BLAKE2B 427fd39d864b2b69e161c0a97cb88984c0dc3f05a07df25412f6e365ec0405a1d226e4bb1f0c024d02f1823d93b9127d96cb025362b1f0e5da259e93dadf0ae9 SHA512 30b660ea5cbea483e284ad82125e4c9e22ac6874f25c9b0d709c64c940ad03d9cc2a87af97e2c182c6720c23675467e3b0442bb7164ed36bfd36dd19dd8ec924
 DIST aws-sdk-ruby-2.11.488.tar.gz 5997468 BLAKE2B bf374a451d07052676eedf75cac71f57f4557ff3d0970593cd76f057938844e0eca28e63aa983619345a5852542a8b1fe371c1be2c6132146daa9b5c123c7869 SHA512 c2726a9afc38d579fa65977c3c1cd2af5f6b235ac84cf5b4dd8fac6040a01c753d6409fe90e1cf32d500f26366c76a3b2499a0e79ebb005601756dab068fe91f
 EBUILD aws-sdk-core-2.11.488.ebuild 1110 BLAKE2B ce973a15f87f647be263a7ae5845d007f3c06eea13904fb34e71b1347961d1e6e61d5949bddc313d1eb1815de267a435fa4ceb26fe446a8407502628d79d11d0 SHA512 f0e7b77b107e86cc7dc2e35a8833fe1cc0600bffe538b67b64c7a970a29121a332ba4be6dd470174527ba4450235c95ce376a2f817d4182b5eb68f6f7b4dc94f
-EBUILD aws-sdk-core-3.94.0.ebuild 584 BLAKE2B 94085c6a437ffe3f0941f9e6ca2f211ac776fe8d75f7b4027ca01128f85e7ec82d3609c03e197188f0888196d224504d8bc13869a935ff18021971afd0b7fd68 SHA512 a111d336f6fccef202eb0cf01394a6bad857ba2d361b45ac23320de3726292ab9b4980217b49b95feab4c14dca943386b52b70d6ca07855f4d12dd4b08fe9fa2
+EBUILD aws-sdk-core-3.94.0.ebuild 591 BLAKE2B a348adf50ef3f4e1fb6f0c7dc1992c0f35760eaecca3f184f6be2fe48867aae378a161576550ce1adaba9b3b5eb784f4cc399728603afa43fc3adb33b54d9e3a SHA512 d531d1959064d8c29f6103bc8cd9f2d3e55dd3856e5ab5235a16c9766342ca378569b2966cb675d207463907bf4bfe3c352a8c36de8079c5786dc162897dec4c
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-3.94.0.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-3.94.0.ebuild
index 16d54afa9058..c543a1502c63 100644
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-3.94.0.ebuild
+++ b/dev-ruby/aws-sdk-core/aws-sdk-core-3.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 55437afc9f1f..9f30211e6958 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,7 +1,7 @@
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
 DIST backports-3.17.2{P}.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
 DIST backports-3.18.2{P}.tar.gz 158492 BLAKE2B 7ad924758939fe50b26fb845e96583a57a06e0039780eb96c8df9c535bd5aace261a6b3619ca3bc3a772c0db51162e9d340a6a1515c746acde91d8cb608f83be SHA512 3293430331f217c13f754242848f2541906ce930a8683f0ed65a64f93dc1d2387ef33501b1d8129872d536bf2f59c4e975c67abc2cd966277fd62ffbc68b5522
-EBUILD backports-3.15.0.ebuild 666 BLAKE2B 582f77e0126ad733ec009687eef69942ec75f90bdae8be08cc460af4e28ef5f4e36d9ac16ab2edff4c1d632488a87e81645642b5c9c74405bebb9c0ca2fd688a SHA512 b61462d7b91475e48927a0c816c02c51d66876400225703ead490e73bfe5d4915da2a9b381f6947dbfb0931f3012c03df9b03f0dcae41ef64649a59b3a44dab9
+EBUILD backports-3.15.0.ebuild 665 BLAKE2B c0c1352f4cf39ba87583fedb26509dd81d34edccde2b4c330bb015afe472f385393795266a4c01166f525257195e9b7ddbc737d6d6009052cdc113fc6a02eb3b SHA512 9237fe040bc0c1fdef95c2767f0fcc47d27824ce34dcd1e26d0e1d6e59bcec8465b8ad5f4ceffa81ae6f6a854ff3a0012b76f1631deded7256e4d7b173464390
 EBUILD backports-3.17.2.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
 EBUILD backports-3.18.2.ebuild 793 BLAKE2B c44bf9a13dfbce3d8713b93edeadefc69407bf7f0575ef5629bb9401fccb82dab893ce806daaebe3b4c703a3680aa202a88cca8466ef75a9b55d1f98a0112d33 SHA512 60444bf27bbabc3ea8bf28ae0c54d6dce880933e58d386fee988f5dab15885ad401919a554d103d1577aa938cf58f66ce0d144dec11304301ec382130c56c738
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.15.0.ebuild b/dev-ruby/backports/backports-3.15.0.ebuild
index 57b384b2be49..e4275447b232 100644
--- a/dev-ruby/backports/backports-3.15.0.ebuild
+++ b/dev-ruby/backports/backports-3.15.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/marcandre/backports"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bacon/Manifest b/dev-ruby/bacon/Manifest
index 6246deae0b63..47b040b23c0d 100644
--- a/dev-ruby/bacon/Manifest
+++ b/dev-ruby/bacon/Manifest
@@ -1,3 +1,3 @@
 DIST bacon-1.2.0.gem 18432 BLAKE2B 7b5870a4cb2b4340eb16dfde4649049def3f19e9a3202a6040c26fe0b3ad82b04e14d47380f9d08d1a8640e38244e7ca89f897a12b382cbb2cf368e414d5af41 SHA512 ce7a9171be67b872c8a95dbf93a45fd79574796c694769e9c87a35257e85eff98187c8ee76429124ab475e90fc619eebd30e672f3dcd4f8280e139ecc469f907
-EBUILD bacon-1.2.0-r2.ebuild 604 BLAKE2B 8e05ae3aa2cf9767cf2e3cc490404e41c58b90a5d23e393509a3db4e9888653a75e1882696f5a0c8eb89b5d2c454df9b32129cbf2326ecfce2b98c4e2d145064 SHA512 1a96223484564e3257347e8a802ca9e217f0712690af431e4fb8ffdd22eb236d2a7f5c787b0c72cb4cb0af7f5229e5814d4a0887b3de1e24c25b3f62a2bd447e
+EBUILD bacon-1.2.0-r2.ebuild 603 BLAKE2B 214a43997c10786c2a8b66d0b73c098013c410782a6f34eabf1a594bcdb96908b9250607afa06b955b7504bec259fab050c097e785932c19550ab04b5338c91e SHA512 989ec05f1e5e8d89e4398b31630b2174ea4edeb406123f9654251002be3d76cc2a1428020650509ef18132592da2885d4ad272c693fd30ef42e9e6f6912dbb0d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
index 37ba98748354..5e0324cc36bc 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 ppc ppc64 sparc x86 ~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 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/bindata/Manifest b/dev-ruby/bindata/Manifest
index 67dd5c4dc4a5..0dd84ad7988a 100644
--- a/dev-ruby/bindata/Manifest
+++ b/dev-ruby/bindata/Manifest
@@ -1,8 +1,6 @@
-DIST bindata-2.4.1.gem 78848 BLAKE2B a497299aca02abe61c64fe946ef928ade75f58195bdafa1b5ac842c7dd272e0dd2e5da957b558492bb1dd1e47da7da1525c0d54f0e97e571c5db804e8b24ef7e SHA512 5bbbb38f7deb461c234801677baf30bf6d5300dd46f201ebcaef4cc4182354e1ed375fc1c341a13d6b3a1f579e25e4e53d8aeab0dd979a581131e2a984758243
 DIST bindata-2.4.6.gem 80384 BLAKE2B f8e5ee0ff0fa849b5f00fb456235f002ae2786af8fedef0b13105669808269a95a6125969d7ba07f8db04c8d7e43db4d93e81550144e8f23f8d31af5a2f9fc8f SHA512 8c8970abecdd83bf803b8793d36bc0425872fbfeef5db7a7175ea5f7c9e809185bd6b0cf0c7587028d907d74cbb1f9bc9728a49ea4659b7460104934b6a2ae2b
 DIST bindata-2.4.7.gem 80384 BLAKE2B f65fe9132faebf645f905dfa749ec3e5dc958dc5523f2b60e9568fd6353323a405bd436b54788a2d98fe0f64ed7df8b4b5c00a0f8186d2e2c65572107219d83a SHA512 f5616a372c0f17ae3b1c89f5993954b565058d099ad0783dbaf49081b7847a26a3a2908c957ec6cd2518ffec85686cf3b19e76f96e5244faa6c83b2598f55364
 DIST bindata-2.4.8.gem 80384 BLAKE2B c5c87078016ca42fd09a903b803aa9b5d7b9da576c9060428f64433d21d0c30a7884c1baee4f5a48cfc0e0e462623a826f932fa38f3b4db9dd9fc6869ff10df4 SHA512 a6e037720acd520e248aecf0c0f4de413ac1f47665487c876457585853c822d1ee46816ab7cd7060e58566b8288ba77917be51cd6a783c25f619bb8a84724446
-EBUILD bindata-2.4.1.ebuild 533 BLAKE2B d20286e4bd118bda00d14bf1f15375147a6ca65ebb81f7a7b17fbf4eb064775c5d4cc4c99226154e579f05bb619e4d519c790268556171b4261f56d883fb6656 SHA512 22b262e4f834a1eba30485cf7c5df1110e2f80d8cf8073169b20f5321f35e367c1beb94768c3089190cfbfb9cf82df209d78a839910cc8b56cd8391cf4278bcf
 EBUILD bindata-2.4.6.ebuild 497 BLAKE2B 9cfefe2268ffd1fb2564d349d370c22020c41e12583d1c1642c462454bf6f02008a07b774e7bc9d96c398f13ff7cfcd1a0907c49243e9994ada6eabfd9179841 SHA512 4697cb09d27ce6283ae107328979d6569ad8f51bafa0d9407af06b723af79cab8ea4b71f74ba3e2224fd8c8021ce1f2f9290e19a5be140eb405ed32015864547
 EBUILD bindata-2.4.7.ebuild 497 BLAKE2B 9cfefe2268ffd1fb2564d349d370c22020c41e12583d1c1642c462454bf6f02008a07b774e7bc9d96c398f13ff7cfcd1a0907c49243e9994ada6eabfd9179841 SHA512 4697cb09d27ce6283ae107328979d6569ad8f51bafa0d9407af06b723af79cab8ea4b71f74ba3e2224fd8c8021ce1f2f9290e19a5be140eb405ed32015864547
 EBUILD bindata-2.4.8.ebuild 490 BLAKE2B 9d06008f59702873ffcb7480df4e09b6814000a3ff99aa5ef6cca34312155e1c17141ee6390d4bf244c117c257824764f787486fa5111f02f0d787a3a9666ecc SHA512 d2c43b074ebe33be57b03b501b50134b7bb7fcd2746f047de7be0c1ec2edee7597db391333e119fc6854010d7e6c496d852f0e3779ba97d9ccc2375d8db33229
diff --git a/dev-ruby/bindata/bindata-2.4.1.ebuild b/dev-ruby/bindata/bindata-2.4.1.ebuild
deleted file mode 100644
index 88c6970cf0a9..000000000000
--- a/dev-ruby/bindata/bindata-2.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parsing Binary Data in Ruby"
-HOMEPAGE="https://github.com/dmendel/bindata"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/[Cc]overalls/d' test/test_helper.rb || die
-}
diff --git a/dev-ruby/blankslate/Manifest b/dev-ruby/blankslate/Manifest
index dec62eee5f78..d7ca815261b5 100644
--- a/dev-ruby/blankslate/Manifest
+++ b/dev-ruby/blankslate/Manifest
@@ -1,3 +1,3 @@
 DIST blankslate-3.1.3.gem 8192 BLAKE2B ff5494661e875290a354089efbd79ba8f7af50ff261d56f99201c9a11162fe7d61c0089c0c9e4839523a7f95e3a2cf8e79cbd5db14be3530f1a86ac696deaa42 SHA512 4164c2e9ecb6a294fbd0d25f70bae36ee9277da3a75aae6c99d37147f8111c40a6cfb85ddc3819e45c361c49fd9c3fc724ecea201763f7f9891b96589226f245
-EBUILD blankslate-3.1.3.ebuild 643 BLAKE2B c946d6c58660e8710cfe7330a9496004b5d54fbeda7c373f15afdd9202795720a277d8dc75ebf9c57573b61abf00fd44eaa7a0ec4b8b48255274850099debfe5 SHA512 b4770cdc376534558dcb4bab7524d1be250b4928598f509db2fd30b82090ec7e12ec8955126dff72306a2197564ebf4326a14f83ef80747b0de216db770c5a5f
+EBUILD blankslate-3.1.3.ebuild 642 BLAKE2B 9eae39619308789a0c0d8bef690086fd5dcbcc68af406d155280538614c63988a62b185ef629da9ad5afd2ced4390aa9f98ce5b92bbc91bbd47122010ecaa18f SHA512 09bee3910b29dcfd6ff7fc2dc061d6bd23837cc5de90f415c33202546313cdb9f88ebaf754d49d29033436eadf28ff729bd95b27ed89126fccb60ba9c225ccb8
 MISC metadata.xml 328 BLAKE2B e6d8ca7038f3a6e6c026955eb0a1880d8ee08580141b438e74797d58bcc122d2d6258bce5ebb3547220d688ac0cac36fd7d5803ad28cad1db80f5694f6cbfe92 SHA512 d75ff746d7d11a9caf17f1b09d0b8edafc405e345591cd5c7046074f9ca80b0cd3fe59bb9d9c1647b264f5df6366b4ea99b0bb90c31343fd4dc6df6d8bd9612a
diff --git a/dev-ruby/blankslate/blankslate-3.1.3.ebuild b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
index 485ed1ee4f7f..41d7d9b1d8fb 100644
--- a/dev-ruby/blankslate/blankslate-3.1.3.ebuild
+++ b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://rubygems.org/gems/blankslate"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 
 all_ruby_prepare() {
 	# Avoid test failing with rspec 2.x.
diff --git a/dev-ruby/bluecloth/Manifest b/dev-ruby/bluecloth/Manifest
deleted file mode 100644
index 688559942ea7..000000000000
--- a/dev-ruby/bluecloth/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bluecloth-2.2.0.gem 94208 BLAKE2B e2fd3eaeebbbe365ebe076c3027ba1528c11e036eada18c9b6aecc2f0b1f389aa23c4072fbeba6ac2d86831943e3d6710308ad9d26d7c29a9ab571a7b5c52b98 SHA512 498ffc9eddd47ded1df5c60e8ae8647de1e0376c7787c42dad2450c15a237b01a734bd0a2742c56cb59831cddc5b35c88e954abc0a087fc803ce4890c07c2852
-EBUILD bluecloth-2.2.0-r3.ebuild 1155 BLAKE2B 71aeb5378c396f346a0fea63a8636132f8486193df611c134ddb7ce755bc9f8967014b90ce2f6c1621b2b6a7724dcdde25b97e66f7a39e12c456985cae3cea0d SHA512 f75b6649cc409d60ca6ebeb4ef706f52e42dc171bad3e0acd9a44bb62cd2cd7edd6e31bb21f55eb52009dba6fe0dfb629aaa27d8e8c285cd23260f3754b37e77
-MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild b/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
deleted file mode 100644
index e7786dae6c21..000000000000
--- a/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit multilib ruby-fakegem eutils
-
-DESCRIPTION="A Ruby implementation of Markdown"
-HOMEPAGE="http://www.deveiate.org/projects/BlueCloth"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND+=" doc? ( dev-lang/perl )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/diff-lcs
-		dev-ruby/tidy-ext
-	)"
-
-all_ruby_prepare() {
-	# for Ruby 1.9.2 and 2.2.x compatibility
-	sed -i -e '1i $: << "."' \
-		-e 's/Config/RbConfig/' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-all_ruby_compile() {
-	pod2man --center --release --name bluecloth --utf8 bluecloth.1.pod bluecloth.1 || die
-
-	all_fakegem_compile
-}
-
-each_ruby_compile() {
-	emake -Cext
-	cp ext/bluecloth_ext$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	doman man/man1/bluecloth.1
-
-	all_fakegem_install
-}
diff --git a/dev-ruby/bluecloth/metadata.xml b/dev-ruby/bluecloth/metadata.xml
deleted file mode 100644
index 28ab0c15f206..000000000000
--- a/dev-ruby/bluecloth/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/calendar_date_select/Manifest b/dev-ruby/calendar_date_select/Manifest
deleted file mode 100644
index cbf333611ce8..000000000000
--- a/dev-ruby/calendar_date_select/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST calendar_date_select-2.1.2.gem 22016 BLAKE2B 3cd19112e1d6f3acd9c3543a39b650c753803f3aee4581562cfe5625cdbc1593fbdae45ef2caa15391e6b4caaaa98f9563a70240f45a7806772bcaaec4a5f7f8 SHA512 99d4cadd8b58c49882767787a1c04d1238f2679e6034a1705d24dfc1d1830c9101028b583f36b8fa3403e58ad1b995ead4fe33cda42dd16cbe17d435c1198af1
-EBUILD calendar_date_select-2.1.2.ebuild 659 BLAKE2B 29b6f72acfbfe55a999691af90f966f748b8ceafddbec44a6e4505c4701dd62ab62159f64740e1412df205c269ed1bc15019010b91aba4214225f0bfe288cdc5 SHA512 ec501f659544cf016424ec6718d1626d5e85640d7dc3a2b257af6140a93eb2bb598a05d29cb74638aeb854c05fce8d2b0d6e253b7190a40a6d060065e04c6b47
-MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild b/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
deleted file mode 100644
index c0dddc526ae0..000000000000
--- a/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# There are no unit tests, only integration tests against a full Rails
-# 3.2 application. Skipping those for now due to difficulty in getting
-# all dependencies right.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A popular and flexible JavaScript DatePicker for RubyOnRails"
-HOMEPAGE="https://github.com/timcharper/calendar_date_select"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rails-3.1:*"
diff --git a/dev-ruby/calendar_date_select/metadata.xml b/dev-ruby/calendar_date_select/metadata.xml
deleted file mode 100644
index 28ab0c15f206..000000000000
--- a/dev-ruby/calendar_date_select/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/capistrano-stats/Manifest b/dev-ruby/capistrano-stats/Manifest
deleted file mode 100644
index 6ef772270a5c..000000000000
--- a/dev-ruby/capistrano-stats/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST capistrano-stats-1.1.1.gem 7168 BLAKE2B cad6fbe0119af877b4398c2e6d0c6319ac82b5c6f8e45b8a28c523ecf6b2ed2cb366dbcc0424dbc6c97b9b1030f7af856457b9d2a9258c8147410cf0e5264398 SHA512 d7198052dba1f518a972b4d9e4656b23b226222c58c4898745abf90876722f1040d0f0acce07d97aa090b77d4c7655ce300f73dd0d6f55666e551862a13b7e2b
-EBUILD capistrano-stats-1.1.1.ebuild 435 BLAKE2B 17effc8138aed024b523b5c420665f054fd7c89ff440d8f11553c832fef05f71fc1d47c67369c6ae3612539ddf86abc71256450fb3a4d86cbf82033df0207151 SHA512 7a4e853710062d35ab91c0b122cdd239f059c159b64b5c1bf24ee5277389e9f5600784d325977e50fa1591f15068c20865791fb17cfa418fbc2653a20bec99b2
-MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano-stats/capistrano-stats-1.1.1.ebuild b/dev-ruby/capistrano-stats/capistrano-stats-1.1.1.ebuild
deleted file mode 100644
index 6bcc7bea288d..000000000000
--- a/dev-ruby/capistrano-stats/capistrano-stats-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="tasks"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official metrics to help the development direction of Capistrano"
-HOMEPAGE="http://metrics.capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/capistrano-stats/metadata.xml b/dev-ruby/capistrano-stats/metadata.xml
deleted file mode 100644
index 7ce59145bbd9..000000000000
--- a/dev-ruby/capistrano-stats/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-<longdescription>
-Capistrano is a utility and framework for executing commands in parallel on
-multiple remote machines, via SSH.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 457b9113695b..91a154ca0caa 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,5 +1,5 @@
 DIST childprocess-3.0.0.gem 33792 BLAKE2B 7927e29efdff3fe5ad26fdf8ff5d55328412c89d442d3ad34fd44b642a91edf5cde3a271f2f7929a6365a3a740212f3f1364867ecec09c0d5c3846466922cf82 SHA512 56aa9303f1a88d57d0928f9c7177291a115736a5989e30bdabfb0b7fa1e6b02e42e45bf5e0498efc5ab9bb5f58a44004ed56bda61d95ca9a8d8df156b9f30ada
 DIST childprocess-4.0.0.gem 34304 BLAKE2B f27188ae722a8a3fd1279916f8f364365778053dd3c9fe2510abe35d60df4be430c9988ba5575acb1864f55c4c9130cb300328f0915d808e1760ec2b3bd7350c SHA512 89ea5f9d437ac2e5d246fc849002a5d14fba2907b5055cbf12a7ec89545bc3daa531dcc0217ebc7a7d88ee21798e2886a899679f6d25f2e664390752ab32dbe2
-EBUILD childprocess-3.0.0.ebuild 938 BLAKE2B 8c8b9eb9507f6bbcb8a0d8acc0d2866589382fe6c4844289fcb4e9312cbe7ed706387e69b93fbdbae4fecca1766ae59270bd1c4e8a7cd3ce3be66dd70f97b3ee SHA512 68764a79057da9084357a4e1bc67d0e450a0d8626a2aa7d55de7e9d34fa222fba8674564b0a2c4f5de841d9dec846b9ca27aa30c4142e2c15158e982e56df51e
+EBUILD childprocess-3.0.0.ebuild 937 BLAKE2B 8fc6899cc44e519d789da4fb32a5e23b5b5b965a267881c72dd974aa1130463b85edceaac1632fbe64fddcabb3faf05ab5d433e68b71355d2573b3c07b08bbd6 SHA512 5ebd6f02b4d905f09d952bee98070390193a7b952185273ba616b2018eeb95b0dddcc12ab6d32e202f9f7f30c924abb5d9187d2d6089f6fed794442ad63a8c5f
 EBUILD childprocess-4.0.0.ebuild 1026 BLAKE2B a88e2d0058601472a79381f840474559736d335b85604df6f34d1a137e865a5c91ce5668a32b638547dde480a843fcbeca16a326e5acc49f22370a3abc34b7ca SHA512 2b463bfc64c98447978eddd7c448f20bd0a441c65764501a631c4a9d8b258229de334e71bac013fd9529035ac4d9cdac56250abdaf50375f623268d128b3abb0
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-3.0.0.ebuild b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
index ecb76c09e36d..f62cfad2e405 100644
--- a/dev-ruby/childprocess/childprocess-3.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index f50b3b8a7505..d91a1fe21592 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,5 +1,9 @@
 DIST chunky_png-1.3.11.gem 352768 BLAKE2B a60607830c41921f8e8018b91e459103d0a793a6c3a5491f36399dff0ac83dee09f66173f01e3e8f8f2bcf9fc69b1ffa53a9bc29adda758be75fefec391f7900 SHA512 5935bc7672ef4eb271abe0e2d4b83c2628ecb9d4fc1bb095d28d0f7fd5e13443492bc91b2c9c1de59d8bb669c185cddaeef62d03d3b0df88ecfaaa3c7a2a0ba6
 DIST chunky_png-1.3.12.gem 353792 BLAKE2B dc891b23189ab4ff1f487d1ef3e83ede822261691c77a04d4ec4cb268902a6a3dac0db705644e7cceea6d5d097f520409005ebdf6496f5d3be339f2e0d27b13c SHA512 84325afc3903b3d0b4e4a19ebd9548029e02f68d45896efdcfe6eb23a64360f2c2b3d191c736cc172a11258828bf82687b950f95104cbdae639d00277c37bebf
+DIST chunky_png-1.3.13.gem 353792 BLAKE2B 9804e2baba7816b52f9ba10db0cfc6e4b45db05fa95f3d154163866bc97e6da644f6240f65e3d5ca8b984cd102346d8838986ca7a1441647cbddd168fee3857f SHA512 40596c3a404830571a24b4241b306ecf1600d7d76f6d535805fbf53640890526b941f0cdae0f9873d00858457a65edd6b415a627725cecb0c32b753e42bf1bc2
+DIST chunky_png-1.3.14.gem 363008 BLAKE2B b35dc7523583b2b6b5c42024ab0e29b90c3c2db734d80ae4c6690f34feb8af22eda09b17ef598fd96dab245d86dd20392b7d8ef727be4ee968d39225aa914bcc SHA512 d52aca34f94749dc58c8850f552bacc6354c93bccf041435d4fd1ed81a88e7564840fca191d6b40d56dfa69a74bbe09f7adbed1517e363e4e00884f7c81c4494
 EBUILD chunky_png-1.3.11.ebuild 735 BLAKE2B 0b660745c190b9ad13ef26ec32b2e6b9bb20ae1e51e85578333d12af02df390b6a4b1cde9b959e708459b7d8b003afe8d60c66712fc2eec4c1505eac2f4c70bc SHA512 f9bdb047dc31f980d22103f29b133103de6e9a70663433cc96bcdc52108ffe022daa60fea29330c2638dbae396149f85a822645ed995dfbec3d5e9e4b2f7408c
 EBUILD chunky_png-1.3.12.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
+EBUILD chunky_png-1.3.13.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
+EBUILD chunky_png-1.3.14.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.13.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.13.ebuild
new file mode 100644
index 000000000000..58f7a1ed2e69
--- /dev/null
+++ b/dev-ruby/chunky_png/chunky_png-1.3.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby library that can read and write PNG images"
+HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
+	rm Gemfile* || die
+
+	# Avoid git dependency
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.14.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.14.ebuild
new file mode 100644
index 000000000000..58f7a1ed2e69
--- /dev/null
+++ b/dev-ruby/chunky_png/chunky_png-1.3.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby library that can read and write PNG images"
+HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
+	rm Gemfile* || die
+
+	# Avoid git dependency
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index a349bcee439a..194ed49f38fa 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,5 +1,5 @@
 DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
 DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
-EBUILD coderay-1.1.2.ebuild 1359 BLAKE2B f3a61690a53eb8a154173e73f1b3e75e417b56284f9a52e7308934d8bcbb44826378f2a736c9c8204a1ebdc7db86dacbc6d7ea1cc6fa7bb9d52de187a6b18076 SHA512 94df2b72f6f343630d3cf10176a0f30395f77cb8d2b124b0abc6b96c9b64daef5b0b9ec91cc21ba4857fa2e4388aa1ba12091855f80e24a5def6cbe66878c45b
+EBUILD coderay-1.1.2.ebuild 1358 BLAKE2B acabb995a44bb57bcaed3a23b84d14e53fa48a8e921173560b85c59964052882576011bb790adacaf0b0d7ccf967e336043b915cbe31b05cedbad7d684de6527 SHA512 7ed404d779e8e56f694e258c7523875b8a0cd39b2a578945f7fe73b256796f6b8f3bd5026933f0ee7febbc9477fb2122ef26d7374e2bc2b0961c882fe31c3036
 EBUILD coderay-1.1.3-r1.ebuild 1476 BLAKE2B b9e92866486d5f8555e727d556aa0d586d0bc7537d074cc2c424a91f189c911905fb305fb87f77b76aa0afdfbb3696e5eff8f1681e30fcb614e068692d05eccd SHA512 87bb4172a71d1e5b27752d0bfffd994ab01067119202a767a2e8f7be85e6a7f9386db44b3f0c41c1e8841c3ed34c9d2d8856c88013e1c2cd987649c031e7fe84
 MISC metadata.xml 342 BLAKE2B b907829065b996e9bf467150216ce92b7fa4bedef8dbe9b9d79a1ba6831c706c312ce0d1cbb418df6c5b43dad59509c132187637025d4c49e9b29e21fa68a107 SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f
diff --git a/dev-ruby/coderay/coderay-1.1.2.ebuild b/dev-ruby/coderay/coderay-1.1.2.ebuild
index 031c7d8fe667..0d26009a63bd 100644
--- a/dev-ruby/coderay/coderay-1.1.2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/coffee-rails/Manifest b/dev-ruby/coffee-rails/Manifest
index cd4846f9686f..9983a9754cf5 100644
--- a/dev-ruby/coffee-rails/Manifest
+++ b/dev-ruby/coffee-rails/Manifest
@@ -1,5 +1,3 @@
-DIST coffee-rails-4.2.2.tar.gz 6013 BLAKE2B fa8b241f68fd191175f35d46cdd3c1b668d9c3cd8fce1899d33cf16a1b88dd4b3bfbe48a545487478c6189bf4c5b68a057751a669065a2972fa67aa429ba9e33 SHA512 195f4132f21b271a3142af1aec911f86cd8234a6f382a337ba349407626fe501f529ff0f65ddfdd91c413dc87a44433e295f81f4399163910104369d11320041
 DIST coffee-rails-5.0.0.tar.gz 5892 BLAKE2B 4d3b945ab4b53936bd39599ac7ba8af4d90e6fee073188847dbb157e098f275df5a3a6e91dcf804068b707804047442efc86524935a56cf403b55426466c502c SHA512 f1aac41f8f1f7181e82fbcf8c3007f40116639e4c140f1837be835fdcfa1babc7fc370212a9954ac8398d9a8d20fbd468550cd8b11c31788428769ea7aedf769
-EBUILD coffee-rails-4.2.2-r1.ebuild 965 BLAKE2B f26c401c77021aa2c25f4fa815b3fb30a06cfef478a0d1ca68d68fa22f77d8917d53a61329a731423b1bca07abd898b1fe12774d49b20f69d24d9ae2e1002aed SHA512 477d3012fa8083a7b8934eb2b1883ab3b71f9cab31bd91e3787469ec21a3ea15e5d7989e21d676a352a3dba0cf7d280d47ecff9d288d028ad7c6dd65e3026bc7
 EBUILD coffee-rails-5.0.0.ebuild 1019 BLAKE2B cfcc0a7673dd733f02f39ad2e05e2091e5cd18d5b54179895b89eef7579f0f194f21524f936661f84c27c525d54b3db49aa4cad2abcd63ed4a31279268599092 SHA512 9f096fd8a2756c4ab0a656daa0f1a9e7c5315b36e3e127c31dd8898301b4f1bde65ad3af5b6ee122bc67b55dcf94cad2f3d058cedeff231455ae2e8ba62806a4
 MISC metadata.xml 344 BLAKE2B 9c10d5783b118d1630cde15f1436110e2e3943f2e25b4f3dfeffbb5c12de30f0439d544e6a6fd522803cfea032b12e5d20565ab0848d8aca1972fdd1e5ceaf2c SHA512 ff265b823397054ca71fdcc18be7b1bf69396f9a7dd5b5b2a051cc0cb862ec03df4f39497043d53ee2c6af607f82f47c97c42196c09114ffb7e1c05d07b36085
diff --git a/dev-ruby/coffee-rails/coffee-rails-4.2.2-r1.ebuild b/dev-ruby/coffee-rails/coffee-rails-4.2.2-r1.ebuild
deleted file mode 100644
index 1f4a0cb3cc3e..000000000000
--- a/dev-ruby/coffee-rails/coffee-rails-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
-HOMEPAGE="https://github.com/rails/coffee-rails"
-SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
-	>dev-ruby/railties-4:*"
-
-all_ruby_prepare() {
-	# Avoid dependency on git and bundler.
-	sed -i -e 's/git ls-files/echo/' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Make sure a consistent rails version is loaded.
-	sed -i -e '4igem "railties"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index d777aa0e13d6..06aca860c9f3 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-source-1.12.2.gem 65024 BLAKE2B 7796ea3b031fe04ff286c023d5de62a1bccff6bef7aa6b0eb01e92bdae59f2e46134c0efae36d647a07cb0dcea61d7da5bf47d1197bdd02a4a2daf0edcbae743 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb
-EBUILD coffee-script-source-1.12.2.ebuild 456 BLAKE2B ac72f28619c4c6f08ef8943a5e5453a34e446c6f0c973d7eea78c37bc5590d60b3e4cf36664727cc7fd7f94cd0a1d1392f0263c2790072b3638666a42ecf5ac4 SHA512 5b691f79172b5bed5834d42eaa5d6c38f9e705df0457ef56bebbeff0b3f58f235b4d4b101d62cea2c937df6f967a866408fba6309a1b84b2d826686e2b62a400
+EBUILD coffee-script-source-1.12.2.ebuild 455 BLAKE2B ef8c7f6e8f7f30b454747bf2848e62cb1042381bf1233edbeceb9fc576a237f662c84ac5ba1f436b6183ccdf6c9fb8bdc134365c7ae2dac39370854e255919c4 SHA512 3f45d722e3a5248423958445d35375f693749f1de26a413de0881450c67672f4cd4bd326f5485be85640fa99d8b00cb7e3430a87deeec7ad75d49fcb88b99df5
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
index cdb380a9911d..c0abfeccf3e5 100644
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
@@ -14,6 +14,6 @@ HOMEPAGE="http://coffeescript.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
 
 IUSE=""
diff --git a/dev-ruby/coffee-script/Manifest b/dev-ruby/coffee-script/Manifest
index 02965e46640b..386fd34fc763 100644
--- a/dev-ruby/coffee-script/Manifest
+++ b/dev-ruby/coffee-script/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-2.4.1.gem 6656 BLAKE2B d670da7888dfc576f7bc07f1d46e82c954d784ae9fb5c3aa094a9d58a74e4e6b12af5b0ab16940de9c8867871dae425cbcf14f1a36d4753367b28785e8c7a1da SHA512 5f19e3dd099408c633243d110fb6a3aece7753eed398c6568388b943a4a068fd5c2085f4e5408ebb7ea7eef529154995fe6e8ca4d437d491ec728a876bfd6492
-EBUILD coffee-script-2.4.1.ebuild 609 BLAKE2B 4a996f054f1e2ae2d7ea6be295b77396a3b90b73a3a7ae5b0eb4bebfc032af43aff33b63753c5c9b59d4da9841980cd1a85aefe1605dcdd07e1da13d9c1112f5 SHA512 0f6904a2ec4f1115dce8e03509c01b7aa10e2bd34351581dfa0bb20edaca6a73d67e10417b2f3db27b1636cc47779251c18ef45170c329675d56a22be4df95f3
+EBUILD coffee-script-2.4.1.ebuild 608 BLAKE2B c5c2cf08e407e56f24d6eb0bebe1a8e5b83257867ee2c9db4e90a3a26b640e4b294aabd73864a3d432a0979948c21d1f5ebb50cf591f2b7df35c91d9acd1f700 SHA512 5e9cc423ee4843695a18d7dff0ad88a277c5de9cdbf21088a8bfb6590bc63a4992a69e1671be8781970a2193fca343f94cf39fff1fc70dc7df60c49c8a92d0cf
 MISC metadata.xml 344 BLAKE2B 9c10d5783b118d1630cde15f1436110e2e3943f2e25b4f3dfeffbb5c12de30f0439d544e6a6fd522803cfea032b12e5d20565ab0848d8aca1972fdd1e5ceaf2c SHA512 ff265b823397054ca71fdcc18be7b1bf69396f9a7dd5b5b2a051cc0cb862ec03df4f39497043d53ee2c6af607f82f47c97c42196c09114ffb7e1c05d07b36085
diff --git a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
index 24aad6c47691..08e7428f3b6c 100644
--- a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
+++ b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rails/ruby-coffee-script https://github.com/rails/c
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
 
 IUSE=""
 
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index 545567aaa99c..d2655291042b 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1,3 +1,5 @@
 DIST combustion-1.3.0.gem 18944 BLAKE2B 5a6f6f2ffd67ae180d3f34be0501ebb05f5a7e3a008b2588fa7c746c69760201b533fdbbab93df6c97fbeb642b6c3f190605b35fae4cb3c31b0b7b7c16d1fa77 SHA512 32ec2c2ab9b1c6a834cf334b3f41e60e495a9c366e57830fa27bc8554b6eff72e8998d76f4c8e8e2e6d81e6c3574db46edf12a1bff05329cd3bacbea8eeb2a46
+DIST combustion-1.3.1.gem 36864 BLAKE2B 08b0651d33b15ffbf9ee01186f90e7247623a06af3bd9e535f82495d3beb7fb7f0a570bd0f9a2a62233b98fb1f9c91ea1527f59fd747300fc68a8f0054b78ffd SHA512 59f456d29cf0b014b1a87a8996bc596cfc8a7d57a8ca514c726eb26264f35c3075d86b712bc1efa1d154a068afa4d389fd1a3efab44b050f07db5c334d7300f7
 EBUILD combustion-1.3.0.ebuild 477 BLAKE2B 74214bd4490e5335c3a028b5079c241c99b2b6f7ca7b4fc5fe1ca3804939407090c859b2ea1b184a9425e45cdf25c6cfda0cc4c2f3a2f636549c27faa41bfcbe SHA512 890a94d824ab522ed7d9f0db88e1260495ba545866b2b47bc7d175e3f6f910d6a3549d73a404d459c225478f00b2c3897a36176ed4c944e90d5e9ee04671f0ef
+EBUILD combustion-1.3.1.ebuild 477 BLAKE2B 74214bd4490e5335c3a028b5079c241c99b2b6f7ca7b4fc5fe1ca3804939407090c859b2ea1b184a9425e45cdf25c6cfda0cc4c2f3a2f636549c27faa41bfcbe SHA512 890a94d824ab522ed7d9f0db88e1260495ba545866b2b47bc7d175e3f6f910d6a3549d73a404d459c225478f00b2c3897a36176ed4c944e90d5e9ee04671f0ef
 MISC metadata.xml 340 BLAKE2B 92307b9df9e0e099c9e38095e3fe14be95374db3313eff5357c57ea1c86cae77276f0a7fe828189402f69e1c29feefa17975d03c94694c59257be999c103a488 SHA512 85ab18259671a4c6f57a305fe992c5a0b078f6bc9f10d88662123def6b378340f5b2f62350a007dd1f62bb66766f1e7b6f3c2546042ff9e52f53332f66ff11bd
diff --git a/dev-ruby/combustion/combustion-1.3.1.ebuild b/dev-ruby/combustion/combustion-1.3.1.ebuild
new file mode 100644
index 000000000000..4b0534f01501
--- /dev/null
+++ b/dev-ruby/combustion/combustion-1.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Elegant Rails Engine Testing"
+HOMEPAGE="https://github.com/pat/combustion"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0.0:*
+	>=dev-ruby/railties-3.0.0:*
+	>=dev-ruby/thor-0.14.6:*
+"
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 1f9ca9c60619..dd0ea3a101c9 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
 DIST concurrent-ruby-1.1.7.tar.gz 4370284 BLAKE2B ea9120fa6c0c58d758c71d54a7a1371a2a94987141343be92e5d8150167d774b513003bc945b7a54dbae8ef1f15b371f6ec28e6e84828d653fdad5b6b58c63e1 SHA512 2af2f1236850666ef56f6024db3b094051de88bb0495b902f5be9471ded733e998b2845aacba2ff8b166d5097fccd597203502ce58766017cb67c529c2840d29
-EBUILD concurrent-ruby-1.0.5.ebuild 1237 BLAKE2B 740e2dd25355b5ceccab6137c24e0fd53a679cae43657494fda9868bb32ca3d9208b68d2ab228a8f1fec44d1b56b6397626961330381fc1e0ef0982e08f0bf49 SHA512 ecbab577139a12e67234641ad43be7771d9ccb62cdc91977423911fc19b4578603171f8a4e58239690196f97624cecff0a2e37ec7c90cc54e810108e3c99468e
+EBUILD concurrent-ruby-1.0.5.ebuild 1236 BLAKE2B 3c2fd9de1f761401e364f7a0678fcea022bbb5f8ffe3fcc4dcb419052d467e7ff17583f220f5fbb2fc6b724a0140e2ac9633e98012adb9615f9530c832ddd3ae SHA512 017f91134b3786ee9815edd02fbd6306ba23759e3b25f6152c94950867e625f267d52773ca6bff847cbc7e909b7ccb4365497433a27a78938082a7b6bcc3bb05
 EBUILD concurrent-ruby-1.1.7.ebuild 1380 BLAKE2B f09b8f295d54f3c102c651bc231025c961177dccc991eb5fd4fb3275f88b8fdbc555ef51fc244b6c9d0f5d6f6c87a4eb25d2e60e4a76ab9fd1e40ef7be10c673 SHA512 0a7ce428b84f030a65c926714ccd5d56b69dfa664eba994b4ec49498ea8a20b159ddcb0c2f47710beae0a4bf7c998c8096eb22a77e419dc3c295b502d7806d9f
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
index f35d43160656..f02868909236 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~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 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/timecop-0.7.4 )"
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 066bf92ab88a..f65200c47067 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,3 +1,5 @@
 DIST curb-0.9.10.gem 88064 BLAKE2B 8f761e752bc1fd0775f012373847330d3ced9d394e5159b74c8e329247f6221bbc26978755d84b91e75b4082b7bb50c7755db299f90f291516f355b4ab1ddc7c SHA512 eab82d3c1b34bf8e5bfd334abca38a80eaab255d31164ca189185b8b98d7f3760fb116babf50dce5aef01be30b15e9374e7a84e1b0926dba13c3e9f8d36c54ca
+DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
 EBUILD curb-0.9.10.ebuild 1382 BLAKE2B 691f384283cb988aee2cbdaeae453b538a551974583a913a93720f04ba28e3688173db154c272c93157336877faaaa83358e316fba21bccc985597a8813c7ae3 SHA512 ba77ab93dfc7c36e9094b5cba39ad0ef256e979bab2352f731d795590f5ba0efec653fd4871596e5379b11e04f27ca129d0c70a654e5b064e03b78fc43d443b4
+EBUILD curb-0.9.11.ebuild 1352 BLAKE2B cd85eb7e577b0576250063e258463a4d6a8c213bd48c6fdc9cde98503dcbd0beebdb53802c8ea251a4ec630bb7880a7afa2ad07ef8691ab916efe0550e7ecd51 SHA512 a62aabeb221292bb83a897b7ef96ad0d680fd2d3b5344290613d14dceb8ec944ba7ef005393f9ef8c507d2cc0401fea141d194c439fa1ad815b9c2c238bfbbd7
 MISC metadata.xml 335 BLAKE2B e68d36e70f8859cbc9d47397720949fdb7d048601e46c7380575f6c5ce43b04dccc2eb3bb0396a72beea0840f197ceeb5325e935431ef45022bdb2749e1cb57f SHA512 993073ca664dcfc0698a820063013ae20e431f0d2d1b5fa27e0871ba33ebcd09ac70de516ad943934a3a4783d3df4dc93e533082b3b47f245908a5eab4e94658
diff --git a/dev-ruby/curb/curb-0.9.11.ebuild b/dev-ruby/curb/curb-0.9.11.ebuild
new file mode 100644
index 000000000000..c623b8cffa57
--- /dev/null
+++ b/dev-ruby/curb/curb-0.9.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby-language bindings for libcurl"
+HOMEPAGE="https://github.com/taf2/curb"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" net-misc/curl[ssl]"
+RDEPEND+=" net-misc/curl[ssl]"
+
+all_ruby_prepare() {
+	# fix tests when localhost is also ::1
+	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
+
+	# avoid tests making outside network connections
+	rm tests/bug_postfields_crash.rb || die
+	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
+		-i tests/tc_curl_easy.rb || die
+	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
+		-i tests/tc_curl_multi.rb || die
+
+	# Fix test that expects wrong output
+	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
+
+	# avoid failing tests where failure condition seems weird, no
+	# upstream travis so not clear if the test is indeed broken.
+	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -Cext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}" V=1
+	cp -l ext/curb_core$(get_modname) lib || die
+}
diff --git a/dev-ruby/delayer/Manifest b/dev-ruby/delayer/Manifest
index b11893ba25c7..0da70df9d064 100644
--- a/dev-ruby/delayer/Manifest
+++ b/dev-ruby/delayer/Manifest
@@ -1,5 +1,3 @@
-DIST delayer-0.0.2.gem 8704 BLAKE2B f0fba28398c0e585b10cfa48eaa7aceb9914e335f11253e8c4cb7a3c85201fae7a52e6792f1d0e824c75936ae2dea572a0ea99e89384562b76be615f6b70628d SHA512 1a5e149b739d8dd975d5c4a9e6a072181cc4d816af202461a0f98ec91f92e85e76faf700171b83652ec4f5114b1c1c5b2c6cd9d1d8d6508c1161b43f099e2b88
 DIST delayer-1.1.2.gem 11264 BLAKE2B b377fbeb5bd22f0e63e6c6135e86a266929ad3e77ac310bf18f47cea4dcb7cb74fabaa58960dd6ec9b1d26f3e28631da960ce51e9a2c48fa14014d5a47a28af1 SHA512 826aa27922c6d0d377db8b9ff0abd19903574a03dd9439548c82400a492127192ac875b839a54031ec7aa27d64bcef1158f0d94986f6b4d55765b6541d177ba0
-EBUILD delayer-0.0.2.ebuild 481 BLAKE2B 0e15d86fc49a9617b2f56e50f142c74b616ae423019ca98dc9994ab19a5240a33629f12e159d260ed8cdd1061a692cd52097ac99689bfb2622683c42a4292806 SHA512 d51a61129b82b5f5fb168251a3535cb7f27dead399119c395d45300ecb09f4df09c437c0f45fa00941ff2004cdb6088be22416efc942760a560baf4e0c7f1483
 EBUILD delayer-1.1.2.ebuild 451 BLAKE2B 623449065ad93c19b63d198356303fb33ceb8be9dcaf67b59ada9cb8b0c168a8de71ee5b558225671314720989e5d50d4af3615f19d9692ba73b8a17b4fc76a1 SHA512 d531bb9b3a3ebbda43eaa236a1126fd14aa5f57d56b38a9edce62b404817ff16692e8d255244ac1e5296946a8232508c219c8631b6747a816ad65b5da2f89697
 MISC metadata.xml 402 BLAKE2B 55d14808082ea735f42e1973414806c29ce83dc35dbc7a9b72c70d22bb00b0f5f22f34798a8232dbf32a74a134387eb47ff014477e336c912d89bd23c388e78b SHA512 9d11aea71d2c27e3aeaa80848458166719daff95243f342b946756e9b2d0d1ab23551a3eafc40a74fad1d029798f2ec7bb67bf224ae9985bd7db9fdf4576ef41
diff --git a/dev-ruby/delayer/delayer-0.0.2.ebuild b/dev-ruby/delayer/delayer-0.0.2.ebuild
deleted file mode 100644
index d9fb739a5159..000000000000
--- a/dev-ruby/delayer/delayer-0.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="Delay the processing"
-HOMEPAGE="https://rubygems.org/gems/delayer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec test/test_*.rb || die "sed failed"
-}
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 237a2e2f0a73..59c290e852a9 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -2,7 +2,7 @@ DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d3
 DIST diff-lcs-1.4.1.gem 48128 BLAKE2B edd92f00b858c716787974772858f65d98b1a07ea4e8697eed190d09e2cead7b3f2518ee96521b0cda1cd4b938365705cf969ef2d8cf1333ff843202ea2b6c90 SHA512 d084ee628caafe4b61e66142d57e25dd2c8e9423a5d0d042911a4816ce391528f03ea2c6226d29c953a83e6642d0c3328ea5a22216011f112f64030c6808a7bc
 DIST diff-lcs-1.4.4.gem 50688 BLAKE2B 0b72890b147696425120f2dc71f8d741d993411bd8e76d130d3c12e3b4f451b0812a3cd34b09e653ec7024c616d7ffb4bd1c40303b66ca4a13e26c397d5913b6 SHA512 fcc6c86f392697c4b3690827f7c20d50fe68e367626b85a56446356d7bb21b4020bdb2bc5c2faf4e82807cd9f3049d71c94d166c85a1a4231f0fd9fc032f41c7
 DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
-EBUILD diff-lcs-1.3.ebuild 640 BLAKE2B 802b2653e9789014d27eab658fb2e1857a5de107a9df5c1fba293b3ba2bbb5449106a9d5de14611f39490edbf9f283c8123de5cad42913a50fc33eb3412988d1 SHA512 6af2510987d3d6f4e5a8f7135ed35713acb08628b046538588aba4f201de74bee84b1b46ac4fd2a1cb6c2feac8e634593fcc0a9530ee269b54557379911b093b
+EBUILD diff-lcs-1.3.ebuild 639 BLAKE2B e8340b826b99d3e7fd473088d01e8b27ad7d3c96d2a8e42c2434622a7f12e7963a8d5adec0161a21e890cd4fc0026fbdc36b5e01bbfe3dc4d175b0fb847a8ba3 SHA512 d62ae56c4ef402b464159a30c36e22f1f71bed44d2f02df42dd3b65a13e72332c9418a04ef08a28a6d1682870d902cc6d62910abe76d562781b8426f3fcfc0c4
 EBUILD diff-lcs-1.4.1.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
 EBUILD diff-lcs-1.4.4.ebuild 752 BLAKE2B 42f3e9f4606b029229f8e349bf07e2d29848dbea7125b0598e3318c03b29220d87aef06482e49aed7ed286b45b07722422fd2c5c831a8e046b2ed1e8b151adc1 SHA512 b917559d2c9d5ae0d51dbcd4f0a274a89b61e4ecad265eff8bf254dc48c2bc2399696f8a35c30f94ea414e75a2fa9b3c4913cde94f4b52f762019facf10c336f
 EBUILD diff-lcs-1.4.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index 28112da5f8e3..e7422d0d2ae8 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 ppc ppc64 s390 sparc x86 ~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 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/duktape-rb/Manifest b/dev-ruby/duktape-rb/Manifest
new file mode 100644
index 000000000000..cbe2da03a345
--- /dev/null
+++ b/dev-ruby/duktape-rb/Manifest
@@ -0,0 +1,5 @@
+AUX duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch 677 BLAKE2B 74224d6c929cafc5d61566ff9bcd69f4279d1e14e3029e9af2396c4e7c1c280bba5bc8ed7a9751c8f9596cb26414d0ee893e346480ed3b780db602eb40169425 SHA512 3754e03340c2cbed7f9b264c718c4b39d7115b7c7d6d9ce6980bb04a0f426bc626019edb132f34ae031fb53be6c6aacca71137b1c46fda879dd285e4f920249b
+AUX duktape-rb-2.3.0.0_use-system-duktape.patch 1860 BLAKE2B 479457cc1782a43ea217ac65dc20f41bfd8ca75dcdf7b77403b144514b590989a98eba01b3f0687e49b81cbb9a096bebb7e0034a0c09dcae36def12d10ea8e13 SHA512 567b9d3b41a413703e64e9167c683a5fb60af13a97426aa03ffe4a38ca6f810fad54ee29269157698c70c762329b3e889b7bed72420700764a478c9047abd4ef
+DIST duktape-rb-2.3.0.0.tar.gz 1356464 BLAKE2B be7362ddbe6860bcb12c8f8909f66ae525585e628f7be2317b07eb07960f8f25e503dbc89e713e57144cc8108751ac856aa73a16cbd58502e928acf9e116247c SHA512 af4fd45387c3f40cd24bf3c879ef4e0d7efd43ca24f0cb866bf869db7fa9f4add9b60122c0dcfbce5491cdd7479b1414637fa1054078216b9f57fa426feb0154
+EBUILD duktape-rb-2.3.0.0-r2.ebuild 1088 BLAKE2B 399ef457a21cbf2951ffbb6c7f3f79fbba8f57959b203e071bc54489ce9774185654da6d337f890357f7fbc08a0a8a07ff939c37c8b2129c4028e0a547bdbb8a SHA512 68d60258bc35d50b3739b852371e8ea24f8cad7a224201baa542b84adbe9870a438e1ef2b406de80f0f506eb2cc48210471e7a94c2b6c084c31162b480bbe838
+MISC metadata.xml 456 BLAKE2B 68d38aee7b4f05acc971cfce3dfd8df7be680a45fa0f304a37f829096a3987130855b048c082887f38ce023615eccbbe9a9a83be27103c354c614b8fabc9f08f SHA512 25e7ef6ee7433b73deedbe4a7cdada16b57000a9f02b9a834a228f604624b310d41aba9cdcb11e7989079034181e4143b1e98d320572430c9152c4ba9583fee1
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
new file mode 100644
index 000000000000..ae7052fef742
--- /dev/null
+++ b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="duktape.gemspec"
+RUBY_FAKEGEM_NAME="duktape"
+
+inherit ruby-fakegem
+
+MY_PN=${PN/-/\.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Ruby bindings to the Duktape JavaScript interpeter"
+HOMEPAGE="https://github.com/judofyr/duktape.rb"
+SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ppc"
+
+COMMON_DEPEND="dev-lang/duktape:="
+DEPEND+="${COMMON_DEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
+
+ruby_add_bdepend "
+	dev-ruby/pkg-config
+	dev-ruby/rake-compiler
+	dev-ruby/sdoc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0.0_duktape-2.5.0-tests.patch
+	"${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
+)
+
+RUBY_S=${MY_P}
+
+all_ruby_prepare() {
+	rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/duktape extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake compile
+}
diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
new file mode 100644
index 000000000000..20228c480da8
--- /dev/null
+++ b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
@@ -0,0 +1,28 @@
+The parse-error message asserted by two of the tests has changed since
+duktape-2.3.0, it is now
+
+# encoding: ASCII-8BIT
+parse error (line 1, end of input)
+
+This should hopefully cover both cases.
+
+--- a/test/test_duktape.rb
++++ b/test/test_duktape.rb
+@@ -102,7 +102,7 @@
+         @ctx.eval_string('{')
+       end
+ 
+-      assert_equal "parse error (line 1)", err.message
++      assert_match /parse error [(]line 1/, err.message
+     end
+ 
+     def test_type_error
+@@ -160,7 +160,7 @@
+         @ctx.exec_string('{')
+       end
+ 
+-      assert_equal "parse error (line 1)", err.message
++      assert_match /parse error [(]line 1/, err.message
+     end
+ 
+     def test_type_error
diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch
new file mode 100644
index 000000000000..9f35293c9e81
--- /dev/null
+++ b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch
@@ -0,0 +1,79 @@
+--- a/MANIFEST.txt
++++ b/MANIFEST.txt
+@@ -1,9 +1,6 @@
+ README.md
+ CHANGELOG.md
+-ext/duktape/duktape.c
+-ext/duktape/duktape.h
+ ext/duktape/duktape_ext.c
+-ext/duktape/duk_config.h
+ ext/duktape/extconf.rb
+ lib/duktape/version.rb
+ lib/duktape.rb
+--- a/ext/duktape/extconf.rb
++++ b/ext/duktape/extconf.rb
+@@ -1,6 +1,64 @@
+ require 'mkmf'
+ require 'zlib'
+ 
++#
++# functions
++#
++
++def package_config pkg, options={}
++  package = pkg_config(pkg)
++  return package if package
++
++  begin
++    require 'rubygems'
++    gem 'pkg-config', (gem_ver='~> 1.1')
++    require 'pkg-config' and message("Using pkg-config gem version #{PKGConfig::VERSION}\n")
++  rescue LoadError
++    message "pkg-config could not be used to find #{pkg}\nPlease install either `pkg-config` or the pkg-config gem per\n\n    gem install pkg-config -v #{gem_ver.inspect}\n\n"
++  else
++    return nil unless PKGConfig.have_package(pkg)
++
++    cflags  = PKGConfig.cflags(pkg)
++    ldflags = PKGConfig.libs_only_L(pkg)
++    libs    = PKGConfig.libs_only_l(pkg)
++
++    Logging::message "PKGConfig package configuration for %s\n", pkg
++    Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
++
++    [cflags, ldflags, libs]
++  end
++end
++
++def duktape_try_compile
++  try_compile "int main() {return 0;}", "", {werror: true}
++end
++
++def add_cflags(flags)
++  print "checking if the C compiler accepts #{flags}... "
++  with_cflags("#{$CFLAGS} #{flags}") do
++    if duktape_try_compile
++      puts 'yes'
++      true
++    else
++      puts 'no'
++      false
++    end
++  end
++end
++
++#
++# main
++#
++
++if ENV['CC']
++  RbConfig::CONFIG['CC'] = RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC']
++end
++$LIBS << " #{ENV["LIBS"]}"
++$LDFLAGS << " #{ENV["LDFLAGS"]}"
++add_cflags(ENV["CFLAGS"])
++
++package_config('duktape')
++
+ $CFLAGS += ' -std=c99'
+ have_func 'rb_sym2str'
+ create_makefile 'duktape_ext'
diff --git a/dev-ruby/inifile/metadata.xml b/dev-ruby/duktape-rb/metadata.xml
index 7faba36c6af9..9e38302f85b5 100644
--- a/dev-ruby/inifile/metadata.xml
+++ b/dev-ruby/duktape-rb/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
+  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">TwP/inifile</remote-id>
+    <remote-id type="github">judofyr/duktape.rb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index 7873184d1042..8b9b4254eb7b 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,5 +1,5 @@
 DIST em-websocket-0.5.1.tar.gz 27792 BLAKE2B 5aa8b9b9a1bf7066086c3115358a01054dbd24c3b9e7b454210c653aa25face2230e5504e0fc3a13d4770bcfcdf5d792c1914f173ec8d83d1b97ee7c169636af SHA512 ca2b4e2e4be663a5932fe63ed0efab169fbee9aec50f9780c1ee5df0efa300acb58410b97a22d5d10a2cb9195c2a68f6c71bf4e070ee6d915c6abf4015aa5d94
 DIST em-websocket-0.5.2.tar.gz 29367 BLAKE2B 91d41044e20f1f8277527205e3ee6671de2a1fb9b433c18d5b48a166c7cfa53c6553e32b726326f126981f0e014625075bc918b71e00bd8a6919670c370b6cab SHA512 46df705e2af93082884c7ca521df4f6cf33309c441eb3ba96be609b2cf280e3b72c689810d55279db6dbbc178ed843d64ccdaf9d4b39d52ddac7d84956065b06
 EBUILD em-websocket-0.5.1.ebuild 1230 BLAKE2B 4156b5637f5d5253ce6bdf4f8c45439991d7239d46b181cf7c4227bf2b09968fa78717d8fd675bd6091444bae1a192f373bceed373d166a08d7f4b037d277a7e SHA512 478682fbba3d3f26687d705ff8c11ffdab0b90b6be3014f48aa85929661fb035d46f3d486e231394535ff809a250880f1b31c24dffac5a4772842855ee940b50
-EBUILD em-websocket-0.5.2.ebuild 1185 BLAKE2B b12b369962d7920f268b53011788652ccb298f038a6cce1e9eec3fcf9832b2ba8b073c9207127377c615b7febf710b384fccf0cea7d51f40f4bb8c1f3fbef3a5 SHA512 d9449953eafcf71ab3805c72bc49f093d775a7da7e14dba7e0e50912659391368fe373147b4ecb5855b004ac4bbb4e8083168bf59031219d689a99c92ce5d046
+EBUILD em-websocket-0.5.2.ebuild 1154 BLAKE2B 9728f32e0d54df840bf364307e29365ece1f35d8881199186e97ee9a62a841d84ac048618ddab0af75268977df185f267c7d96f1fb5190e180b422829b98b47b SHA512 4819be816f69817390b05c4041a110500f82f518b6c77eed7641555aced63fe78c15e5d534137673e56ddd72ac8f671712eb4c6bc50c382b45c907071d407b65
 MISC metadata.xml 458 BLAKE2B 59015f88eb8e2a4d6d538febe271bc6c9cd6849db0f9a8a11125f6efe9ee15c437603d498412aa23e16f506fa44317314762cf9b4302d938c4bb3913a9e4418d SHA512 ea01b58e2eb6ab8a23418be9140c28f8849382014a12b6aa3910d12a6614361b63d2fdbd31b6c099df38c4223dab330425885af6943ce87b4fecf4edc13b7b68
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
index 61ebed06f908..b5c36614b5ba 100644
--- a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
@@ -42,6 +42,5 @@ all_ruby_prepare() {
 all_ruby_install() {
 	all_fakegem_install
 
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
+	dodoc -r examples
 }
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index 3194b4c9339d..df0d454ea9c2 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -1,3 +1,5 @@
+DIST erubi-1.10.0.tar.gz 11212 BLAKE2B 1a31994bc02a6acd0a5ec025c71961422dc8850de1b871a23b6b89fba59b0d3221153a1e1418d2c279ae40b2a942c53290f4695793b0fedba0a4e7b7c324b41a SHA512 adf62511ce9324b4c5f7a95863254c9d95cf40f2107eddad1118ef97d7f534fb74d79b48575ff17209e492811a9a8f87c52fa7a30e4b6ea4e50504cf5572c024
 DIST erubi-1.9.0.gem 13824 BLAKE2B 00cb428e3433090370e9f61d2445f98553a45e2a92181076114db2601fa7261d8ffc44c3f4a0ecb73d616fb5e93dcc52ca6a2efab3945b11bd17d4a53c68fed1 SHA512 34770c01215b323797739af54c5c821d28e982309a76f0a212657868629625ae6dfca3e9e2f5ae16893813fc81b5afbb172c397ddad1e2f93108c5112c540bd6
+EBUILD erubi-1.10.0.ebuild 667 BLAKE2B 380cae4ff61608ff54a9956903f87a3bd1982e884e43dc71c7593f1551a1ac1f4031e514258418bf20f603d9aa5ecef70d3fd8ebde566558e51dbd03278ae924 SHA512 ac0e870ef7bf3c2d607eb676787b9d02f6a51bc4de1cae87d4a27d385c91671f33979f85a42559da9522a5b7d1cb136c0be26d368fcf7bb483ab488d78aaff2d
 EBUILD erubi-1.9.0.ebuild 552 BLAKE2B a91c6fa724b5b3667de2ce9b68653deee079f87a30d1f98dd963d9a2383aceb5782d5431219b16e2c86b10ac8ae6d13ec19a8d27a55470d836873226bdaa8f4e SHA512 7169ac29042525609712634b46857e2bbfa122b77f3430a77864d6987964f86ac159b653910203e40445d2487add5b79433403f9a613fb4bed22dc0d5613ff21
 MISC metadata.xml 392 BLAKE2B 69b13996a3f20cfea19c9633ae778b8fe408fb0ce3655ff27b10dd5b128ac1c0f63128f77076586584a95389b6f6d2890153b653a5ddc71e053cd50224a8f15a SHA512 011c951701fd525c150ba9ca737c502cb78937c173e5286b06f3ed3f007860eee68265f419975ea131eb18682789435a328f5d8345078781c733e7148eb381b0
diff --git a/dev-ruby/erubi/erubi-1.10.0.ebuild b/dev-ruby/erubi/erubi-1.10.0.ebuild
new file mode 100644
index 000000000000..112ff370658f
--- /dev/null
+++ b/dev-ruby/erubi/erubi-1.10.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_GEMSPEC="erubi.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
+HOMEPAGE="https://github.com/jeremyevans/erubi"
+SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 92ba6a09b081..0aee5ce493af 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,3 +1,3 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
-EBUILD erubis-2.7.0-r2.ebuild 1105 BLAKE2B a2242e9a99ff3ff51f6ae32b19c06d414979c6be1a7ab35c6528cbe030a5257d3be1f5968a83efada82171a249f334fa1d1e3269843c611e0ce94c9f33aa86db SHA512 a758299523e3123489cfdb598847d46a8ca19822b2f03f112fdc440cf04281c43a4b31e2f8d7ee500d7de69f1388ed1eff5bac489b7f6030ee821b08fedd340f
+EBUILD erubis-2.7.0-r2.ebuild 1104 BLAKE2B 892eb1734f4045dab3addcdc94384db9d40633d355c7ce153ef9d5d51b9115a56f7aeabe64e526d5010e75629ee0dfcee32695013f37ce2ea5a78761ac2fd3b9 SHA512 83c570210dc4b11c1ec35c8045f69b035c2e01f2246e17fdbadac31eb8be8f6f9ced15c690eec9d32f27eb2bce817450b57ebee27f14a62e2769571242935edd
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
index b339ec8c1de9..6470fa4b83f5 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.kuwata-lab.com/erubis/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index fe4beb6fca66..982cdf70f00c 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,3 +1,4 @@
 DIST execjs-2.7.0.tar.gz 425361 BLAKE2B 8dd3bb5557a6993667abfa6c424cbea6377c1ea7b3928b9b60a6ba084f1df8a109d10d1a616c9d302e1b98a2031ece9e710d7dd933791cbfb3eaa48e45b9a595 SHA512 9627f466e8a363404c940b29227d08a8ad067b53383989a3d8f4f902e8c050c0e81facdbdafbb660c41f7c8dc2fbdd3bd357ca708e612af4d223b5412c6c1fb7
-EBUILD execjs-2.7.0.ebuild 1165 BLAKE2B 4e4a6d1d507feece4967423d9a2fb6541cb113eb140edd6ff2627f30a893bcc60275a062d72a0b3adef9ec8324675e949b7d8fe0f54838c75f285b880fe6ee90 SHA512 11a70dc6c6ec5240654de05acebc6f39c1e7929113a209cae6e302bbb756fb4a7e7862f64f13fe464322eafdb3c799aa99c5c21bc809de63044b52dec0fc48e6
+EBUILD execjs-2.7.0-r1.ebuild 1021 BLAKE2B ae8f9081626b160d365f5179449ff8b09cc519f0ecf5c8decd7eda6527f9f6d21595b465a9bf55b7c31b493ddc996623fa24e855bce2178561cc16be3999cf84 SHA512 5495d5f96499dfbe9f3e4604b22c78b611e34df6b396e798942483572b8c602eb5952be01cc3bb3a4f7af0bbca3b8fc987b99b4c97924cc235b9e04d023d871d
+EBUILD execjs-2.7.0.ebuild 1160 BLAKE2B 2a438bb2d819abf3915778f3e849aa7b3563bf19bee28b929969dcb303c49dd1ebf791a403a1b8d8d13e1439ffa51b25f7ce7ad77f2f6409c718d3737845c1d2 SHA512 143ae9fc7118d8f2e52b89717e2d1e5537964bf08358167c33c7c1eabd21040ae0e29508b94eaaba83bb1d41682035d2fd8980e9d4cf19f9ded725ee9f4a11da
 MISC metadata.xml 338 BLAKE2B deb976ed7b368fddcb7e6b7b553ff8fc748f90c61d23f84cc251e7154f6f5f5c79c7d3d962dd2bc8061df7be36dc719ffb2c247c759e6fc7e4e4ff211eba6e16 SHA512 34e46d203d186a98cb50f83fc6508457a8ec536920b9640b7c0ce2f6f00e96643f1265c750a0f8555e57eb14ac1d19f0487bbe6e7fe5afe0870d8ecb162e2f27
diff --git a/dev-ruby/execjs/execjs-2.7.0-r1.ebuild b/dev-ruby/execjs/execjs-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..507e2b0a4aae
--- /dev/null
+++ b/dev-ruby/execjs/execjs-2.7.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
+HOMEPAGE="https://github.com/rails/execjs"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="test"
+
+# execjs supports various javascript runtimes. They are listed in order
+# as per the documentation. For now only include the ones already in the
+# tree.
+
+RDEPEND+=" || ( dev-ruby/duktape-rb net-libs/nodejs )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile || die
+	# Avoid test requiring network connectivity. We could potentially
+	# substitute dev-ruby/coffee-script-source for this.
+	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
+}
diff --git a/dev-ruby/execjs/execjs-2.7.0.ebuild b/dev-ruby/execjs/execjs-2.7.0.ebuild
index 6ee18c149d13..b67bdd792e28 100644
--- a/dev-ruby/execjs/execjs-2.7.0.ebuild
+++ b/dev-ruby/execjs/execjs-2.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
 IUSE="test"
 
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index b75cba826254..40ea5eca9db5 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1,7 +1,5 @@
-DIST exifr-1.3.6.tar.gz 245123 BLAKE2B eadaec6e1e75d048a9279459c157b0e493ee79f30b964897a9e30a38d27bc5b6b6fe87db7da192f7cab430630b7ed8fe4084f951189cb5bfe805d38e9861c5bc SHA512 9580e47c9de317b456c3cb23099293e26aa1889e338d2b95c4983d7a03c8658ced67d1f11a3fc7b23a80b3a89698c6277ce1bf47e762e5e42822f2ba3041887f
-DIST exifr-1.3.7.tar.gz 245155 BLAKE2B b7a333de97015336cf776072c1d6940edaabe57c9fb379e4611bbb85fb03803be44244424e50ad9bc807a5598fea28dbf7e975cb063e644e6bc80ce365ed7dcd SHA512 a3249c9bc2b1702e82287e79f854ea7ccf5757eb5000f88479138026b1b8de56072a1289a29f840cd619bd81f27e835131e890ce5f3c573849d64e5ecf942f66
 DIST exifr-1.3.8.tar.gz 245288 BLAKE2B 49032ee6bd5aaf07c3ef66cd1cc0ae67adff6afc4cae058343d88c5a7dce3230fe151bbedb22c7418745953a0005f0d385a175246c5be48f33a14406914a7d13 SHA512 4e2d49418a31f4a325b9428edefe71066717335c263e0594e0f5b3707cf3fb7d5208d09efe5e2a43948c17894a841e4f1b08829d3fe7759ad3027e29989dce57
-EBUILD exifr-1.3.6.ebuild 650 BLAKE2B 429db5bdf7aa8d066ccc6c37dbf01541ab8a3880a2b74be97258297eb07e45dc90af361479e55011297cd031df152126075d54126a6b7c2cdf5fa4600f76c69f SHA512 01ac776c5d4ff0c6e3401622c65b2af72d043af041b3a818c13d20bfa011a1909ae4aae75fed0de04ac0a30dfb07e6b28f6b90fa43f0dc94befd6c11802a04bd
-EBUILD exifr-1.3.7.ebuild 650 BLAKE2B 913adcc5c6c1c56c1801ba4e0f26441ed3c1a8f44e4814ebc5dc1d0210b28b7e900f0622630b0230e7c9a6650c653558f4a9ec2c712c45e1ee2b1e13e678d116 SHA512 46f6b8f2cccea92e09da8f4211fe2240ac77d3e4690373ea4634fef48404568bde09afb86b7f9a3d1d695b03db5d38cf7f2003206d9f03e258e163b9deee6c0d
+DIST exifr-1.3.9.tar.gz 265384 BLAKE2B 39af2ce0b881fec73c38a707397dd596b1e6a020c357dfd7fb3a4032a743ec0ce175f349f9bc9ec9cd32842c43d20d8bfbf0de3a8e195b6ac028ade651cfcba7 SHA512 e9cfac2ef8da6c9d6fc0ef2463e743c3547f10f3b8fd597516b11227ee2ffbbcfd188d2b27b7ad2ebf828502919dce04139787efe7344b1ec6cc21df6bbc46c6
 EBUILD exifr-1.3.8.ebuild 650 BLAKE2B 913adcc5c6c1c56c1801ba4e0f26441ed3c1a8f44e4814ebc5dc1d0210b28b7e900f0622630b0230e7c9a6650c653558f4a9ec2c712c45e1ee2b1e13e678d116 SHA512 46f6b8f2cccea92e09da8f4211fe2240ac77d3e4690373ea4634fef48404568bde09afb86b7f9a3d1d695b03db5d38cf7f2003206d9f03e258e163b9deee6c0d
+EBUILD exifr-1.3.9.ebuild 650 BLAKE2B 913adcc5c6c1c56c1801ba4e0f26441ed3c1a8f44e4814ebc5dc1d0210b28b7e900f0622630b0230e7c9a6650c653558f4a9ec2c712c45e1ee2b1e13e678d116 SHA512 46f6b8f2cccea92e09da8f4211fe2240ac77d3e4690373ea4634fef48404568bde09afb86b7f9a3d1d695b03db5d38cf7f2003206d9f03e258e163b9deee6c0d
 MISC metadata.xml 338 BLAKE2B 47c3d987095290c119098638186a209bceec785b33cd6501a3a45c373f2e0a15f1f9da565b7b05c948ab9889780969935c631f418fed04a6b2d45d346e530f82 SHA512 76f53e033898bf27e6d8a3a2681dd5aa66f7b112fda61489397fb0a1205ac1c2e3a07007493d9de82e7ce5fa57b4f7452d214b6873f325fd0ff53d9730721bc1
diff --git a/dev-ruby/exifr/exifr-1.3.6.ebuild b/dev-ruby/exifr/exifr-1.3.6.ebuild
deleted file mode 100644
index 5c848bd4f431..000000000000
--- a/dev-ruby/exifr/exifr-1.3.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc/api"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
-HOMEPAGE="https://github.com/remvee/exifr/"
-SRC_URI="https://github.com/remvee/exifr/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-release-${PV}"
-
-# License is not specified in source distribution but is in the GitHub
-# repository.
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/exifr/exifr-1.3.7.ebuild b/dev-ruby/exifr/exifr-1.3.9.ebuild
index 601d7e6393fd..601d7e6393fd 100644
--- a/dev-ruby/exifr/exifr-1.3.7.ebuild
+++ b/dev-ruby/exifr/exifr-1.3.9.ebuild
diff --git a/dev-ruby/expression_parser/Manifest b/dev-ruby/expression_parser/Manifest
deleted file mode 100644
index 1767f0c558db..000000000000
--- a/dev-ruby/expression_parser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST expression_parser-0.9.0_p20130518.tar.gz 4212 BLAKE2B 10974bff0b671f6105bc38356d1681e9673b96ddf62278b68e4327d5db8505d468a32699f15966b02600368f842b3baf4ebadb6eb203ee53c3568c2d7bc64f9a SHA512 d0d031570e99987a78a4285cfc5ebdb3ec517fbfdd053b7da3dae9c3f2ccf47083f0964b135f3c2501aebe44bd789f1a360cd386620a2f3585af014dd81fc474
-EBUILD expression_parser-0.9.0_p20130518.ebuild 630 BLAKE2B e83aa8f50377ed6be94452f96f4073292c66bf148c71c83db31144d0f95838f7e9dc1415e3de465e82aae8fe5959663c863af0c4d5e36f7a26d98826b55a8560 SHA512 5fe42a8fdc8da482d18d643dfc99162307d90177b5e559de14a702206766732ac8e12966ed7bce47d1ee4b57e8df29dab970c9573fa4cd3d4b661cc59072c449
-MISC metadata.xml 352 BLAKE2B c91e2a8f30d8ba651b4beffe3c0238504224f5657909bf8ebfc11181714858bcffc26d64bfbf2c99e58a68a61a0f262bd279a73e87e81025d4544306c855859e SHA512 8dc7c99a4c036e1fc2ab5c899ae70984456c44726fb8f20be2cff28df6acf93bca56a7231c79f8526be09189136cc29799727f4ca01a594fab18dcce3195cc24
diff --git a/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild b/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild
deleted file mode 100644
index ca484c75bc90..000000000000
--- a/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README"
-RUBY_FAKEGEM_VERSION="0.9.0.20130518"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A math parser"
-HOMEPAGE="https://lukaszwrobel.pl/blog/math-parser-part-3-implementation"
-COMMIT_ID="6e3c7973423ff0f2cd33db2304fcd4eac3af01ad"
-SRC_URI="https://github.com/nricciar/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-RUBY_S="${PN}-${COMMIT_ID}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/expression_parser/metadata.xml b/dev-ruby/expression_parser/metadata.xml
deleted file mode 100644
index def7340a01c4..000000000000
--- a/dev-ruby/expression_parser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">nricciar/expression_parser</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 1e384bdab9ea..012136e1f897 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,8 +1,8 @@
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
-DIST facter-3.14.12.tar.gz 406896 BLAKE2B 5f25e9da754931c6318370877b0ab1158e47920c8d9776a24689b3b906a91beddfe6c32b584888f6c9131d8338eb3fcb3983f062767d16eb9da51572d0156c60 SHA512 599984d0cc86f65ab9c487963fe6e12513895079cf145d924910a53ceb702e3b59785ea073e695ec9acac36f8a7405ffcd1130eb338ce261a3af4213ef11f7d0
 DIST facter-3.14.13.tar.gz 407204 BLAKE2B 12019c20284eb2a62fb65f2ab09246b98708b1aecb485700c2074865d02bb836f140802ad3b54f28c90fdd225b72e9216d21fb57dc0d82b8b3854607d5ba0eb7 SHA512 62910dc71aff0a0b0ef1ece054e0d1eea095c65ca6a34e17331aea943e217baa1a12bba1176143b652bb322195248a4aab1379eb69d6be419b73eb6ae3a8afac
-EBUILD facter-3.14.12.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
+DIST facter-3.14.14.tar.gz 407276 BLAKE2B 5f911581773ef9a19ee42b5ed64114e2519ff88e024490d74bf9b1e777221d92d3ed502c8e6a0df573a5390fca323fcf0bcfdce6aeed25826c84efb3971307a5 SHA512 22e0ff0a9280be129f7587e24109f76f34660d99086378dd7e9ccc004c08a4fa5dd6f9ba50957c146ea40e26344ee87dbafd45b885f8f576192b6e572b084af7
 EBUILD facter-3.14.13.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
+EBUILD facter-3.14.14.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
 EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.12.ebuild b/dev-ruby/facter/facter-3.14.14.ebuild
index f2b40c9e3b70..f2b40c9e3b70 100644
--- a/dev-ruby/facter/facter-3.14.12.ebuild
+++ b/dev-ruby/facter/facter-3.14.14.ebuild
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 6a765495624e..41945a3a58e5 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,9 +1,7 @@
-DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a00fd4ae0a2a28dca91c5981290c8540602d89d406e91d98a0f5dbc6fc4a54ab6d7d2b716a4d4957ab32254dc SHA512 1ea0c4194603b5eaec0f4abc2460fb39cb9de97179d7699c3cb37673731ebf8bf03d20fb422911d4725d4308691d4c92a82f5a661e034381cc04066ddcc955bc
 DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da5c407e030d9722ed8ccc4ed1a0a8b2d5534c96b50fbe79e84fe71e4268f3228c223dc61fe4c74cda0de18a790 SHA512 9adc03cdef0714656738d354d787a99cb9fcc85718847db7b183b02f38d550ff86d65c8e6ed13be3c839cc64f36f3e95ff25dd5d2f8f45c7207dbe5735238e0a
 DIST faker-2.12.0.tar.gz 1100460 BLAKE2B 8be31911c9612d7433433121344a1fbfc735740898cb4fa7115a9ec33d22f610e5eca9ace3369da7f6e107478493e7b732a74650a233171ebb8b306f3e2d872e SHA512 7adc89cc3ba7e4d802d5f96199e21a6ed1dc9f0144d2da5a9a5adb705097d1acf4830c7ff0ce733fb9b0ddc11fba0290cade9f791824db5ab737b3facd93f93d
 DIST faker-2.13.0.tar.gz 1129212 BLAKE2B 358a959a600d5638681bbad20b05618cd2d67857de120a4ff6d8d6c3c723d1efd24ebfa617e3d2090862e111271bd3c12ac3f3f340e8eda6811760c1de31f642 SHA512 700a3d4d6f9019bd7c7e61ed770c6eb2e9dede6e4af9e3a06ca1858a2eebdd67491b94a41396ba1ab4940f0f7fd00f2203db78f5267adb08360b95823c633131
 DIST faker-2.14.0.tar.gz 1150487 BLAKE2B 51343e8d45d2615d180fac4845d2cc8a6509b3710528c2770e52f2e4203e458ba07e3fa4f8f7559704598379b54fe38d8d557fc6cc0b614f3695cee8265adc49 SHA512 3a65a65c587f9e2a12c0d7a1e5ecbb12d059146cfda944d5bca950dd2b8cbdb509722b7b181fc619f395ebb526c3f99461ed74803a79cda1b74df83c203db518
-EBUILD faker-1.9.6-r1.ebuild 720 BLAKE2B 19d8387ce2fe15cf1fff88f00219e630526321f37645f5011920c68056646c55c5f983f9f3bb8c291a4a90ee6503e118d4c6758a93f39cc78c881c46f4e0ae67 SHA512 50c6bffef40a9ff278234abc58cf4ab71e187dbbc9b48631f547ad6d40637150ca2dc040f5d3208126e1aba09fff97cc8a499437777b7113ba5be934510fcb10
 EBUILD faker-2.11.0.ebuild 799 BLAKE2B 3cb0a41f26666e42f9afcbb64b533cbb80c5624d5b04447f6c8136500f65968097c2476f6da5a13e1579dd463c4ee387f8482dc62c9a76fa67616cc0377a91a5 SHA512 cb773add5e5a637eb2a27e98b5229bdf4380f8c9ff2ac9d6061b1cbcc896331b458aa11c17c925749b5a4bad9aaec5b291f9dc121d9a68cfa3ccc6150d9b944b
 EBUILD faker-2.12.0.ebuild 801 BLAKE2B 609e08547e03c49ac7d62e9d5240aa3d8d8640d00d85ce44e1e6d22b3f5cdd73b0f1a43e7b4010ec608c53d4001ae94e169c4cd98497b271b9d7dbe6619bf21e SHA512 a65527c7764100b86d8399f0caa3b882139ffc4981cee878b20bd3e15e3b12f20fb4b11013f2da6e5a66310eb010f524dadda30193b8711bae03268f9cd283f6
 EBUILD faker-2.13.0.ebuild 794 BLAKE2B bf8cbf0dc5a7992dd7bf20b2352783abbd1d23e71e7ad710641473820fca5ea3e8828f132edefcac7b1c0d992230bc4da6166c0c29386214324fd90af4d0f1d3 SHA512 a953537117984f3169944b80a4707901a654f46f64240f94bda20676de0927ce2be8946412c27dd8599c6d59f49df88e0d6f919decb870bce69fff50e1182a1f
diff --git a/dev-ruby/faker/faker-1.9.6-r1.ebuild b/dev-ruby/faker/faker-1.9.6-r1.ebuild
deleted file mode 100644
index 95dfce7b21fd..000000000000
--- a/dev-ruby/faker/faker-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-0.7:*"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 32e607ae47dc..b4fc0ec4b3d4 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,5 +1,7 @@
 DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
 DIST faraday-1.0.1.tar.gz 835557 BLAKE2B ea5c32f0a93bcc4c4a0a7c55d61578b4e9f0173caed484c0c6424201884b8e81304c0fe07e1c1d6ffdbff41be85bdb494904c2a3b3e19b6c89b58995d9fdbfe7 SHA512 6a2dfd751d013ddc7cb005e262b48120f9a6ae2bb50564082ed5c5e47cfe2b07ee91d7d1b6967813d39b9874c7d5c7daf65ac773dd7afdcae65ed38698b1f496
+DIST faraday-1.1.0.tar.gz 838062 BLAKE2B 6615992046fcd2dd77db8407f8f658f224f690ff36236182174f7aee89ef24ab7789f1711f97b691ac96a9137404362f62c8277e32a0970feca44441ce8da15a SHA512 22f4cd68d409afbb3523713223325a516ec8aa79591b816f8510ab7d3b1e31acefcc2252e8fd23aa99b4a5592c1604c0cc28423f55f1633c331554e3405b11f4
 EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
 EBUILD faraday-1.0.1.ebuild 2468 BLAKE2B 9ce92343c08047b61d8d29ca8a14a0d6b87b01692ca57501c8f62c5172534a063f3df054976f5b45aadeca19b02df22158e4f1367a063d48e9e56a25601c6769 SHA512 9fb4b89df5631582b76a18a0e04d949b126ed62fbf07dc054ac3ef4a4651c31302eb44584da9c6122d7a2bd7405d171bd735f8cad646bd50b7d6c3f935359924
+EBUILD faraday-1.1.0.ebuild 2220 BLAKE2B 0b306a51c345cc9352cb8e55aac1153ecdb49b345cf5614d0aced904080ca1f86083d748146cb5d92e2b92131a0452feba395e6f62d1a1d423dc5a262efd5c7b SHA512 c747da8118a85b7067ab117c362ffc095e73aa3eade1ace98adfc3be460d475ed661302fb69ba344ec64b9387900c9e13554e3f2726ca355b89aaae901bc3533
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-1.1.0.ebuild b/dev-ruby/faraday/faraday-1.1.0.ebuild
new file mode 100644
index 000000000000..d745a606dfc1
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	dev-ruby/ruby2_keywords
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 9fb90e520555..7fd91aaea59f 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,6 +1,8 @@
+DIST fast_gettext-1.1.2.tar.gz 86970 BLAKE2B 62df5aa9407fc4c163d38b107be2b3d39adb775a0354026f369863906ce198823343b1c4d68be367992a509ffa228e6c91cde87f0139f391da7d6f93c2cd5d49 SHA512 abeea38e5ed88dd7527f5a273f27db7605a081935c9b3cc25e301cac8683f320d9231ded986390232f6cc95a3acc0d163fa68e136d6fc58bd104e03ae6fe2afe
 DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1a65edd3cb581ac5bc058560aca38ed083e0470d4834cfdc5abae36f1e8264171b75649343675ab415b28ea2f0e8ab SHA512 0657b5955268166787a32bb74481cd07309018429c21707e061e022d67d5d2448d2d173149f164d16ff5f6c9ffa0feef38369b79daa299e1283fdcdc019ad72e
 DIST fast_gettext-2.0.2.tar.gz 92030 BLAKE2B 762f5e5375f29abb6477579aae25c023e7b5db27a41b857523baa3412f8f80f26fc9334ce0937de20cefcf9d845846a362e34540bc5817e9e8ad00c6a7abea8e SHA512 027b35c5d8f93719fbc14cbcd0843f2a0948b49c9cf2fb65e723ba410e6c0c14ce3e42c5ce7abe657946a7da2d20665559b71df1b9855c9a04978946a50beb51
 DIST fast_gettext-2.0.3.tar.gz 92262 BLAKE2B ebcbb081e8197e3443c2adc0ec6d1b4c3ebc7ccc8623a857705d893aa5e17af4be367802b5feb313256e337c1f751b74b45fd71f6aa5cb2188d6b71fe52718bb SHA512 b9a51c32a8cec8700cc4dea85862b48196aa87a567c813bfa45ecddcb841afbeeac8b061ef7f95a5f6573d78311bf5504e10adee44547b78ae412080bfb258d1
+EBUILD fast_gettext-1.1.2.ebuild 2063 BLAKE2B 4d3c471581b154a7a1521cade648a21600437788d409f99fc58805ce436d19d5dd6f75bd6e7032af257ed05ba27d3384dad3ed8d39b2fb5df4ca4313ed86940a SHA512 5c9efb7c6bf1baf693ada017bd0335890803490e795953440e2212a29b21d859676858382f26b7c242e1d5db5804366ec29cec54b8c44610088860c774aa83fc
 EBUILD fast_gettext-1.8.0.ebuild 2003 BLAKE2B a00f5d042ab0ed7cfdd18c3a6567816bc7dd0f85d79b5f41a314f87aa1a0a5d1e685fce6a8c2b31c2d02e0511247acc48310bb2542e91843199b4670d09ad9b6 SHA512 0d66443640d2593f3697c15da50f0ba299387f032e9fbb510561acf5f53406e466504e51ce20479efbe6a29d88412a673ab8fb0e3d5c6f64bf90704d551e80d8
 EBUILD fast_gettext-2.0.2.ebuild 2202 BLAKE2B 113b8ec7d97a2a55ce9f8da0a8315f9d227f2e804e3419ea271a59ed1e9286b52274afe79b91da394b686afce66e97a6ff9631f3f267e55bbd114a5f3205e537 SHA512 b4841e80d4bd22400979ca2b0b148e2374262a5e7c6d34825a24aafce6e0092fed285bfb8e71699601f39784b13dd9054628d9b7e4808654eea2518ea8c989d7
 EBUILD fast_gettext-2.0.3.ebuild 2202 BLAKE2B 113b8ec7d97a2a55ce9f8da0a8315f9d227f2e804e3419ea271a59ed1e9286b52274afe79b91da394b686afce66e97a6ff9631f3f267e55bbd114a5f3205e537 SHA512 b4841e80d4bd22400979ca2b0b148e2374262a5e7c6d34825a24aafce6e0092fed285bfb8e71699601f39784b13dd9054628d9b7e4808654eea2518ea8c989d7
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.1.2.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.1.2.ebuild
new file mode 100644
index 000000000000..e398213311e4
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-1.1.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re-added to support gettext-setup that specifies ~>1.1.0
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	# Remove jeweler and bump from Gemfile since they are not needed for tests.
+	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\)/ s:^:#:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	sed -i -e '/works with DB repository/,/^    end/ s:^:#:' spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+
+	# Don't run a test that requires safe mode which we can't provide
+	# due to insecure directory settings for the portage dir. This spec
+	# also calls out to ruby which won't work with different ruby
+	# implementations.
+	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index c6ff923c7b3b..dbc508e1d370 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -3,7 +3,7 @@ DIST ffi-git-1.12.1.tgz 158108 BLAKE2B e5685e94ef0c1a1f5a5443fac4d9934fc3613219f
 DIST ffi-git-1.12.2.tgz 158344 BLAKE2B 903825d7a6d77e26be47ec7e7991253e1ba58b0f0049fd812f8c26dee6eb31c17388dd5f23270e84cf53c02ab3a73c79ecca870814e14993496d1ca0e99a5390 SHA512 2590ff3fd704334fe00de10ec5e08184c350feac36418e08680def0b4742c488f8168fa82759317e93cc3d7969af366254aeb157c84d07565e1804ba1678d119
 DIST ffi-git-1.13.0.tgz 161537 BLAKE2B 2d113bb31fbd65fdaa397d2477ba8bb66a76c7a01e2753c33b04b81a5175a25acd3495d41e38995ed8161daff25094e0a45ae4b5d6666c7508840c21e5ba5c45 SHA512 6e90d79b1e60b237c20aa3e863f97797a310d651a52df67957b6a8e1e577b0d800f4e0b6b3ec6da77776214ae6a0b855ac23f6f5b3f9439b549a043a3789627a
 DIST ffi-git-1.13.1.tgz 161660 BLAKE2B b8a6c3f4b9bbd94378ab2adbf40c0bbf56883e34c6a1c12b9e1496069b8a4935b04012820699260f9cffd47efd78d7aa2d08e71a5bff9de740aa96ad11f499eb SHA512 f0077518c9ced54881e40a0047440edb4e40ba0ba89fc814a489bcbaf52e08e9a773e28f453f579162439e247151b994936695fe0b1ed5fb429d9bfd85b845ef
-EBUILD ffi-1.11.3.ebuild 1525 BLAKE2B 1216806b2cbdb7ac20f86f40bf4263710ca776ee0935d02ba7040b475c7f8305a90ba66fbcac081a6df9c158b5d79ec8794c4d0ca62555cb875daa82ba55e693 SHA512 15ec176c0e3424740d1838b99a4e302a3cdf4f912ec2816dae232bdc044376af50ddae2fa5f29a0883271731156b23b6f225f9f11a5ac7309c8596bfb3008c3d
+EBUILD ffi-1.11.3.ebuild 1524 BLAKE2B 7806fcbace21f99bbea34ee61e3704cecaee13a8385ed258d1082379046f0342eab25eb9933c6247a473e9b2affbc55d84169f4e509f6e70afcdf24e5795bff7 SHA512 287eed256af61f83440998143d9b5579bead0d04804ccf70346bf781e5d71a5147c40841f4091ba1c0ae3aad7d87938cfb3d4180c0113df06c4ab03f3378bee4
 EBUILD ffi-1.12.1.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
 EBUILD ffi-1.12.2.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
 EBUILD ffi-1.13.0.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
diff --git a/dev-ruby/ffi/ffi-1.11.3.ebuild b/dev-ruby/ffi/ffi-1.11.3.ebuild
index 3a234be11366..2557cb1ab4a1 100644
--- a/dev-ruby/ffi/ffi-1.11.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.11.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:0="
 DEPEND+=" dev-libs/libffi"
diff --git a/dev-ruby/gettext-setup/Manifest b/dev-ruby/gettext-setup/Manifest
index 5c80297064ec..0ee201525880 100644
--- a/dev-ruby/gettext-setup/Manifest
+++ b/dev-ruby/gettext-setup/Manifest
@@ -1,9 +1,5 @@
 DIST gettext-setup-0.30.tar.gz 15952 BLAKE2B d224e0fee34b0735fdf22abe2efe81b45c6494fc48ca509daf076cda9d3b83dc6dcd3e44c20ae9776d98b7d6128e5b9a93fa49ba1f2daa4b00929714e8d7365c SHA512 6ee398a131098f46dcc2951d166081a90872330b6ba5637292eb326b1bd6f40f46350f6be7b2b9ebee0c62442609700e06d25befcbcbf6510f3d96e656855124
-DIST gettext-setup-0.31.tar.gz 16043 BLAKE2B 762d40295644acaaae27045a8a03ddb6a9e0f44093754492da3af4ce9a65fe4f58b9eb53a5d837dd1e553a7301dde29cbe27d4f6a6e7c7fc737ca9516b6eb3c4 SHA512 ac408d37a4feb03043368db6dd1e0fe3cc1f08c5d0c161ae8e9b80d0ac514e7d5891fdbdbcafa7bc72c960d38b6965b73c56d5d4e9a3fe1da0502667c33142ef
 DIST gettext-setup-0.34.tar.gz 16010 BLAKE2B 3da3810bba89205a0a2856760b7fbe7a415207ccc45a3cd2e8aad658131dc751b1ad44178beaee2d0c67164a5e3e7b1ee0aba1c4e1b099f77643d72aec753de3 SHA512 479e2a79768923796960b45f1e3b3963939a4166c636ad4c3af60840a5c8449fa7fff81271b4c938e5a441146b25fcdd9fd8bb60e1df7ef31bb39efc56577572
 EBUILD gettext-setup-0.30.ebuild 1083 BLAKE2B d2131b49d40885b97ad9037169834cee5a344f7cd1bcdd5977d8dab5d3c1034b7a3cbdf8fd4ab65d50bbe24c009a4fac2ec8d702a84fe89ea430d8921d957bd4 SHA512 e9a2863774b8c36f6e2327f7f04752150440d13b51b2e2f0b755111330566b7cef7a58869135dfebb5b9afa3f170c62fdd6e315bcab97d357e3559aa1bb362fe
-EBUILD gettext-setup-0.31.ebuild 1047 BLAKE2B 812825978046a5347fd02c5d7c8051f175e137b1017e85e490b2a488665c2f513f0e71c3cff68ae5d55b7289dafb69e82d07f67f95e4a87e2a068b43e6e56fea SHA512 f4465f5abe1f56efc4b41dc952437b6ebc4a6fe92a1edc25013e3dba3c072b92373eb6d5c59b3e9bac571651d209acfc6d34dc563d5c9a2175642de5db0b4c01
-EBUILD gettext-setup-0.34-r1.ebuild 1112 BLAKE2B d2d6c01eaf59e6158b00ff5532f78c5a465b5ddd9cf215a43050a6ac891b70125892bd49524c1fbe65c4310798eceaf6b96be2ab873e23a58a549fc7a1a65a8e SHA512 55a0c0db38ca6a15e6f6fe23ef5d3ff8f329115f653f6d475f410c451a329507dea9cd2d1b086e00cfd556f97f33ad7b78fb20d64e5a7d55797599052ada905c
-EBUILD gettext-setup-0.34-r2.ebuild 1142 BLAKE2B f1d42699df682b036c901cd2a2bb52686b880088ac8fb70e5ee75117f31db995deec0f11bab7c5b2aafb98ef5ab841691728ca6878891862782e26dd10b17f6f SHA512 0ef457885277ba84313c3224a7d5e6f8b6192363fe629ea7e09f3bfa0de06affef8dddd5c112d186b283e0b4ef896273d5b6379c382736a61a2198329cbce082
-EBUILD gettext-setup-0.34.ebuild 1054 BLAKE2B ca24c406b7dcfc85ceb7ba8e990f22547d02e8f2c254b998ed6463b59d66cf22a63e8d1370773353f7d501790982fb41255c19e6926028226ae1c5c315e983da SHA512 bc691cc1d4d7585b83ced60fb8e5aac2ae16ac99c04a513960d39537041ff3a448be913cea94fec35884b1db2ccde5eb9c94834b9c14c0fa6333c1bb657db722
+EBUILD gettext-setup-0.34-r2.ebuild 1140 BLAKE2B 68db0d15a73441dcb819a5d443a255c719e98bf8af37118c2c15e14511154eb66200e67c6201e9a36acc8ec36e1c5d9f7403464a832eda9269017bdc1226309b SHA512 131faf1ccce0bdb5e82a8b896a06c3a426b72b2ecd7cbe912d9787e36887d6b7eae6dd977a4a548f7c47d02272cb56ec00b906d205cd2950797de1e47a627101
 MISC metadata.xml 344 BLAKE2B 14075c722372613eeff2cb810420e1e0ff7cdcf4ee1ba748a0b615222b88b13a0ecc01c9d0ca1aab71c0bb28359c18682b7402444caa01100c3d8381b9b13e08 SHA512 f7f8c8e7f745313b74340ffe738cab426f793f452106e0ae70f5e73a3a745f1b9ae7b1b70b5951f1d5eb81d4e61851845fa53bd2aa3dab8362f330e6f8d79e9c
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.31.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.31.ebuild
deleted file mode 100644
index 0fc883565d7f..000000000000
--- a/dev-ruby/gettext-setup/gettext-setup-0.31.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to ease i18n"
-HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
-SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-gem-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/fast_gettext-1.1.0:0
-	>=dev-ruby/ruby-gettext-3.0.2
-	dev-ruby/locale
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/1.1.0/1.1/' \
-		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
-
-	# Avoid spec with specific locale requirements
-	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
-}
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.34-r1.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.34-r1.ebuild
deleted file mode 100644
index e56f46d82428..000000000000
--- a/dev-ruby/gettext-setup/gettext-setup-0.34-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to ease i18n"
-HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
-SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-gem-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-vcs/git"
-DEPEND+=" test? ( dev-vcs/git )"
-
-ruby_add_rdepend "
-	>=dev-ruby/fast_gettext-1.1.0:0
-	>=dev-ruby/ruby-gettext-3.0.2
-	dev-ruby/locale
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/1.1.0/1.1/' \
-		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
-
-	# Avoid spec with specific locale requirements
-	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
-}
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
index ee59e09ee553..da99c7d8967e 100644
--- a/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
+++ b/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
@@ -19,7 +19,7 @@ RUBY_S="${PN}-gem-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.34.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.34.ebuild
deleted file mode 100644
index 1acc0f83dc31..000000000000
--- a/dev-ruby/gettext-setup/gettext-setup-0.34.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to ease i18n"
-HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
-SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-gem-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/fast_gettext-1.1.0:0
-	>=dev-ruby/ruby-gettext-3.0.2
-	dev-ruby/locale
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/1.1.0/1.1/' \
-		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
-
-	# Avoid spec with specific locale requirements
-	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
-}
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index 2547ca3d9fce..4a51a43438ef 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -1,3 +1,3 @@
 DIST gherkin-5.1.0.gem 29696 BLAKE2B 2439b82a147a546e8df71e11996f9560a8720580e07795542fc81781449b483a42e54251f3d0dd3482331773b1cada1d61b468bfcec2a9464ee2542eef2ed13e SHA512 d935ccceaec493736f337a4c3db69909858d15f4c41e93ecfc6ca31a30fc48eec1cecbe71d455265e1062006f49f05461c9860c9b3cc4806bb25f42dec6f504e
-EBUILD gherkin-5.1.0.ebuild 566 BLAKE2B 988aad75c0c7cca5402fd2c00326b9bcd404e45e99785a2805999cf637adf24b47b41dd72c7410b85f85f5b5696418af154b2ca14aad67182f677be425b33471 SHA512 83e1061f0b925a3cbe2c9dd6fbc0577d2eafce2804826feb999cb445ad984cdb1b1a560c151995add7c3bbd1a98b1662bf34db1a391eca596e21c5d56b1d3188
+EBUILD gherkin-5.1.0.ebuild 565 BLAKE2B d1f04b480499112d4e6e41dcd5836bc805dfd9de4fbe9a067fb5ca4a73296bb08c18f5f59cebabcae809b930885e34aeab82b4cc4569fbe60c852cd1e68d70ec SHA512 9fb753115bcd7f360c8f343cd36997dd80c60fa5b6ac47e6653c849498c3292f7d119c8c0041b5bef44ef3e2e10b0e6f089a16a0e1d57c59cd111e8bdde7ba2f
 MISC metadata.xml 342 BLAKE2B 9a34d41c97eea1996d1fabbee85346c55ab263b0f7087661038b42d2fb25d05f03ec46cf804f8972984200b9891c5ff8b77d26faf5edd8d3d63a76e25ec66b5e SHA512 83d54811e863b8af9f5ba53f081e140d12af0d20ba5ae7273317fd42aea5a5a0fca8f742352794dacbddcdca932dc2ea60e1201f3d6429315210da99578f844e
diff --git a/dev-ruby/gherkin/gherkin-5.1.0.ebuild b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
index 2a33f20c8bad..94602ca59989 100644
--- a/dev-ruby/gherkin/gherkin-5.1.0.ebuild
+++ b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
@@ -19,6 +19,6 @@ DESCRIPTION="Fast Gherkin lexer and parser"
 HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="5"
 IUSE=""
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index a110ac669728..85c9378a7767 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,3 +1,3 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
-EBUILD haml-5.1.2.ebuild 1677 BLAKE2B 1c26084fa20a65e01e3326a91b546b90c10a996896968b2d67a120274d8c127ab44f44ea535cf93451f5d9d3ed11e8e7118259881c76530008e13d2a21cd19de SHA512 5288a67f335885bc39b07c9415dba64741770bb955c58341f65ee09404f534c63767ef29ed5bb0da4e2eed0cb2417d9a1c16ecf521e290cdda335265f65ad74e
+EBUILD haml-5.1.2.ebuild 1676 BLAKE2B 56947043cad3e5982f62a0ab2d1f3f56bc8d7f1bec09364cf18e9996979f3143c7734550f8ef2d6bc21a1f79901eaf072bf3385cfb312f484c110b6c9698067d SHA512 bad9ea4fcad2f56c5d717707ae61ba696d4d8fd35a5d04ae948e4291b5cf2a45e62aa63e3419e382cd4278c85400e2b07767c25a22246ebdb2aeb5ec1e9aa9e2
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.1.2.ebuild b/dev-ruby/haml/haml-5.1.2.ebuild
index 077a1d33f39b..30815f8c9ac1 100644
--- a/dev-ruby/haml/haml-5.1.2.ebuild
+++ b/dev-ruby/haml/haml-5.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="5"
-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"
+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"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/hoe-seattlerb/Manifest b/dev-ruby/hoe-seattlerb/Manifest
deleted file mode 100644
index 3d680762a4f7..000000000000
--- a/dev-ruby/hoe-seattlerb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hoe-seattlerb-1.3.5.gem 14336 BLAKE2B 76dd4e82e4b3ceee897d484e2bbf596414bfbe50d998f2f3833e6be63dacbec4d4d1014b14d9504cbf9615736f584ea3c083c8f5b15609f400264ce5cb31856b SHA512 a5cdb38114e22e07824749e721ad7ff85724c04d8ca1c66996ca86fc9ec150a3b0b7b3bc83511932af0c4acd7e9b581d6b1583eda60160bf7ed91021ab803d0f
-EBUILD hoe-seattlerb-1.3.5.ebuild 763 BLAKE2B c5943b0f2adf4be01e58a9faea538105ff423a9a9ada2d4e8ae4617fb06e249dd7ddd1ad34b5fcc6bf74a2af79233a233287d182482a3fcb2822e8dfb0544f11 SHA512 4cbeb442c9385a9c3af0046e45c8632922a29ca21440f73df98031b5d801bce746631bd6ed45092008cf3323b2c0411ff8dc189c9d8f629abdb196b4e0fe1b91
-MISC metadata.xml 339 BLAKE2B dfe565b89582b66fb99b6c9e50c9ca3efc0eeeb4a2c2cecd5e103f2d9526fde1a6e591c240cc83163d55c2973adb9482dc8c91ec3cea5a8f67848aa0bcdf5e4c SHA512 2e0d6992a3e11200d4373727efa7ea4c1a1eb1e1cc2a1023b0d0b651769580d2405378c4560e498ee5f52f7350fee443a443247ccedef5178be40f014f44cd20
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
deleted file mode 100644
index 07cdf2ebf308..000000000000
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# no tests present
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe plugins providing tasks used by seattle.rb"
-HOMEPAGE="https://github.com/seattlerb/hoe-seattlerb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa 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() {
-	# Not a real fix, but otherwise USE="doc" breaks and defaulte license is MIT
-	sed -i -e "/license/d" Rakefile || die
-}
diff --git a/dev-ruby/hoe-seattlerb/metadata.xml b/dev-ruby/hoe-seattlerb/metadata.xml
deleted file mode 100644
index ded179debb9d..000000000000
--- a/dev-ruby/hoe-seattlerb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">seattlerb/hoe-seattlerb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index b2853a10ae14..929a5a3697a7 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,3 +1,3 @@
 DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
-EBUILD hoe-3.21.0.ebuild 1477 BLAKE2B bccf26363f8fdb9464ea6db1ac8ceb94b7230924699d635273cf2a13be4d751aa37adedd74f028a3ee293925f8f2811b2e2b0a6f41f7732d9b6373653933e129 SHA512 f0634f51a7d2a96d3f3e71004e0d8cb695798c88948c37cf56841f05d6d5806038de001792e6797fbbd27a753a5dac004602ec0321733392b5b4675998075676
+EBUILD hoe-3.21.0.ebuild 1476 BLAKE2B f19a4c5856d2cb0cad4f3e814a2c039cc59879936f0f8585481a3cd20351bd11a41f847a4cecc03581786e7d4583c2b87182afef70f2a8ca07857adac6a6a23e SHA512 542d6ccf3f7cc3b1b5fccbd98e18d6827def38157a1d2c54882d8610d4025546e0f5d7ddd2754cdcdcc31de22b9157bfefb8a4a1d11c41ca95863b6eeb4de946
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.21.0.ebuild b/dev-ruby/hoe/hoe-3.21.0.ebuild
index 01c705c66454..f96952a25e1c 100644
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~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="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
index cfc895bb56e9..b77648316354 100644
--- a/dev-ruby/image_processing/Manifest
+++ b/dev-ruby/image_processing/Manifest
@@ -1,7 +1,9 @@
 DIST image_processing-1.10.3.tar.gz 985090 BLAKE2B 9626dd41ae97cd0c68b857ccce2dd2b5eebbc04a5a3fc145cfde681b8ba9cc78806ddf1e7542afa2799ad707ced592149304216875297fc1bac112501dfcdbbb SHA512 7883199b2ccd693ae91a5d028a7c7bf5834cb36c7a48b4d02d1d92d7681e382a4e6605ca80cb0ca2f9949bfa95d8dafac3057e2508bb2932c5c3c0c3dee99b12
 DIST image_processing-1.11.0.tar.gz 985565 BLAKE2B 2ab1cfcdb0637dfbba50558cdb0b778cbb2f7bccf2a12aff5515171e252b0f41624d1867a2cb825d7200b5c09eb57d4f002cd086fdb987a9513a2ef3401a2db3 SHA512 2978ab351f6afaa9bb4ff08be6f89a27a634ac49a239a88c59cd40c877ffe4da57bdfe0d02af31577be113f04d7dc736e891b1edebc09fd4829bbe89085c4282
 DIST image_processing-1.12.0.tar.gz 986331 BLAKE2B 765906d2cfcb63ef8257144bc54744d9a43f4673fb5d1f99d7230bee52534ebae1e6d39009203a1fa080e42889c55885e8e828be1d282d8d2de7358cf69ad2ca SHA512 b1bd8b8da8aedc348591c900dfc0f6a862acfb7f12f10640ce4db181b738a145efc8c1ce8d6f0863930fdd7989670e1114dc8d91581a22e7f9093cf6ae9ad61c
+DIST image_processing-1.12.1.tar.gz 986447 BLAKE2B cd3fa67c7f9890835d86fe669c5aa450fd91d1a898da3193da0e8d630bbe141867a2b9ac08f28886d167a9bd07128ea135c6300a265517d0155ccdda48a00b03 SHA512 c2f3f3db1c06a8730d98193276b12b9371735929b267054a7866fda032f5860474390b245bcb2017e60cc1b601a2f0f598fc8ebb358e6a98e25bac6fa4d96c7b
 EBUILD image_processing-1.10.3.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
 EBUILD image_processing-1.11.0.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
 EBUILD image_processing-1.12.0.ebuild 1258 BLAKE2B 27f9318f386cec54e81ee9ff490523b660e0db89f6fe3a58780668d54258bf57b18beb85fbd1025aa86d7206239ab1d332007e46513018625003e26efe3e75db SHA512 f556b8e5055262261cdd1ec35f472843d26c8fcebd2e5ebb7d2c1733e0b47da7a7ef2ff45517406c201929c83c5d6181db6527dac36a6b08c6b6352d2bf3cd98
+EBUILD image_processing-1.12.1.ebuild 1258 BLAKE2B 27f9318f386cec54e81ee9ff490523b660e0db89f6fe3a58780668d54258bf57b18beb85fbd1025aa86d7206239ab1d332007e46513018625003e26efe3e75db SHA512 f556b8e5055262261cdd1ec35f472843d26c8fcebd2e5ebb7d2c1733e0b47da7a7ef2ff45517406c201929c83c5d6181db6527dac36a6b08c6b6352d2bf3cd98
 MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.12.1.ebuild b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
new file mode 100644
index 000000000000..b5cac1d48840
--- /dev/null
+++ b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="image_processing.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="High-level image processing helper methods with libvips and ImageMagick"
+HOMEPAGE="https://github.com/janko/image_processing"
+SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( media-gfx/imagemagick[jpeg,png,tiff] )"
+
+ruby_add_rdepend "
+	>=dev-ruby/mini_magick-4.9.5:0
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/minitest-5.8:5
+	>=dev-ruby/minitest-hooks-1.4.2
+	dev-ruby/minispec-metadata
+)"
+
+all_ruby_prepare() {
+	# Only support imagemagick for now since vips is not packaged
+	sed -i -e '/ruby-vips/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	rm -f test/{builder,pipeline,vips}_test.rb || die
+	sed -i -e '/assert_dimensions/ s:^:#:' test/*_test.rb || die
+
+	# phash is not packaged
+	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
+
+	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/inifile/Manifest b/dev-ruby/inifile/Manifest
deleted file mode 100644
index 4bb1053fa734..000000000000
--- a/dev-ruby/inifile/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST inifile-3.0.0.gem 18432 BLAKE2B 28c778b9dc49e618dd5f86ab6d87a21e6a1e8ff577ce98390a7767778033012fc3c4d5476de48d80807b0a74bace0b5f775317106949fe142e88854a95436e94 SHA512 d77344812bb62a5639b0a36e5ac2726280990210000b85bab700819fe0fb9f56415517c00436d0056ca090e3d568596bc30f8ed211a00aced5b929e534d0a72b
-EBUILD inifile-3.0.0.ebuild 568 BLAKE2B bf5a234319150e3319536f491f72d6093367ec024054609d96dc900db0b9dc4027314c59093e5481416c5522d77c0aba4eeadf2440d801097088a370f57e4738 SHA512 bad11d43624769aa12edd917538e2ede2e0de2b493c8371f4bf2c68b01927fb058613df8b4a9b2527a59b9c7c49877aa2f292e9b798c2660c1ba8a8af29d7c30
-MISC metadata.xml 337 BLAKE2B c33d25d55fb6a46e6b48375526f6c1052a8e1c39231551b6911cae898445701a9ad9a9358c1f21be5b1546142a02ab3cf45441a0044464b0b798f7e07ec55ea8 SHA512 49523edec5fc510375831232351c9d1fb622da7c14a0ce2b7e7a229882d5ff1c6647461d9f1363098e90bec422d48ae711eb1a7af048387ef5636f4c9c488a43
diff --git a/dev-ruby/inifile/inifile-3.0.0.ebuild b/dev-ruby/inifile/inifile-3.0.0.ebuild
deleted file mode 100644
index 5623638e05df..000000000000
--- a/dev-ruby/inifile/inifile-3.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Ruby package for reading and writing INI files"
-HOMEPAGE="https://github.com/TwP/inifile"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index 8ee526c09568..fad8fbec7f00 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,3 +1,3 @@
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
-EBUILD introspection-0.0.4.ebuild 661 BLAKE2B 2baba8b97958799e5a187fa042d9ec764bea55f448818d2d06342b70da0a12345df891fbab8981aed2a761cc614ecbf17d6f6c7b6b88b62a97908e44a93af28a SHA512 ba024a8bad36fbe16207cf34bb11de74f52e83c6a9207b4ece8f9f08dc2af30eea2b1cdcb7fbd7f8d441fd6d41e7ac108e31cdca865f245629b0f3ba8eb02204
+EBUILD introspection-0.0.4.ebuild 660 BLAKE2B 57ee2118a18fdc6bd3374dfebd86a0e49a6faf263a2c940e581c092992ff4c03c5e964004a8ddea902cae836f215202f776aa4eeda0c52a45c42c5bbed3e499c SHA512 33b5e8df425f58d3015ef7f1cee3078b042f99216fd3d9c01fc21f1777484668cd18cf3608aab1ede2ef1ee165a573b68d74f35d8951175174a6f7927f43e219
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild
index 50ffa84cc4ee..aca29aecf6fb 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
diff --git a/dev-ruby/journey/Manifest b/dev-ruby/journey/Manifest
deleted file mode 100644
index 94ae3f8435af..000000000000
--- a/dev-ruby/journey/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX journey-1.0.4-fix-tests.patch 2149 BLAKE2B 17693a10ad41b43d17541cd93a3f7485a60766bf5bfa9f96c9e1031db44cf9ce04f02f7e5aaa78de29241346d3707591ae15dbe17f268b90a482a6158962d2f6 SHA512 d4b34ed92f131e6e17f4af6d9be5ec743b6950f86ee724d32be67fe88b378cd8998c6551e78d6dc7b72b2911afbb14ec8ddad3be414694b86c696a39513a2857
-DIST journey-1.0.4.gem 28672 BLAKE2B fe78647c9f80ad4b9874eab9488cca199cd69d354e69f3f5b47b417452ca259790109d07a27c4c2d99778683d9264413399d4d7acd7eb4d8e78f7e37ccf2a8d7 SHA512 9e6a06da8b77f6efb9941c58f53254e8cf3a1ebb6f8261a66ef3fed9c21ff4e4a90567fee88507b8e2c1fecc0fbdf204a9d3c8473b671bbb4b8c6b9faa6f2a07
-EBUILD journey-1.0.4-r1.ebuild 640 BLAKE2B ee6448b4ff69130d8ecf70bf79804b2ab77bef34f12f6e31de8e5c72aff90025f058c95ca263849d1ed0f1be645db0c3e8f6c089b181e3281d524199447b2ff9 SHA512 2666c80ea88b6f604ac9ef65956152ad7811340bdf17329293651d9f96c04359dcd371bd4c125419fb2c3909d0f5c697518e15ca697d5de636df4382a3a50f8f
-MISC metadata.xml 339 BLAKE2B ccf9044fae8d836e4a60fa4bb0c95bd245b55a21dfcb7367e8a41c854f32c0bf3b65bff9a0ef625bb645063f84ad01cc2cc0a13a1f2cad4732e959fae7122e1d SHA512 482ceff436735ee12e21e9519a174803b5c035dfc31df0e25eacecd6186682ec9209f5bea95d3ec8263dace8cd64145daee26986dc10820bf99db2793f942f7a
diff --git a/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch b/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
deleted file mode 100644
index f977172e6464..000000000000
--- a/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From d836e960d9a20c4c5bc986630d2ba34a340959ea Mon Sep 17 00:00:00 2001
-From: Aaron Patterson <aaron.patterson@gmail.com>
-Date: Fri, 27 Jul 2012 11:20:58 -0700
-Subject: [PATCH] fix assertion calls
-
----
- test/path/test_pattern.rb | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/test/path/test_pattern.rb b/test/path/test_pattern.rb
-index c684a0a..ec93471 100644
---- a/test/path/test_pattern.rb
-+++ b/test/path/test_pattern.rb
-@@ -85,9 +85,9 @@ def test_to_regexp_with_extended_group
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
--        assert_match('/page/tender', path)
--        assert_match('/page/love', path)
--        refute_match('/page/loving', path)
-+        assert_match(path, '/page/tender')
-+        assert_match(path, '/page/love')
-+        refute_match(path, '/page/loving')
-       end
- 
-       def test_optional_names
-@@ -108,8 +108,8 @@ def test_to_regexp_match_non_optional
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
--        assert_match('/123', path)
--        refute_match('/', path)
-+        assert_match(path, '/123')
-+        refute_match(path, '/')
-       end
- 
-       def test_to_regexp_with_group
-@@ -119,9 +119,9 @@ def test_to_regexp_with_group
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
--        assert_match('/page/tender', path)
--        assert_match('/page/love', path)
--        refute_match('/page/loving', path)
-+        assert_match(path, '/page/tender')
-+        assert_match(path, '/page/love')
-+        refute_match(path, '/page/loving')
-       end
- 
-       def test_ast_sets_regular_expressions
-@@ -186,9 +186,9 @@ def test_insensitive_regexp_with_group
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
--        assert_match('/page/TENDER/aaron', path)
--        assert_match('/page/loVE/aaron', path)
--        refute_match('/page/loVE/AAron', path)
-+        assert_match(path, '/page/TENDER/aaron')
-+        assert_match(path, '/page/loVE/aaron')
-+        refute_match(path, '/page/loVE/AAron')
-       end
- 
-       def test_to_regexp_with_strexp
--- 
-1.9.1
-
diff --git a/dev-ruby/journey/journey-1.0.4-r1.ebuild b/dev-ruby/journey/journey-1.0.4-r1.ebuild
deleted file mode 100644
index 1e510b67e67e..000000000000
--- a/dev-ruby/journey/journey-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Journey is a router. It routes requests"
-HOMEPAGE="https://github.com/rails/journey"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/hoe
-	dev-ruby/json
-	dev-ruby/minitest )"
-
-RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
diff --git a/dev-ruby/journey/metadata.xml b/dev-ruby/journey/metadata.xml
deleted file mode 100644
index 16111db641b1..000000000000
--- a/dev-ruby/journey/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rails/journey</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 21d6e4319b4b..11b88b65c530 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,5 +1,9 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
 DIST listen-3.2.1.tar.gz 51030 BLAKE2B 1c7df3910c856c472f42417d51449f04d56635f0c77dbc6eb7a30d25042482f4efc7bbfa2d74609aa9f8d4ae134f53dc675b621efe35c2cc6faed8780d7128c8 SHA512 24cd67b926589401123dfce1a344a6d1ab1d0f9435b9646b7f638deebc0f683b77df70064537f84538eaf800beca4c67fd7c02e40d955fac92866b8ce1eeb769
-EBUILD listen-1.3.1-r4.ebuild 973 BLAKE2B c071c3b6584220b717512b2482b0cd20de0af7f863bfe9c20c037ad3b99ecd91d9ab22ec80ffcbc4d49c5f20c237f3a6597c5281838e13348061f2837f6fab13 SHA512 741e80e900b3d15f9f32843fef48889d24938e63668225542b59f93fa207e6d86d022e1143d312b91190c20ece61b2d858f1d94b1043ae08ce3f91828d173527
+DIST listen-3.3.0.tar.gz 53387 BLAKE2B 4e68e0789fde26c43bdeaba3742d1e3ca6f573441ed0b71f54ca85712c39727cb5dc4975b06a6ce52ac2e7049588442a787c7deaada7e162076af5a514884f1f SHA512 c3a4df6293429962c6412b16c7bbabe0244e1296a6bd5516397699f8770793cb7f7dfac78f74593183c2312eb8832f4ab7a650ee29722c7e4e1493faace1b726
+DIST listen-3.3.1.tar.gz 53470 BLAKE2B 6dfe8074883cbced8f7b707414309428b16e755e6652106cb0525dbee0a7596ae1b57b22e8dca665294d9a23de6776738ecb527ea8467fa6c0ff5a04ecdd04f6 SHA512 fbdd743eecd7be5431e7a698d8a00b17f0889975292b1eb798ab8fbddf997aaeb296ee13f846481bc68fbcd512e91f65296792829557a1d420a422717bf1e8a5
+EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.2.1.ebuild 1208 BLAKE2B fe6653f617c1f0caf4c4cb39ab27977acd22af42ac1ecbdd03be705918050d4b973eb6410a1eb1e484a2ba90c51c2c9ca6d18e0d259d160c911e41d7916e680e SHA512 6c54b1af911554bd2c91e94ee7b6e005715fffa9b31594a270c7b49f819bd38e427b9fd376c2d027bf97400d67bc49688487166de0597a47185cbafddb1e1549
+EBUILD listen-3.3.0.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
+EBUILD listen-3.3.1.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-1.3.1-r4.ebuild b/dev-ruby/listen/listen-1.3.1-r4.ebuild
index a89fed5972d3..bb87c7b3ba7a 100644
--- a/dev-ruby/listen/listen-1.3.1-r4.ebuild
+++ b/dev-ruby/listen/listen-1.3.1-r4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0"
diff --git a/dev-ruby/listen/listen-3.3.0.ebuild b/dev-ruby/listen/listen-3.3.0.ebuild
new file mode 100644
index 000000000000..7120fbcdf848
--- /dev/null
+++ b/dev-ruby/listen/listen-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/listen/listen-3.3.1.ebuild b/dev-ruby/listen/listen-3.3.1.ebuild
new file mode 100644
index 000000000000..7120fbcdf848
--- /dev/null
+++ b/dev-ruby/listen/listen-3.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index 252b5bfed3df..bdc04900c85c 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,3 +1,3 @@
 DIST locale-2.1.3-git.tgz 99648 BLAKE2B e395a442f674c73ed03d0d4d55d875c796add076132964ce2abb457d5d6e2ed8643395f283728735bbbf1ffee8b03549e882e5c66f6a589106a0a36f5b9e4ff1 SHA512 77877f15914dbee5ca83155f8cb84815296b4e2e4205218c9926e0265b40940cbdbe68fb048870ce4f53a6caeeb593813a2e16e8c130a19e44a28cb67c82fe25
-EBUILD locale-2.1.3.ebuild 1095 BLAKE2B cb551457274eeb88124720cc877f96264d87cd32ba0b58e66909bc62f30758efaac4d334ba437d695892a350189d687be0d19295193efc26b1d9437bda38f8fd SHA512 943b5145986b245e67d668aaff47d15d05a100da62822387718a8cdb275be63c9287d221a02df450c95d98c1edfa410571d42d18eb250bdaa6b058df2787b75b
+EBUILD locale-2.1.3.ebuild 1094 BLAKE2B 9a697b29979dfa07fea510da72634fadd1f24422b022b74805baf4045b91d79207e25cd90349d04aac10309c19d9a3fcb2733b722711310c01f5f94dec0da7ea SHA512 f62206bf43c32b9c49dcd99be98b5b254e42c60c8b4732ff96bbdcb0c60dfea159b98f4e07874eff95caf46776382408f252dcbf3190d85eaaed1e420709739c
 MISC metadata.xml 345 BLAKE2B c2f8101d9e2cd59540e4e95827ac5fa503b0f76bec78ba5a73031b3b966ed1e3153a05aadad5dd563db931881ff3597d1cfb74e113eba53470da11de29eaa809 SHA512 1da3655a6dd1df21971ff6ef41e3fce230f17379bb936ca8a03d1fec427a6904fec717884fd4551d23a493fcec85beb1a9107907c01faadb63b02db8efa0d5af
diff --git a/dev-ruby/locale/locale-2.1.3.ebuild b/dev-ruby/locale/locale-2.1.3.ebuild
index 35ae8c83bc6e..61f1a0e79d39 100644
--- a/dev-ruby/locale/locale-2.1.3.ebuild
+++ b/dev-ruby/locale/locale-2.1.3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index 1f0def33e5c7..6a0a58b81349 100644
--- a/dev-ruby/maruku/Manifest
+++ b/dev-ruby/maruku/Manifest
@@ -1,3 +1,3 @@
 DIST maruku-0.7.3.gem 140288 BLAKE2B 31da6bf63272a2e5a77aa6f3cdc1462f0039751424bd0888d69f2f2660534cab8868238cbde37d184c2ddbe50b76dbfa5305a450fc27b9995f74284a1f962724 SHA512 efef3eea7451e32c06c0820834cb98eb5424f6837b2e66e44482679d73d958e1e2c59e790a3e5ba26e0c91ece0a5c17f91877a7797d9a15a73b5344b0d444507
-EBUILD maruku-0.7.3.ebuild 1276 BLAKE2B 25bfbdf74b64628583b8992b11c0222eb8a8153d1dddea2d8643568e3ccf7f003691b2da432abe3fd1213862349dc7b78be48863aa2a5ee28605393e69208444 SHA512 a09bd99e125600d3e4cb6787f699cfb74629de617237d24f8d12e4c42bb03ace47ad4fac335026b4cce9a7807a8ad1f94bb53fd5002213196f8727c3560d1005
+EBUILD maruku-0.7.3.ebuild 1275 BLAKE2B 41d9ad07562bfaaafc4f09a69649f2dcb776777ee0a9bad23797589f9c84f20d338b93215d54b72d5106edd5b5facf3858a36616bfaccbf9c935bb2cb2ddc86d SHA512 959e7b0a4381752e6d585f13604e6029581c53717742dcd9c5ee335ffd02391e2fe692edd3216927b3daa6ea9a62c68c0f0775328dbf89930965f66b128ae689
 MISC metadata.xml 454 BLAKE2B 543ededb4beb16959617c700295d7c7517c3969b482ee0e0ea71cab8c412ba09480b4503024dc23d1f419c9bc621a66cc23a589d240577554a36a712f4d1892e SHA512 b58d0a08843b11dd0ce0fc68d347f16aa2e6fd6530a3f7a54ece40c6076cc64544857081d9ff889a816ac545e68973f709c168378fdd756bca286e4b874a2084
diff --git a/dev-ruby/maruku/maruku-0.7.3.ebuild b/dev-ruby/maruku/maruku-0.7.3.ebuild
index a80df7d70193..fc978fd6a987 100644
--- a/dev-ruby/maruku/maruku-0.7.3.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight test"
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff dev-ruby/syntax )"
diff --git a/dev-ruby/metaclass/Manifest b/dev-ruby/metaclass/Manifest
index a4301c5d3b03..c6662771a021 100644
--- a/dev-ruby/metaclass/Manifest
+++ b/dev-ruby/metaclass/Manifest
@@ -1,3 +1,3 @@
 DIST metaclass-0.0.4.tar.gz 2482 BLAKE2B f4993bbe61b0f4bd1b060f9e8b5ea0a6f6666e5012b31b1d5913c1bf31aec94f344b88f35e76c9ec9d442604550b7765a20f0683beaae0025ee64f1212237f35 SHA512 5f41fe3db9c682ab6ab01c737c8531d2b4c2fdbc0f35f8fc9f40ce09a84ddf0d442c17caa1c3e87bb2c5e4703556c5d50fd9f72434b89e03d163db375046f0a4
-EBUILD metaclass-0.0.4.ebuild 727 BLAKE2B 2de56da7527992cc82119115830439431856b82e40be8bf26d79fcc13024b21d091db50553eb644e6d4726e3d3983cac6e490abddabf4e2c883b63ebfb510d85 SHA512 4b53c21994f573a5d8cec096077275aa9437cdb55ed54e8fecf8b0a20e58ae70e71602497d786f952a0933fe67d36b3b20878d9bfb22691f04d584af04c49557
+EBUILD metaclass-0.0.4.ebuild 726 BLAKE2B c2588f90264f6b3bd16c38a09ae5a60d1460c9dc54b440ad849684bb9276194d73ec3b43ba248ab72110a598b540d602ba19352a3163d561728338e4bd0303dd SHA512 c7e1418096155abd336a0ac208d18404d6add3d15f936bb6e209ca5e15c197e4f2740164fbd59c835658a68dd40fc19da8b8d42a404bc3e97ba53ad89e4c8483
 MISC metadata.xml 346 BLAKE2B 90c4ea7a6dee6842bf19100dc0394e11bcf36407bc123bbefe176d00c3a4ec0001f453b47a828dc26c4f933b8fc279a29868b8a09026abd27429cbec733a32bc SHA512 4cf92e374453ad5661bea2ed7cc6f23a93dff90542bb349e88717962ad06c48f8d88b3b5489a0f333f9a5f204097309b063cfddea74d6bb09ea13f8f60817b3c
diff --git a/dev-ruby/metaclass/metaclass-0.0.4.ebuild b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
index ef955b45ccb4..7ae367197111 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 ppc ppc64 sparc x86 ~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 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/meterpreter_bins/Manifest b/dev-ruby/meterpreter_bins/Manifest
deleted file mode 100644
index f67a575660fd..000000000000
--- a/dev-ruby/meterpreter_bins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST meterpreter_bins-0.0.22.gem 3565568 BLAKE2B 9f3b73908220dafc7e5b41fa09e86317658191cfd20acee8247d13671ce378fecb566177ac7cdc6243caddd10767952002f90eb433b9f5b5f855824468fd191d SHA512 80b7856bdab0ec91f6adae5497f8d119f21e8f36a2c1750e50f2dda9323dbaf7ebccf6f1a8e57f2459d8a2e6ab7b718454d35a653da6ec03e1e01c1d04c9288d
-EBUILD meterpreter_bins-0.0.22.ebuild 551 BLAKE2B d035897d3e0799dea0b8eb507df85e866036e9a33ade499708d8d1a968c7a9724d09da6314d00e127276b845b53d9fd8751afa85851057fd8a1da3ad78a17a6e SHA512 54b08014cc79ee05280502348ff7fbb65912a083bb0b5d6bb33b55c76a6dab5d03eb5ab00ea77e71336e78695aba830bdd8a576d0711ea7078b97de30a59ef2f
-MISC metadata.xml 345 BLAKE2B 96db6272e5361992b21c63d1ad5ed08f2a606fcd2f0c45906cfe063ad29855daa76aacc80128d5de17ec94311685add5c059cd46a94c09f6ce0d2f7a42343847 SHA512 31f83a98f599245fc9866583490f5b0612e2bd65e63bfb6c7efc37f64ca8ed711c248f4ec34dc7f12650266faf163bca6995de85e3ad58c639bb537d5ea33fd2
diff --git a/dev-ruby/meterpreter_bins/metadata.xml b/dev-ruby/meterpreter_bins/metadata.xml
deleted file mode 100644
index f01db371fe39..000000000000
--- a/dev-ruby/meterpreter_bins/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/meterpreter_bins</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild b/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild
deleted file mode 100644
index 7aa1ec3de677..000000000000
--- a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="meterpreter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://github.com/rapid7/meterpreter_bins"
-
-#https://github.com/rapid7/meterpreter_bins/issues/5
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT=test
-
-RDEPEND="${RDEPEND} !dev-ruby/meterpreter_bins:0"
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index e793fcd32f68..8e86a53366d1 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,7 +1,9 @@
 DIST mime-types-data-3.2019.1009.gem 160768 BLAKE2B c03348c8fb03d6398ca542679789e323cd9e11a575119d84c8310c78f05a4b71f0b26b7268b95dbaa4b5a5c19ee005c25ce0b4d31acd3a6de9c731e78c1ca0a9 SHA512 f4a18fccb5bb4cb558c273276ba83cc1189faa9ce97ea671f2168449b9b1d35fa0be26d7147c2b80ef12624b427a754b9fa78fc4684c835b4a51f7b6d888d6cf
 DIST mime-types-data-3.2020.0425.gem 163840 BLAKE2B f9139aaac4bde42391efb1d1227cb55560d7fac1240ae240074c7895b252a87e0cc2ff4e17c691089749c20957690f13f451e2d6a3bed5f7e9b34bdc33af9cee SHA512 b32aeed2cc8943db3ba3275c704279c43f31bed70631eae11c258244804b8080f0ea2da3705d7ab7e0f5934a8d1eca0c4b64e40eac520102991109106a3c507c
 DIST mime-types-data-3.2020.0512.gem 164352 BLAKE2B 6884cb029386dbcc3ee433dbe13baba99bc67f1ae409aef5f698731ce141b00c44221b667c2efd3d3b949d5ecaa0b4f0a3ad5a5fe5ddc99e309cf4a925db8e0d SHA512 019e45ed63ec86ef3eb4784a1526d4f163daaec676786b21c345bb8e1c57b26444ac7ee11fb25ffa9bbc687a60ae98d1cbc5d9ef60b446f50c5896a30299bd71
+DIST mime-types-data-3.2020.1104.gem 166400 BLAKE2B c657b27508a61865027b33a5184b963f7335878dadfda2b836723e1bcb782fccf4372490fa2f6405e0632681aa26ee04a65e16efd0df953995bae7517f76d77a SHA512 674e43205b17aefb3f9d2bd79110165c287631197002604ff0efaca0aa638a0e51a3b9a78bba2a7845d31183cd3810e4f2477ceb1788c1b614e2a5058f565f6e
 EBUILD mime-types-data-3.2019.1009.ebuild 624 BLAKE2B f7d784fa168b9adad93af0f040e47cddb9e146da341e944e1212353737419657c79f4e0dbfbc9bf31e8723c2f2937ebb8785d3ee69b268be3ede5f70e369cce0 SHA512 2ea61463ce0ebec58f5f32bc5b7be2ba932dea4eaa5386e03cca8d1e3a2720fad3d15106adde3aada08b02fab103553a80a6e14b38a2b755de0de70ded69bf72
 EBUILD mime-types-data-3.2020.0425.ebuild 625 BLAKE2B 29a87f9920fa8f686522552b2726e87caaf3b57429ee4d1302bea32f52d2d82603f2364dc142a86c4db4a2a05f7126aa1a07461ef453e430abc37c255fe317b9 SHA512 b86ef144d2bcb1f798f86790f6748abdd25caed0a89f8f01fba4d40011d1d527ec32e0bbb7d5e469b5286a10941d0079a34028edd4424f44c398dc2bd960d518
-EBUILD mime-types-data-3.2020.0512.ebuild 632 BLAKE2B aebe84472419e26f27e612b8218f3649166465d6a0257897b505996f2627608d3312a042f1bff786f3f9b824b31d4ac94a133ef4e218a4937a8858d1eba84ec3 SHA512 af45b00fd57b50a957b9a1301d7ffba39b790fd6ea1ca23131db37f649f4b7478cec081283a5701d7109dc6abb05b1ec95bd39fa577348ecb6df85a2989116dd
+EBUILD mime-types-data-3.2020.0512.ebuild 631 BLAKE2B 786855a25b92f0d3a98aeab5d37f03062b17592533656f3673dee461acafb93afa0e085f99c399649c5e0f84f2f6a01f8d921ffc2a5b38be80a2b61a14ea3875 SHA512 93bf811f17d04c02a6ac03eddaedce56e1ff159a0ccb0df6c62d056577d2c4661b266a30a1845864912b6e1fe4a0c7e6e174068a5660d77a2e0a76213d6eb4e7
+EBUILD mime-types-data-3.2020.1104.ebuild 625 BLAKE2B 4d18fa4ab1c3952c3d150413680ba11b535caf8053b094fa187bd2543f55da2836e8c8cf6027c5c6d7e9d143d772c65303f4c353d00f247f9f2e11d060bda076 SHA512 abf751bed663bfabf9487f173d419f22cf0d669f68d9b21823a6ed891fd68a1c2c4c5bb4be063fe5b59ff9a9232ecc083c4c4fa7296b6c66636e0869cac3c693
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild
index 4f41af4b55cb..578674e92947 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~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 ~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/mime-types-data/mime-types-data-3.2020.1104.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2020.1104.ebuild
new file mode 100644
index 000000000000..ad485ceae4de
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2020.1104.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 8f388a3a23f4..6335c5e826a9 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,5 +1,5 @@
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
-EBUILD mime-types-2.99.2.ebuild 965 BLAKE2B 124e97ce04f76b3100878d7bb3e4993bdb8d3ef386d919a66f55d89baba2a14e9f09fcf50eebb1b9e3bde92d352e36e37c3db867cfd1c99d6d27412f45304812 SHA512 a095bfebe675c30509ba8a753815a525ffd1bd2479376628bcaadd6eea40d601ffd3b21f198309aa5650ef377bf743c44eafcb501a37e64ba632c6e263082d9e
+EBUILD mime-types-2.99.2.ebuild 964 BLAKE2B 89671f9b936b3b5437a3f6260b11840eca9f5b33effaae5ea8a07e1b47a372c9153b6f792eaeef9f1b48445a00952c2f4681665dcc459a0f620b290f74f489e4 SHA512 f5e72d3a909cde831d5c6e408b1a9c87c8cc6aceebd432095680455c00cf3cd806cd9549146fe52b90517dbde4852b197df1e41b3e3ad7bfd4a798f1f68bcae1
 EBUILD mime-types-3.3.1.ebuild 877 BLAKE2B 74caebe75eaaf61c08f1aa60a41f543e0cf2018aa40b261d0a5aa3c5dc30fbf4faf9daa8b132aaf3f534590b901daaac25c2f27f8bd82750c33a7d0d0b43a693 SHA512 b9e24113658f8c91d51db093c893e8a55dca01246619f5328a1572d526db70f6cae7a6cf2d6bf5ca723e12d57d379a8d4a706288bbdd04ed4b6bd5c318cd4f17
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
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 7f459a822c65..7a5e9cade415 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 ppc ppc64 sparc x86 ~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 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/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 3e528eefc64f..6967be0271e1 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,3 +1,5 @@
 DIST mini_magick-4.10.1.tar.gz 1192455 BLAKE2B 269f0fbf0e49bb14c3a39124dfeb8171775db7a9e51e4662e5dac0a98c4668156bf5bbf22af62a9f62d7834d2205a9475e5631b768d27cac0527cab0baad25fa SHA512 28e4a4cf213db69182adb56daa3e09eb576e96e8ff4ad95121f9a16f8ecceb98ad790d3897463fa1ab3b7d4b9925777f9e71302adfd3f31b3f88aa520371e77b
+DIST mini_magick-4.11.0.tar.gz 1193122 BLAKE2B b736bb1b147ec2b1f926ebf5a3b908e659d6dfcaca0e7199932086e09cfd6be21046dff3c4e0edb7877c40c5bbda73aa0f521b305c15abb6fab931242b4561c9 SHA512 7201a94345aa95bb9466369c78fbc48108b245df77435e839a3f0df7694f4da4eeff3a7b3da4aaabedefd93859abde1145baef6f0f01580f66255653be88f5d2
 EBUILD mini_magick-4.10.1.ebuild 1997 BLAKE2B e6ccc6f39fa802bf01b275e76692a06afa03a86995110a07a53396bc9f3742bf8124bfbd66786fe300e3dcf461f36acff68ba926ccb3fd9b99a8d19bb0dafa64 SHA512 c6fac624c0ae3fa0fc047ff940f7621d248ff1b0cfe89459a46e724cdf1a8ccd66e12140db152eae483b5528a2f72fcec1add7bbdc55ee2932466dae662badb7
+EBUILD mini_magick-4.11.0.ebuild 2066 BLAKE2B 20edc1c155ff203765e7a8d0373ed7536364f99cf798e700a79cda1973ff7cac025fd56975fd4a4207c09f5755f3cfb98e0ebeb2b073f4b1fc6f38cd6b74fb91 SHA512 333aa2ebda3e9507aa9a022eb3195e8bcedeeed966e60c5c4c1b57a05a1b660b762e055032aa534359b88ae3e257a000c6f4f8105b3c0ad5e5720beafbae0c57
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
new file mode 100644
index 000000000000..f98c002b1596
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults.
+	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+
+	# Avoid broken spec that does not assume . in path name
+	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid spec broken by recent imagemagick updates
+	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
+	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid graphicsmagick tests because installing both in parallel for
+	# tests is hard.
+	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
+	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
+	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
+	sed -i -e 's/"GraphicsMagick"//' spec/lib/mini_magick/image_spec.rb || die
+}
diff --git a/dev-ruby/minitest-global_expectations/Manifest b/dev-ruby/minitest-global_expectations/Manifest
index 6117ebc2608b..97d10a5759fc 100644
--- a/dev-ruby/minitest-global_expectations/Manifest
+++ b/dev-ruby/minitest-global_expectations/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-global_expectations-1.0.1.gem 6656 BLAKE2B 19df8ad02f9dad9711e219389fa2d0114d1b2b07b3d7e263eb69e48d78596184261c5de91d3f03d996bf45e897d1a7ac6bb3efb77cede34203f6712263eb573e SHA512 e63b50b02612d751b1bd0b3c9e100e0f6b674dfa5475434a213f78c5e556004c43f00b9bf5b9c479c2381be87015125a334308fae27d70a6aed1e9b392ece546
-EBUILD minitest-global_expectations-1.0.1.ebuild 404 BLAKE2B 719e0da95a8ea6e0a30acdb18d00a99c6c017a377b875a82d0aca9f99f7134f0c85a1076b44ab25c25418f18f3b91c4a397dfdad078822d2ed9816f79076f9ad SHA512 882cb26ec29e56002fd0ab1bd975e0724270bf4e6d6c3710d21f41e1f35e69240441546929504a9dbbd9ab5b59dedc67b4039cc721b52426c6af098f908dea1c
+EBUILD minitest-global_expectations-1.0.1.ebuild 403 BLAKE2B 2d9dbbcfa099d9c7d88a71a7ea0c76acd02c1035dcc80426133812a5052874b4dc0276268e992718620409aa330a65be3bd79b13996bfa2f2921203c9afa4b25 SHA512 000fdee815186f81ba5de8bd6ac302035ed0d7306a062dcc48bbb8201c82db6d4434d03eef15ec8e832c43b4d88afc9269e2ae9fb0449879157786db9552787a
 MISC metadata.xml 366 BLAKE2B 851420e93e857c2d26c11ed324a9db64306ffe71c00e1397f8c2f3eda2896f6ee63073be3bb131ddbd3a9e580fe35bbe0f6375438b34e2ecbd0e2527fc5e9fe2 SHA512 3e762503c0ee2cb739096beef82fae8686304a3c1a4f47a26d9326105b740ef5b0110baa5f108f41f2709c8558667175cb0fa214c0a726e1cfc676b74cb4209d
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
index 4b68db7f00fb..56ec26e51565 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-ruby/minitest-power_assert/Manifest b/dev-ruby/minitest-power_assert/Manifest
index 150007ccc35c..6f5bd2886b0a 100644
--- a/dev-ruby/minitest-power_assert/Manifest
+++ b/dev-ruby/minitest-power_assert/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-power_assert-0.3.1.gem 8192 BLAKE2B d5b9a862d19776d673fb510d2cc52b6741ac20c9b286228a672e49f681d37d2d2c3517253c70b5d1a8d8dc08ca2ac35f8105717edb74a28b6a2ed8667d94a9c3 SHA512 178c70dbe0db2b2248fa83437241d80c7054bf51e21afce74c61bc178907b98ae5b691e0cb644d5754a497d4944520e1ebf7727f1d7f286b4aa28b4560a54cbc
-EBUILD minitest-power_assert-0.3.1.ebuild 525 BLAKE2B 9c349e7bb2e04d4dfb5815bd92daaba5e3fdd37bc0aa859bcd1c99c1cb4aedccd93bbf489308ac53db5aeeada36344d6980a286ef8ee638148356dfae99b1aac SHA512 dc2c0293d2ca1ae7c0778a752ff438304b9aa430084dbfefd95457a1a43ec97c19baa547fde18c693f9ddf31213332ff8cf0d6a87d5303daa1bd085ff9b9e6b8
+EBUILD minitest-power_assert-0.3.1.ebuild 524 BLAKE2B 4adf5867c360bb27dcf2a722080b0232c4e324533fb41bbeba4a27d1e514fec1a523af16af374433ea54973211b03c3c3e25c933e49a224e9e9e933fe022ab75 SHA512 9d1f21d37711b797d355d51eee11a7554914e04d120ec7df377707b63bc4bea7050a4ee0532cb1b252bb96aa3e5a658d42c31548a64895a44f91370ff0656e35
 MISC metadata.xml 352 BLAKE2B 602e40e72ddfc6763f110238ecd49ae67cf566e86a996e64514e4d0302e88e287faabf52cc27bbdd50dbc92b996d06b66e8eacca2f75e318c8fb98ebd08d28ba SHA512 bee51a932b3efd1dc3a3df1d6572f83ad7011b0947f9bdbbd42b5e5ec222bd642c27f235fe3646a903597e678f0894d6c8bfe1aefce1a3e3e9e42ecb53b5ab36
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
index 3e67847d11de..b4c131736c80 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 75fe5b4de77c..525afff73b10 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -5,5 +5,5 @@ DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5
 EBUILD mocha-0.14.0.ebuild 884 BLAKE2B 0c645c6b0a6d2d802604deb982eee3fa0048217061231b63aca2eb7fefeea383341b9bc73998b7c2760b650d06f98023603473d9ebab54fcffbbd6d31bc2ba22 SHA512 37fc72fcafe32bebe1d7af115dd1cc871f4b4559abdf6dd66a6e6cfc784e90d18d000411e4f482d501d04c2772a951c231c457f7336fff9dee8251f72a90ab7d
 EBUILD mocha-1.10.2.ebuild 786 BLAKE2B 6b30a8ff71632be937cbd0b6cd4300ba3313eb49d5ba980721349a7c0f85f3e3b803b69da63c05487cf2a7c682a1e9844070c0181438a60b89375c6de9f54d42 SHA512 6ae0eca663ed3c2054c258604166a56bfe2466bbafde758722f0c51393790459fdcbed2015ecef94745c53a5cd18e53b2bdf89a43b663cd5b46610ee4f0a80fa
 EBUILD mocha-1.11.2.ebuild 793 BLAKE2B 9ac48088e0140794d0cacec7d33254750e12fdf0786933dadd7358da1dfd48dfe308659fb4185e7600c2b5200652fad5b7125ff51a7c3d6913d1f55392815e62 SHA512 c5764b88fc5434681ca0126d171778c58bd4ccc0f6963e6cf2f009a82654e9d856db564363322349156c6288e563c184dab0fe54ad5a8358850473438130f547
-EBUILD mocha-1.8.0.ebuild 862 BLAKE2B 17393a4fb1d67430458ccb4c56342766671dfdc1e8b6a58ae8760a08235c7c661c8b95bb887dedf0881aef6b593cae63fca22accd8e1933fc254f1d7afb73a6c SHA512 3b916c2c27192b0d290e861423a52d7777d0c2e39559499d21eb08faecfe9a84d99993fcf6d8c3d748fa595ae5f9b900d0c9179bdd9f01ec9946a256fd289584
+EBUILD mocha-1.8.0.ebuild 861 BLAKE2B def8cb6468e8f33aa32503d71972a019fc559ab2c4303956a46efca85e85005f76aa63a79b5c7e89651a9eef8d2cb1b9e06366bf6af688d39436ec0f24ba6ba3 SHA512 73188c99026e41dcfac403d5cb38a46255a6549e9f5352de70d3b072acd4f790b771f1b52eeeeed17ee14ac83fd860e7951a8c4c16b4feb4690596ab4bb8117f
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.8.0.ebuild b/dev-ruby/mocha/mocha-1.8.0.ebuild
index 5e207fbdb35c..a4d695cbe018 100644
--- a/dev-ruby/mocha/mocha-1.8.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://mocha.jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 4828a2f7b16d..ed1851a871ff 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -2,6 +2,6 @@ DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac9
 DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
 EBUILD multi_json-1.13.1.ebuild 1908 BLAKE2B 47c9e593445a9597164535186839fff55f3b2637f0d936e939731d375047587701e20a237b288b4218ea9f5d251e02eab560ddbaafa31c42f3cd69edbe4beb41 SHA512 88c6571c406e1323fe456a02a1037da689d06d00e5138a7c68d53c067e315fe29947a5168b32ad4ed69a69253fed5148c86e633d1c4f5135ff622832ba5652cd
-EBUILD multi_json-1.14.1.ebuild 1968 BLAKE2B 3454c739720ed206a26f8acf1fb33095708842af64eb13e577c8effbc3ce0a654b2c6fb76aca6a9e6288814117859ed94a9f19c1d35ef6e58e70441bf243bc0a SHA512 b928c89017ce84ba990b3c03aa4c74398b9b6c718167ed5e7cc9e9d18506954ef42c7b62ffcc1b51ba4992b36c8c495934ae8f6cd67b2e3dd16f177c79d27cde
+EBUILD multi_json-1.14.1.ebuild 1967 BLAKE2B 5100d3f8f226f4d58c7ddc0305615a4c5c254cfb584c8d6275f55dcb1a41adf392a308d87ce708a6c601b808f3a0d429c93e90a1e7ce1d6284f9ce65d87ebb5e SHA512 61ec160505bafab848fab8b5e6b28ea2c7111401b109584f13a602d7f04dc67c2504d14278fef9ad49ae7ca778a4ff0730ad4abe5c339721f621cec2e3294525
 EBUILD multi_json-1.15.0.ebuild 1968 BLAKE2B 641843d31c77760261e556a6e8277ca1c64e1400027eeb0ceb2a3243f3f99d5eb4a397637154aee891a40aa4bfdae801343be39b77af82f928756d1a2ac96227 SHA512 ff7a796705cb587ecc1ecb9f2bccbb6f974cdf4f9c01cd54900891e2ffa5ff58d816df4a9457733ef877303317a4b9537f85dfc26639e7a6dc785ce0903fd2a2
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
index 58e3dea6028c..c0cb20182d80 100644
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 ~s390 sparc x86 ~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 ~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/multi_test/Manifest b/dev-ruby/multi_test/Manifest
index 935b53b9f45f..912bb70b8c65 100644
--- a/dev-ruby/multi_test/Manifest
+++ b/dev-ruby/multi_test/Manifest
@@ -1,3 +1,3 @@
 DIST multi_test-0.1.2.gem 9216 BLAKE2B 9a5888937c82f87822445855eb15406b4250b3b42f00116a2c54360ab35b923d08c4015d90b14003679aac5d674baec8756b74aae4a5246beeefbae262edcc1f SHA512 a0d59f51dc959b7febe9c32853b5ac5cbbb3215e8810de5e46fe10fa42931c1ea89df477155cc8124264d608c5928e54fd4e1949e7d0940f927e1430bfd60a2b
-EBUILD multi_test-0.1.2.ebuild 549 BLAKE2B 2482101bd2f1e0fc5966ba0201e73f9453a456ed48a2811d57ed0f1606b3c734e8682ce14287939e9190fecb7262ba6460e4afa252e9eb8d9ab816f000e9a16f SHA512 ce3a6b993a04493b70963eae64ed614a851b92a473a385f75a5706ebea507caaaa99714a01a983b84443b20a72f98fade4bc9b9b8bcbb3de3fdf65ea64e49d60
+EBUILD multi_test-0.1.2.ebuild 548 BLAKE2B e58d6afc9b8b5fdc95107ec767d38893cc5751b91fa96ef7b7410edfa90ce6ae57283b76c1f4a9b1b9da3ecb9f4b702edb42c4fbecb3b8a95c751a79a2bbc8fd SHA512 37ad063e53d7d4f7825c549ad21dfbc1b9ad3a1b86ac5dc2e45399a2dbf952d82ade96ca37859cbfbc11cef52450785d1925d0d9be74c105993c28ebae5a0f06
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/multi_test/multi_test-0.1.2.ebuild b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
index 80c95a8d4b48..70246068398c 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="http://cukes.info/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nanotest/Manifest b/dev-ruby/nanotest/Manifest
index fce11c097e33..6c5e119a590b 100644
--- a/dev-ruby/nanotest/Manifest
+++ b/dev-ruby/nanotest/Manifest
@@ -1,3 +1,3 @@
 DIST nanotest-0.9.4.1.gem 7680 BLAKE2B d6353949241c85df6286728938c017881763c332fe7deebfe641cf2ca85e65d9934ea4567494afd775d54171e5ebc86558ff1c376d6519fb9ff0f6d5addc1bfa SHA512 0ef48c747130fadb5f11818e131780b05032d57102a142293e29f135f75c1dd57c75005479880974342c257c645b3d2a4489432049683e3421743fa3e252cc09
-EBUILD nanotest-0.9.4.1.ebuild 486 BLAKE2B 2ede95936396b84867e72d4c8f4f503ba2e9463cd0d7aa5297bf35ec813cdb4b5765096d131095f8eee726f94c156cef513b662c567cc0fdc3654e4cb21348cf SHA512 b6970e51174bc755bf0f3a00bbf767a5f552c6b69883b1b3a4697dc56f54d3f407ec5633f39f15c744fa4445b992e051891524ea56d90fc88a08d71270af54e8
+EBUILD nanotest-0.9.4.1.ebuild 485 BLAKE2B 3eba0aab79f94a10c8aa34162e17c96dee26a1dc205910351869a18f39d13d3b02ff2ed6b5a2eab5c77166b0db90cfc49f4bf9fdf88791fe82d3b3063eeeaf66 SHA512 099c52d4df8882857564d60814b1052994767ccd0a7a742bb2aa23bfb633975b4817ee97efc49c97410605a95e408ad68f3e23b1e25e8bc5b1bca3159e913744
 MISC metadata.xml 341 BLAKE2B e0a1896a9c6b6c9e1dbe1824237ab79ff59ef337a6c38ea9a37d3244fa69dd58a6b32456eded92cc73ab769b15402c6cc3fc557db5133ee44cf5b9bb666d882e SHA512 9211350efb92ba99f2db802a2507abb8ea5995b6ad8734c5dc7df8f3d2e8a96ed7ac970c68948946ee69ae3821ce39db987feb3dffdb37e54a10d9311d9b93c5
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild
index 4e54b530ff41..7fd277a75303 100644
--- a/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extremely mynymal test framework"
 HOMEPAGE="https://github.com/mynyml/nanotest"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri-diff/Manifest b/dev-ruby/nokogiri-diff/Manifest
index 9d7f14695af0..fd516f2f90c3 100644
--- a/dev-ruby/nokogiri-diff/Manifest
+++ b/dev-ruby/nokogiri-diff/Manifest
@@ -1,3 +1,3 @@
 DIST nokogiri-diff-0.2.0.gem 8704 BLAKE2B e1df47db2e6e7fcd29eb229245cb9a9a7b31fded319a6fe28d04722f457f0ea7bc19e13ee49b2233f3c072eedf3c83c7e38cd8b19d5ecbc4937f709a9f4cf3a7 SHA512 9b2b6f266c9c7d01153c345567086b4cd1092a5984e6867ea81d15e00467936f296fd5e2c3ab7dc18e44d1dd2af022d250234fb4311a9be80fd3ca32b3d201ca
-EBUILD nokogiri-diff-0.2.0-r2.ebuild 662 BLAKE2B f1b26cdac3b5586b8bd1088a77b7a2a49f69dbbf8f7a960570568a310a7fc97f657f8c18db39668ac01e4537d7e748863476872d87a4c2360f8b0b9278124113 SHA512 cf91adab89ab16adfcf04f4476734f4550f55370a04966f1fcbed71c201fff8e30cf503a0d7ae9d60d664fabf8b626d914b7d96ee31dc2cbd13437f9916b188f
+EBUILD nokogiri-diff-0.2.0-r2.ebuild 661 BLAKE2B b29bfe3b1a58d781c05b6655e4e5ad84aefed5bf222455dbc575bd7aab34c810959cac911f0d2e30ab14feada5239799712db1e31c95e2916c7afd8cdcf60c5c SHA512 e19e0602f3f7469e631b51aa0875ed4507d51e2f833ca4d6af3bf84d2615e821e616f953e5b5e1f675dc7f213bd0614deed85559e99322999ae95c970991d849
 MISC metadata.xml 350 BLAKE2B 9c24289e33dec214608deb733950e5eb9e5c382fb2333b63d3553f93e0cebc0028f3427fc07f39086e2cbbcdd2dbfeb704a0f01c75d19b57d922e9931ed012e2 SHA512 191219269e4b972ea2f1be612b29580cff0bd2a19a45bda36444194027ee365036b09b825c1c522f57d93a998ad8b6b268c3a7ba1c57d74c0087f4feda466d56
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
index 823cf68fb067..131ac5bb39c7 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Calculate the differences between two XML/HTML documents"
 HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~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/Manifest b/dev-ruby/nokogiri/Manifest
index e758628807d6..387d0159197f 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,5 @@
 DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
 DIST nokogiri-1.10.4-git.tgz 5792963 BLAKE2B 80223c7bda39c56ced8e98d1d9f6858907f2814eb2d9f28d13c9f26fe29ae7f057e5a19765a3b304ffc4f9edd3dd0f77b99d5a673923ce95a8f02135aa9882ca SHA512 c27877297d432b9a9baf3e0639600d6ca5b382a87ff0dc1efb5d9bb3c79aaa31a589a4491f938283e4f9d35e8d29b6f88a60e27a5d4c81e7b491e100f8d06a9d
-EBUILD nokogiri-1.10.10.ebuild 2725 BLAKE2B a2be1a97945a675c995534b81fc89c48c433b7058832f83be55064867aab14de3b1e7b2bd3fa068963388c72b42084664fd58689425f1f32a86eab202e838b47 SHA512 f0c7b066aebb6699d8f42c9b5fa7faec7da5e41d9861afe077ac5a04c452e91f92c9a0bb2a48e3107f2b262e3b0a7abef782837742c9f95bad2d8372dac2421d
+EBUILD nokogiri-1.10.10.ebuild 2724 BLAKE2B 921b3a55111aeed8e090f1acbecd194740a91bc027dda766a5fe1ece6b150983a19fdf5854a078b6de266834f3dc01ce74c5accb60c1c6609fa5b58f89b334ed SHA512 27331abf16039001b9ae43578e72e35822b926c3d35370d4e7b04804ae2de5fa127131c0f4863ecd7ed31358cea53cfed7ba2946ef40e3db5f11bf5eb3aa0462
 EBUILD nokogiri-1.10.4.ebuild 2705 BLAKE2B 1ce2dc0a22679f24d3e1080e4558145983fbae4248dcc8084a75bafe0ad0b292cafc789bc742856da8449cd13bd89a9caa38b324ca363a15128183063659ec62 SHA512 f2332676b2539698cde6f7f11e636a6c1cc19556c676e0d8d6f4e1872b0322a2a3966e9aeaf4273d24e4f66ac36641ee5a2624ac344d38c2c1908010d4f4a45c
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
index 17bb2ca54b30..f76e77e91fc3 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.10.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 ppc ppc64 ~s390 sparc x86 ~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 ~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/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index 784d5fe5bc37..1b6566fd31de 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1,3 +1,5 @@
 DIST nokogumbo-2.0.2.tar.gz 295558 BLAKE2B ce52794eb3359ad34234d8f5faad4aff7c197326f6449a09a2264cb1a3d920886377f805e055980224644223d31a6621300c583a04f48ce8a8abe275b2614470 SHA512 fd115e072d2763ff63c46dc6f6117bb841b2c2ac28df0180d44a581a2a46f0b7b90ec17ae1b629e3e7c2f8a2cade53031cc118c8a946bbfb7e9e8600efefd67c
+DIST nokogumbo-2.0.3.tar.gz 297394 BLAKE2B f1afcf516c5c47b15c8404e8c218af1f2ca0bce022fefacb39842527be7be38cbaf9d2fe0572afd8d9c1893a82428b903ccb8d4506043f766305d4d43aaf066b SHA512 b44af7394f0b2c7159b34ead2aa15e39cd08348c1e3d7c4d9a2830c0920ae1a0d22ff9ac32db8fa1bd69c8ce55bc4a32069572944b53ef0d743f8a40560bcb47
 EBUILD nokogumbo-2.0.2.ebuild 1313 BLAKE2B 04c8964173737ea1618c7b13b196b5571438e3520cdb9c9025e23b79621bfabdb72349282426d9ebab2b5726c35a0a9768379240cd3609fbf737c7a06e62f388 SHA512 1ec8d25f9955da8d3eb849d9308504700a8d2d6b92e065a18f659164c149c4d0d91b42f43f56c0a8f43ae9fdee08a37b59e08805405cac1f60365036c93e9207
+EBUILD nokogumbo-2.0.3.ebuild 1306 BLAKE2B d9089f43ee28b13b4bfa374c58609bab1df7df9fc2e14d8e6eb372c5e61102aad1bb4f989df80e23cf603697f067ff0d60bc90ac5fdd4bbe946a132a148b26c5 SHA512 fffb9620200f009ac055e3c0d3437402c2e34f59b10078b9679b11530faae71b3f583bc33309809ad3aa7d4cd980a6617555c14de31943c91bede62b5e330ccc
 MISC metadata.xml 341 BLAKE2B 56d3bff8ec2e7b01a76edaba7633edf4388b00976deab109ef3e34112f35878bfa81de9a32a2aacfdef5f3919fb0210a6c824c4d1242686eccaa7237f783b176 SHA512 652bff94a0b5050f6d8dffbc1dd2b0008202c9f6fd19aa44a148a53c7ed9cc78b8ed64ca4c548f60643b58954f1e344bea0a5b9fc28cd381daf2987ccbf6c149
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
new file mode 100644
index 000000000000..43462c380e47
--- /dev/null
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
+HOMEPAGE="https://github.com/rubys/nokogumbo"
+SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Contains a bundled and patched version of dev-libs/gumbo.
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
+
+all_ruby_prepare() {
+	# Define rakehome in scope
+	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
+
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/nokogumbo extconf.rb || die
+	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumbo/Makefile || die
+}
+
+each_ruby_compile() {
+	emake -Cext/nokogumbo V=1
+	cp ext/nokogumbo/nokogumbo.so lib/nokogumbo/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 8198b5714564..f9fde34156ea 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,3 +1,5 @@
 DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
+DIST octokit-4.19.0.tar.gz 3121443 BLAKE2B d0ac2daa9409d982d5428dd7fe1414c1707e860d7c3ec6534fb962c38786955ceaeb0f1cb33a8636c18a216fb4e2b8ac2777f7ef8b7ccd433b6d4597d686ffb5 SHA512 bd4171423c84d082cb3c5dea4bfa1bba9584964b8e328d88235a8ecfd084e1188367afdf54b5097049427600451edd72dc3663bca50ff761a44ddbcb001d0a99
 EBUILD octokit-4.18.0-r1.ebuild 937 BLAKE2B e0fd6ba0cee38c22e4e520b83cec1ae4f35c90cc9bee3064e0e954f5c01f9bfe97a90c3a7981878796f240cec15086291ccf53bd7751d344418e173f0395ffaa SHA512 3ea459d955bec294bc05535b004dee8fa929e43187c3ff1304eab82861fec30eb9a9f5dcfe8a1d4dd93185069680633c9208b565e45fb74b35a0023097320b6f
+EBUILD octokit-4.19.0.ebuild 957 BLAKE2B 70cfb54a1995d2290c61014fd3f99217b393cb5dd0cb861d24ed9fba7cfa3ee9f0c494b290798c296cb86e06c029b71ba551fdfbd5ab69beb5312937466935e3 SHA512 7493b5b9373eb32cdb3cf6b325e528a5be3404de489e0eea8008feaaf54d10455a059448c775e6e678577e87d0962fa2f5f1f5cf2bffd0059cf154aa4fd215be
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.19.0.ebuild b/dev-ruby/octokit/octokit-4.19.0.ebuild
new file mode 100644
index 000000000000..ca58dc925303
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.19.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-0.9
+	=dev-ruby/sawyer-0.8*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr:3[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/helper.rb || die
+}
diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index f1813e930341..52e81b6dea33 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,3 +1,7 @@
 DIST parallel-1.19.2.tar.gz 21752 BLAKE2B aac6564ad95d8e366ad079854f22e7dcb149643db5792ee81c84c8c765185e367dedd0e635d2373aeefcd84997da89f9f9f4f6c398e753af4a1ddbf90e428dd0 SHA512 192ce4dc18ecb47522360d0d7022a9e20d72e90ad09889f1b7f29c20c74c980319956f316a35aad0fc7efcd8aac5a635da69eebcf78ba34659365df20e402c3c
+DIST parallel-1.20.0.tar.gz 20598 BLAKE2B f9e8626bf6430fffecd9aafb54e0c8c4b61f70dd58f7a2faee0e4c83c10c19d8eac419ab3e22fb75942a5c63f729d47d5e64683caa7f24bc304a1cb16862e18c SHA512 dc472a4792bea7b22b6613942a9c640437cb332d879406af2fad3de0f0529983ba92e6ee2e6f2d424e57695f238d44bf6987c6edc3ce5afca4b024b7501d9508
+DIST parallel-1.20.1.tar.gz 20807 BLAKE2B 71f0894126837d71cdc3bf1ca7d4040d53dd88e0c917f29d3ebc940c1ff16bde42631aff50df455729a2a33df3e96de5dda5c9913d9ff4b1cde90ef1702883fa SHA512 cd0f6ad673fe432d48de77adc177181d48bcbf43e4c2a9f86b579bc1f7a9f520730ce68be010e6645b87c8ff755c83ccaf53ffd73631b0f239beb9e124b4d527
 EBUILD parallel-1.19.2.ebuild 1794 BLAKE2B 067f3cc745aabd55870f23b88d8da5d144b9747f60f249ba7cce83486765f6c65cb23aa1aeab6fc3a75d98c87d56cd22945b40f0bbc742b78f0d575e55ce42ec SHA512 67a8e66d385bd9fa7b3b91fcc3920a71385ad555652a9b43d16b9d7dacf05b0ef123ab1303dc45e35dfc7edceef395a5980cb7cedb9231006cecb719a26d68c3
+EBUILD parallel-1.20.0.ebuild 1794 BLAKE2B 067f3cc745aabd55870f23b88d8da5d144b9747f60f249ba7cce83486765f6c65cb23aa1aeab6fc3a75d98c87d56cd22945b40f0bbc742b78f0d575e55ce42ec SHA512 67a8e66d385bd9fa7b3b91fcc3920a71385ad555652a9b43d16b9d7dacf05b0ef123ab1303dc45e35dfc7edceef395a5980cb7cedb9231006cecb719a26d68c3
+EBUILD parallel-1.20.1.ebuild 1794 BLAKE2B 067f3cc745aabd55870f23b88d8da5d144b9747f60f249ba7cce83486765f6c65cb23aa1aeab6fc3a75d98c87d56cd22945b40f0bbc742b78f0d575e55ce42ec SHA512 67a8e66d385bd9fa7b3b91fcc3920a71385ad555652a9b43d16b9d7dacf05b0ef123ab1303dc45e35dfc7edceef395a5980cb7cedb9231006cecb719a26d68c3
 MISC metadata.xml 342 BLAKE2B 0860273d70423cb92207369335e1f684ea623e1217d7aaf4d016d9aff9c02b0b8dc9af3654b523f77cbd8d92f7043887a97ff87abb79d3c65b66b0e6b40082fb SHA512 805eaecfea071b1d632ade7da42ed63717d2f829c4c99e29a4600b26a81e87c4032d7ee441b865d86f37faa13f455c9f2888dc8099178cf6211ae13d3e3e1835
diff --git a/dev-ruby/parallel/parallel-1.20.0.ebuild b/dev-ruby/parallel/parallel-1.20.0.ebuild
new file mode 100644
index 000000000000..e49b4e4213b2
--- /dev/null
+++ b/dev-ruby/parallel/parallel-1.20.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run any code in parallel Processes or Threads"
+HOMEPAGE="https://github.com/grosser/parallel"
+LICENSE="MIT"
+SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE="test"
+
+DEPEND+="test? ( sys-process/lsof sys-process/procps )"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:6.0 dev-ruby/sqlite3 )"
+
+each_ruby_prepare() {
+	# Make sure the correct ruby is used for testing
+	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
+}
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '1i require "tempfile"; gem "activerecord", "~>6.0.0"' spec/cases/helper.rb || die
+	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
+
+	# Avoid a failing spec regarding to pipes. The spec seems like it
+	# should always fail.
+	sed -e '/does not open unnecessary pipes/,/end/ s:^:#:' \
+		-i spec/parallel_spec.rb || die
+
+	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
+	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
+
+	# Avoid spec broken on Ruby 2.1 that clearly doesn't match code and doesn't really test anything
+	sed -i -e '/doesnt use Etc.nprocessors in Ruby 2.1 and below/,/end/ s:^:#:' spec/parallel_spec.rb || die
+}
+
+each_ruby_test() {
+	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
+	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/parallel/parallel-1.20.1.ebuild b/dev-ruby/parallel/parallel-1.20.1.ebuild
new file mode 100644
index 000000000000..e49b4e4213b2
--- /dev/null
+++ b/dev-ruby/parallel/parallel-1.20.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run any code in parallel Processes or Threads"
+HOMEPAGE="https://github.com/grosser/parallel"
+LICENSE="MIT"
+SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE="test"
+
+DEPEND+="test? ( sys-process/lsof sys-process/procps )"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:6.0 dev-ruby/sqlite3 )"
+
+each_ruby_prepare() {
+	# Make sure the correct ruby is used for testing
+	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
+}
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '1i require "tempfile"; gem "activerecord", "~>6.0.0"' spec/cases/helper.rb || die
+	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
+
+	# Avoid a failing spec regarding to pipes. The spec seems like it
+	# should always fail.
+	sed -e '/does not open unnecessary pipes/,/end/ s:^:#:' \
+		-i spec/parallel_spec.rb || die
+
+	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
+	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
+
+	# Avoid spec broken on Ruby 2.1 that clearly doesn't match code and doesn't really test anything
+	sed -i -e '/doesnt use Etc.nprocessors in Ruby 2.1 and below/,/end/ s:^:#:' spec/parallel_spec.rb || die
+}
+
+each_ruby_test() {
+	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
+	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index b45b70062c7e..59bf3171ea80 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,7 +1,10 @@
 DIST parser-2.7.1.3.gem 785920 BLAKE2B 85ec4c6d0ff2c86937f3ca43e27d222d75c98a6d7c5cc38a58f466aa905f303577fb20cbd02e6c295f45ca9b83fa8decf27c7ed22149b0cfc6cec3b1a71afce8 SHA512 eb9018deda2418e728925c48fa27d373f3a25ae562b92798e6ce42e225afaf9631bcd3c98999ff5d11daf464d80a887f7f2b5a23ae9dafa5e12ffd8b46d7bf88
 DIST parser-2.7.1.4.gem 790016 BLAKE2B ac3266b686a04f1bebb59bfe2c3dfa1a3791596d2b606d3d0d40b9a96c0b56c08d89da77e659dc8a50b4ea39a2ae4134b69eb9c27afac60fb666a228d25d3fc1 SHA512 ee22f6e9622a460b9f4a9be840c8bb850f5c7c5f7fad4503e518376378d45e2bfb8e6113c25a3f4decc93bad9ea9b4616e8e0ff1bf46a21120c43d0f675c3b9a
 DIST parser-2.7.1.5.gem 791552 BLAKE2B 813b05fd6cbf69fe6c5c96e15b1a4542fe00710cad9ab6f4e97ccc4cabef59d29dcef052dde0770adc67634d2cfa1d11d6afd5a7624c09eb65069d90da6d577a SHA512 8ae6901901c58e6dab7f0d54d113aeb8cccb27f80d7df69a51c70b13284a680cce1b34661c1ccec97ea2234768d90e507b89d43732af7abc4261b18dd024fc67
+DIST parser-2.7.2.0.tar.gz 266318 BLAKE2B 5bb3e4649eeccaa4a72fb2478755185a749b28f53898b361d5a6f35a57eb9cfbddeb149cd4a793243e60b7421966662992c2ebd6e42298e0f5828a1a7fb43e47 SHA512 e9754d6d334115fb272c3df0a6620da0b0a014aa7c49914556d72259a11229a6c71f797cfa814c87eec052097c2f6e3cc18adf50cc30690549c74b57733f0c72
 EBUILD parser-2.7.1.3.ebuild 770 BLAKE2B 8a19357a619c59631a53dd16cf04908196c45264616fda90e8bcc8e44226266cc97db519b85455a9b2f8eaf1316fdb234270db09a4c687f3bd9085a7487a53d2 SHA512 963009d84623585d8fc8c8a6a691c1d11154cdb07e5584bb3feebfdbb7f78be9adfbaa47e7ab50f63bbac31197092e6955fbfa7448cd54d78d08552964d7c812
 EBUILD parser-2.7.1.4.ebuild 784 BLAKE2B 3eb9236cad942686240aa3339c8538f0f6001ecd2e498882181cd94ed7c0d8d620cba29c4ddc10786ad955f681371467561f250f2d3e12f4bcd0fc57a664ec97 SHA512 d1be9124e9feae418cd23f5c2996e810744e098235dfd166ea0c7b138914fec8636a6cc5dd8d369471ffa67b050756cee717738ae8bf25eb971ccd3b423025ca
 EBUILD parser-2.7.1.5.ebuild 784 BLAKE2B 3eb9236cad942686240aa3339c8538f0f6001ecd2e498882181cd94ed7c0d8d620cba29c4ddc10786ad955f681371467561f250f2d3e12f4bcd0fc57a664ec97 SHA512 d1be9124e9feae418cd23f5c2996e810744e098235dfd166ea0c7b138914fec8636a6cc5dd8d369471ffa67b050756cee717738ae8bf25eb971ccd3b423025ca
+EBUILD parser-2.7.2.0-r1.ebuild 961 BLAKE2B b983259aeb654773b384d9be90469bfef79587de6b376e60cdc643c433fc67e287272f8290589266443caee118e3fadd07d1d5e25f067581ae95292f8dda8f8d SHA512 ee6064b566299e4b600bda95314eba535b39c8ac7909440fdc5ff62f4bdae280c6813b62b44e8e73e8d45e189852c8431d0da63c007b8ec23bf91e2b5ca8143d
+EBUILD parser-2.7.2.0.ebuild 907 BLAKE2B d35a64e967f77f719d793f1ea5ae3eb3760fd002e9493efb83bb4d865c7ea2b999178e88e7411047d670ed8534f2cc9b7275f527ae1ad1367b1685297513f779 SHA512 a06d1fef1f0ec987b77a1b8b47c3adcd7b2f4dada76c59c56bf8f08b36a37da996661fb20ca31dea7493f67c30768b591fdf6a385e0eb72039e998721750b202
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.7.2.0-r1.ebuild b/dev-ruby/parser/parser-2.7.2.0-r1.ebuild
new file mode 100644
index 000000000000..9572def45868
--- /dev/null
+++ b/dev-ruby/parser/parser-2.7.2.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/racc )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/parser/parser-2.7.2.0.ebuild b/dev-ruby/parser/parser-2.7.2.0.ebuild
new file mode 100644
index 000000000000..cc4de9d6a806
--- /dev/null
+++ b/dev-ruby/parser/parser-2.7.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+="test? ( =dev-util/ragel-6* )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
diff --git a/dev-ruby/patch_finder/Manifest b/dev-ruby/patch_finder/Manifest
deleted file mode 100644
index dc52e2d714f0..000000000000
--- a/dev-ruby/patch_finder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST patch_finder-1.0.2.gem 14848 BLAKE2B d876bb130d0174f762032aba3c1326633fc10ed539b697a83dcf7999d1ae0f5045e5d12ad409d60bebff894dee315bd19523a225885fa8d99d489ccd88434cf8 SHA512 24b269fcf9d379ca07aaecb8a9282086767eed0dfa9a12cd2523eda488621a81e90c4cb386600f3120bd503e0de1887f6826da33df4e77c5c8eb3fae61e7ca8f
-EBUILD patch_finder-1.0.2.ebuild 434 BLAKE2B 9b8edbbe113d493c344bfa863fdd3cac1517cb404676bf83ffece32a7ccc6c4c8b9b1a597d9ac37429dd7dd629fecfc7ab3c497c3c5b24f56a23184633ac6744 SHA512 627bb88aacb6a3feff282a558e36587b9ab8cf541e2af75c451d39cf5a9338fae01204de27c808554ba35ca33a369b16df6546af5b1f0356abde3bcf78ae7286
-MISC metadata.xml 399 BLAKE2B 7f35f4eae857297d4ba94ad8218829786759938fcd49f4b61b7ba2ee6723d62dc37487abfa3fc33b90e4d066e2f904cba363c7a733f1fdf03a8ffc89d0042e2f SHA512 683463d00c40d458128a0317b997d0db4e7f6392f10fcdfdf99289ad52f8e75b1c569cf36011309e28702ab92058f54c1ece7c0e9a43f19ff3233f87dad9780c
diff --git a/dev-ruby/patch_finder/metadata.xml b/dev-ruby/patch_finder/metadata.xml
deleted file mode 100644
index cd2760d3f464..000000000000
--- a/dev-ruby/patch_finder/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">wchen-r7/patch-finder</remote-id>
-    <remote-id type="rubygems">patch_finder</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild b/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild
deleted file mode 100644
index 4e7103536d10..000000000000
--- a/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generic Patch Finder"
-HOMEPAGE="https://github.com/wchen-r7/patch-finder"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE=""
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index c055c4478342..5f507c732f3d 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1,5 +1,7 @@
 DIST pdf-core-0.7.0.tar.gz 43382 BLAKE2B 55116d0d997d5e76d94fab0be9bbea273bcd677fee951a71e3209bd764560c4f14fcd55ccb11748041582a12d4a06819a6203453f0e440718533a92287dfcad7 SHA512 c99409284e9f7f929902d88ff7943b3dc6b37c32d67ceaa15ad79e1f9a02b561af59889dae4344a1a7749edbb6705e06f6ca356f08ca38742a2623168d53d29d
 DIST pdf-core-0.8.1.tar.gz 44159 BLAKE2B 9f199a76434ba1813a9d23f1d489a7aa9eea2bb76dcaccbf35323b1d36beb88ee2a2d642eeab872c3ae4911ff461cb3335d8a5d7a90b880c3b5bf52fa40a15ed SHA512 83d5adfb77938caa1458c262ea466377bc5185ff35e18eb365ce8e20f4f317fe17cc50043c2eb76d863bbadcf13f91cd792b2bbb4828d5383fa0e8b8c20cc8d0
+DIST pdf-core-0.9.0.tar.gz 45772 BLAKE2B 860d0995af759315564b91264f5d6072b8a1530f4c994700e5d2632e0d8c09fd48c9b0991ff8026f68db07c43c412bf13ad73913a82977dad0bf6477fff81dfe SHA512 668b19cd722c56c00330ed81ad4fb8fb8bfa7290c2a8a3d23ab4ca92e7f9ea44729314aaaf68da9cb02dd73643b650ea87437d8d8aba5075342917ebd7ffa2be
 EBUILD pdf-core-0.7.0.ebuild 772 BLAKE2B 13d4e4a68edf940d9a71df616e8ac916a0aa1448df62fe39daa810bb3caa3f7e8c5be65da7af367db0d1e8fdf27116526309530201852352d2ebf52822c931aa SHA512 0e8ae528ad5f7f4dbdfab1f4c3f0f5e24360f372d22b19f9148bdd4d06206812111205c8b11d863342ef9fd1096558b8377026e61b2eaa1aeb481391e5945714
 EBUILD pdf-core-0.8.1.ebuild 772 BLAKE2B b777571aa9dbb30385bff2e01bdb127ee4ed05cd470c8cf75bac82ded2b3dec48a98424cbf2b56eca9bea300e8ce8a6f214befafd8c8fbb0f2db95c7382744e6 SHA512 75863ec5cd29db8d63dd067d87126127bd94803f9bd48d67ff836df14bf91e0c70fdb51b2d4e7b32b96803d6a0ecc6ed19bcc0862bbda4d8af71ab8c173adeac
+EBUILD pdf-core-0.9.0.ebuild 765 BLAKE2B ac96aef89fe23568b5f3b8a7a39b88630df6d1a4d231658c15eb50be2784140f79a6bdb45a79e3160a8436453ee4e688c4486f28b675f6c6ab73efa54a92b647 SHA512 3136adbef56a8b41184f51e0efdea1c1ef5e07c8ae98398d851768e9aa65066d973f5ca93e1682a2c4c05888fa1266202b82c4c5a8cf016fd131fbe387ced5a2
 MISC metadata.xml 343 BLAKE2B 1c70f6275d3aec7f1414e408ec97c954da1bc047b76c39efb2a4d984dd0af20a0410235c74615be73f33bb8018d244f3a267ec3897763632672216ed13a39ae8 SHA512 def6cce805afe3c3ebaa7db7003f7f4c62f9a7bdae71dbfb9f4ec7ee39947b85952a5a49b8dc473fddf03b26aeace6a0e711ae4d0bd94d2d9d49881ffc9086c9
diff --git a/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild
new file mode 100644
index 000000000000..5f2295555955
--- /dev/null
+++ b/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements low level PDF features for Prawn"
+HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
+SRC_URI="https://github.com/prawnpdf/pdf-core/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
+	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 75a0a99c9e38..5ea6beee4046 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,5 +1,8 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
 DIST pdf-reader-2.4.0.tar.gz 11025697 BLAKE2B 6886090ce7e293280db434ab7a8e866f11fa8debad3767ea5fee337f481a8695c98bc9dbd46e7e29b132f7f9675a0ce13b957962189bcffe46d37d826e9a2bef SHA512 965b016f8d71e46f1f483c48470049b2ae7eebe72b8e7ae9e50a7ebbf6e72e409e84bf4a6e612f6b76713afd6b38f7fc7f24ae5e898d12fa8f65e3878575c090
+DIST pdf-reader-2.4.1.tar.gz 12453907 BLAKE2B 9ba4aef6c8bd8ef4cb696e7afd3a47578b16ccc82ee065f49d092200c39bf1b218e886f63af8f38e1a7ba6ae2884021a3759753044b2af583454ce301d4b8341 SHA512 84c30fb8ff521b3d3c86348668ce5bacca8e82d414e35f59aaf6e04a1dfa87b3beead2a527efc42d80534358f27af6bea445f49fdc223ecdc61a910ddb7ca5e2
 EBUILD pdf-reader-1.4.1-r2.ebuild 1129 BLAKE2B c5e8d7a19c8ec4f504bf8a8c782a1e8be9314f98ac6c088ee12aecff88a6e57fe9322b03b98f4945d196f907de34b87ad224cdb17e8836ed52ac78f814f1cf0c SHA512 9dc7540d7232bb34b2edf9175fc0e42a898d7cecb9c1f21f4261c020884ac4e6243ca22e81a96aa2a47437976124634febd94cbc33135d67f9df5d6078142278
+EBUILD pdf-reader-1.4.1-r3.ebuild 1197 BLAKE2B 73ccfe23a60594aa0c17a58139a55f33581c3c2b732e4a92be89e8ef66dc545472b5b5f958255a9322e569bb386bcaede77eac94172f1a9b3075915aca2aa771 SHA512 511b1d15521c6efebd390ebfbc94c6257e8456dc42134d7ac2775e40bb61069edec461fd93fa11b833219fe56a1697c58a5ff63ba49d24661a1dbe1185dba544
 EBUILD pdf-reader-2.4.0.ebuild 1135 BLAKE2B 7a6a729d6c5c2915ae7dc0cb1d170c067d9d4f9030b20ed0296d72d1c70b93bdab6b8f0aa1f1b98b5913d011847bd3b7441c0536a8b7a816e5b810c5fbf673a0 SHA512 46d42522a297316c62eae155e1c04080477f2a22fb5a532ea6431863df176c7748f21cc5df08bc26a42407649c8f3e16aa277ccc8da8c1f5feed845cae82a60e
+EBUILD pdf-reader-2.4.1.ebuild 1128 BLAKE2B 3161755cae0b5c4e3e221cef1acc96cb29af0571aa945e0ae658293b84f3d5282de69311b8e89b67b023b732f92f6448ab32a1bf3f8f01065b439de4d251c412 SHA512 be1781fa3d58de11b578fcbc2bbb697d0501982d2be2229f33d4f26fbe5fd98f4519c483c05548e6dd5dd89be9806cfacc62c1abff79c1d1d73ea1f627fb8ec0
 MISC metadata.xml 340 BLAKE2B 870883ff3971c347d1b9a28f228629d1c972c8a7e1695d77755316a864b74a8b65190d6b1cb07e55e8138321b91a6d9afca61872434ad9c13d081ce47e75d3b6 SHA512 8746d7bf7de89f49d161945c3dd434efa275799aac66d981edabec64ee789ca5864d69f3bae738b3c5ff26cc54b1d824f7aa35b2b9c9624e07339794b56d029b
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r3.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r3.ebuild
new file mode 100644
index 000000000000..f2a8095194bb
--- /dev/null
+++ b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GITHUB_USER=yob
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
+
+RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
+HOMEPAGE="https://github.com/yob/pdf-reader/"
+
+# We cannot use the gem distributions because they don't contain the
+# tests' data, we have to rely on the git tags.
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/afm-0.2.1
+	=dev-ruby/ascii85-1*
+	=dev-ruby/hashery-2*
+	dev-ruby/ttfunk:*
+	dev-ruby/ruby-rc4"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+
+	sed -i -e '/Ascii85/ s/1.0.0/1.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.4.1.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.4.1.ebuild
new file mode 100644
index 000000000000..0d9203bbcb24
--- /dev/null
+++ b/dev-ruby/pdf-reader/pdf-reader-2.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GITHUB_USER=yob
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
+HOMEPAGE="https://github.com/yob/pdf-reader/"
+
+# We cannot use the gem distributions because they don't contain the
+# tests' data, we have to rely on the git tags.
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
+
+ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
+	=dev-ruby/ascii85-1*
+	=dev-ruby/hashery-2*
+	dev-ruby/ttfunk:*
+	dev-ruby/ruby-rc4"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 76756dcaba98..7d23a647c99e 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,7 +1,7 @@
 DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
 DIST pkg-config-1.4.2.gem 22016 BLAKE2B fb8f32c811f856d11653fc0450e5615d83dea07f07f712b4914edfdca1e35f9b2da7d04578c9f28a1562cb0a405e54f6429cfac792ca2f86710d18c30a75be71 SHA512 f727f416860b08e87390c60800333bab7b0d6238fe1f93bc12b92ec67ca75c5c9ad128332a54a0b895dbf49944a50619e3bf40c49efcc7e73811d51714ae3d66
 DIST pkg-config-1.4.3.gem 22016 BLAKE2B a23bfee3790a03d4224efe16439b1c43a6174336b567d7c84d429e848035f7c77d96340e677a7f75e3cef415f236cc1d09cc0f75bee5d8769e9490bc2fc5f4c8 SHA512 4952636442d585b555d048666937e568f237789329ed6110475efe149d607f4b1946ce1b616574a91de7e4c17ef9cc5cc3b4bb2867a7dc08344183a41303f42d
-EBUILD pkg-config-1.4.1.ebuild 782 BLAKE2B 401895b22c5b4ec52431ccc8f8dc49522e8983cc645cdaf575db8df39c2f0c16fb216d9ddc81ea0c2cda84e4ef33cf0909cf1bfe91469f938a706a6a240000bd SHA512 0cb36123407a03899f0ce327bf973497942845cdee4996a8dd01452eb6aa1fd403955d42b0ea781616dee6531462eea9a635bf34a48f86f2d442486226d02a02
+EBUILD pkg-config-1.4.1.ebuild 781 BLAKE2B b792fb76d1fead0c1c731ca3c1f91726909a9737726250f2e7f4ee64f6d51b0acf5e5c830e179e4767be3b86071bd918d4123697c3e121cc6c9374d04e7f5d11 SHA512 040c220a3e3c010ee1b02a37e03993cad28cc938082511e6a9108322a40c2d5880967d2d441a125f062edbfb6269a3f4fb62b7c41bfa188ffacc5479b403d487
 EBUILD pkg-config-1.4.2.ebuild 782 BLAKE2B c98e5b89f526daed4e5f6df0b5fbf74ecbe22d7c60177d43c11ff271aaed89f44f5b161946ce59995840c7eb31b72c656d13cbe900417c2937e9b3642d036698 SHA512 cda391497ad497d1ad7d20a9f731aaca1af862ae34ff1b063d26dea6aed75a497f69d44ce7a2b255a8abc7e49d909e2628a51e3672dd6c5fd10ebb4f08911975
 EBUILD pkg-config-1.4.3.ebuild 782 BLAKE2B c98e5b89f526daed4e5f6df0b5fbf74ecbe22d7c60177d43c11ff271aaed89f44f5b161946ce59995840c7eb31b72c656d13cbe900417c2937e9b3642d036698 SHA512 cda391497ad497d1ad7d20a9f731aaca1af862ae34ff1b063d26dea6aed75a497f69d44ce7a2b255a8abc7e49d909e2628a51e3672dd6c5fd10ebb4f08911975
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
index ec66321b888f..17d695bd19df 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 57c74b34aaa1..2aeb9fc328f5 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,3 +1,5 @@
 DIST puppetdb-termini_6.12.0-1stretch_all.deb 21290 BLAKE2B 11bc0a316517190162e7e4e5a2ce05bc880ef8412bfcf5fb66ec68545bd7779e217d5d5e75ab79f24fc6b2f68e1a962262704efb8833fdce84288d060245b898 SHA512 a742825e9f9bacf5726814474b7812393d1a51c50fd710d771c10a9e23c874a465c6859fc17485b66a2c4114ac170f2f25c5ce1be6684ff18f5da31dc9ef0744
+DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
 EBUILD puppetdb-termini-6.12.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
+EBUILD puppetdb-termini-6.13.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.13.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.13.0.ebuild
new file mode 100644
index 000000000000..7919b7b236e7
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.13.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/pygments_rb/Manifest b/dev-ruby/pygments_rb/Manifest
deleted file mode 100644
index a3069f0e7a08..000000000000
--- a/dev-ruby/pygments_rb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygments.rb-1.2.1.gem 1176064 BLAKE2B 7a6651606a433a9f15853ee06c3fe9a02d266f9441a08cc92c0db4ba679a97a2a25aaa4e96a621fbda0553e9b0c995ce53c6f828793f4937de12b3089f12963c SHA512 f0fc63ec028169872e28e2181c6a10c8a3f5e7f07074ba9f43475a0b5aa403a03d7045abb03433b600ef3d74c460556355b4ee64be598d3b93ddb1e0bb306259
-EBUILD pygments_rb-1.2.1-r1.ebuild 1587 BLAKE2B 978060ba494fae2ac94dd20fa4e5be0dab96ad632c6b3d9ca5ae3d47a24a8817548b0c63e9aa0121fec5937d69498daa8c42f5aa2ebd27e3223f8255dcf6282f SHA512 d9d1c730178f89971302092d7ad75fbfdb4c6a6bb2190ab7c58bab75230b11e193f1359f1ca4395dcc63a08b4f1bc06a1f22073e81d36f587357828c7892e8da
-MISC metadata.xml 342 BLAKE2B c4cab71f5d398ab14a8e95598f510c092fa2cb34fd6facf4c59289c8f78f601d585207eba1ba4822ac6552ae12375e4e786873a55d2a34d2e36c02fa72ab5b02 SHA512 aa104434e5ba9d5a27409be91ee791f898e72aa38632b3c185c09071632915686dd5a3ccb46c24c911468d29cdfed6c6421bdfb0119c28bd5c404be4b55bf789
diff --git a/dev-ruby/pygments_rb/metadata.xml b/dev-ruby/pygments_rb/metadata.xml
deleted file mode 100644
index 29c1a796cb32..000000000000
--- a/dev-ruby/pygments_rb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tmm1/pygments.rb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
deleted file mode 100644
index c85551346487..000000000000
--- a/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-PYTHON_COMPAT=( python2_7 )
-
-RUBY_FAKEGEM_NAME="pygments.rb"
-MY_P="${RUBY_FAKEGEM_NAME}-${PV}"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
-
-inherit ruby-fakegem python-single-r1
-
-DESCRIPTION="Pygments syntax highlighting in ruby"
-HOMEPAGE="https://github.com/tmm1/pygments.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
-
-RUBY_S="${MY_P}"
-
-RDEPEND+="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND+=" test? ( ${RDEPEND} )"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.0.0"
-ruby_add_bdepend "dev-ruby/rake-compiler"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/s.files/d' pygments.rb.gemspec || die
-	python_fix_shebang lib/pygments/mentos.py
-	# we are loosing a "custom github lexer here", no idea what it is,
-	# but if we need it, it should go into dev-python/pygments
-	rm -r vendor lexers || die "removing bundled libs failed"
-}
-
-each_ruby_compile() {
-	# regenerate the lexer cache, based on the system pygments pkg
-	${RUBY} cache-lexers.rb || die "regenerating lexer cache failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins lexers
-}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 08be67d0b09a..f25271363885 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,3 +1,5 @@
 DIST rack-cache-1.12.0.tar.gz 262794 BLAKE2B 63668875cbfba5a6012f43fcfb504e99e357301b8c4b26bfd007b6d22fd9cd3d2f40b096505f9b9523c49ca2a7c980fa15c95187284a339604ca8acadfad374b SHA512 67101c2fec86db94d177c4cc476a17e5bda51d222ac8530fe6cdef8fb196b3b7ffe301003abbc14430c4f4068da0627ffcdd498fd79faebd190571bfbaec3ab5
+DIST rack-cache-1.12.1.tar.gz 262878 BLAKE2B c287c547496f0c4659f16cf45aa4c562cfccc5d6ba9e71a10a6507346797bba7d9d1e287ef1fe3d8c6bb6e8ef148d6c24d90e92db1ae53ea2f7d1ee91e3fd148 SHA512 f850facb28f302db819b6d67fd86e0dd18ae8f5d132044582bbcd6792b287c7d4a29219a47e708b5047fb373b5857632597d9743b4ba530b1258d29924ca4cf9
 EBUILD rack-cache-1.12.0.ebuild 1334 BLAKE2B 2fdbfa9133453e93cac38deec79e8d1e643aaecad397ba1f13bd5970fa24b7783fc8ac538380f74a30fcf55b50516ee67ba731bb68c95e4d9a247f9fdbb5984c SHA512 b89335d58516e0de9d78a41dd159b8ffd3f05b09f6e2aab37ba7b18ffcc9901004da7c5c2fc41b13c2a2f9680ed34c14cdc713845d68991ffd86aff538a005e5
+EBUILD rack-cache-1.12.1.ebuild 1328 BLAKE2B 9652f7f134282abf824dcd8e8b8d3de3360a26b8f0a9787a510890b2fc695a150182633019033391524ef92a0229da1004bb1191d561386d8edb25cec9dd8640 SHA512 888e72e374944ca85d9d1685c01c1b3d2c88e5489b4a120de4c8e6182f003c2b61bd77d87ab08917d72a10251b0bd76f7313d42efa192d3a1ce12264e60967b9
 MISC metadata.xml 335 BLAKE2B d6f5130ac567d01cf6c3d831149be70ffc68d04d1b115473e6e8a550f392dd82341d72d9ba813dfd33cfa4bb5453ead5506ae75ae6f80cb9f47623e631e7c997 SHA512 3763e8653d06f4f62a253bd075ff31273fdc39edafdd74838c8fe65bee42a9bdfede99c01f236218baf496b910f5aef722ee3d5ff39d26c901e30df1406ecfa0
diff --git a/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
new file mode 100644
index 000000000000..dfad5edb6bdb
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+RUBY_FAKEGEM_GEMSPEC="rack-cache.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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/rack:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/maxitest-3.4.0
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-0.13.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		-e "2i require 'timeout'" \
+		test/test_helper.rb || die
+}
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index f6e641886121..0eeb3236c5ae 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,9 +1,7 @@
-DIST rack-1.6.12.gem 230912 BLAKE2B 98a3ae6905535b284a5e723d39db7788f97c11b29506fbdb3c584c53d1dae35d1e8006724e5f63195d8407521806c53a5fcf47544b4241370a3576e6dbea0dc6 SHA512 9d0f6f44d228c1b6a7b0fbf29a1e5a2f45339b4749d563336c1729d88c3e37d6360fedde75b7cfcddcd7e051025fc50f04b594fb68d499899e96e2385478fe76
 DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
 DIST rack-2.1.4.tar.gz 251772 BLAKE2B 9dbd1ac1dade5935a3819b8c23e492b3e637ed2fc99a95ad0592d40501ea4171433ac4bba08a6031cd77521f4ae0f430ea60394c51b7c5f25cd9e82b72067ba8 SHA512 ce36902125171d2c9baffdd85a171237b9262a47115f043ce96486fb60fcd77826ae28d9416c43a3549db657a3da1c7be45f14842e4b343517f23dab82abd81a
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
-EBUILD rack-1.6.12.ebuild 1691 BLAKE2B 27974bc4f722c22e14cab0486e18c45ea52840898e4db6979f337fa0efdf77f8d160d73ac42ddc668b7fc41c6d726ed9f6e0533f3632483670ab44a9b71e14c7 SHA512 2c68b3554715800a3d4c299d9c655618b369540925922418bc6d233da6d363a39d2eccc72d652900e4da8154a0dfeef2896cd40819e23096cdbf7396d5497f34
 EBUILD rack-2.0.9.ebuild 1449 BLAKE2B d9462a4fb6d7c0811b49c776fd0778b79986e229789047d750ef1dceb62470750d3099d55bde1af758300b1b8f973081e184d2587d1521258d9e94da0af75869 SHA512 f4c6734000355a69552b6446d85475a505d00195a1eee31780435ffdb543dd87fe575da36cca9d74198f0f1b4d105f50a18a5430b66754f3434677a6a3bce65a
 EBUILD rack-2.1.4.ebuild 1698 BLAKE2B 19566995b14950f7d79dc361a5170ec56df9b7a8900c658de03e5f47e3344355e96733dac9113a90245545f4c7cc3d053db1ee7877acf2750c858ce17eeb6546 SHA512 f7af118477ae7fce8fccb8c25258f6357cc7159e548f1dce89f35041c6a5172eee018f425d480b0d2511859b68973f786d3963fa74e660b2ea8d5bb6cec53be8
-EBUILD rack-2.2.3.ebuild 1490 BLAKE2B 04b52537a1e2e56ac56d18fa67e509fac6a6ea81d38c22b84f045d742d677937559791e1d8d3e6f74f9041a48845774537e1738d8b1501a37a55843b98e6e6e9 SHA512 994ebba8be17a50dc31d50fb6f6e496a7c452d1a17007c90529ae25e71c9b26dfcb70653f97969714f274f1a394d957601a70b33190bef84d5e243caeee645f6
+EBUILD rack-2.2.3.ebuild 1489 BLAKE2B e46538e108f8fecc923841760307851aabfdfdef21d5a8fd289aa41322e32e80e3da97c799dee898f65e00c42bd6cb96d3dd0f12069e272c87767455939d05cc SHA512 4c0152b93b48f25ad1f0cea6dbb9a92f46fc03e86b02ce5cd5ada90d2491b3bf9d13a8fae7007175522c28efd723964a351bbd83765ff4aaea390cf3b468c984
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-1.6.12.ebuild b/dev-ruby/rack/rack-1.6.12.ebuild
deleted file mode 100644
index a3e336dca7f1..000000000000
--- a/dev-ruby/rack/rack-1.6.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md KNOWN-ISSUES README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa 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 "virtual/ruby-ssl"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.5.2-r4:1.5"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Skip test also failing upstream in preference of making a security release available.
-	sed -i -e '/knows to prefer plaintext for non-html/,/^  end/ s:^:#:' test/spec_showexceptions.rb || die
-}
-
-each_ruby_test() {
-	# Since the Rakefile calls specrb directly rather than loading it, we
-	# cannot use it to launch the tests or only the currently-selected
-	# RUBY interpreter will be tested.
-	${RUBY} -S bacon -Ilib -w -a \
-		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
-		|| die "test failed for ${RUBY}"
-}
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index d33473890998..e58fee1b6078 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 708afcb8b65d..d41354ba62f8 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.gem 6656 BLAKE2B 36519aed8bc34ed303125857ebcc4cbc860b530f6de1
 DIST rails-5.2.4.4.gem 6656 BLAKE2B 232562c858d2f487cec1916d1c8afa229028262c7c58cb1f8e021f90ec4f4a309b1cb3c4e91d22f1cad3ea83a78ec7a3e16d83c623060da48545c49f9a87a2f6 SHA512 01c2ae7537afef84a583d42b610791a6c1bfecf3f45b9dcf1295f60978fe60a4cbc286a3f091430144c7fc5e4c89d3c3616fba9045188d53010abf199cee869b
 DIST rails-6.0.3.2.gem 6656 BLAKE2B 080846459db9ad58650852acb60eab1474cb8eefb7f4720dc83ac0562dd1bfecd4c98ea0c9165d3c6d578edfed6a45088ee4c223e33fb02d26510ad9ccfd74ff SHA512 288f48bd20f4a5ed485a127ddb9e307a69d3ee00198a168ed1d2581b0e200e0fa14b02811b4c72cc20eedf616b10cd46b38dbbed5fcf44125bda25e1aae41b44
 DIST rails-6.0.3.3.gem 6656 BLAKE2B ea87053cb20859b63a2c4f33e9454bc618b9b213a6c983f1bdff1c6c19e0d3406d99265bcd729163fbd9a3f0ca4cb617280386714059f07fae2661ccba7c897a SHA512 b50b690bc89638d9f22bdcf57f6fb68595f1d19e2dc8b380e9519e0266087eaaa258d5bd1f3692d0a4437bef8b92552aa01a0913cbab4ba460be6d3e5f1c2dfd
+DIST rails-6.0.3.4.gem 6656 BLAKE2B c2b1d1573a6555073441baa02bd7f06a3151ea39e4b4845a6323efe9834236e1ac1f4731014f8fce7563300917449f3d1c92d5ff169b951164b8a17c4ca16e53 SHA512 6206864e3d70870a6b9a31e63cc05d7d58eb5eaa3df78ad96de7adbf1c884c2f28bf62291a8cc628d8d702c67b4080ea7389fd7518f1bc59b72ae403824bf83b
 EBUILD rails-5.2.4.3.ebuild 1049 BLAKE2B f83e6236526c6ca1d7c61b8eb60022720cda90e152aa598df59556e1574756f72c4fc7c319da1d9fa97c671eb96bd73fa0ece185e26dac8138b30d341ff66d6f SHA512 719097b30a977f4d34b90ab785ba457a860dbbfd302630cb392ae1c24f355362cbeb76f00a8806ed9570ddd8c0545e9149c31893deb608b6374227381caefe05
 EBUILD rails-5.2.4.4.ebuild 1049 BLAKE2B f83e6236526c6ca1d7c61b8eb60022720cda90e152aa598df59556e1574756f72c4fc7c319da1d9fa97c671eb96bd73fa0ece185e26dac8138b30d341ff66d6f SHA512 719097b30a977f4d34b90ab785ba457a860dbbfd302630cb392ae1c24f355362cbeb76f00a8806ed9570ddd8c0545e9149c31893deb608b6374227381caefe05
 EBUILD rails-6.0.3.2.ebuild 853 BLAKE2B 07e8ae0f3c85f07a9cb9940a8c2db21356a8c4f96defd8b1e9ff699abdce492ce6475cb3215d13e639cf1d1c44cb3d42149d30899e7938f742c3800a08d5414f SHA512 70868a2ba88eb834c316aafc6813de9b50d72b4be72f53b76b7c92565df36e53a0e523149449f22a8b154ec636212eb5589cb0319a22987bccf4aa3d97b805ff
 EBUILD rails-6.0.3.3.ebuild 853 BLAKE2B 07e8ae0f3c85f07a9cb9940a8c2db21356a8c4f96defd8b1e9ff699abdce492ce6475cb3215d13e639cf1d1c44cb3d42149d30899e7938f742c3800a08d5414f SHA512 70868a2ba88eb834c316aafc6813de9b50d72b4be72f53b76b7c92565df36e53a0e523149449f22a8b154ec636212eb5589cb0319a22987bccf4aa3d97b805ff
+EBUILD rails-6.0.3.4.ebuild 853 BLAKE2B 07e8ae0f3c85f07a9cb9940a8c2db21356a8c4f96defd8b1e9ff699abdce492ce6475cb3215d13e639cf1d1c44cb3d42149d30899e7938f742c3800a08d5414f SHA512 70868a2ba88eb834c316aafc6813de9b50d72b4be72f53b76b7c92565df36e53a0e523149449f22a8b154ec636212eb5589cb0319a22987bccf4aa3d97b805ff
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-6.0.3.4.ebuild b/dev-ruby/rails/rails-6.0.3.4.ebuild
new file mode 100644
index 000000000000..3be9b73306e0
--- /dev/null
+++ b/dev-ruby/rails/rails-6.0.3.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3:*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index e009074574b6..1ea2c6b877eb 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -2,8 +2,10 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD railties-5.2.4.3.ebuild 1677 BLAKE2B d601f23359cdf576011977ff20c04163a20143a9e24248e56afab2eac46824535f9c22df9b8575e7f9bccecbcda201412032fe70a2a89333e901597c81895564 SHA512 5240fec770a505a3f1748ab74f6edb2abbfae76ab6e0323c715aef497a945162f3c15c84aab1da41a7fe39d319f7c0afca2d136d48dae3ab0751915b0655848e
 EBUILD railties-5.2.4.4.ebuild 1678 BLAKE2B 70d6b1e1c6f89f7f05c3f537d5299cea958d802e1dbbac45511885d23801431c005ee1c8a9d8cfb975c204f04226d70ce661dc88c9c20cc4032139afaf1275e4 SHA512 281a2905f5d2ee138638ba2d19d2198d8e9381001fee4d31d86674817300c0a67c5664a155dfc87a9f70dab5ffd362e1e3a26db1a2c94815845c2f661cc1e559
 EBUILD railties-6.0.3.2.ebuild 1632 BLAKE2B 239aba4d98294c747f6e99f720e69cbb79b9f86233c53a68e13b66c0e7bce9cba9b0f5d6c320e25dfe662fd4a99ed823c8037fc952a8930e3dcd467fd11ceb22 SHA512 037e009be08dc68e7fe952260a52ae1207f3c874696caf5a859e45885e589cec30495c741362703c4e08a8981823a4cd102c91fdf382c1d2446c4e1784eed63e
 EBUILD railties-6.0.3.3.ebuild 1632 BLAKE2B 239aba4d98294c747f6e99f720e69cbb79b9f86233c53a68e13b66c0e7bce9cba9b0f5d6c320e25dfe662fd4a99ed823c8037fc952a8930e3dcd467fd11ceb22 SHA512 037e009be08dc68e7fe952260a52ae1207f3c874696caf5a859e45885e589cec30495c741362703c4e08a8981823a4cd102c91fdf382c1d2446c4e1784eed63e
+EBUILD railties-6.0.3.4.ebuild 1632 BLAKE2B 239aba4d98294c747f6e99f720e69cbb79b9f86233c53a68e13b66c0e7bce9cba9b0f5d6c320e25dfe662fd4a99ed823c8037fc952a8930e3dcd467fd11ceb22 SHA512 037e009be08dc68e7fe952260a52ae1207f3c874696caf5a859e45885e589cec30495c741362703c4e08a8981823a4cd102c91fdf382c1d2446c4e1784eed63e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-6.0.3.4.ebuild b/dev-ruby/railties/railties-6.0.3.4.ebuild
new file mode 100644
index 000000000000..ac2c8ddd992c
--- /dev/null
+++ b/dev-ruby/railties/railties-6.0.3.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 5b276440a465..c6a5310f7be5 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,5 @@
 DIST rb-inotify-0.10.0.gem 15872 BLAKE2B 52647ff17994287810efa9c04bc9553b101c42cdd27cf42d530565127dfce104a589ad729d7019409079731577d327221ec3423fa7a5f746aefa3d817b93d898 SHA512 16aa7fb21e5ed713335e583299cfc72676e3ef66de3d349f74a14885b88020b79e031839b193dc140036a0b6539a45ef3a0c3c6027a7211508d388137d22a13b
 DIST rb-inotify-0.10.1.gem 15872 BLAKE2B 1ddf4fe8de7cdd348e007ac29ab7b41667092439f9b70eeae49d7e917351c73512e43a7ccf6679af1c9225b19efadb6a1581f63e1958d2a31d61f2bce5a13664 SHA512 7831a6228f2d6363e634b8d6b4a12206f19b96098e5dfba1d27b1e994a7284a5cb58cd0299d861a6ff275fc8248c0e68faaaf786d6222ad68f3e6b43ccea29ec
-EBUILD rb-inotify-0.10.0.ebuild 1033 BLAKE2B 744fb42d80580697355d780cacdd2572ad90586fbf3d284157c62b52c0293ad0368ed843312f09295ee682e161e50ffb86cfdf331bed256061c0694759ba7ed5 SHA512 0207777731544c2f25e98f72544b3867b87c2cc0d81e8612e600a0d3d512ed5b3e2726503ea9939654f4763c3e0155838eb73a1021f356ca27c3096a395bfa9f
+EBUILD rb-inotify-0.10.0.ebuild 1032 BLAKE2B 804302cf27e3027157bd4eb9fa5cdc82e74070fb5d5d7bc4a6ab1a6f29203017e2243ead78c3d0a451bea481fd03f3cccd0795497479cea27309b2e530546845 SHA512 8ba5c28258974cb73dd135b705ddaea8aed42e73b0efa519e8d4b1e707037710d498cef799b2df79b41020011abc27bea370db16afd522c268d2d24a3e42b4cf
 EBUILD rb-inotify-0.10.1.ebuild 1009 BLAKE2B a6600eb46d95b05304150795a7ab466ebe7f7a0d12002faae2713a204fa712406f76c2fc7279aa26af4775654a7415a20fc8662bfcf89e630bc2d0021179ff16 SHA512 bac5275e4fd719e551944d8b196a3d4d1c7bae0429037b178cbb33f1995e035b26534bddceee26366b324fe2f449269546bb03d47361bb8223bfdf9f30a462f5
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
index 30e70247e89d..fbd552775b52 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rb-readline-r7/Manifest b/dev-ruby/rb-readline-r7/Manifest
deleted file mode 100644
index 24d83aaeedb5..000000000000
--- a/dev-ruby/rb-readline-r7/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rb-readline-r7-0.5.2.0.gem 96256 BLAKE2B 0afa90a210233630f9d5068636efaf5874294b524d7abee4a7560436cdcccd9785ea356d0ebe50a4c191e57a111c7301f9b42d787e9a1760d241ff1c14e90834 SHA512 e94b60e368104f5e626a5c98dbe894cea52294b9c2061aa0cf32c34b7575a1ba9b0c514221ce266be89553d7936fc82696fc979710b9e8bb2503fc8b3cc0a938
-EBUILD rb-readline-r7-0.5.2.0.ebuild 643 BLAKE2B c12ea7043b7ec3f94fe60601860ea3a0f7eb828a9a80049d6ac8a30236b64208147816c9873eee7ce506173fb1b451e30002f5c2428a08859c95484406079d7e SHA512 fff488ba1d9653fe75e7a79b911d15c9f6ae415b30517b7375866fead0467dacc09d5150057c04e4b9cdede5986f4fd1762a8fe73536acc3b23c83b7a6926326
-MISC metadata.xml 398 BLAKE2B 3cd6003925d27d01dd200b49d5d4c9ec0f0954816fbccd9b60fee5cb2bbc8c7680dc97783f420528b12cd82002b17b5eada95c54294d8f762bc02c71d88dab04 SHA512 2f08a8565c17bdf29ce5f94194904bba4ab779fb2f23003bdf35eb15f7f2dbe39686026324c1212f3ebcc785d5dee2cc117eaf90e78ae2e4c107f3863cc6fdf4
diff --git a/dev-ruby/rb-readline-r7/metadata.xml b/dev-ruby/rb-readline-r7/metadata.xml
deleted file mode 100644
index c1095bd03fb2..000000000000
--- a/dev-ruby/rb-readline-r7/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rb-readline</remote-id>
-    <remote-id type="rubygems">rb-readline-r7</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild b/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild
deleted file mode 100644
index b3626129b202..000000000000
--- a/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby implementation of the GNU readline C library forked by r7"
-HOMEPAGE="https://rubygems.org/gems/rb-readline-r7"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-DEPEND="test? ( dev-ruby/minitest
-		dev-ruby/rake )"
-
-all_ruby_prepare() {
-	# Skip a test that fails when run in the ebuild environment.
-	sed -i -e '/test_readline_with_default_parameters_does_not_error/,/end/ s:^:#:' test/test_readline.rb || die
-}
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index 02e08411b2e1..1ad33f05a112 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -1,8 +1,6 @@
 AUX rbnacl-buffer-size.patch 765 BLAKE2B 0865380f35748adeddda7a9a880df0c1be81994a965ecd40505e9f47f39c7d2a55876080007e28204e388f5a09396d28275d2cf9547536523c7d2fc5f6e035d1 SHA512 da9dd16452b1449f3d862d940b518bf4b99726195ee0ccd0bf3633299b6d9f44120b9b638b77243f7a1c30802d79e6467d2673eb7987cbe38091033aecda283b
 DIST rbnacl-4.0.2.gem 220160 BLAKE2B a4a3a7b0346bdc3d0e1930bf9b1c6c05182456837c53c8a56f5d8eec831df8768589affb00450088c4ccc3de37f474a359e9ea362655ea66ada63467936abcbe SHA512 d13d36e4248d5e40bb5d9496e08823438d312c16d14e3068be89a62dd7f80ec7f99fa5995752b183656b6ae863af77645b16ce45d05a74ad0dfbd4a93c8854d4
-DIST rbnacl-5.0.0.gem 221184 BLAKE2B f64a754c478c57af901432e9cef335d9f01c1acadcd9d860dacca2ed5d59bdb71f3a431488357b57cbe7af61cf03b50b95ab5421a9ac59f63242a0ddd693e373 SHA512 d6c0c90587beae9f5086c442f4b7b9f430d527576307c5a5cdc5532b231245e5615434a001b3a4b47d1fb7d7148a167d77f12e7b4f5bd1c25c7ce5d361eb42f6
 DIST rbnacl-7.1.1.gem 226304 BLAKE2B 4c7c356cc3414c1b49302ff16af701bffbeaaa18b49bcdb4c9d0c10fe2e1f693e7917f8031c90d5c4362d95ffe5a8d471a48476788f64f97092adbcdce0d9f72 SHA512 da7e406bd2b5112e51d2c15cab35d955b65091ed745fbd027750eaca8ff1d11d982c82f497fc15b9ee9aa6536dbd21ff9ac285bb2a2d1fb39c3374fd0f3dca5a
 EBUILD rbnacl-4.0.2-r1.ebuild 794 BLAKE2B 674c9c4ca5ced2f9216ba1aa14e4e6fbe08df35f6af28c91541e26ff5a14e9024afd7b936ad38dd2aa748b7866c8a8a167326f99f7525f3f944a8c771a2086fe SHA512 7eaba4f90b7b832720e2a7fb3ad226811ad678d6002c5db83ca4bdd15f121f25943e15651111695c447ad1fda70dff37d39a2056ffbb9347dd85b902f83ceaaf
-EBUILD rbnacl-5.0.0-r1.ebuild 798 BLAKE2B f6df83228b60bd0914b10ea9aac3102bfcdb36394a5f40c051ac51bc36776eb3bb788876560f1965fb7498513da735dcd2895909e6c2a0cda2f68ed3af214f20 SHA512 be8528b0feb3a34d6d75536dfdc99a002a493a3593b56c248d2e1623abb22ef8e5f4b43f3335e757b2db763b9aebfba18edbfab8d3a36da4cca539aab8b51ec8
 EBUILD rbnacl-7.1.1.ebuild 715 BLAKE2B 8222d6ca00ab7d53770b0e061211ba3675069be9e7c78dbe9455820ebcceccf07392ee477d50b7a2d9d54e01475d8de872ac99be844576e066e14fdc1dc94bfa SHA512 dd3cccbad9756f9b6d9c8e33f45456dc140b62cbcab18149bcbd589cb62d2a52682bc000874bbaa986a0f126ce9d90dc85d658dd58ffc6f7a530550b98f99baa
 MISC metadata.xml 345 BLAKE2B 9b2e901225c95717838370d1de17dea5619d4485d7856050d55abd8bd05eeadbf012ce47b160d367e0027d2e42abfdf4eed15c598d0a8062713a00894495cd88 SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e
diff --git a/dev-ruby/rbnacl/rbnacl-5.0.0-r1.ebuild b/dev-ruby/rbnacl/rbnacl-5.0.0-r1.ebuild
deleted file mode 100644
index 231a1413e65e..000000000000
--- a/dev-ruby/rbnacl/rbnacl-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
-HOMEPAGE="https://github.com/cryptosphere/rbnacl"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-libs/libsodium"
-DEPEND+=" test? ( dev-libs/libsodium )"
-
-ruby_add_rdepend "dev-ruby/ffi"
-
-PATCHES=( "${FILESDIR}/rbnacl-buffer-size.patch" )
-
-all_ruby_prepare() {
-	sed -i -e '/coveralls/I s:^:#:' \
-		-e '/bundler/ s:^:#:' \
-		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
-}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 5bbebe9fff32..f24c413284c4 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,7 +1,9 @@
 DIST recog-2.3.14.gem 331776 BLAKE2B 62aad2cf8252c24cd7adc456a022555f05924e501fd5f2fafeb87c2587e049ee41a501602bc1b5d97370a69a6b98f1ae77df22bfb7ae2c9e80b38b5e0a1518df SHA512 1154ca3d610fe8f554a15846b49f978d3798c9a43893c40d58c8421e8012c0823368d374ecadd351fc1479037c898966dc2dba9debb4c46ce6b743c7782a848f
+DIST recog-2.3.15.gem 332800 BLAKE2B 4a6360f72d5ee48e066a30abf875fba18e8dcdcba6d36bf8d8de28b36405870819a1b91edee1a5877b1ddda99a25918419bf42bdd4851c7d814a2acf558439d3 SHA512 a26f722da886be22332330a9b0407ec28431ca900b43d6cb7c6fe65938a026a51d54f90cb264652fb8a70352f5e548a7ed013a4b136a7a21df4a9987b36faf0e
 DIST recog-2.3.6.gem 266752 BLAKE2B ec11be53a79f83b174c12f44d90c4085e02ae10fb49744ee6c5d655e4be32414fa158f6a11b2d73786c00447f8ebf3f40aecd422f14886a72eb59f1519a65f63 SHA512 b4731092884de9dcf961122bf0cd5b4ed2fe8b9fc7ecdbd144d0813cbad52895ab4b3c0b7069a7f7e7a80bcf236cfd1c8c0d594d2caa65a76cca60e362009b43
 DIST recog-2.3.7.gem 276480 BLAKE2B 227b5ee13245a8c3f47b9aae1a3a15133669bf2d0438f6c693da6496243b915e036ee922f0db3bbfa605b38803c4bd1cae472b8494f74d7dc73b2d476cc164b0 SHA512 184ed1bbd661899d66f51675f2c5e62804b24b75426ad064c1fff8d5e3f2e083cdbd48c5482beedbaebc355f0fcff3e29d1406d7bbc31c55a17fa467adf7c280
 EBUILD recog-2.3.14.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
+EBUILD recog-2.3.15.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
 EBUILD recog-2.3.6.ebuild 779 BLAKE2B dd2b02b306c18b6f15988de6782069b006ec90434adb8e20e304eebf63bf35d94edfa57d233c6dd58e653b2c9771953a1ed345185f9bd6456645fc7ce4b3d3a2 SHA512 2f173a35948cc68d497787501bfe60e8fe9ebf69e7ec558be13563dbc6b00cdf398d0c09ba408668e2c1f992c7a3fc6f258d8415fa764ed467228fbecee9d305
 EBUILD recog-2.3.7.ebuild 786 BLAKE2B 5fd7e5d4070af67ee769f066c1cb476f1ed2702890c3194e4c09d16868f960a489bbe5a144b894283b488ec46a36bc208321c61967c5950f086b3051f60cb880 SHA512 c4e517d65bd0eefbdf4dff4f67f63401baea31638c98e975ed9acd677e6901418b95353d5b4d44ee4541db153c4e1153361bdc08d59aebdeb7c64e30861f3e50
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.3.15.ebuild b/dev-ruby/recog/recog-2.3.15.ebuild
new file mode 100644
index 000000000000..e7b78df0cb67
--- /dev/null
+++ b/dev-ruby/recog/recog-2.3.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="xml"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser:0
+	dev-ruby/rspec:3
+	dev-util/aruba:1
+	dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	ruby-ng_cucumber
+}
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 45845eedef99..285a54251b22 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,5 +1,5 @@
 DIST redcarpet-3.4.0.tar.gz 105525 BLAKE2B 38b28f400b7300ea49cebda9b4739193b54c322c1c20ecba50938893286ad87e44ba9e9da83eab8433af0790d76bc0db4189fc0b70a4438480fe784570809e1a SHA512 25ed1fd35ebf815f396ed819baec69aae366bafab3983a53d364b1ef0d3f18cecaa523953d12cb0e5b896c30ac86e000318f33c633047bd271362474b9b8f877
 DIST redcarpet-3.5.0.tar.gz 106773 BLAKE2B 34c72d21c8ea4d841c9728e3c7e66be02c69943e5e0ee091688992c400748cf0a0900fa15de7bbaf18db8a89bc0309160fd5c2b2ca83ee86f6d46dd5d13d9770 SHA512 8d48f1b437297aa556d7f3c5e69c8dde04c63388e78ffe15ea3c36e4764790b5cb75a8baaf75ad64317bccc63384fa0a42251d05718902096229f9f6a24f06c9
-EBUILD redcarpet-3.4.0.ebuild 1032 BLAKE2B 3d177c63e1037e3d7687fc53e08bb4aa3807132a966327a42780f83768e2258d9b949b72cb7b11df40a7eb593b4853bc57283700e95cac8d46324a018e690f94 SHA512 d09fca41e0e4307e5910ba7d4b5e9d3d414814dc7817a1f2eea5ae4f403bdf5d1fcd77efcb7953de09942cf97e5cbb295d58660e828a8debf76e62ef731481b1
+EBUILD redcarpet-3.4.0.ebuild 1031 BLAKE2B 44ad77ce9fff4057c3eaf59bf83b3f30c3e37c870fe468cb2ff9f667485fcf063db72f436c60c1cd969228173161989c342e2ac26fd53ca90598d72a4df0f810 SHA512 4c01aef2e885a9a6eed7374b27e16b29b442b08677089c4b1520e445102f75512080fa9532a2969abb077b53d232efd649686da59b398efdcb27c693dfc4b73e
 EBUILD redcarpet-3.5.0.ebuild 1080 BLAKE2B c2c95175c69f4ffccccd464746e473987486774e793ceaae24a55d3567f81b74dce7a86890d7dee970d825d7a4ae75984c10a457c798b34ebef63fccb1f66817 SHA512 d1d069562f4bcdc19d215b81264d6e1e75898e0b809067ba7e7e2b97d8187e927ad67c2dc4c6da95e309f23d7fc63b8a3036b18f000230a5930be2f331f6369d
 MISC metadata.xml 339 BLAKE2B 3f8aaf2e00581b0e8a62f7a035a0bb80208dd8b4a1541cf77a3550cfaa486e800662c9f251bf02ec3e9a326dfe62d254981f04808b35700130b055488025c79b SHA512 eb85f708675bd9dd3d132e73d14e52689a94279ffc754097a986ddc3224ee21a69e7e81f1bc391725f1d2f1d41f72f8553079a10ffde7c8eb55048b7c6f089d2
diff --git a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild b/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
index 1eb5fa7864a5..4f82bacf9d85 100644
--- a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index e7788a31987b..5d02284857c1 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -2,8 +2,12 @@ DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6ae
 DIST regexp_parser-1.5.1.tar.gz 82482 BLAKE2B ff1746e52e786e273923dd222ea8c8276eb1e4ffe9bf899068160dec229784709ba679983c1e43736c128ec094861174bd43e0aceea704ee2d38aff4a53e6775 SHA512 4856fbcac800083b417880c30b5d6a5ea445bb85950bdd7898f368bfa2d44b01b1e2058b279f1640cf1cf4d7b28e225d25bc2d356d2c4a7c1be0a2c621dd3827
 DIST regexp_parser-1.7.1.tar.gz 83865 BLAKE2B 1aab4f5c4d399ee48951a9fa9f24fef14073ca5267ec29e5011880274d2749a7a3d1f5cb2a6a5107d5c848537367e1f725a6de9bb9af8803ccc8ccedaac415eb SHA512 fda810bc18039484725df5c6092b3d1b31f398e337cbace253cfdfa934274902f2dcb4e64c4fd0bb24379c79ea2976383313c1a5cd4ad246ecb7eabfd1a47d64
 DIST regexp_parser-1.8.0.tar.gz 85071 BLAKE2B 1d9f60617372f872e8b372bbee0f808d060add768094d53bc05ef2f4757936fcfb4772dc0a2ba59630884b339a3c66d34336cfa05825f4ef53427ddd3528b9d7 SHA512 bbf2429c00c214288869b77641e44d04591c3917ceeb9262ae8638c0731b020bead4a7b11d397ef2e1a26752c660addcc46fd94a4e557766d230de71b99a9501
+DIST regexp_parser-1.8.1.tar.gz 85379 BLAKE2B 341f16b6fce9654984c9fbab589ef0991d50f42e935558da2741e2dcbfe8cbc21200fd2233abff2907a1bd44c5b350b41a665ef4f993591b92f31d3280a24ba5 SHA512 6642dad18313e10856d86bf3ecd2fc5b0927698ca8e37f17745b755088f750febf2c05fd098e99b87543cd90f944ae0d9c4c03452048d2b44b4b1fb68e986045
+DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.5.1.ebuild 878 BLAKE2B 58e808a45e8bbd6421b73cc5887b75ed6e925701a5d60b9fb76bcc1e59bd8c0d573cfd188f77ff2afc98e300ab615babff5901fdbfe70fcda66a370ba5e722bb SHA512 2942957d37008a42e954a1fcbca7f901837b9fbc4d3929687f3fd89b4d0463f33e1be6b37094efd4f539c2ddec96fb27d3a83fcae48b7044f5d29a7851f13113
 EBUILD regexp_parser-1.7.1.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
 EBUILD regexp_parser-1.8.0.ebuild 877 BLAKE2B 280b725889f7112ba258e523f8c36b353436ec11563cb5823b908d0b309bb934bb9ca46fa665d68ed7c3c31fa4484b0e2d2f1451c64d4ea503ccfb25e7bf6bde SHA512 d0e2b1d06970975378e50b0ae3bab15d803f10ddfc3cbc1912dfd962eeba4947d3213fd44ce44d859a7741ea4dbfe67b192c258751df06fa61422431281fbe8e
+EBUILD regexp_parser-1.8.1.ebuild 877 BLAKE2B 280b725889f7112ba258e523f8c36b353436ec11563cb5823b908d0b309bb934bb9ca46fa665d68ed7c3c31fa4484b0e2d2f1451c64d4ea503ccfb25e7bf6bde SHA512 d0e2b1d06970975378e50b0ae3bab15d803f10ddfc3cbc1912dfd962eeba4947d3213fd44ce44d859a7741ea4dbfe67b192c258751df06fa61422431281fbe8e
+EBUILD regexp_parser-1.8.2.ebuild 877 BLAKE2B 280b725889f7112ba258e523f8c36b353436ec11563cb5823b908d0b309bb934bb9ca46fa665d68ed7c3c31fa4484b0e2d2f1451c64d4ea503ccfb25e7bf6bde SHA512 d0e2b1d06970975378e50b0ae3bab15d803f10ddfc3cbc1912dfd962eeba4947d3213fd44ce44d859a7741ea4dbfe67b192c258751df06fa61422431281fbe8e
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild
new file mode 100644
index 000000000000..9a339fd368c9
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:full"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
new file mode 100644
index 000000000000..9a339fd368c9
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:full"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index 364c9b239299..b7d26d037ba8 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,3 +1,3 @@
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
-EBUILD rexical-1.0.7.ebuild 1027 BLAKE2B e93963b8eb8bf751bb33c63d5f4fac657b0f1635b60aae3b0ee0ab71a253192076f71d17e713a8e30097a25d630f3b4cc0f75098b013db34ec5f8d474b974da5 SHA512 5d13188eae53c03b1bee8d95f8a007c1fe38e669a024022a5383d1debf7c08751c9d433baf0c0beb4cabb25bf5fe81b8a5c12277fd95caf260f47aae50027fb9
+EBUILD rexical-1.0.7.ebuild 1026 BLAKE2B 4f2020a330cc6fa58ea9bc5363de3b807d0416bc2fb473f8f7bf6a1cd4d69ea502d2c21aaeb009b01cd3058bcd28f90d2df6e56f23cd2821be424efb741006de SHA512 ab8998e2d9cc55871cc8f1fdcf659dabf86174f30b07bf0a426f98c79227a6442074ac093fcd419dc0d07136e960f3fa12d0f3d1e98fe8f0adf115dd584d7af1
 MISC metadata.xml 344 BLAKE2B 308f72345dd9f7ce808e53f6b3883102b7c5b51d41ff822d28888d684abb4efdce86e24fbbb2d6ba46342c85e23189fa619343c467689a13b62382a5ea024d2b SHA512 96c6b9e4f3ca4aad95e01087158bbcd9a159569d7ccfc90365732e4ee6b9772506521c7e4706043897ffceccc98236077abf570efac9f0ddb24ef56efa65176a
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index 1ceec1d4d403..9236c031e4e7 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 ppc ppc64 s390 sparc x86 ~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 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/rgen/Manifest b/dev-ruby/rgen/Manifest
deleted file mode 100644
index dc0659029ea9..000000000000
--- a/dev-ruby/rgen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rgen-0.8.4.tar.gz 277720 BLAKE2B bf7c5f017f056d05464d7f15a4faa8dee41eb857b1ff026be6ea9185d1e4bc2162d0548eb061bf99b2564b61303b4c5204a2db376ff7610ba2c1bbb85cbe9ca4 SHA512 7a1691624a88468674fe3988c3eb098f3c955ab380401cc43f55ab5a84dae81b25d9d19e237b1c9e0251165f298138ca58f9a358124fe4fe8fd233e622d28015
-EBUILD rgen-0.8.4.ebuild 796 BLAKE2B cb6a8d6ebf6619dc5e3907a3bf56889c1278fd06c7b5491a930754b86c9d6ef0fbd4a0af435c8149c85332a77ed4caff98e26de06f46380d0300bf99a0fc70d1 SHA512 ec293558d2f82cf0a1fddb5d50b52642e8d07059efdecbce3e6da655bab16ad13177bf3c2a46d754e49158a48a9bf8a3dc78af42137213dcf144bcc7c13a488c
-MISC metadata.xml 338 BLAKE2B 93ef49d518bff5cbddf74d2d851eadfdc01b79389f77fb002c456c453978d41c5157f545cce8dfa09878f42599daba66d8cfce611f6ebe91496cdb1589309ee5 SHA512 714e42942d30a44542c2c9804e4c5532fb69bedd0c12b9488cf23f64fb58abc80c068c7049e10f793005ae1c6d1c54694dbef0982f2adee03dff58855f41b9b6
diff --git a/dev-ruby/rgen/metadata.xml b/dev-ruby/rgen/metadata.xml
deleted file mode 100644
index e43317ea38d4..000000000000
--- a/dev-ruby/rgen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mthiede/rgen</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rgen/rgen-0.8.4.ebuild b/dev-ruby/rgen/rgen-0.8.4.ebuild
deleted file mode 100644
index 143a8d66e594..000000000000
--- a/dev-ruby/rgen/rgen-0.8.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-RUBY_FAKEGEM_GEMSPEC="rgen.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Modelling and Generator Framework"
-HOMEPAGE="https://github.com/mthiede/rgen"
-SRC_URI="https://github.com/mthiede/rgen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/minitest-5.10:5 >=dev-ruby/nokogiri-1.6.8.1 )
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/Can not use a Fixnum/Can not use a Integer/' test/metamodel_builder_test.rb || die
-}
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index dc7bb52d42f2..d5e99e93306f 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,5 +1,3 @@
-DIST roadie-rails-1.3.0.tar.gz 56899 BLAKE2B d4d4f1d56c581b0af894959ee985f522b6470ff27bf22c4589032b0cf049337556377bf5decbd3ca1882762d80371df372bd7c7ad811fb087bd720f26eeeb6c7 SHA512 af08f0a877993d5b3f6d13e80a4aacd4d2d13f8940a554f2f91289e119d754015773a67ef14052717244374e3636069fa8b39078cac2145c86cb35ec54ad53fd
 DIST roadie-rails-2.1.1.tar.gz 56419 BLAKE2B 6a54797c77267a61ab63d72743fbd3f98d4137d917ddebf0335c30d03e5efb9e2907679237eea168384b54ea93bbe9be3aad4dcbf6364d411ebaa6e2ba7638fb SHA512 ceffe9746cded4f5dca83c614dc6ffb65203455775df9f56a402837018c0a322c7edad37ca05c72bc70fa8d19cfb4f9eba5b2fde1cbff7f8b28312e95140f353
-EBUILD roadie-rails-1.3.0.ebuild 1102 BLAKE2B 0ca2e11901df251388ff9990d5c75581b0e0f51719c6417f2d1f1c44a75da17b477e323f5fb47f9bc13b5c9ba21eb4011df517a62fdf4c634202364c445fa886 SHA512 8d0c10f43763125fd47e43daf8e25c75e2f83f84ca3c9f9190175cf24b65d1ff4e9e374fbc2bce419f9cfa0ab8ea7b19fda09d04b0e290d6df2377978ecfc631
 EBUILD roadie-rails-2.1.1.ebuild 1152 BLAKE2B 2f45b36d39da532391e21c071a8b163d34e5ef9b16f2a81a34bba365ce58e352ad29c07b25ea0defd2e7b1fa2a57e7d1d6496323aea58fa9fded841823d5b7fb SHA512 26bf371328d17e0966e57314a89662fb57783d5c8f42365a34adac82eea2db33faf1073a23095bfc50f8e107a592e2a86f94fa22ef08b1095d158c7d5b670077
 MISC metadata.xml 334 BLAKE2B a90c3828ffee06b0b840e728c96e4a554aaba24f0b292fb2cc835348900a852579eaf74da7b588f07d4ebb985a37a530ab94b6f78dceae2ceea7ea056a944506 SHA512 0ebe3d25378f2e38ecea332a47c249238a8884c69372579f2fbd4c2017e07932062832091271a473641675f0adbb71c6f9d4ff49694533f11b5d609264c360dd
diff --git a/dev-ruby/roadie-rails/roadie-rails-1.3.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-1.3.0.ebuild
deleted file mode 100644
index 90657c5ec6ac..000000000000
--- a/dev-ruby/roadie-rails/roadie-rails-1.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
-HOMEPAGE="https://github.com/Mange/roadie-rails"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="test"
-
-ruby_add_rdepend ">=dev-ruby/roadie-3.1
-	>=dev-ruby/railties-3.0:* <dev-ruby/railties-5.3:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec-rails
-		dev-ruby/rspec-collection_matchers )"
-
-all_ruby_prepare() {
-	sed -i -e '/development/,$ d' Gemfile || die
-	sed -i -e 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid already removed rails version
-	sed -i -e '/rails_50/ s:^:#:' spec/integration_spec.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index ecf8554ff8d8..6fb8508b744e 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,7 +1,3 @@
-DIST roadie-3.5.0.tar.gz 50687 BLAKE2B 4d48c7989798977e74ebfb3959c5d1b52ff5aa91c1e81075b7b631a70893f344965ffc838f1debe0dbcc807c588e7e4da93937beb4fcef8f4bd9f3eaf7b81407 SHA512 d0602ccee1b642dcda0644afb762a56c97715472e7dfdd63115fc595e1ccbbf3192114e32e25b3c0e6c8c9db37bfc57b75f66bf9ac1e4656b27972f0d4fcd98b
-DIST roadie-3.5.1.tar.gz 50873 BLAKE2B 478dc7bba6424b953d4c32aeb793f0212fe0ecef5526ec4a28e3b05ff5f29fbbeaaf2022b7277cb20993b99fa7bfc5d03db57c12b589c727239e944e78da2d9f SHA512 b61cc8c1ddcc4819d496489578eb7157cdd7716e99ff675af37b9b650504315120238889d72dd617f37588e005cbba62e1912f4c02ba0e4ba0d111784219ed5c
 DIST roadie-4.0.0.tar.gz 50727 BLAKE2B 671c5260f4a181e4a50d136e4c6e96e96a3bb51adc7cd88d070b558af0d1d858e712a8f6d586aaea5c72b735db41a54ecb1833b74b3e76f7838a3323a69fb5f3 SHA512 ad42ff83c7983e8cce1506f6b72d66e47a860251749eebd3cd65c2114859d3d8a8103d309964aa53875cb07a83393b086fb6c58db88d95a84059abb514d12665
-EBUILD roadie-3.5.0.ebuild 929 BLAKE2B 6770ab325cb1fec5dc211abce61b083ab0d21dd3accb3e84cde73fde1de72ed7765daf8626bc3eb1cd97203d1d443ec7d027dd7c2ee7319a1c58e3b09c2a9c4e SHA512 e91ee97161116b4a53f610af2ab86e0d865e9173fa9fed54cf698c176087757b12eaf71a91dfbb8104c99ba92916dfc11c02cab9fbc39aa4b0a1f648205db51d
-EBUILD roadie-3.5.1.ebuild 929 BLAKE2B 61ef9dc6ceaf49317c1809ed5ee38ab84088411c39519298a1c237c232e6fddfed20813e6656f005e0f7f64473ab716bc3bcace738e9a896c1ca3695fbd1e1b0 SHA512 214c4cd343495c3a2f5df42e38a5206fd1de445b5665c6d0af953df37fc00257e0a2d8fa3953fbf25cf4d726ef825554f2fa3af3c232b721f99d6a08dcbfd422
 EBUILD roadie-4.0.0.ebuild 940 BLAKE2B 50b0bf2e700cbd1b3907b53cde851237158df1bf9c92c650ad2624039d81f2c95ec75b9da1a167941fec0f000f22f2fcfc4c5bd66bc54508eaea303108fb0d06 SHA512 dfd81ff22115c9db2297231c4d843937248bc0b7b1bfd0080542c2e46b292a0854a6460d91837859847f60a22949cb3d443d709efb4c4e186838895bf20e1d18
 MISC metadata.xml 328 BLAKE2B 1259d1fa19fc2a8d67f47d7ab4a409758d735839a384b75fb9807a1350e1dff6caa79e19063dd0955616b15a12f25040db50d2ffcfc4fdf038375032ba9b8a4e SHA512 56c3c637b8500939fa5b0c54fcb7382a666bd3d661baae8074dc1a11281aa149ed6911d19831ec62c311917bef30d10498c9c4323866cec6c0f9f267a5608ae2
diff --git a/dev-ruby/roadie/roadie-3.5.0.ebuild b/dev-ruby/roadie/roadie-3.5.0.ebuild
deleted file mode 100644
index 2b52aaddc5ca..000000000000
--- a/dev-ruby/roadie/roadie-3.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
-HOMEPAGE="https://github.com/Mange/roadie"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
-ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e 's/git ls-files/find . -type f -print/' \
-		-e '/test_files/d' \
-		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/roadie/roadie-3.5.1.ebuild b/dev-ruby/roadie/roadie-3.5.1.ebuild
deleted file mode 100644
index ba22b54e3f7f..000000000000
--- a/dev-ruby/roadie/roadie-3.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
-HOMEPAGE="https://github.com/Mange/roadie"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
-ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e 's/git ls-files/find . -type f -print/' \
-		-e '/test_files/d' \
-		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 12e219f2f8e9..caa827b5e716 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -3,9 +3,13 @@ DIST rouge-3.20.0.tar.gz 938340 BLAKE2B dcb61527f023e34be5c2fdc362f74b64be24cc26
 DIST rouge-3.21.0.tar.gz 945455 BLAKE2B f783bc6750bfc3b463bf63374127be28676428a13335c24b331f8ae327afc85d961c7f06319cfd6f80f31accd3ef874a780e7dd77816d9ff863ae491506f5fb2 SHA512 c71dfceae7902f8c4a02288053baa8d1285ac0570bcf754743bfae045a1d5fca177a13843aa223ded822bc95007d049187b363f4dd8f022336e6325919d2787c
 DIST rouge-3.22.0.tar.gz 943288 BLAKE2B 9daa8166e05002a633ce6a99a794173148336f3f755f2c672879cffe177d1fda1b37723ed540d3bf8613725bab965213257043a4b7dfaa619650568c946378ba SHA512 83032099a0d540e77a25bd79c94481cb7f39c4a33e9b30f9f74d738ee0781ffc0c9bfbf9b90400d4833975df8a857231bed0739678153d08c716fe7e2cd3f8a8
 DIST rouge-3.23.0.tar.gz 947011 BLAKE2B 2b9f35859d54aa616e2b30c468466f1e6e9b8300004e306e9fcf5e1ca3c7814c2966e4286ed2bcbe4236a6926c10c00491d671acd7c2c5a52f37b35155530427 SHA512 5babaeec803cc9e3346a82d8599ca305b2dca6bf1e3104741b2cfc2ce25561f03e1f5b96f006af782a50245c35de2944ce51e339c6bbdf076a95779c8a3a32fb
-EBUILD rouge-3.19.0.ebuild 971 BLAKE2B 08e80a66dd9ea50b2e5e2f4f09a28fc40b5827b6a9783bcc50642442c15b6e0c1b3d2d0665828c1ab54c2cc4e56cb991f9c7ec1d1bc7f766a62c5e2784bf0930 SHA512 cbe03cc2f1d779dae389556c693be00d812b6bc5ccc1384d9f2d7fb72f0d3a9fa9297e3da274485e46a46b4b64558045c13108ff248c16e289b5878b9be8a9ac
+DIST rouge-3.24.0.tar.gz 954216 BLAKE2B 6813c0ee4bb6af664b684cf12662e1d0bec916f18aaea1f1d3a081a18fe7dd534298d6432e42c0798b437bddcd305a40fafa8eced4142215d094b8e1c94b5b17 SHA512 5823e5907f1b3303b928e88dbad2d95e91846be32e242b8a291ad90108aaae1ac6b8d397a47d3fc4c047a26e260e9b8d45866d0627e0a98f955ff46556ca1908
+DIST rouge-3.25.0.tar.gz 955146 BLAKE2B a0e2fb513f3ab251d13c0777bb4620c4b447436a5906c7a0600b3b3652de952ca14a014f59408776cf2dda8f42b835748f1513ce637bee0cb6298392acc0ec3f SHA512 3e50d2655a7a58374a798b6718753cdf73b6edd434d954f11746278073478281dd9df246e6d9524f5c23deaf5b43c9bbe8c750160e356c8ee6ffa9b795c2b2f4
+EBUILD rouge-3.19.0.ebuild 970 BLAKE2B a5a5fca185c436833cfc31d8ba1d7acf897c274a961a54d350a188cf82a03234cd15ffdcb889c74fe213cab2f68a93a3f6384a4f2e2929aa6158f348c8c5b8fe SHA512 d9fc5b0e2d57578347450e7ba6d88a445f0d84f8ee2a8b975daab510c1398df5314c225f33d216a970699f70b2633b5cb49eb562793619ab73beae2cb8b7d5c7
 EBUILD rouge-3.20.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
 EBUILD rouge-3.21.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
 EBUILD rouge-3.22.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
 EBUILD rouge-3.23.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
+EBUILD rouge-3.24.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
+EBUILD rouge-3.25.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.19.0.ebuild b/dev-ruby/rouge/rouge-3.19.0.ebuild
index 0e51302dab05..b4b7be4966d6 100644
--- a/dev-ruby/rouge/rouge-3.19.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.19.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/rouge/rouge-3.24.0.ebuild b/dev-ruby/rouge/rouge-3.24.0.ebuild
new file mode 100644
index 000000000000..7e43cc39b023
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.24.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-3.25.0.ebuild b/dev-ruby/rouge/rouge-3.25.0.ebuild
new file mode 100644
index 000000000000..7e43cc39b023
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.25.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index cc0b79020661..e86027bd94b7 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,3 +1,3 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
-EBUILD rr-1.2.1.ebuild 1105 BLAKE2B 7ab4094c619b5712f1e94082f6ac68f9b75db8b813d2c78f74f827af885f874afc529685355bff7550cc0a57ced0fd732bff81225b6d9b378cf98592da97fe8c SHA512 24870f85d9aee53bf4f9dc6bc2ea0c255ce987e65d5f64895bcb026226a70ca6cf73565db34912ad6c7c2698dc39c832334005e30a010691acdb1b50cac489ac
+EBUILD rr-1.2.1.ebuild 1104 BLAKE2B 381a6c966ea005b8433bc9ec321a9449160eef1beeab24e27bcbd1ca975934884273948ececc797574a985bc2f1069f43e3839613c9bef6c7613123030fa09a0 SHA512 56c2a59a34665782823ce4fd2a40f3faaf8c5bc6aa9664d650e597435803a69219e7cac307ce2b8133fbc38d5433f8c66297491c71fef6a9abda51a8a6ece849
 MISC metadata.xml 331 BLAKE2B bb2b9b8afc411541f4cbc3f3ae7034761b8424dc81bcfce4c47d945a974a13c1519c2b46968dee270bc76beeca6902fc42cb0f8ac1ba3d944d96e4146993094c SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
index a7a34657c5cd..5cdbff70938b 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~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 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-core/Manifest b/dev-ruby/rspec-core/Manifest
index 0fec4e6b08e4..4b52158b49a2 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,7 +1,11 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
+DIST rspec-core-3.10.0-git.tgz 396978 BLAKE2B 6fb8947598234351595a8832e47baf941f2ca3e8bd39570fba79b9539a7af51144ef41a257d309eddab895ba1e8ba7fe1efb22c855aaab7f1556998d7024ef4a SHA512 f00531021e20fd389dd7a5129ff3bf338c3fa35dfa5e15b0b73ba16eb081d3d7ed2014b1b2ea4ad2682e06f2822c2b895736ac9e80d6af3fba1aecb5cfcea8a3
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 DIST rspec-core-3.9.1-git.tgz 392102 BLAKE2B e41d4d930201e854015b486eb97e32f356027a837930f061f6282215a0d7e80db99c30c8b537d10f9359380512b46a03fe10ec382f5403704cdc7f0c1796aeed SHA512 2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a
-EBUILD rspec-core-2.99.2-r2.ebuild 5110 BLAKE2B 16f93764e26dd8a88e83ce2ea01a1484d7a74dbb3bf32414bbc1b83a7d515818088119dd12e29e183bbd804c51576cb6d9f4e684ee196a46980077b35527b297 SHA512 ff96fd2872a19f4d906a125dc72d2aa4ce2e3d5fa9ae1e171e1674329ffd8bd9a50c26813b02278e82d2e33e4de838620f66c5c9e1beaea56b41d04ed04a7ee6
-EBUILD rspec-core-3.8.2.ebuild 3165 BLAKE2B f0743a06b1845742b15d6b9f42701aa9613352a2fe8a8af88288dfe578d2deb7633d80e4642572fa8846eff109181864d49454f57b6073f6bd286f7a0d74193c SHA512 71eccab1a5db8e1ae23bdbea87d9e56f7e70472b9cb9d92ceeaf3fe81a53c6e9694172b143195ab09d35012b99067c9f6dd8a7effbed11cad81932d62da49b91
+DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
+EBUILD rspec-core-2.99.2-r2.ebuild 5109 BLAKE2B 0feecafdfab395df13ba235ea6be95921dc80b2f54533062996016b9406f52518d81b90063c52e5079b3cf8a4bc918886572ed8ac5315114d852716f780a8d3d SHA512 d5d2df61816a83d46c3f29ad908392e58e3849bf8df809ede5e8d716524b845c4cd855bee13982d0d0669089272ed0ee16b83103b02d82573dde3e0937f1221e
+EBUILD rspec-core-3.10.0.ebuild 3133 BLAKE2B af9964b0d3eb76d9b040d28925734c5dc7eda3d4fdc190f6f64e1b53804a5abaf7591f10711004597e17a7e6c991f8e134585c7e302ac5ef9ffb6707ac27ca6d SHA512 2c386596c35a3867efd8728d9c2eb510bd475ad59c0ad8b50c2db4b6d4136b18779563dd5473fb459730db58fbb76a8f3948f3a57cb5905ecb1573e31a8d7993
+EBUILD rspec-core-3.8.2.ebuild 3164 BLAKE2B de0f884d4239cf65706ff912fba59499d9ad83c47351138afbcc5497a3ad1702ffa0ce4cddacbac08174b6dafe288a4910c9ac7890fb78f8fa0c13758d0ae6a4 SHA512 f252fcf8603d8773bb03b3fc36a3de0651f363edeee74d3830a9de62fbe1b6bfea3c59b887409a1b8b157a738b6db9f0985b235f3b180f56bea5db15fa135a26
 EBUILD rspec-core-3.9.1.ebuild 3140 BLAKE2B 7186b1ac3e19965f302019ddf96e0d9c4c3b30e2a2612008222f5de0fdff5afeaafaaacec5332498b6a4517fffeafdaa89ea43f1579329009d7077f14ec411b6 SHA512 5adbc381c649a8551f1c659d8f0debd2f181ad88d7fd3be6636c0fd489e0d5cd31895dd68c3c9ca157bddd971ca3ced24b669acdea1fd7ecf8b64e0cedef91c1
+EBUILD rspec-core-3.9.3.ebuild 3140 BLAKE2B 7186b1ac3e19965f302019ddf96e0d9c4c3b30e2a2612008222f5de0fdff5afeaafaaacec5332498b6a4517fffeafdaa89ea43f1579329009d7077f14ec411b6 SHA512 5adbc381c649a8551f1c659d8f0debd2f181ad88d7fd3be6636c0fd489e0d5cd31895dd68c3c9ca157bddd971ca3ced24b669acdea1fd7ecf8b64e0cedef91c1
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
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 4e6950f3187d..3cdbd73abcb4 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 ppc ppc64 s390 sparc x86 ~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 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-core/rspec-core-3.10.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
new file mode 100644
index 000000000000..937c6cffe645
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
index 5fd4a0948a5e..8c26715a4d02 100644
--- a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
new file mode 100644
index 000000000000..837a456d2180
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index cf0c49a43664..82843ecb281f 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,9 +1,13 @@
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
+DIST rspec-expectations-3.10.0-git.tgz 211125 BLAKE2B 50fc17eadc94b94a28bf56b1ba6af1d45afe3f62548533515c49eb434becc11ce12f6b6fbd92e98483a1e7c97beec4f0dbb87bc00f3dc9fa1f6877480dab331e SHA512 edb0be319ca2459425498ebe84db0f712dd9d97b36c8a1d99a810ad16f877226bdf9b88c8e84a8379659179868a173745501ce933519727eae20619cb15c4b2d
 DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9b75e6d14a6e8c1850ad6fd84991d85a61860730caa9f191aa9d1ce4e21c85dadd2c52bb69bd0a1454f5ab918dc1e563fc54f1 SHA512 0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8
 DIST rspec-expectations-3.8.6-git.tgz 200343 BLAKE2B 9d668216c18716344e8c249086bcbf2b70e7c1a5a0d1f3a5328fe03752ef4ace6f5029219314016a4bb00ef482f440702a2adb7d9fe49392b5b1c6ec15f6a2e5 SHA512 9ded8de53127f63f2117f5ef64b6608b643586be498d8df24909366ce159a8bb95c9d8771633b777897f3e4ad3c9a12e3dfe62b2310513320b3d9656d24a120a
 DIST rspec-expectations-3.9.1-git.tgz 203727 BLAKE2B 47db054658bdec43c252fd5ac155e7ca794d60ecf8c8b0d3c8e072cf05629153c9778ad618619e5cde5400c95a85c1520f2b9fc3824699af33805fa187549115 SHA512 23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572
-EBUILD rspec-expectations-2.99.2.ebuild 1634 BLAKE2B edd39ab70072d76ef5ab79ba9f1b102fbf6c91e16e536af1dfef0b09c2d6623d0694bc67707089004243b89a2a91fbd214b6ef225bb3b14dbcf9894e28273297 SHA512 fb1214c4bc5fd1cab298c95bcee1af96226f2675e0878bc69c099644b9e108de633d428c0aedc1c530239d33bc59424ea58312d6f6393145e2e171e3fbd4ac15
-EBUILD rspec-expectations-3.8.4.ebuild 1310 BLAKE2B dbd871e4dc6bd598416e459b9b6b9a2f2760066ecd0645f74afc1abff8832af58629d8236e6a78423bba8787e7fc013a638ca5da5d9049cd07eef6426c928867 SHA512 cadeba8dc827d788e81bb83502c6d9c567953d90cc637ed750926316c91a3f78d88d787188ee322576a4c313895f30328b615c27de92a6bab81ad0c956e17863
+DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
+EBUILD rspec-expectations-2.99.2.ebuild 1633 BLAKE2B d6428ca62d05c4aeef5f606356c14557acf499bd667cb9d2861f501fd6e371764de176544a29499aefb2477bb9822b4f9b7b47ef7a4e5154c6ec7a18f564db61 SHA512 f8a446c731f30a74b8836849581c68b06abd929fbe9ab88843bb556dfafc1a6c7e3ece67374620fed9ad551b70f0c4853a2e8364fbcfc58666edcf0434752560
+EBUILD rspec-expectations-3.10.0.ebuild 1315 BLAKE2B 2dcb0785709b13d2da0dc23384685a073887e42348a918e257293959b7258cfa0a77d88160d3e3fa92e3491a071ac631a9d79f9f056a45f8756e3358ecd275fe SHA512 a6c2eeef1b4b27efa5797a6a54e0154cdf02b2afbd1da6944ccdbe3b600285b07e349bdbef21b27b15a8e6fad67efb51a5faf35229fd8895740a1b80c8aabba5
+EBUILD rspec-expectations-3.8.4.ebuild 1309 BLAKE2B ad056b1c82859a71af3245759a009ad03a5a97d9b7a100b0af5d2b6ba6248b6961a6806402ce9cba57391e3177abdf4158fdf032f29e9cc413f54726e955e2aa SHA512 d28a32a80e2d213a1724b3e75e3bcbe14192320fb4f8392fa5f13364d6f96eabb9fbb5e9805b929c5c7473554b71dbcec35b98191ef21d5a39e5191473b689aa
 EBUILD rspec-expectations-3.8.6.ebuild 1314 BLAKE2B 8323d2265e2713fd683e50640f755f16bdfadddbbe91da15f0606d70bfdc68ab02b70198cf11a7dbb10959e0ffc81971a4833746787eda05496f531465f913c7 SHA512 08439866220487e6ebeaf4a6972aabe5e741795ab72bec1fc690c3ebf7706caedb1fc754fa85dd8c6992ae53adb28563aeb4845980a110670e4f09fc393eae60
 EBUILD rspec-expectations-3.9.1.ebuild 1321 BLAKE2B e65dec8543cd9a8ce5764f6ca3377959893088aef5ecc45dbe04e1893d41ef2af1205ae9fb1a89b279907727c6fa2c3358f8b2d267b41cf3e92512ea123cdf24 SHA512 78744bbff53064ae7601e99e9c70a670ded059e5be306002e444c6cc9240e9a0a287d507d8c629099ec3edf2224785b4da371a99add2aab34f8026cacad3b544
+EBUILD rspec-expectations-3.9.4.ebuild 1314 BLAKE2B 98058887522e4633b0be3bebdadf629b08e349340835008bdfefa2357412dba009e3553258efe853a5495dc544be4ad0bdeb9333ce3defb5f36be89d065a1d0f SHA512 cbdb3f1020b253b3a52df6312d9f0b53521b0ffe3b858cb6f03a29b7c842e99d2d83a95f713a6146146f410be332577ccf8a00a36d4711c9be01681cefe3fda6
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
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 ad762b8c7d78..d5009ecc1b08 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 ppc ppc64 s390 sparc x86 ~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 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-expectations/rspec-expectations-3.10.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
new file mode 100644
index 000000000000..51856b64738b
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
index 17bb778cae8c..094526b1f9c8 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
new file mode 100644
index 000000000000..eff2dd3e6147
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index febebfb17999..3336738513d9 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,9 +1,11 @@
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
+DIST rspec-mocks-3.10.0-git.tgz 193499 BLAKE2B 9bddac80a299e2fc8f549bf4beb2bd3fa5dea21486df7dda9112b008334014284330965881207fedf4b6bea09c25f36b8b2e15ac7bbc6cb244f3504942673d0c SHA512 a2bf76a59b74b89891e4032519fe83ae49a662d3508ecbd9919e6a76d13f0a736063e7215bfda21a3aa58cd88e69fd5eea2a4cbf998a06ee0c192c3d5650995a
 DIST rspec-mocks-3.8.1-git.tgz 191543 BLAKE2B dae8b22a011a3563eb65d1709006169bf5dcf310749cb858f4ff20c7b82e7675a616fc427136fe5e0edeef1db0b42a1d0af1c5623eed35807e84dc355131c8cc SHA512 ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8
 DIST rspec-mocks-3.8.2-git.tgz 191807 BLAKE2B 9ec44fcaad9fe1e9d75cfb84253e52411b7083070de5dbb19bcdf7c518eb2439e6493e979daf814df7b31bab8bbe72821d42eb797ab88d95e051a700b63d93b5 SHA512 42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
-EBUILD rspec-mocks-2.99.2.ebuild 1520 BLAKE2B de14de32642ad939a2df277db38f67b7ccdc00cccd960e70bc75dfe0128c5362a63c5091a2ea3759e8f4af0c2e6af91533338e73cfae1fc808196929fe5f0b01 SHA512 b35906114f66516ef418000374bad2104108caab2ff46c8158a12d18ea804fa1ea59c2ed84555cbb73068c7dc9697e21fbe8792fd171f5413c0aa8073101d7c4
-EBUILD rspec-mocks-3.8.1.ebuild 1334 BLAKE2B 1c75339daf94d245b7261280d3c04a82b4d1f9dedc32b0c20110a4c4fc337a7ba9a95dd7d6ee2e0072f94f2e57f653c627ec80298bee8e5cc2afff0f8a4de09a SHA512 aa563323b987eee68cfb835e9d778f3a57a45395ea80f18db812b5c2dd5202cb34282c19749cab3418c447b1e2b542cff8b5e6a36ef7a11dbd4019f97eef8dab
+EBUILD rspec-mocks-2.99.2.ebuild 1519 BLAKE2B aec0e51488c2a994094c13e9117b9f2e89569381fa8797b2193bf4cb0d15b6c1c71d8878df297d896fdca7153010e6f4a4f90dedbaca72713e6b8684084c45c7 SHA512 8ce450bfc839699843a8f8834e19da71420c08f6cf837c7869a57d6f877860be62f640ca2f9c072770eea513d8f64e843f860ad1136ce024141491d6da69eb6c
+EBUILD rspec-mocks-3.10.0.ebuild 1446 BLAKE2B 0c318546b4a544dca6974cd063b25e0261d1772fa1adadd6b5979d4717197c3196dfff7afa2eb0e18931e92ad298faee3a9839731ec1da3d64a974be51c60f0c SHA512 bcc0d29d58bce35834811ae92c15ebdd55f156287aac152ecb15a7e5aeac900768af58645b4e2e61b62abab40a8bf1bc8a130c86a03a6dc8f512f813adf5fbc7
+EBUILD rspec-mocks-3.8.1.ebuild 1333 BLAKE2B 15b25e33acf62a1f7deaf764288ff1249f1a6fe8eb129a39777add4f77d07e4abf98fe1e579460fe344facf5751ca31c0f5ec60035451b448609acbed750440b SHA512 be1c127f087a2bb613fd1a76300e151ec3916dba40c9e9d05418e540aefba9da8a43806657f32e1dc36b140757dfd36cbc04d5c6355a4cca9cbb652c0086dd24
 EBUILD rspec-mocks-3.8.2.ebuild 1377 BLAKE2B cd7d102c1bc6c615d06c7a41d4ba81a46fb28ae03f8ec7501b8e5c3d5e31cd66b3c151c12def7c0e942d16e62d6bf2ca4035b828482620134f000280dbfc6511 SHA512 60aafb15f57a0d64689eb411cd2588eebaf163e760fdcfd3e73c51216ec6de58a534059d566f00b1ab609453f16cf8babee4ad1a0ee5abf45131a6e0efb31f1f
 EBUILD rspec-mocks-3.9.1.ebuild 1453 BLAKE2B ac64aea4d0322a83eb2377cf7f55083bd4a7b32939ab726f70531fcd54970124120bdc22b2865171e50231888941304c4ffe65345d6d2af16553ddc99aca3042 SHA512 a2bbfe9e5579214b4e635c035add5c29e4102314cde48c7ef9b86df59257dbb22636d918c7d4bae259a2070a2a1666a5d5ba5459d260c4a32762ee7f269e7376
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
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 21836988f560..7070d720dbad 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 ppc ppc64 s390 sparc x86 ~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 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-mocks/rspec-mocks-3.10.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
new file mode 100644
index 000000000000..222b056a4786
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.3.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
index e6738f32d9bc..56698cdd75c9 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 202b6fb66e99..6f566be30ac6 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,11 +1,15 @@
+DIST rspec-support-3.10.0-git.tgz 72853 BLAKE2B 59c585800013fff2dea15ad33dfeed430c9a932206623bb368f4f4660682f537391090cc8538f9052ebafcab336ebd2fdc79003844330adc447be6d977e5648b SHA512 f7183f01b7a7ad55360823617a88a46b2351063d85d81bbd722ecf8b4bb41d014c9ae0af6123caa9405374d484aa61971153f4c59d009986aa20e93afd4a177d
 DIST rspec-support-3.8.2-git.tgz 69112 BLAKE2B 84600d3e2b4d847618f7f53efdf60be3836c7ba6c586de88cdf085e84749e616ad556683b1e7b588b9aec08adee10054e64ae1daf69c6ad58a00d1c2447171f7 SHA512 9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc
 DIST rspec-support-3.8.3-git.tgz 69654 BLAKE2B 1ea3eed0602655fbf5f92cdc14217eb8377d980378c9835a342840bb7a00bb1cf095b6fe57a24f80c01ce1835b398ac3c1bd11ac1f95a90b501be6a000e8f6d2 SHA512 90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a
 DIST rspec-support-3.9.0-git.tgz 69705 BLAKE2B 96d5cea9c63e6ec2acdbbfc4b7253acc26dbf5202c3bafc4a461123380db7d56958d2bbc787eaf3f1c480801441f6a134e1f29b1d3ce23b1bd3225fe4d8f37a5 SHA512 10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5
 DIST rspec-support-3.9.1-git.tgz 70196 BLAKE2B 1edf8e64f6121cb5ed9f543c6ee1aac54f53dfa33e25caf278803a3284414e6d0aba69d1d137e0b80b482e798148ec865feb6e3ab0e9e5d86d13c9aa3754fe75 SHA512 d8267117c9e785766860d781d1e6190714f0d3bb378bf19def213d0807cdfa706f90ef54ff24e8e71ea1e14c6bfa175879250525d3baa7282d997bdc2aa13a0d
 DIST rspec-support-3.9.2-git.tgz 70021 BLAKE2B 410464836d322545a05277cda5cd5cca8b9d2dcb4bf4299850e089d7a169d05aa630395a7c6fc42dffa29d7c6739bcfbf734fa8b0bb69d15b03243534c8da67f SHA512 436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1
-EBUILD rspec-support-3.8.2.ebuild 1573 BLAKE2B 7e6dbaa451c95769b89830bb5abbd54a53a10f981c3ef44af4afd96a596f08915d01b661e2d1f3a6db6586ef5beedfe02c69a61b2bbf6c6a027f4073e28363bb SHA512 8c5c3094aad342f4144c5e34e7c442224cf964c992780e9f9f3af57950e1304c974ecd7f06b1a5dba2e009e6f347cac10836ff5bdbff23c7fb1f8317f59f33bc
+DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
+EBUILD rspec-support-3.10.0.ebuild 1769 BLAKE2B ffca214fdb61fbcff4327c0398e4e2d5727a7511da3ed27c1b7d13a3fcab3a313132a3f2915db50bf93c995db07f14aa7b368843ff02f6d2f61901c75ac4cd80 SHA512 745d2b0afa47608becbcac57eeb20b4a660ab225d50fb531b45223e6e62d681a9a2c144b3b756e91b7a956f088b5a998fc94fa143c511c52ef4d1df8a043bfb7
+EBUILD rspec-support-3.8.2.ebuild 1572 BLAKE2B 376189c43c03c7ebe12ca17ebba71668bf0ed78bb7a2c564ceec129b54d41eeda3c2bb625e81adc4f6bd73bf6e53d55223a58e829a05dc79445d4e7ff5493085 SHA512 9263ef05aad8adf71ed6845935df54e71c64d67ae3bb9ab66749f8996baae72d47784e350d627d57cc1a335e8d1743ce686d7f3a984a5e1fb82272391d001009
 EBUILD rspec-support-3.8.3.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
 EBUILD rspec-support-3.9.0.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
 EBUILD rspec-support-3.9.1.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
 EBUILD rspec-support-3.9.2.ebuild 1712 BLAKE2B 27a447f54c51b617727aeda7164e96d3a506796c62795a19e767b2e5bdb9c137a6dd0c4036a6dcf7b39a221f6266ba782b7b6f19a64a9821c0ac1fc0b1cf9a89 SHA512 7d1cff7a840de7c500b55adf44e40a44e5b7b76d47360f8312fe76b3278ad1bcb26df8e7ed297fef86be33dd6224d03a2072f94d82d566515e56c3f6527ebdaa
+EBUILD rspec-support-3.9.4.ebuild 1769 BLAKE2B ffca214fdb61fbcff4327c0398e4e2d5727a7511da3ed27c1b7d13a3fcab3a313132a3f2915db50bf93c995db07f14aa7b368843ff02f6d2f61901c75ac4cd80 SHA512 745d2b0afa47608becbcac57eeb20b4a660ab225d50fb531b45223e6e62d681a9a2c144b3b756e91b7a956f088b5a998fc94fa143c511c52ef4d1df8a043bfb7
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
new file mode 100644
index 000000000000..ae05db178ec0
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+
+	# Avoid a brittle spec depending on ruby implementation details
+	# should be fixed upstream in next version
+	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
index cc992874be34..7aad823ef6b3 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86 ~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 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? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
new file mode 100644
index 000000000000..ae05db178ec0
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+
+	# Avoid a brittle spec depending on ruby implementation details
+	# should be fixed upstream in next version
+	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 750904ade49c..191ba008e188 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,7 +1,9 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
+DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
-EBUILD rspec-2.99.0.ebuild 784 BLAKE2B c6da7d031b4c9601bcf73a916372093a6ec8222b47e4d63514ec9d67f60938b5251f7485f49efdc7fa027a7cf4524effe5da752e8475f60c15add4fb24738697 SHA512 0949052e2cf7a9e148f31789253022d7d077a188c278aae408de172c80642080cb0d8e48a359083aa714ab7fda15f00fc8cbd1d3dd3f1892967704575411a8fd
-EBUILD rspec-3.8.0.ebuild 650 BLAKE2B baa4d99cd405e0b184162d6e31110b734ac0354e5aa343528887e915c5edacbb4f2f5a65d89de88c2f5a0a202ba8b94285cab69af0558a58d519ee5e3e883afd SHA512 4cfbcc2cff6c755c74241d2afbc1776b48d1cb4dd29da9cd0aeed9faa044ce21c7e13aa70aa1f54c02268b27dade61ad7183057dbf7966b88d7d8411abfc4b90
+EBUILD rspec-2.99.0.ebuild 783 BLAKE2B 94c3b6a0a7206ba940d7587a2be2ed43eb3545743cdf456b355a345e86ad6d2c2c59764568cc6ecafa1ea6a643bb6988e3cd90d1569efe8be475faf10a36054d SHA512 4ae6c9e87c241248695ed78077b94301275ba46104ed81c0d5c9b907546a74e9d15cf956df67fb2c5b233a97350772209ce6b871c472bbcf76442ace6f8f526e
+EBUILD rspec-3.10.0.ebuild 616 BLAKE2B 2467430dd31b904227caaacbc3c2dc9580c18f0439ff5768cc5b91b16024496b3525afdb2d13e3c66d056001ef339dbf23ad6ee3dd8f6d75080d6dfe8b13d22e SHA512 b833cf5160c6e8a74746c7db8d42c7350b011e8b0c66147979da3494c73df6f785bf28dc6616c7fce1b68945cf90be77d5380964d53a4dd30138e63325bc50aa
+EBUILD rspec-3.8.0.ebuild 649 BLAKE2B 40eabbdee13bef66079870097fbabbdd97480df60837dceaf243a4a1f8a8172835d1264448c10510cb0a20cbdf604a2c8f70bf8a391c6877825e23fc21a1489f SHA512 10d0d6bf4c6726682e7e732023db8e874e27ebab7a60ae56c93668a262aaf6958ac32c31f67cf9da50d18d2521a7cdb748bce086e3adb1d87f99ab865d5f8071
 EBUILD rspec-3.9.0.ebuild 623 BLAKE2B d9cee551e060edb33a2d1d0c9f98aa821a893caa8430a96b9a78078dbae921472dbf6f018dfdecc06d91cd4c572465c1f24988882be53f549336727da6b6c972 SHA512 b9fba855fd3905fdde16601ac798b7b0663e4d46bd7947655820f4aa9b35b48b43cfb938b1146eeccb663cfd9386eb2dda06ba21e98791eb9e9c96f01d06f9c6
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index d2d62c086e0a..8f86cd9711e9 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 ppc ppc64 s390 sparc x86 ~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 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/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
new file mode 100644
index 000000000000..517190c916cf
--- /dev/null
+++ b/dev-ruby/rspec/rspec-3.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
index 7b7b4794405d..025dfc17d0a6 100644
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 9b76e27ddac3..b4f45aa211b5 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -2,6 +2,6 @@ DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9
 DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
 DIST gettext-3.3.6.gem 291840 BLAKE2B 5ca1a48582cb46e96fd672d9dc9e65ef3d5171560cc82fae147669023dafef761b67a68f31eb32fe1e433d918efe2c4c6983c32d8985093a3f090ab718703fe4 SHA512 ed03d370c03fe7502360aeac33f924c7463d7cde6bcde85c66befe8560b221a00f995ba6208ee14d1ca9cbaad6bd37aa7d0085ed75557f5b07724468de4433a8
 EBUILD ruby-gettext-3.2.9.ebuild 1766 BLAKE2B a3b5be2becdddb94c1f9f24cb6eb95904f4dd19b7753177991bfbd5cb573af9443c8780c3ca1a1ab7471b40646c2c60c323eb58b8a92cd9cc4d871fd7c0bf07e SHA512 1483f034efcc4bbc88388914ddc7ef1b7baca8230119cb2afa538ba0628452843c9cba25d046fb5d59a003fb8383a58de851654ccfd24a2ee9fb3284de64119f
-EBUILD ruby-gettext-3.3.5.ebuild 1729 BLAKE2B 4adbd825eebee965644e0c55ccddbb183dab556a80344a836561d876fdc698c3ffe18cd3de51bf1526b242e047f05204db267712163888538d8a2cfa269ee67b SHA512 e99a24094584ed1168d81ea12c2555e3f729ec4887f4e71d9bb941231b9f7e09b240c55c5996ff8f1f716308b3f8b6d00899106cd8aec34611b4034ec5194772
+EBUILD ruby-gettext-3.3.5.ebuild 1728 BLAKE2B 40f5b9c7dfeff472c16f885ed0e0881643dd1d55d1d57c02b2795d48b7ef4c838e5a1569c857957d85726d4ed511a752295360b114ab10605ab92973af69d6a8 SHA512 cffa07bf99808729344eb8f828b89a46be0299f53a10868af01333cc68776960854c2c18d5be1b5dd3d97d1d54cb927be8f697e4261e7ce826cb97b64f358cfd
 EBUILD ruby-gettext-3.3.6.ebuild 1736 BLAKE2B f1b19efb62011446279fcb327179e773ebb2239097b2b2b7a8195c7b2672429f4b58b35cab47995beb815386e5de3a4714f6126361716f68b4eab01549fa0df8 SHA512 5b52cc32f1e21418a9d4d9d84a8d90f65732d6b15f37e9cc5c76ba39f61b8932cf9de62cab5e3b9d9ac3036cafc466ee23410869269ddd70dcd5d7c44d97bea6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
index 3745d9e3c04a..d45f53bcdfb1 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
@@ -20,7 +20,7 @@ inherit ruby-fakegem
 DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="https://ruby-gettext.github.io/"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/ruby-macho/Manifest b/dev-ruby/ruby-macho/Manifest
index 815a13c97276..08f6a51ecb5c 100644
--- a/dev-ruby/ruby-macho/Manifest
+++ b/dev-ruby/ruby-macho/Manifest
@@ -1,3 +1,7 @@
 DIST ruby-macho-2.2.0.tar.gz 65473 BLAKE2B aedb5524926649d2f1612c135bee2cd18e4740412afd5d0e21616edae46fa4111208d8490fd83a0fe95ed13bd7c33a8a347162c34667f3f4d0bbdf86258bc4c7 SHA512 bfb13d0ec52f3fd2a359d0ae8de1437c272545f0ecf594c13ee491089ee79e5d70341e3557e840e82c0ca7d12dba27daff5d011903239d5caaee44f5d5189a97
+DIST ruby-macho-2.3.0.tar.gz 66200 BLAKE2B 7ef2195a5906b8d7bef1b5baafd74887a0501c5334c6045069c00333b5f94d298487f98e6549739b090bda2f295640ccdf8bfa0d10b26608899b54ac4b02c022 SHA512 8ebcf38cc0282c32c6755d76539e7b3836de8f2ee5d2ef659d74a132b19fda73e24d85182b3e70e8d0dc599d48f904b7494e4232a508722aba9d789b151d2fd6
+DIST ruby-macho-2.5.0.tar.gz 66548 BLAKE2B 256ba814e495a10273cfb8d92e9da9947b6ecb19864b7203f334e58c1dd2aa1de9832300176826e8251784d0b76a8efda2797e1c2d5d3415dbd946e94bbdfcc0 SHA512 a7cbe2944a302e6320ec098258b08db0359808abfddee56ef82d541b0473202d92fbacc5560a73d8cd4d17dff6b0b80e1cb93c021a178a50393facd72b9a980f
 EBUILD ruby-macho-2.2.0.ebuild 627 BLAKE2B 7c6cc8b3bc2beef434c6599c591e418e2fa4b0db52a62780f853282edfeb2d176ce79471c5f0c9353c35d999d31095ad5a8458a17a38ad9140c2594fbeecd67b SHA512 15833cda6a01202e0b414be8a67576c905d093c2b054ca322e1bcb556842066f10175f8619404949165d78bdf33f04700479c027b069945eab817d799806beb3
+EBUILD ruby-macho-2.3.0.ebuild 663 BLAKE2B 0374836a7f6c01b0782fb5e2b5aa496e4f2fb3972d8ff39d49a75f41cb70693db4885f6520adf8e1b61fc511f1da108374b499acee87e94e151e0c46bd7577a1 SHA512 87922dcfecf10c0b90925612ccbd5b571f2cadad8b8c5fe2dc36a326b384b5496fed6b9446618121e00318e99b66e3d228ced7994a8112f9fe37477bd61aa6f7
+EBUILD ruby-macho-2.5.0.ebuild 632 BLAKE2B 53534a8af161a1845e91862a91e41fbe2b28a77460949fb841e684b08bb99ca12021a400fb112603688bea6c3fdf02c40f30dc1d067220be969cbe6881cdf922 SHA512 82e2cacf8f53f470ae621f17a60d36059cc2a613acadf56ffd241884c6381191c50e112794c824c20ca4ae61f895e17c7ca17b958ecf5e125f7a47f21245b361
 MISC metadata.xml 459 BLAKE2B 36980a760f20e2af64b31500397e59049e5efa99eafb8da840bd717696fb8483243d067e23959da0eda02f80bc680e6ebdeb0510af8f4985a0dcb747d3ec658b SHA512 bc0bea1bd344b54a449b421a4bf30e681574a8270f17ccf75b7705fe3ee3c0bc680efc3a6fcf6b01294f7cf53519ffc5f614edca9c4b49910783c79f01c37de9
diff --git a/dev-ruby/ruby-macho/ruby-macho-2.3.0.ebuild b/dev-ruby/ruby-macho/ruby-macho-2.3.0.ebuild
new file mode 100644
index 000000000000..922d1019b682
--- /dev/null
+++ b/dev-ruby/ruby-macho/ruby-macho-2.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
+HOMEPAGE="https://github.com/Homebrew/ruby-macho"
+SRC_URI="https://github.com/Homebrew/ruby-macho/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid benchmarks with additional dependencies
+	rm -f test/bench.rb || die
+	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ruby-macho/ruby-macho-2.5.0.ebuild b/dev-ruby/ruby-macho/ruby-macho-2.5.0.ebuild
new file mode 100644
index 000000000000..4ad3eefba916
--- /dev/null
+++ b/dev-ruby/ruby-macho/ruby-macho-2.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
+HOMEPAGE="https://github.com/Homebrew/ruby-macho"
+SRC_URI="https://github.com/Homebrew/ruby-macho/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid benchmarks with additional dependencies
+	rm -f test/bench.rb || die
+	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index a526c0d6d369..2ef48c19e3a8 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-oembed-0.13.1.gem 4509184 BLAKE2B 212cdb606a1155349c23c1c06f25fedbcc2436dc22a52c8f405b63e27457881617b41d79db15e92e5caac8094c7a9ea912f1b16d994448f5296d3c6117062f17 SHA512 d87f65f1d76d485488c81d4fa2b2df5580a03104a16e3af5e65e6987f4652b3f5652ebcb0a79eab882ef0e5cc9c7b35537032a849de7b848b609f13ca3b83dd8
+DIST ruby-oembed-0.14.0.gem 4510208 BLAKE2B c27df5f0cb48e64b754ecbf526dbb82efff66401ca28a9a45243c5e78397a114203a1a997545055fe2ef45c49bfcdc2005540af9b35b97b8f278e8a173211218 SHA512 101a9f8a35bfa5cd5fb7ecab1f8ee8b616286d6d880506c936ec20fb1749bc6c4ed7c61ebd9ea2247017567ca7e885dc9d83b38f3c55ed9e97a1b7cbe7e53d29
 EBUILD ruby-oembed-0.13.1.ebuild 795 BLAKE2B 35cf25fb62924a8f66d2296490e51499c7066e73d2b802b142712876822d91a9f4995c40828718429891a7bf25738690559081ec6dd03b1dc862589857228955 SHA512 d9f831c5f7030f153a9263d7cbdc75acc26f90b24a1b108b168a315e2c392536d506f20c7e3a1c3f526f656f236028fb88b755b479d5272fdc7f56f63e0e5847
+EBUILD ruby-oembed-0.14.0.ebuild 788 BLAKE2B 8f8cbd67da65b1e0dd1bf5a9f9c23a9880aab28d20ec1aa8336329b869a66d4460eecf960ccb983de08bb71c304eec93971228d37058c645c20c767246494aca SHA512 96c0f8e2d7e39e85e5287abf80807f20b3d6830fb076b2778c1d4e87bd712d060ef4b3a433ab44a2f57980df2a4f1a4e634d227c1622e1e756ec7f7c64d032b8
 MISC metadata.xml 345 BLAKE2B 575c6ff6aaa60be02f4afbaa5b6855e9e0a8e24992c7ae7db0f3f23856403c3f223a4e6c861550a96b967585bc0f7aaf937b2a98c6fad69fd6ab69466e98613c SHA512 e0c3ea7c1c5057b74e8b03b5d314050ee21f8a235dafb981888ebec4d8cf866d13723ac1dd6a96a685380f9b30e61c513e1f83328c778a524ecb52f9adee8e03
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.14.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.14.0.ebuild
new file mode 100644
index 000000000000..39b5682b5588
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.14.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby."
+HOMEPAGE="https://github.com/judofyr/ruby-oembed"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:5
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/webmock:3
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
+
+	# Avoid development dependencies
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index 880f91d84efd..54ba33a58e35 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-prof-0.18.0.tgz 93925 BLAKE2B f7e0825e5291fdab017035b2a71029407d2b01161f4c4c7aa1f10a80b4080ac14f7adaa2c0340fe5c80f7352181d085d724dee66597ed29825ab7116d37c5e58 SHA512 1743bbd97789c9de66e9479384d204b0870e43a265471f0fbdf7a72bb19d77a30afc25da9d0ac66a921c28ce83d8a8d72279bdd9b23cf8505ccde952092dd9a5
 DIST ruby-prof-1.4.1.tgz 90180 BLAKE2B d996474330146a5daac50f1dcc2e39ed9d3c43ab5f4851805ab264168d3a242371cf216df53c474360de164dd42c14465b4d660c4a6aee7e8983d69ea52dc4e0 SHA512 a436f5fb81bc972c799591ee1077d8fe3d092680c8c0c40ca3607f7ba49611e6fb986464df16bacc7e429ad51276f76c800457a3a68beb659ef8ad01d183434a
+DIST ruby-prof-1.4.2.tgz 90386 BLAKE2B 55263f6cd24b18112a917c2b03a57ca91619419244f79b2b06f6d6794f76d9411d4e1b39dbb2e4b7e2ca6cc03b244f529f4b56fec54ef5fda18853ec2ef05fb4 SHA512 e75a8898533dd2ce9098fcf940883e3cbeaeaecdaebe3592ee67321feb4e294e25bdf14ce6cac50fb6d582cd55d33f175929a1d5446a21b74eb86c468e779fc3
 EBUILD ruby-prof-0.18.0.ebuild 1557 BLAKE2B e61085830ea7864252534c335cbae9cdee387fc5f2ce891b9f31d01e4893e60adb147833cd4fd0a63cb86f3e8217443bc3a09bed5d93ece2f48a601a175f5565 SHA512 6064d1e707aff7caa56899087f40e2e25199ae3228237fb464cb993cd4521e84d9a674954efe4c26df7d8dca7f6b475a5e28ca8ac57cc842805b1ac0533c30c8
 EBUILD ruby-prof-1.4.1.ebuild 1336 BLAKE2B 7b0ddb66947f3f0eae1cf769533fe9d1d3f8fb024d68e91eeecb844e59a419bb30061f4e6f971cd161526af5ec60f7f5a75092b6802884649dd3bab676f6ff81 SHA512 0e2d941fc539b09ad089181c0893c28fd91a561e7a8abddcba9cc2aeb176c0f720242fb3247e28612de58d0872faaee81afc468146487abdc36228795c4f6166
+EBUILD ruby-prof-1.4.2.ebuild 1358 BLAKE2B f401939e41348e43fc0b01ade4cb813e91f6a9edd6fb8aee068d4b09c8b596dbb5e7300f851972c156b8f5b2eb0d6f125f20ada142ed57ef3142309ca6baa47b SHA512 581a60f079980b6ca8b169122943ba9295c4a08c61c505576c5ef89b277d52476f451a771595c52c4eb277130d49396ca85d28171263dfcf586f9635c489fdf7
 MISC metadata.xml 345 BLAKE2B abf08843e05ea5a260b8d3b1de88259aa5b593ef0be34c9066cc9f53aec48f13e962ee77224e28b7253f45850af20222d672578f57111bbca2d250458515c26d SHA512 e1647ce0131d640e8de67cdaf4bedd36d5cf3cc1d251e08b3f36a7c82bf356f80a3911984adbe14d25250b2f5c3333a988b5baed8978adea0b68594d985f22ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
new file mode 100644
index 000000000000..46325890cca0
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="ruby-prof.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
+SRC_URI="https://github.com/ruby-prof/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Avoid bundler
+	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
+
+	sed -i -e '2igem "test-unit"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
+
+	# We install the shared object in lib, not ext.
+	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
+
+	# Avoid unneeded dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
+
+	# Create directory required for the test suite to pass
+	mkdir tmp || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ruby_prof || die "build failed"
+
+	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
+}
diff --git a/dev-ruby/ruby_dep/Manifest b/dev-ruby/ruby_dep/Manifest
deleted file mode 100644
index d238f673546a..000000000000
--- a/dev-ruby/ruby_dep/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ruby_dep-1.5.0.gem 11776 BLAKE2B 0883eb6908c4e0aeec3bb88eaa2a3fd526ce6f16f4b9feb3b817ea32f40f86967c3e9f60791f8bd83e52b108bf748784c98d07d5d121ccf884ed19f76fa8266f SHA512 f12b589262d84525b301370845840221f0d204b0cfee66fbbbee62eb61e817c46590e87f70318f8d14d000da20280182448d129b685468701ff7ffa8e6965377
-EBUILD ruby_dep-1.5.0.ebuild 490 BLAKE2B 633bab2502d08e60cabfcfe8da6945c9895bc3160c60b830973a9d7630e81382aac8ea4eee3eacdafbb4d2860ba3cbed8e8a2912f55bea1759a69cc17b2a1879 SHA512 7ae7e1bc6a064e2ddb1584fde445bef5df9db85222045b95e0e24e628137cae62f7a1e2c030d10db40feb90d6d78ac9b41822d969826b791459d887739dd3ce6
-MISC metadata.xml 327 BLAKE2B 5708c74c786998a5e5c9d5e14c9890cd5271e73f0469cf60e3a657facefed7e1326b1a270f7f67f0767664a1936c20c3e2650ae9930b680e61d3f86302b3b962 SHA512 be034c994d4c7eebe730b0b3cdea143d872b8519d99fcde3e49776c7b729a5f1d5b9a3acb411850d7ea518018e9d645820297afbdff11d5f4d3554d649f4e01e
diff --git a/dev-ruby/ruby_dep/metadata.xml b/dev-ruby/ruby_dep/metadata.xml
deleted file mode 100644
index 47591135ab24..000000000000
--- a/dev-ruby/ruby_dep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">e2/ruby_dep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild b/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
deleted file mode 100644
index 16d227947d83..000000000000
--- a/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Creates a version constraint of supported Rubies,suitable for a gemspec file"
-HOMEPAGE="https://github.com/e2/ruby_dep"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index 186bd0a0cce2..4440bdf208fd 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -2,7 +2,7 @@ DIST sass-3.4.25.gem 352768 BLAKE2B f3c725ee75f0d5b3a30cfbfdbf5dd949fc2b6d998780
 DIST sass-3.5.7.gem 320000 BLAKE2B aeae548d1005b9f420c82f4efc96b2428d3025395b49784917c298fa48228d8052f758c1f851fb6e4e8024c63d48a9880f6c2e88411cd2125e76ad291e469bc0 SHA512 a72b499cfca4862fb4bfeb5201fda788339bb57d97b467c427e9c8365b03088b886a0f3cb3a6d87b1426e1497032b8394a948eb4a2f45004be80c03070304f95
 DIST sass-3.7.4.tar.gz 401442 BLAKE2B 52abe37390282d2aead3eea6c2a049da529a5e96bac44b01ccded1e3c4d2c332d82f164da941413c0138fd3a94f59cda084d8fb724db87fc522f33dd7bc31adb SHA512 4bebb6ddc84e7f2687d9b801e6b30e897d83a46940249349d775e0139d1fca8ffd96d0976f4c35a7a0dba9ebf786883a70aff2ff002708e28b685a034634aaf2
 EBUILD sass-3.4.25-r1.ebuild 1005 BLAKE2B 9f2080a43ebf841c098c2d92594258ac5614ffb038b02cea340a35386eea7df27cf1c90f18fcd3e3d95380632d89a518ef041df85de04c206ad7695b298abe2f SHA512 b9ee8193ff9eb3a7115cc025c873e383184fc4bdf8be7d9ff09ebae450024ce99d684c3d8811e1bf65df721a4233c1d3bd75dd354a37b9eb35d8b34f6ca1b506
-EBUILD sass-3.4.25.ebuild 934 BLAKE2B a48ff68e8aae2ca87e777a52216cd2617c947240a1f246085e5b881290cd0f06e4ab845c20ba00c06ea5b9f9d32b311961c7484d1bb7ed64b4e320e53ae255ae SHA512 d6f98dfff19df6afa3b80cd46b8c851d5be375e29f8f320e3b3e9ded6f971c41ec19fe08294333c95eb4aafdb1c79425fd6600dbc02bef0f85b68dcb5ce44fe6
+EBUILD sass-3.4.25.ebuild 933 BLAKE2B 48ffa6fdf6c38c8e0688c38e5a38e063c50f6e5742b43456c42d5df6eedecc9ce04f24f77bdfc93010fe8b27d89f8fbdddd032db52b3fe4b2b457c79530dd561 SHA512 4c70147999f8b6b7e62bca7bd03fa26872ed9231abcd103a225515300978b805b7caf4aae5b01792000573940e940c944af4a78a092ce376d8f8025990a6a2db
 EBUILD sass-3.5.7-r1.ebuild 1087 BLAKE2B 802ccde36fa5d972c6627af471bd9da5c8d01419be51b8f0828db20661f903f1f4a204490a5c68eaa165643a7e683a00fbb5b4ff1b289eaaaba29ab696bf6081 SHA512 b9c472c4dd5a638e7e3b53d3180fad267ae811b44ec5d083a63c36d9134618a9fcaecc5a8e1c18fef90d37c08128ea3b18753f32a68b52e6a26ea23129156c18
 EBUILD sass-3.5.7.ebuild 1062 BLAKE2B 0e8c031294b7ecde284afe9e5ac90b9f157323b8899ade0b7d4ef7e79f19de6d86ca3db8a1efa1cbb46f8ed93f9f67b4c19073bc07a2e5cfbb5ad090efec6665 SHA512 8f759c385a81fbc6a21e15170fad345e2b9e2499d505a4f8dd64e9b60a59388de87d6a9f69aa4b4e09c94b8bb8b4fd5f3c08c06df476a442759f89c45f6e869c
 EBUILD sass-3.7.4.ebuild 1186 BLAKE2B a1f474f44cce09e1188dd5402bdfb2bbb47cef7dfdde094bbe8c11d9a2683540ded43f6bb70382432a73141836587d61cdd4ce96fa6cb88fe808f498f488da57 SHA512 6a4a4f6f5393bf0eb2c708915c1a864f07f0a7306966a063aac0fba1ee46ffee480fb3a8f679cfdb93c9104a6beddebe343c07fc7f41b663f9f2a2d44e3579df
diff --git a/dev-ruby/sass/sass-3.4.25.ebuild b/dev-ruby/sass/sass-3.4.25.ebuild
index bbecbc273dcc..660ae10c454c 100644
--- a/dev-ruby/sass/sass-3.4.25.ebuild
+++ b/dev-ruby/sass/sass-3.4.25.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and m
 HOMEPAGE="http://sass-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux"
 SLOT="$(get_version_component_range 1-2)"
 IUSE=""
 
diff --git a/dev-ruby/sdoc/Manifest b/dev-ruby/sdoc/Manifest
index ef958ffa2d46..efdf418ab91d 100644
--- a/dev-ruby/sdoc/Manifest
+++ b/dev-ruby/sdoc/Manifest
@@ -1,5 +1,5 @@
 DIST sdoc-1.0.0.gem 268800 BLAKE2B 238b36af9909e7329f6b54e297b4e03f27e8850bee2cb65483c9b912b92c16933639fba5f085ae8c30f808cbd6a94d1b34b5bb45af3f1d9a7fc37a4ea45f32f8 SHA512 cee8be23a2bc53dc3e052e183405ae17546594e2b1b87b7d83c8dc527b2c4bd71a5f642f52ae489f4990ba5d3571c23b590b6a562d677b32597cdeeb08c63a38
 DIST sdoc-1.1.0.gem 269312 BLAKE2B d830a0477bb2a46f8f4c08b0249293ca56d5a398eab36dd1a91f4fdb134611065053f1d445697f249be3fb2d672f2ed95a462f045c953b48e9bdfd30b147a675 SHA512 7bd6bc4725b020adb504ec5c2cbc7387f46e8cddc8c3be5643c1808f203d0663326958c2d039fbb3c384369be1ff1363c162c8868b8906605de76a1e60a3c0a1
 EBUILD sdoc-1.0.0.ebuild 600 BLAKE2B 77871015cf6aed5724a51db8ae426aea6824d3dabbca46f597cdca7c6554efc60e497044e61dcea245a0981e865bbaecae7a4d1c0f93a1c8a772fd060c9cac94 SHA512 e0ae302e5928935d81c89e4164d793d5f729305e1677c6137b582e14bef073d910a16c35a7a49280d10f97357d01b09a54cfe8781ee12492a231c5dbc7398f2f
-EBUILD sdoc-1.1.0.ebuild 718 BLAKE2B f97ad3072f1cde05ec95c30ed1d6dddb014cc945a9e1d30b3425960a87765dc0098cdac73f301c31efb2797b449827c508d1f29fab8d3a8f01fdf20e74321560 SHA512 3573c31db8d1c3a1a3cef66633ad7d4ac14b3dc219b7c057e85bbfc7cf492521d76cc8e66b4c0cae50a44bbf8f6baf82cc7f7275ea111a3ab7e6c0d6f636d740
+EBUILD sdoc-1.1.0.ebuild 722 BLAKE2B b6adb1bf4b1d8ea985e404c3ccd873b3517662a3cc40d90d3765bb270f26accf28df7fcea7e3afce9bf595264812892be697e3d2948f48358f248e454dafa5e4 SHA512 30586fd60136889ab6028e722dd6883bc342c9c89c83b101d8b73734a9b4b317bf1cf585c3adecd48572a460a3df3b0e04ede61908cac2cb409ea348aec80efa
 MISC metadata.xml 430 BLAKE2B 0aef69f5cf64546a53d97f95bc931935c2e00a4dcec015467aebd1e100349c9808470b536583dd91ec53337202286c6b5837f0fe0571b0df732bab734d692a39 SHA512 abf1644b3da843261358135709a6f6895c34da54714a1d2e83fc6960e2228721e767b44c75e942af360242c9959619e7fd2323fbb96a46df2f652f6c9325d277
diff --git a/dev-ruby/sdoc/sdoc-1.1.0.ebuild b/dev-ruby/sdoc/sdoc-1.1.0.ebuild
index 2f69e4f81e30..2eba8de69eea 100644
--- a/dev-ruby/sdoc/sdoc-1.1.0.ebuild
+++ b/dev-ruby/sdoc/sdoc-1.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://rubygems.org/gems/sdoc"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ppc ~x86"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index 411d344a21df..bc0adf540a88 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,3 +1,5 @@
 DIST serverengine-2.2.1.gem 39424 BLAKE2B 0c68bfd59c0f6abbb294ecd8003c80853413b38b05ba1553230a2a49ffbf56dad43428eafbac4e77a012d66fdc30d4445249aed53e6eead11f52f5aeffd91c1e SHA512 920dd828561b44525dbef2a45144a40f456a5fbc2a56366a7831b42e9f6e115895a0156adc10114a007c2487d1bd1488f73c9c00373fd90648ee272c9c872111
+DIST serverengine-2.2.2.gem 39424 BLAKE2B 113ffaa6dd1c35ba0796aaec30c4b3bbc71d63abb7214bd0ed30c7d38195bb2caf4e12d79968ca2750fb522600ac9494848984248fe1645ae3d7c1e97fd6a608 SHA512 ec34af108017468e3981861b4a4ae84d071dd31aaca78d458512bf430a1c7075deb64134f899dbde14e8f18a0e163f0f61236a7b3678173030c093d3362eecf2
 EBUILD serverengine-2.2.1.ebuild 787 BLAKE2B 89e0c43add0b47e665869c0b044333721a7f8e4247fb5cec3b5746c94f768139f51299a1bb4eaa6671bd084b5e975d05c8c90e898358f53c81d5e90230c8c558 SHA512 9bc7cdb7a98cc45f022e7d32127b6d3572febdf2292e3e91737f0d8114f3b99ac84b60a81ec0d69eb2ee6e4a6b8bccc9df5e9f734eab2db142760a74f8a1f262
+EBUILD serverengine-2.2.2.ebuild 780 BLAKE2B ea88557e63b858eefa3f78df226437bf60a2c98b8f7e74f76c7a7f37400a2b9a3c4419db5a7bf8c09bdd7172f0f83cf238bd3c4f813d9681d55a8c02215559b6 SHA512 b52559dd5d8e2a43a7d30cc27665d1920ca7d1e5683b9db7e2adf604c2ae5ee4b21355ce3e1b0ed4afbe51d60be4f73ec093687b03678542ddc67e2c878a1b7f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/serverengine/serverengine-2.2.2.ebuild b/dev-ruby/serverengine/serverengine-2.2.2.ebuild
new file mode 100644
index 000000000000..f8f4908872d2
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/fluent/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/~>/>=/' \
+		-e '/rspec/ s/2.13.0/2.13/' \
+		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+}
+
+each_ruby_test() {
+	# The specs spawn ruby processes with bundler support
+	${RUBY} -S bundle exec rspec-2 spec || die
+}
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index 575a5b3e073d..4d89e980262f 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,5 +1,7 @@
 DIST simplecov-0.18.5.tar.gz 100495 BLAKE2B b92ebac7983e33c36aacad29ac499dbdcbae9f2bcf9d3ffb0cc07eabff112e74ba0489ada7b923453a69cf3a1487c8ea3c7af8b973242fa52671b0ba96b2a2f4 SHA512 05c452138997f4dcbf4b8cb053871591c291229e3f1fa152d128b1ea87668582ac4d72fa412c59f30fa29dbed1a4ca07fbfe8e1a1fe9470a22b2d1e931171874
 DIST simplecov-0.19.0.tar.gz 107240 BLAKE2B 64c82c4e2c89717f0fd4d24c95352a8ef435e0c7f2e968d5611c67ee275195cd5d89753f6c009338891464eb400ac87535f6bd800c2e79b9be548d75057b8e49 SHA512 81ee7a3d84346d05f4fb78b85b70a65232a1b13fc5cfec17e6bd7be567bd64fda621721bb287f756c079b2b10a11d30c9ae308270db8d9865e01e7d5f77f2352
+DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090 SHA512 2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
 EBUILD simplecov-0.18.5.ebuild 1248 BLAKE2B 4bb5082594786d192ea860089f9bc1c855c04c3f12d231d6116245547ad3f4a424e0c076f94bdbd8227ee469968b8cef5ad4661b32e45bab8c87f70ae1497265 SHA512 6b5a326ffaae5ef9b4deddc8c41a742f04116da8e11528f880b0fa169c21ec1f4e65d355546b6756ecbcea9eadc347f6b07805051451551bb0798beea6d8827e
 EBUILD simplecov-0.19.0.ebuild 1203 BLAKE2B eab03770d9dec22b287ea053db8c3646bc8180d96090e10de1d01cf68079643aeeb5c9581da6be0dd9bb5a7d928f0872e17de60508e5d4ce5dd94ca1aeba07f6 SHA512 c11b911308d04a3bcdc0ce73c5528686a685da80b62f6d40ad5f399455196487f37f665153351f86160e2bf3eee97f56da97c7d1f8ff998671fee9a79b5a6cdf
+EBUILD simplecov-0.19.1.ebuild 1203 BLAKE2B eab03770d9dec22b287ea053db8c3646bc8180d96090e10de1d01cf68079643aeeb5c9581da6be0dd9bb5a7d928f0872e17de60508e5d4ce5dd94ca1aeba07f6 SHA512 c11b911308d04a3bcdc0ce73c5528686a685da80b62f6d40ad5f399455196487f37f665153351f86160e2bf3eee97f56da97c7d1f8ff998671fee9a79b5a6cdf
 MISC metadata.xml 350 BLAKE2B 896e58c78f5ecf2a9a5fcb05349e4d7f1b4d43d03dd5f28a113f744f1ee86e935c0b764e587bc7df5cf6bf978c175d3e6c2635c2d52858e0d7e92507e66aa4c7 SHA512 d4f44b1a3bee9d0f22b2ea4cb9fba05b9635b85a0eeae45c6e36343c08dc246d98c4ea3e1771ce350017b6c6ab6146f8d9dcc9e04c5f5ac03876a23afe5d4280
diff --git a/dev-ruby/simplecov/simplecov-0.19.1.ebuild b/dev-ruby/simplecov/simplecov-0.19.1.ebuild
new file mode 100644
index 000000000000..dd634e2f601c
--- /dev/null
+++ b/dev-ruby/simplecov/simplecov-0.19.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="simplecov.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Code coverage with a configuration library and merging across test suites"
+HOMEPAGE="https://github.com/simplecov-ruby/simplecov"
+SRC_URI="https://github.com/simplecov-ruby/simplecov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0.8"
+IUSE="doc"
+
+ruby_add_rdepend "
+	dev-ruby/simplecov-html:0.12
+	>=dev-ruby/docile-1.1:0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/test-unit:2
+)"
+
+# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
+
+all_ruby_prepare() {
+	# Avoid test depending on spawning ruby and having timing issues
+	sed -i -e '/blocks other processes/askip "gentoo"' spec/result_merger_spec.rb || die
+
+	sed -i -e '5i require "bundler"' spec/helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
+
+	#${RUBY} -S cucumber features || die
+}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 818c1e5bb6d0..8503e9ef2c3f 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,6 +1,6 @@
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 EBUILD slim-3.0.9-r1.ebuild 1628 BLAKE2B 1fc3c75042d2c270ba06e37c9e41a2f9454b82614289547133985156aaaaabd798ede3c60a635c02bced648ad8a020595e0870fff63225ac85935f6a70a593d2 SHA512 159783c00c5b0f916083850e36f645907adfd97007e284c81fc333dbbd09a06b8f0c11fb95041ba62cce99b65e90e551ad1706555e03778a48eb0361f642375c
-EBUILD slim-3.0.9.ebuild 1605 BLAKE2B 496a811173678e88f1dfa9fcce6d86805792fe5e15b7358dc8516894b1a59b0f714fc9ca554be64cef28f5a6d958a2ed4ead154fc15535985a6950dae46cff6f SHA512 2cfb0c25bf080f6978c52d715a5b8daab71cf95bced321d3f12f2c0c9cc6501ae28de0dfafd092795987ddca0b24d06b6994a95ff0f48a226cddb25ef0f7ff45
+EBUILD slim-3.0.9.ebuild 1604 BLAKE2B b8caa913c512b408d04c99741cc4dadf95af6bf80abfee204997d8d9bba75c7ff65d8227430e80eb3967c1e70eaca1133f984f28be36f46144d91aad06ce9829 SHA512 4545b952f41cd47d43ea6cc3421d7599be2c351bf80c30ceeb92efe2e0255c03aabd210d122d90a0e982a2532ad95e3d17b038e8268551f701bebb7b21db00c9
 EBUILD slim-4.1.0.ebuild 1673 BLAKE2B 5b291bb1307e0c31a20d265ce1d39bebfc21843ea8657f0d8a0a403f9bdb7d2a1613763d50bd8ad29cfa4907a49bf7f6693ca63975e418982d7c9518a02d51e7 SHA512 b788c866838292ed0092c331d5232011213c40f9c4bcb830e032323f60a9655550e97561a00767b6892b91a994982d75cb8046a882f054213891e53e8441d9a2
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-3.0.9.ebuild b/dev-ruby/slim/slim-3.0.9.ebuild
index e697e9648c5b..fc9e8312c7df 100644
--- a/dev-ruby/slim/slim-3.0.9.ebuild
+++ b/dev-ruby/slim/slim-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index c298e3201437..5d9136e0d3f2 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,3 +1,3 @@
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
-EBUILD syntax-1.2.2.ebuild 890 BLAKE2B 50947c1235ffba04a7f692f51d8c6a0dac84d3223e80f9f4815a8f28c9d67c7a4e972cd470d479d703bc550b68348a72d584f0f95d52362f6fd3eddd63b00bd3 SHA512 d60f8d66396c3a54bf0cce1ee97db966255366697da7072662c5f10db966719a34b17703d3aa46836d273423b5b050b3cafe4b1777d12652107be3690607a38a
+EBUILD syntax-1.2.2.ebuild 889 BLAKE2B 8ec36a03c3660b5961e751d8e22b4d3b79c109f30b476581efb08ce99d3634af16e1fbcb9a61c7d413335054fe79077960a3ff310af44e0d17924a4e10b5a38d SHA512 b0d260a484c3fe77c0789cbed39b3bd364bb4882edacc78ad12670a9f4b72b4b7fbd9f0645c93929cf198f8824c343693390026704f3e63253a19dd6e0216969
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 8fea1e381e4d..cbd859768a38 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~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/sys-uname/Manifest b/dev-ruby/sys-uname/Manifest
index 18e1dfd47b2e..a3e2398d16af 100644
--- a/dev-ruby/sys-uname/Manifest
+++ b/dev-ruby/sys-uname/Manifest
@@ -1,3 +1,5 @@
 DIST sys-uname-1.2.1.gem 29184 BLAKE2B 4166a6b8d1e87a0a78c4c6d9b542c8ad6d5c32f6f36b03be503cd6ea26b81d0a00bd81ff8a266b4f13e115629519bd67034d2cb80fad8bbc2d3e2c70a821d99f SHA512 4e7c7d5a375a61082f558115d69e74ee8a6f916cb641a8abf9e7d9a92909ca8e595f5d6659dc9cad34e8f0de4c1f7d63bfb5fe6dcf82df628c1e511987436d68
+DIST sys-uname-1.2.2.gem 29184 BLAKE2B abfc9172cde35f946d420f8737a9b60b6810e551c2c361027614cd812a50c86bf8e92446c9a113d0e7e2f6dd09c6f40ceeb5a024defc7cacbb45c53f4b761809 SHA512 97a7a8cdbbc80e9d886be92d104aca389d82a1eac61b7a0172ce8fa27dbe751b0653dc8a027610d69051a79ed1fb2c855e2ee802308a74300dcc709c9e56b9fe
 EBUILD sys-uname-1.2.1.ebuild 576 BLAKE2B 1631d6581f36cd86dd815a74cd8c3b6a6db60b03cc2cfa478358046fa8032b7acebe8c44b42c7ea6d393d61e0065d34155816a51fbdefcd5d21d4bb9df249966 SHA512 57a8a95c931ddc8bccae1ce63f994afdafc4bae48dd2fc203b0a2019f9b0a798e194f38fa289b9999aab693f97646278ec88b2e537dac5fba3bf38ea265696ee
+EBUILD sys-uname-1.2.2.ebuild 563 BLAKE2B 563f9cc7f0c9c67ecdd9da0ee49f420383929490c9cce35db72149e165d14e330828bbc39a03ffc3ae75992a9b391df9b5ac012ea843eefd396ae02bd50c48ba SHA512 f36ef606e2d892c624b6e9c566b94f2d52f4a1822977ca71c6c4e1b95f01aa20d8e389755b7cc1830c0b4eaa9439bf6fcf718a0a0f0903f281ca5441ec44422f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
new file mode 100644
index 000000000000..add34ecdc7c2
--- /dev/null
+++ b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md doc/uname.rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby interface for getting operating system information"
+HOMEPAGE="https://github.com/djberg96/sys-uname"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.1"
diff --git a/dev-ruby/tdiff/Manifest b/dev-ruby/tdiff/Manifest
index 89cf17df81de..cf88f0f070cf 100644
--- a/dev-ruby/tdiff/Manifest
+++ b/dev-ruby/tdiff/Manifest
@@ -1,3 +1,3 @@
 DIST tdiff-0.3.4.gem 10240 BLAKE2B fe764eaf70303670602758bba903202bb468c419e96909561c4d420a86b9237c9af4640947e9dbc27eaca7b7210e26236da20d41f03d3e8acd0556a23205a924 SHA512 2db5c9707a8654fb36b02c7fbdf2317da08c633c0d3768f0f76693ffffd1b2b44e5f4309ae97df944c3bf9f25b596fd3ae19cb88b20435c0f9e50989d22ece40
-EBUILD tdiff-0.3.4.ebuild 592 BLAKE2B e71a39eb950afa15b8ddaffbe164aae920d9973e9683c571f2f276ff8b7f1487da19e834f7201ae3f28a937fdea158355cc30065ebc46b501d03ebe35b7bb5ab SHA512 fcd7de7e572680047cf1eafff6da19f0ac2f116a2be0f41df9927fe1d0d4ee90dfb5f2ee098989bccd4b464e4843c5be4f6b6a3cb658658904dbd49a6d83213c
+EBUILD tdiff-0.3.4.ebuild 591 BLAKE2B d493f161dfb306f76e37bbdba7d4e74a88d49dfa0b045f2072723c64d14fce5ee9a277a68010545d72772b1a9fdedb1006d9a7b79bf59ee4ab9d0946c416ca4f SHA512 746facc223f8be9b2cfa6a1ab127554c56a840ebaea01a97edbe5fe7f9b2e62733ab8acc1913229a79942d97638257b064ec3de0dc331bdcff0dd02504c86908
 MISC metadata.xml 342 BLAKE2B 58a84e55bd616d2031be360592c5e32fc734355379c59f76680acfba0727072817d3e7398ff849a50fa908c048c033fc668d008a8d68749be46198f2c6ca0a3d SHA512 c3d93ca88cfee5e58b40fa4f7538883d507ca4f84fa79b529080fed0c67ac23f83cc51524391796e8997b137ffd7c24890eeba7a13d788f24f382253965fd184
diff --git a/dev-ruby/tdiff/tdiff-0.3.4.ebuild b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
index f75642c4a62b..247d4f18ee65 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
@@ -16,6 +16,6 @@ DESCRIPTION="Calculates the differences between two tree-like structures"
 HOMEPAGE="https://github.com/postmodern/tdiff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index b925e9b194f4..f99feae819bc 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,3 +1,3 @@
 DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d040adc33a7f6dc28a25a02231c4c9bd41723c8e1abe6624d4d55375c2a429514a87fa4f7a7a8dcb6377796 SHA512 51923b3bf9d4c05255131be62f567ca21305ba023ea5395a08d6970236b2a2833b058f7b3906046b8a57a224b368de12a6d5e426effca39324670fb632f33b67
-EBUILD temple-0.8.2.ebuild 633 BLAKE2B 9798241eaa6ba0ef66c209bca8d8aeee1afa1fbd61b1d188592da0a93a70b79cd0c19a7d622c4f8412cde814fc8fad3eaff26ed26c118d9ebd12dde54a54bfc8 SHA512 207b9c596fa166e48984d5aa3b0a186d974d920de984e0016d8f308402e3a68511c6bebaa0002ca73a46b886fb9d4ab6096e5cb3f1822c7112d39685e51ba1f1
+EBUILD temple-0.8.2.ebuild 632 BLAKE2B 7e636125c7767839cc239e79ee9e7f004a1f290e44d2f2d1384226e240cedc3ad5fc56b0431db045aa2d6bc6ddddff176e4e8a5a7f0431102e0989eb9acfe04a SHA512 e49f724f95c4913ac3ab71de50d9705fec615b61ddf5402f4b2b861bb8456af4ce5086e79508fd6c15131f590041a8f64cacdd71d987a0930f31ac5104ae73c9
 MISC metadata.xml 340 BLAKE2B a58482ba0cb0351241c6826bb2014b49b554b28625c9f202dff5dd2c877454bee5a2f11c90cf05ca735def15bc9c7b05edab1ab77fa4dd1f2bf0970c1cc49e1a SHA512 ce7b6d2b6cd7c1d004cea2ffba1a8f74fd53afa3886f9fe248e30a066822cbfb0cf0782f8de1404ac11f492e496bf0ce1b4537aae9804108fbccf4e7382e41fa
diff --git a/dev-ruby/temple/temple-0.8.2.ebuild b/dev-ruby/temple/temple-0.8.2.ebuild
index cc39470ef9b8..c33da2fa1b26 100644
--- a/dev-ruby/temple/temple-0.8.2.ebuild
+++ b/dev-ruby/temple/temple-0.8.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/judofyr/temple"
 
 LICENSE="MIT"
 SLOT="0.7"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bacon
diff --git a/dev-ruby/terminal-table/Manifest b/dev-ruby/terminal-table/Manifest
index 593ab21a0685..04c4574754f1 100644
--- a/dev-ruby/terminal-table/Manifest
+++ b/dev-ruby/terminal-table/Manifest
@@ -1,3 +1,5 @@
 DIST terminal-table-1.8.0.tar.gz 13407 BLAKE2B cf1653a18d2b6b72757b149295e01aee83d75241075912d145032e3bc73deb3e33fd00bef033f4bc90dcd51e4bd994b6966805ed7f81833392aba17bbdd7e179 SHA512 4ea4a66e8db384e448d57027e6314f9ce7a0e1511bbfa6e246e26c15a8ff3e44b46c8b6ca03dd521ffdd63b58976d400359131bc1869bf2dc04b3057f399e269
+DIST terminal-table-2.0.0.tar.gz 14286 BLAKE2B aa4e132338a8bbdb8e665584fca947a5b92ee9b8126545b1fffd727d26c7158a9b1cf2959aa917bb93a47e01a4d605ca400d8ddb3be2f73da256ab2f96e91cde SHA512 568542f1fc60cfdb37b14f9d52d6fb6c3ccc36b5c0103c95e3d70fd5e1371c124c97cdea5a4d5a2ec63e34550624b38bd11e0af1073a8eefb3c5fd9eef427576
 EBUILD terminal-table-1.8.0-r2.ebuild 806 BLAKE2B ff2c57cc6196c3926f516cffe98aa18378913b20d21a4d67476ecf34e053a075e6203bb32be9d418298aec69d76b2abb7b3deab5283e0e1a9eb9210a5c890dc1 SHA512 892b3cafd66670498e4195926a601fc9efc814cdb3bcf676fe403331568303661e5a8544a8cfaf5abcfd35fddf29bb419dbcfef5db3aa1475abfdd102d0b8d31
+EBUILD terminal-table-2.0.0.ebuild 806 BLAKE2B 06655fbce9bc9477e1c975ae4026b9bb7e71a766175b7c36a2e3e423922fb7ca548b7ab8307a5966775d15f2aac5acb0995fd3971978fbb82fc13f77645e82b5 SHA512 a6d70d3de81c8253ee2ee43f148932a8f80048fa2f0bf6d709e46c1b82b61cf9aefcd93026cef435c10647c3acf0b80e3e249240856f1cc38414b311d3e561ef
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild b/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild
new file mode 100644
index 000000000000..8e50ad85b62c
--- /dev/null
+++ b/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc Todo.rdoc"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, feature rich ascii table generation library"
+HOMEPAGE="https://github.com/tj/terminal-table"
+SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/unicode-display_width-1.1.1:1"
+
+ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/test-unit-rr/Manifest b/dev-ruby/test-unit-rr/Manifest
index 32b32c7c5fe2..6338e3c71d4f 100644
--- a/dev-ruby/test-unit-rr/Manifest
+++ b/dev-ruby/test-unit-rr/Manifest
@@ -1,3 +1,3 @@
 DIST test-unit-rr-1.0.5.gem 16896 BLAKE2B e9424a29e5f23d11fc9daebe431e49945262633b5c4729a70b59b054e7a9d2373cc86d69dee86a82a39526ce506e21ff63dc0878313c72859cdd5ac28476aa2f SHA512 120c0c6d0b203a40062d61f3b9c915460660d1222b60878eb4bc30111d7aa51ec271d9dba138ba0b91eaa116ab07051323e1de365c6cd21f84c372748f89d36e
-EBUILD test-unit-rr-1.0.5.ebuild 575 BLAKE2B 278e2c73d3076b9e774663d477085d53708b0ffb64fa32090946951328d149d73e2daa651c16e3419a5bf049971c5537f0ca4ba5028320ec5bad9e0aebe36f12 SHA512 c7e7437a40930c18d607cfeeecd08138cd1684035cb3dfff1485943781e4509fca6cef64fe805c74033012e6547e2c890588b48445db3661618b0f598efb6fb4
+EBUILD test-unit-rr-1.0.5.ebuild 574 BLAKE2B bb4ceb8224fcc87608649aa0296baf7461d493632a1974a265c6da925b1b5fd18e4ca4c421feb25910aef2cf054dba24042493aee291927e5bfdbc2a678d97a8 SHA512 8807d99bd56b1550931d063df0867a8c2a6621b49a3b3314bd5678095f9b150056bdd202ca73ea1cabdf7f93284d1cc9f7e9307dc899ed7856da9668384d4078
 MISC metadata.xml 338 BLAKE2B 85bc12a3d50f4734ae4d5188230046205dda2e902291ea368f79a75cdc183f38329fff34b04e3b0455fc8c318c1f3cd3175a596bf93a40338f02ddc71ab7049d SHA512 4bd0e95ac4f05d5671716f6b416de5436728297faae0a32c0d2a4e0ee977066a77f70991de74d8dfe4627a13adecf50683265332023af423e4003250adaa22eb
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
index 5fddd05bd51e..70df1ee3029b 100644
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/test-unit/test-unit-rr"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index dc3722b7de1e..1ce4b23ef62b 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -4,8 +4,10 @@ DIST test-unit-3.3.3.gem 133120 BLAKE2B 37fc200b121e84046d1ee483277fc1274dc3bbcd
 DIST test-unit-3.3.4.gem 133120 BLAKE2B 1f0122ddfd6337a6dcf16c09f294b3632aff6b20491a6d6dd6ebead18570f4db42fcbc656aada7b11a46c0d04c4a1134356db3d101138739973687695221d819 SHA512 f8fb546ab764cc01f374fd387b26c0d49b5a572b4a428be9b7a583c449fcb73d4aa755f6666d16c7a62e24f263f91329e9e9f997646923b38a1e30af1bb3d168
 DIST test-unit-3.3.5.gem 133120 BLAKE2B 8a799d05fc25a11421eb2385b435de5fc53ffdbffb3ee9c3d4761b11f3b40461ef12b4e2a5583d5ae20fc468846b923317a65cbfbded8dc6ddc066764f1cded4 SHA512 eab194e2361b7aa82dbe18d87dd309e81ddb1cb063e289b63a99c4803c0b88d0323a2028afd6585c14e11e458d4cd5ceb67e674bb7d5065d31b91649be2cbd68
 DIST test-unit-3.3.6.gem 133120 BLAKE2B bbe79ee41f1e25b49099eb00c8c72dcdafd1b7cbae723c1b78240da000f433877790549c6b0503f654f28d86c87bb125578a6d87b41e8b0a28caba87dad1477c SHA512 af8a632117410b486920e77a5bf91afb774a548166ca5cdb2bdeac6c995bf2da6206d2b00e6904024e5e9bf0f68edf9872192faa471297e64c5d4bd4c554fae3
+DIST test-unit-3.3.7.gem 121856 BLAKE2B 507c9c538e89156d620b229e0144258def17975d41fa569178bb0c47761d5afdfd6cc8a99e3255e72df7a3eeeb65358faf1ed81571c12242559990762a09f69c SHA512 42419c947433330f06d68a26dc2c5e8309658d75aac44f6e391e02085eae1819937fa3ba86e86231dfca91e8de86252b7bc79dc5ffa1e1fb8b0f0ec9074a0056
 EBUILD test-unit-3.3.3.ebuild 914 BLAKE2B 936f61f48a0e7834cbb578fd0cc2baf81fb4e763fe6f537772407f0944f584ce1cd39b8d343b02fde8c0464fd8874fa688d1deb9ee509a648ebdd38393897079 SHA512 68ce6de330ce5153359b1a5c20ee2f664475dd106720497e24107c91fd27c9de138319c2945b6a2079283d63f05639ad8dc30976a3d40904c85d6274fd222699
 EBUILD test-unit-3.3.4.ebuild 892 BLAKE2B 0467f49d5f710767ca3aea95bf9f3cde4de629e9af0aa4e560e091526cba6351e4758b92a2037edf1a83c560608774b9fc5845e351c6195dcaa3e9610d36eb75 SHA512 f57bc411e36ef2a1c4c6898464b652b0630740a6ba6e40313804f433b81dce32df5ed162f281eec90201e96aef267878a479ebc26a4702082d21624639d77c7e
 EBUILD test-unit-3.3.5.ebuild 892 BLAKE2B 0467f49d5f710767ca3aea95bf9f3cde4de629e9af0aa4e560e091526cba6351e4758b92a2037edf1a83c560608774b9fc5845e351c6195dcaa3e9610d36eb75 SHA512 f57bc411e36ef2a1c4c6898464b652b0630740a6ba6e40313804f433b81dce32df5ed162f281eec90201e96aef267878a479ebc26a4702082d21624639d77c7e
 EBUILD test-unit-3.3.6.ebuild 892 BLAKE2B 0467f49d5f710767ca3aea95bf9f3cde4de629e9af0aa4e560e091526cba6351e4758b92a2037edf1a83c560608774b9fc5845e351c6195dcaa3e9610d36eb75 SHA512 f57bc411e36ef2a1c4c6898464b652b0630740a6ba6e40313804f433b81dce32df5ed162f281eec90201e96aef267878a479ebc26a4702082d21624639d77c7e
+EBUILD test-unit-3.3.7.ebuild 885 BLAKE2B 52b0447dbee3e138c21b56b52c7e7d96dd9574ec01317febf81b5828bed9d25fa74811bbb69564874b8d27dfed85d4aacc1723ee66ef2f289ac98abc5b6c33c3 SHA512 653dbd3768de27e10a5cff789965868101996e1571036772e3a524d694452d87141a187214ac5e4fd4e1e83d0c4f39d0e550b703bd6496ef476b3168f9dc3ca6
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.3.7.ebuild b/dev-ruby/test-unit/test-unit-3.3.7.ebuild
new file mode 100644
index 000000000000..b77e6df078c2
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.3.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+	mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/text/Manifest b/dev-ruby/text/Manifest
index 256cd8b9b7c7..3be2c58c09bc 100644
--- a/dev-ruby/text/Manifest
+++ b/dev-ruby/text/Manifest
@@ -1,3 +1,3 @@
 DIST text-1.3.1.gem 138752 BLAKE2B 19c837d83f72787ef1a70eca74d9b2d2e8336d60eb2dc07578f07fa446919984946b1c2431efcb4a3b29770f77f9eb0ea9a40c8d74dd07972786066b67aa3e2e SHA512 0380fc77e2f0d427afd9015ed904947311139e52adf3d49b748d0e6ee32c579073ec979f0cdbc117b53e3d841f25ce9f271637dd7edb5f6e124e369cca788eb8
-EBUILD text-1.3.1.ebuild 429 BLAKE2B e68f358898739a87b053a379d545f0dc33ebd6dd0432432e92d8777a82911bc1cf0373124355d66882a84b3d142e736e646e7e49bd53adb8048e7bde6ed8c7ef SHA512 972fcbc87840eac94a200bbd06e33b3c2769cedd211142fa70f9d06f335ec7656c12f4c621195499bda9980c21efeea094879cc3c1295ba94686eed9d5347f13
+EBUILD text-1.3.1.ebuild 428 BLAKE2B bc246b519bb67564ec4448f1469a4189cd754ac30886e6b32923acf60d0baffcb791c228465294eddc1a2fe95b00fbc4973addd22f3b802f0dea39540600acde SHA512 ed38bc7876865a1776c4f9ebb059088c0443ac09c564da6c1d4167bf48de4e545d28d3b5845f88588e630d9ad0d713043cc1f6a484c18b31bae57ad65efbe52f
 MISC metadata.xml 343 BLAKE2B 91551aa0c1cc6f29cecfa2861bfd81de4a807b0611051c48695ff417fa32d67af93d1b5b28fc0653d1723886eed0c4b3f818fa5adb55fa43ecf479b21bcad398 SHA512 892628e73011329fa421c9237bd6525b90f548ef98b297b8ca9d2394f6c11f1c2a235b4676fd126722a5381484e8f278f42a8f045e79f6ab251e2dbb16eaba7d
diff --git a/dev-ruby/text/text-1.3.1.ebuild b/dev-ruby/text/text-1.3.1.ebuild
index 5e45be8de074..e4c7abade110 100644
--- a/dev-ruby/text/text-1.3.1.ebuild
+++ b/dev-ruby/text/text-1.3.1.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/threedaymonk/text"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-ruby/thread_order/Manifest b/dev-ruby/thread_order/Manifest
index be86ed48738c..d1369b785d5f 100644
--- a/dev-ruby/thread_order/Manifest
+++ b/dev-ruby/thread_order/Manifest
@@ -1,3 +1,3 @@
 DIST thread_order-1.1.1.gem 10752 BLAKE2B 2d4677fa1f58cad02697d7946ec57080622deea6853b24d176cd3d77d857275d0f7b97a8701620e4afc7c4658de51a889b72fd7755c8edae03e00bf9b9b560ab SHA512 6c6ab86f7d0472d503107a7c58f84f24948e9418b00ad0076be40ac667f97f1cac78b1cc23692e73e37e2b3ebe1e2ea96c1b95c08d97984944860522d278ef25
-EBUILD thread_order-1.1.1.ebuild 815 BLAKE2B 9584ca6668f6a5801145b77f766324d502c650b6bbac42953913ba3a335da91404ed7f8a9d434b64720007263f952d12d4df9e64a95f7c64c3967adf3c9961d6 SHA512 d1651a74f53cc1048cc1d9ff546f296ba0a985caf244ec617d83b6c92bb6c84c33cb5040abca75f7557baff8548368ad3c034d9ede52cb5c3dcce6f1a656bb74
+EBUILD thread_order-1.1.1.ebuild 814 BLAKE2B e651f1bb29c47dc272d51cf143b6550da7f47c4496d08d77c133f6689057c0bedb0ce206b113aae00343734da2caca3322c8e9facaf64ea979397fd8abaabdd7 SHA512 31fbc685bbc65ec8c69662fa3c649ea616011750e50059de362d610a4266f8b90a4a9617fb93f87d05dad2df5bfc42abf6541c516765df3ef56e289e834f6b52
 MISC metadata.xml 348 BLAKE2B 7921753d82a3bf12a78fd7e3d648800083c61fa6297bdb5a415cc7275ac01d14f1ea1ac6b4c470463b30b728f6867a8402f6d0536f439b6caccb6052c423253a SHA512 63fbdf51c3331bbc7294d04f9e2d397791abdbcfb3f193d28824cab257f19db0685f1ea696791f82fa56b3ae76b03dff65d558d0b884d0b8c07d375dadc4a38a
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index 041ca0bc1303..cb59efc53312 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86 ~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 s390 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/tilt/Manifest b/dev-ruby/tilt/Manifest
index ff76d312cc74..cde05be0763a 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,5 +1,5 @@
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
 DIST tilt-2.0.9.gem 55296 BLAKE2B dd181295d2317ef591e9b89a0a4cf29680a05403c89c33680f563459ebbfc675bfaef14c864f8c8834103fc2ea069b33dc928f2b804d911eec21b09427f7c619 SHA512 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42
 EBUILD tilt-2.0.10.ebuild 1613 BLAKE2B ab55bdc9be0434a2d27d1d73b58e2f0ac0cc654d9a3d616362bc1c33b2aaf2ff7fbd7c589e937a08417ebb738008aaa84553a7e18ea67f63774cb948ad03580a SHA512 16b1b7cf32bce0510082705e2e6abfc9d080e55ca9d1b47ee2553f9085424e250ee13e07d08a59f17ccc2ec217af316d4474d0c4e701c9159f54057dfa9839c2
-EBUILD tilt-2.0.9.ebuild 1383 BLAKE2B 758cea59f103dea499f7fa6d66428c62a21ec4e22edf9e070f0079e05ad63e08202b345900f096636c55c63e9ad374f737d44c605fd961b3586168ea28d90e49 SHA512 dffc9cf00a14c4454f560e1e8e8ed6730fad6d31af1e82a8f2c626829fa4c9b4b9f8c7bdc887846f8ea759dae6dafc4e1c19d668f6aacab84517f67834ee4bcc
+EBUILD tilt-2.0.9.ebuild 1382 BLAKE2B a99654c850763fdac83c330df2e1eb7e86631ba6d40e54020230911e4a99c317b2dee93c3657a18aad4e399f9d7c98aa9d68249f35cc516b4111ed823f41e807 SHA512 1c4a798add449a0f18257f72539f1defd05239f6460e72f3dd95ac887edf2ab72a1ea4814fb8abeaee9777a241413b82bf6161b1ec83e8611716ef51aa40d0f0
 MISC metadata.xml 339 BLAKE2B d8712c61994758c250248bbd14842a7b64d7808008e3d18fac9330bdc03dcbc6e721ffbb2cb813dea148036bcc40a60c4d8b1588b937a02712eb65c312ddb2db SHA512 f9ee61c88fa51f3fed6864d91c8f77bdcb492befce86f260a49faf141d6c11fc4563e57e1b35511571ec02a41cdb8f2111bb7ee76474d1bc65d81bbace15b730
diff --git a/dev-ruby/tilt/tilt-2.0.9.ebuild b/dev-ruby/tilt/tilt-2.0.9.ebuild
index 70d268e9a429..038ceb3d55ea 100644
--- a/dev-ruby/tilt/tilt-2.0.9.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.9.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rtomayko/tilt"
 
 LICENSE="MIT"
 SLOT="2"
-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"
+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"
 IUSE=""
 
 # Block on some of the potential test dependencies. These dependencies
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 5766f01cf5e9..bb5b1fa41a71 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,3 +1,5 @@
 DIST timecop-0.9.1.gem 16896 BLAKE2B f4dd9293743f0be4dc5616aae077965a32e348faa7019867d694689b0376c6be06817870842bdcbf5f398ec4814ae1e4f6546c75c95639bbd2cb8021a1dee3f7 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e
-EBUILD timecop-0.9.1.ebuild 987 BLAKE2B 1ca3c6aae362cf818d7a28ab74650d0e224e9fa10c205abf3c643071699fdb3d955bccf3e76b6ad8943b5e953d768febc0bdd6b9dd506f14bb84e5498e0bd9cb SHA512 45c9de9cb0542bd552de17aae43af0a5dc04f1e4eea1b0a195778760547f4e3e40f5b47380286311dc96f4ce48c94de78c23942610c7a4a741c6995b8cb14958
+DIST timecop-0.9.2.gem 17408 BLAKE2B defe09d5ed0a8eae143b17249502ccd2d2c022147f2e579ced45c3497424d66a420b30c11a1e00e321b5f2772c8bc5cd157a5875f8b66e5d102ac84423975dcf SHA512 d54b87c0a9a711e8c287ebd55083a6f87e31d587fbeebbc892a3e76c7d57fe0926e411dfedd0b5edcd357d995b4a6e7b57eef778a8e380a6675497988f97b29d
+EBUILD timecop-0.9.1.ebuild 986 BLAKE2B 05100c23b2e4f0de3621cb2f9ed85fd2b67713fd99e38aefe0336d6044155f59cecd32cfb6b3522f32ed2b24b947fe8b069e37ca6e59911fc238cd94835ab767 SHA512 fc76b8ec285ff8f6631a6b925efb1072df8337402b7f704d50c5fb2fb509afe90dcda5651d1fb50ee0d254c4dbe10897746bc9ec85751244bbdacb61927a5328
+EBUILD timecop-0.9.2.ebuild 987 BLAKE2B c508847e01b835fe7f711eda2c6af446f58b8c991dbeb5fe7cfc4bc386ca8a813feaf269eb02d2191da128e6f122b8f5192390c18655355b29a11b86ba109fdd SHA512 e6ec5e5b3ec4ffb378ce2aed83af45d0dec315ec201a6bb13f555360f05b600c029242aa9e3aac3a273b4fa3b5c22092630c1c75b4a24e51220db1398b1aa0a3
 MISC metadata.xml 343 BLAKE2B 98bc9d7ecd9ac2badbcf92ce7b89b2b4e3798fc284b7dda56b582a0d18f2dfd4dee8b371bbd74e404985e6d370737e5ed746543393408ec60157b8d0b95a7b86 SHA512 1f1d30e9ec8a13854596017fc22a430ad0b34a8d8477804d28906eaa94c294f5cb7e845adff2aa89835681afab48f77b601b5cbff780d00bf0d58959b2ed4fac
diff --git a/dev-ruby/timecop/timecop-0.9.1.ebuild b/dev-ruby/timecop/timecop-0.9.1.ebuild
index 19d7745b7f4e..074dbca94f15 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 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 # Missing testdep activesupport
diff --git a/dev-ruby/timecop/timecop-0.9.2.ebuild b/dev-ruby/timecop/timecop-0.9.2.ebuild
new file mode 100644
index 000000000000..8e2c51757153
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.9.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="https://github.com/travisjeffery/timecop"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Missing testdep activesupport
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
+	sed -i -e '/rubygems/ a\gem "test-unit"' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+	# FIXME after activesupport gained ruby22 support
+	rm test/time_stack_item_test.rb || die
+}
+
+each_ruby_test() {
+	for f in test/*_test.rb ; do
+		${RUBY} -Ilib $f || die
+	done
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index fd4a32d50cfd..52554f27163d 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -2,8 +2,10 @@ DIST tins-1.20.2.gem 305664 BLAKE2B 37d206664077aa1ba8bac395e076b448797c9d73f469
 DIST tins-1.22.2.gem 306688 BLAKE2B c5b0aed29b763d37707de47a57419d9af934a0949417003707fd13a7e9e4a0d82fb905843ceac75a384c6ca9592471c15bc28ea63af4890ce54076f5c2f67d7c SHA512 6b93242d9c63a84de690c381086fd454714cdb0e82ce6eda4deb5d66a8b9ca4bbc5e2c502c258045b06aecb76487eddd019ca267b872717df36cdaf840ae97e7
 DIST tins-1.24.1.gem 306688 BLAKE2B 64020840eca05dc90402310d2f66a8af2a029954ae8f7b37275c257fc402cc7a6c4f75d8a8f506edf49531b6e1d16112db63094f76736e2e3ee213fb88c92b98 SHA512 3df7a43e63f42d48033410affc5b5990864c563c294678b9070bb4dc9c9d47d3783d4e8fc9c4280f6e00304781dae40585df73a8deaac1f228bfc5dadb961b38
 DIST tins-1.25.0.gem 306688 BLAKE2B 1dfbcfeea4fa88d1a227c5b15dce5f8fbf2bdd8b526d6ec6aae14a309bb8267c89e02b861e0f89c6b0f22638cfce5fde53b07f4bc61838530672b6c9dda2b95a SHA512 e8afd89f39647f0722db3128fdb4e826f8beac5f4c081a4fc95c6e8c9a59129f523af81f953dcffd513172c17173c6ffdc0ce2c215b6073c3b94659c998dc3d0
+DIST tins-1.26.0.gem 306688 BLAKE2B 0e3dc0a2493d95d4d32fd0f37c462cf37ad736b186ae5ee421570a9be7b8155b9d7b10d66ec748b22df99eefc31ccd8d1d7c22f8552d1e62a82f94991ee85149 SHA512 adb5e29420d13a0c147262bb4eaf5289c793795ea929a0e4e9e611658bf97e76edfdb008cff657719f497b0b146a23c497c8adb128014fba390389483e533cfd
 EBUILD tins-1.20.2.ebuild 624 BLAKE2B e01cc5c9685cc233eef19fbda20bc71eece5224684868b6e4cb5994b61540e90a8c75dbea2a69186d127fbc98489d08b08a7045941a6dd1002445bce5482974f SHA512 e4da5368edbc0f6efa2c0f6ceeaa26921bc4ac2fe89f8721daa90986b4b4444fc684c1b2ad515274a8110fabce6f89ca243e9400c816bae1d45575eec73fea87
 EBUILD tins-1.22.2.ebuild 598 BLAKE2B e07a09b9a60ff60d623ca8ed3ee86c0053566aff02610271b776aa0c90e78e1d5252e6bcc502cea6b989ec691d50b34fe68d8eb8e12d525a41c60abd6ef95f18 SHA512 1957b049fdef634bb43bdc3b197e5445cf70608dddac80190d1270e991de8eedcb949da4ab209658c96fd5b11b022c198ff37a1a5eed3d183c5f6508c9ead330
 EBUILD tins-1.24.1.ebuild 842 BLAKE2B 8d7a0334cbca086b1c1ffebd2f6ed0db3f302b6a670c6eaf12b21472b91ba4e02b32e9bff0e85f9c10483bdd2429e8e77ce615d572fb45e2309d8c1d6e53ff19 SHA512 8a404b386187e2ac21abb936c31f8d91dfaa282b0bf79fdb7ac7f8999e246fa5e58f46d0111f8c5285b8a983a1757731cf922b515eba34bbf52d586f1a09f8c7
 EBUILD tins-1.25.0.ebuild 849 BLAKE2B 8e2a3dadda4cda9331901acb3483ced17b1c17eaa3d5e46a98aea07203d218d7c0247617f13f1feb6936bb29f02deac44cefe641fa78dc661f3d2b45a86db605 SHA512 ca2cc4214b8c8a4f214c893af129aed0334aa5510bbc34cd3b49adfa31aa862e4f648af7da8eb76253a3c3739dc7760b2317abac53d6316fc07588124e36a114
+EBUILD tins-1.26.0.ebuild 842 BLAKE2B d52c83625b5dd10d7bfe866c252f1ec68254c170a50760f389008239171336e7ac8f5bf525067bba025d40765ac99fdf71726f691b78c88b81b3175d2af262d5 SHA512 db5fa43ec2f62233406e94b821b948d168e5d1ecea5253358adefab192f972577a231a923bdcfc8ddf7ca245b45e1733dcda7adc9f2436d01f555dbe14d4593e
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.26.0.ebuild b/dev-ruby/tins/tins-1.26.0.ebuild
new file mode 100644
index 000000000000..6b8cb7458da3
--- /dev/null
+++ b/dev-ruby/tins/tins-1.26.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Earlier versions of ruby bundled this dependency
+USE_RUBY="ruby26 ruby27" ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby24|*ruby25)
+			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index b9b63b6e0ae3..9624d82e741e 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1,3 +1,5 @@
+DIST travis-1.10.0.gem 197632 BLAKE2B 0639f797789d1676f71b6354ed77e3e403865cca37e5e04c62e4cfd40d44e26e8e93ea0dbf39843811cccb7960e43b186d61d64f681d2eafe95de890d9fd66a7 SHA512 025e8cdf48100ff20d85925a6285993bda0d1651e145d554c2ec987c4557e2d3bc49da6529af4c577fcd9b88600549b3c12cff49b824d7fcb93a96a0c572603c
 DIST travis-1.9.1.gem 198144 BLAKE2B f207b99bd2bc044ddfedf15a4ce5d35fffa77d8a07504f0122fc1463a441bfa33de40b9dad67490bc44a69aa2ce6e7307bda4df11491015b4c5c81d9fb2daa67 SHA512 1489a1378fcbfcd70ce48f1f7b00bbc457503eabf192bd76feaf9896c63ef6ea77c67c077c8c940b11f6c11cf9b28b752db309b060727e1dc36b1ef1b5b4b514
+EBUILD travis-1.10.0.ebuild 1334 BLAKE2B fc7bfc16ef2cfd2e2486587551e61ec65d1e5c0ef805b2846dee12d7d10ec65765f9532a14de404c283a319fbb11768621dc23222edd5b4bf5e8ff1dde04528d SHA512 3ab822483380f383acfc9f6a6330b6be2db3b3edbee908046cfacb292065c882eb89c4518804a5a8f9ff6288e5caf8ca37b54a7da442ae3bfe2447393372b14b
 EBUILD travis-1.9.1.ebuild 1283 BLAKE2B cfb5fa91831515f6fcb9322bff6130db7b35bcc2421c917b792065537262ea0dd4850cd30f085267b86a72d8542272519f3c4a084eabb4abeddd4650e18f7b6e SHA512 236a0982a493c8fde6f9bf6ecbbddf3cc69534d75ae2c62f83a1ae51fe6cb1d7438ff7acb9774ece62b320e46b17bea17d5421f15cd79026ad74abdfddfd6a73
 MISC metadata.xml 335 BLAKE2B 028a3eb98175d899ca2cb4412a35af5c9d9e1dbe43a1065346c7a529087790e3e3482fe7aa489ee4803f7ddff115bb654c62d865957fe80cce7952d316e7bb30 SHA512 2706c228bc0da2e813ab70918226cf82561b8f3f7c186ce5c97a7d74237e2448029bc0ee74b18295996a0c3d09107e7453cfff8257aff91def14ef30468919fa
diff --git a/dev-ruby/travis/travis-1.10.0.ebuild b/dev-ruby/travis/travis-1.10.0.ebuild
new file mode 100644
index 000000000000..754de9bbe9ec
--- /dev/null
+++ b/dev-ruby/travis/travis-1.10.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Travis CI Client (CLI and Ruby library)"
+HOMEPAGE="https://github.com/travis-ci/travis.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+#RESTRICT="test"
+
+DEPEND+="test? ( dev-vcs/git )"
+RDEPEND+="dev-vcs/git"
+
+ruby_add_bdepend "
+	test? ( >dev-ruby/rack-test-0.6 dev-ruby/rspec-its )
+	>dev-ruby/sinatra-1.3
+"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
+	>=dev-ruby/gh-0.17
+	dev-ruby/highline:2
+	>=dev-ruby/json-2.3:2
+	>=dev-ruby/launchy-2.1
+	>dev-ruby/pusher-client-0.4
+	dev-ruby/typhoeus:0
+"
+
+all_ruby_prepare() {
+	if use test ; then
+		git init --quiet . || die
+		git remote add origin "${HOMEPAGE}" || die
+		touch .travis.yml || die
+	fi
+
+	# Remove failing spec where cause is not fully clear.
+	# May be related to highline compatibility issues.
+	rm spec/cli/login_spec.rb || die
+
+	# Remove failing specs where $params keys are reset somewhere.
+	rm -f spec/cli/{cancel,restart}_spec.rb || die
+
+	sed -i -e 's/json_pure/json/' ../metadata || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp "assets/travis.sh" "travis"
+}
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index e6ab5510a0ac..d43d8361f1ee 100644
--- a/dev-ruby/tty-color/Manifest
+++ b/dev-ruby/tty-color/Manifest
@@ -1,5 +1,7 @@
 DIST tty-color-0.4.3.gem 11776 BLAKE2B 4e51a41fb97b343c22a6ae832a449905fc215b7e218a31c993a47c66c66c049f70ce0da163d27f593309c6e49c014badc378ea89dec42c94ce6ba9e088798952 SHA512 4447c02f9b738f4fbecc14149d6c09da2da36c489d118f7d18b85f48b9c22b7939e5c62a32048f1a0c958533be15ead3952c72ea03fd1d06b23b1ed29beadcd8
 DIST tty-color-0.5.2.tar.gz 11437 BLAKE2B a123a46f855a3c5b2c56b658ba9dd1987ce2e72684cfd2e673337de1ab802d28ae00fd9c5e761014314999c5590e2466a32c64a1b094dcfc3101a3754458ea10 SHA512 767566786d1d676bd1571f2cc040107ffc9532219bcff594acaac9ccf972d335cbb1838017e23fa3e32264e9e48f57b818690747e617851c43b3f7e37d2648eb
+DIST tty-color-0.6.0.tar.gz 12298 BLAKE2B c6d86666cbc8b46f2e5ef37556457bcffd4a92c65ae6a281ad989ded3d89ded8e3e3f5a1a3f91b009b7acdad9f2697d7100239c13eece4d2222c1fe1e8c2c2d0 SHA512 ab4f550ccf8fdc2cd0ad9368948819e4b77473a087510a4853036f18cfb21bab89e36631372cc5f2ee4f5d44c8c84954d14956d7cb7c3050e58d1ce19d11754f
 EBUILD tty-color-0.4.3.ebuild 484 BLAKE2B ba416a8188443ed245feb6221a9f435069a65b438161e8300d08fc1e89e9b493ecc249589a186cbcaae053c35b4163aec73f827c01715bd03d49478c64eb8c3b SHA512 969675656462ec45b6dd49c488105bb7cf49e1a9b9ba5f1176b77062cffc44d89083637bccbf30cfd81f950ed59d8232512616c44c7a076c3a40f22503c7ec12
 EBUILD tty-color-0.5.2.ebuild 687 BLAKE2B 12658021e4a706497ac52515821e3453758c805b6ce2c6ec85d101a88e58ab48561bbc3764c745d982f3c3a7cebadf00a8a4dcce30aa900c5fd385805b5f9e50 SHA512 659dc635732228bf4b8d9e39ece4bee5c6a16d741589836e88337b291406550237aa53a90b58f84bde3faf82cb07c378d057928d3fce7c9d7038a7eb93aa065d
+EBUILD tty-color-0.6.0.ebuild 687 BLAKE2B 12658021e4a706497ac52515821e3453758c805b6ce2c6ec85d101a88e58ab48561bbc3764c745d982f3c3a7cebadf00a8a4dcce30aa900c5fd385805b5f9e50 SHA512 659dc635732228bf4b8d9e39ece4bee5c6a16d741589836e88337b291406550237aa53a90b58f84bde3faf82cb07c378d057928d3fce7c9d7038a7eb93aa065d
 MISC metadata.xml 337 BLAKE2B 65d689f4ae586a7f5eec89aa37ada3cf2d50858b0c206895f8f40e12f5ab642b82e25d140f80a3c546646ef6ef3d2030c5686b9e61a3775d7287b76e571aeb98 SHA512 1c18fad39587e39a56eb9f8627704924a152d4c6d6d66ac27822583d7d81096c4ec1b109a90d7b4b77ce5909cee3fd08c677ba01a2aff42e037c589532a16885
diff --git a/dev-ruby/tty-color/tty-color-0.6.0.ebuild b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
new file mode 100644
index 000000000000..26f62942b75c
--- /dev/null
+++ b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="tty-color.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal color capabilities detection"
+HOMEPAGE="https://github.com/piotrmurach/tty-color"
+SRC_URI="https://github.com/piotrmurach/tty-color/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+
+	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tty-command/Manifest b/dev-ruby/tty-command/Manifest
index 1df254542fe0..d3d280952ecc 100644
--- a/dev-ruby/tty-command/Manifest
+++ b/dev-ruby/tty-command/Manifest
@@ -1,3 +1,5 @@
+DIST tty-command-0.10.0.tar.gz 31592 BLAKE2B 34bb5a926ad32b236585a3e0d5bcfebc6a7d8b3ab3c63e60db30441f6f66b757260b35b40fe5e22ec96162253716d27111c0def59133e80c9dabbaf5f87f68da SHA512 5397f154603b1516be717ac35665623292d1454c18824cc688227f998c8d14e0744fc143e29dd93e737ae78f1800a1e5812ed6cbacb0df6ac4db28b2f096fcde
 DIST tty-command-0.9.0.tar.gz 30463 BLAKE2B fc0436a80b4b73040a89f085315f50e464efd91d6ee222f7b94eec5b94700089ae22963580febf8296377c859c67f1f21772ecd24d325af76308183df6070e2a SHA512 12c5c238ea34b7236b1c1b3115a7f490ae3986de686359ed390428f766aabdb35de7a1b29363b5be4e09e0fb6888b0c8a30eb466153f64b1d8a77620a657ffac
+EBUILD tty-command-0.10.0.ebuild 717 BLAKE2B 2f73b05720fd1a712cead3132c7c7a23a41e47782fb239d25bf170f560810a11e2c439050f0ee4a85cd69c0a3f8c666b0ea7e470aa202c7ba16bd323160ce17c SHA512 b0c1c88ca136e4c4d408792a3fca7c8b677697eed0af2d4795f6c8180dc54fe7d0a2309d3a21ce2eeb92c5685e998d132211bfffdef2f83d189bb56b5dc8d82c
 EBUILD tty-command-0.9.0.ebuild 650 BLAKE2B ffcf3580c5547c80cbce0cda9f26aa8c169c712d00a1c6fa283fe19a8b977bc41bea18a800d1cdd701497e9e96d9a7c4299676eea45a1fe8690825ef8cc67e1c SHA512 d6fdd92c8a3ff6b4b291029d3130c0325ffc139e6144086cf829d7e60b39a452f550c63bb14564efab6b4ef1a91b4a3e0effc6e6cbcce9a17000088d8c497933
 MISC metadata.xml 339 BLAKE2B ee77cccbd6cbd65ca83cbca745047dd8ee4d0ec6e955cbc2238b0d403c9c65815ceda7737f70f05a6f01305639b13cb339509a03a7ccf93cde1c643850cc8472 SHA512 1d76e3ee88423ffcc2902c658e434afc2d6a42464f98a651a563441b76d5a236072f4324d7a2f7fe67e6061c6d4ae9cee00af26e1e7519d4ac428e07f11d3c03
diff --git a/dev-ruby/tty-command/tty-command-0.10.0.ebuild b/dev-ruby/tty-command/tty-command-0.10.0.ebuild
new file mode 100644
index 000000000000..861340515246
--- /dev/null
+++ b/dev-ruby/tty-command/tty-command-0.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal color capabilities detection"
+HOMEPAGE="https://github.com/piotrmurach/tty-command"
+SRC_URI="https://github.com/piotrmurach/tty-command/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/pastel-0.8:0"
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index ecdade7d1625..bb57bab419f8 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -1,5 +1,3 @@
-DIST twitter-6.2.0.tar.gz 519470 BLAKE2B 4c3d929d8706845610b31c8ae702563d0330a95a165e417b77ecfd894b1f216100678c9862856c3c450952e3025940a701d96f0aeb1b29de55e612c6c69ab231 SHA512 5d2bd653233f285e0c08503031317a966ec098e9b302f9e0c65bdbf4632465988b1139719dae1cabb856b08200fc7793cd341fd926981484cf416a01f309d242
 DIST twitter-7.0.0.tar.gz 831181 BLAKE2B aeb888bf1551116916cc10a4c0278dcee541e953c6e1be09bd95f348b8a2a08075d44c4b8beb736b13564d550b5797184c725141c5c3866f5423afddfdfbea19 SHA512 4b0f831ddb1f54fc5894a15010d17b54c62f6caa3eadd6a1f0e0ef37235f29f53f6315c49213244d79ab3708d5a7b1e1b9735d1f35fa291a66d439db916d3ec7
-EBUILD twitter-6.2.0.ebuild 1459 BLAKE2B ee25987ddef02c3f3a47d7546a0ed64a0da08fa67d81aa8d25d95352b8683db44f3c3d775a408d26c7deaf57087745dafca8dbac16b49ad7738e278b3f88f52b SHA512 6a1b406613a783379df2b5619a1bd91c3876993567b6ac54380aa73efb7a3b694fd7ca82af6fb2ffcd9ef4dc46d8d932ef6c46bc0b3aed9ecd7bc2f9103bad81
 EBUILD twitter-7.0.0.ebuild 1386 BLAKE2B 1e7b27a1e9c6a93ee3ef96f940c5e0557f2d55f9ebaa4ec6a6478b0e0465456458621c866d34d140f6db8957dea1c07f0c2db162aec5e922395858c38085cdb4 SHA512 039c23cec22655ba1680bfc6cb99ec6e0f02f694477d9f96bf449dbfe2c8dada7e47c1765514312347fdbacacb94f7af00527e26cc565f8819c8b47f3b2637bf
 MISC metadata.xml 340 BLAKE2B a354a967597b16b9fa93b1f41274674bd913c39321768b19ae9cf81937e53eab05bf616bcde5b375bdd2de0e91f141edc6def3d60d3d7f75732875c529d2e153 SHA512 504babcfb5a3f49934a8eb1107a5777206c134e5f39d96badd9333c57909e2e378dfa1d88dc49c945a9c5cdcf59406f7e6658c177098fde1cd2c12314f9ca239
diff --git a/dev-ruby/twitter/twitter-6.2.0.ebuild b/dev-ruby/twitter/twitter-6.2.0.ebuild
deleted file mode 100644
index d0bacd4583fa..000000000000
--- a/dev-ruby/twitter/twitter-6.2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="twitter.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper around the Twitter API"
-HOMEPAGE="https://sferik.github.com/twitter/"
-SRC_URI="https://github.com/sferik/twitter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/buftok-0.2.0
-	>=dev-ruby/equalizer-0.0.11
-	=dev-ruby/equalizer-0.0*
-	dev-ruby/http:3
-	dev-ruby/http-form_data:2
-	>=dev-ruby/http_parser_rb-0.6.0
-	>=dev-ruby/memoizable-0.4.2
-	=dev-ruby/multipart-post-2*
-	>=dev-ruby/naught-1.1
-	=dev-ruby/simple_oauth-0.3*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/webmock:3
-	>=dev-ruby/timecop-0.6.1
-	)
-	doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	#sed -i -e '/equalizer/ s/0.0.10/~>0.0.10/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-#	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die "Unable to remove bundler code."
-
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "webmock", "~>3.0"' spec/helper.rb || die
-
-	# Avoid a spec that fails due to changes in dependencies.
-	sed -i -e '/#reverse_token/,/^  end/ s:^:#:' \
-		spec/twitter/rest/oauth_spec.rb
-}
-
-each_ruby_test() {
-	CI=true RSPEC_VERSION=3 ruby-ng_rspec || die
-}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 3079679632cf..6dcf7126f47a 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,7 +1,11 @@
 DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb043fe58063cccccb623b502e026a71faef4f7d7efe75eae2fdfd0bf3e0b97a3763fec9a1018f0c6c2ae0f SHA512 87f7cd66d6e80d51d216cb993cc76fe7758db03ffd39dde96eb24a9d208699766a8dbff048485fb732ce125ee9f971e38ed9ee1197f3ee3fc3ee8a8da840dd45
 DIST tzinfo-1.2.7.gem 156672 BLAKE2B c1b52d2ac03fa9d11b68579931991887f566e3cb269bb5eb8b66c3a636decedc99b1729504c6941b260af9415815f5098fb3bba29ac7585da1497eb0fa7efba7 SHA512 dc8d45b09e4f77e5b6f17c9f707932554fc8be8029a9641d82cb8229d764c35522b2d20cc34d50a52835d148135e39a0dc91a7c2bac3eb5077057ac06d67f3bd
+DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f2658052a70fff8d0571bfae03ee212b26d277c6b5050943f6117b5d8ce7c2ce5c5ab6891a1b8e9212bf7ded SHA512 5573b252d91a77b1e1ace2d2ccf48f7dd9bfb79b8b0b15ba2e8757e5fdcb9cbc044abdcf82beacffa284fc57ded2b579feccc393331f0f5a680e5f5c6275b62a
 DIST tzinfo-2.0.2.tar.gz 213501 BLAKE2B 7886ba84257b85104073445d0948fd5f58985fa0f5f85c1ec15978c6f497fffb9bd997a0bae1313d697115c487c069dda1b7e5dd4ec2c7580951d0a8ddf8d623 SHA512 a0c71dd9299e84bd71a91858ba8c12a0ba00c625219da1172d5cd1dfd35318ce8a83e59f45489c2ed5161761e1c39834ba63dbfa189acb100ba37ceae842668d
+DIST tzinfo-2.0.3.tar.gz 223942 BLAKE2B 975c2278ba86c7aaf11cb870b12fa41a9fb3eb8b8b87628bcb0b09f54d7f2490b2d9864dd411f646f20c3760ed0949a8ee4266c28a6b0607927e9807743a9f13 SHA512 c9e94af668217226533d2810b647cc7a0d0a553177ab9c4102e5676fa21d4384e833c887f5cb3f9c00cf738763dcd39b25d991483641426c407237938e076adf
 EBUILD tzinfo-1.2.5.ebuild 1061 BLAKE2B 27032d7fef1d0e7405fb48ae19aa59627a2a6ce6bdfcfaf784a56cf2af04ecd7b6267fe08309311de573dd4a4a58c6f210acd5c501f1665f7e2e03777fc8a148 SHA512 228555b2f7677a4ba855162d8ffc0005454a5c59edebcd1dbf2cf9e6ce49da747d26a000e6db4a98d99e4c187923b74d7ec4602fc8c1c953e629ce9c1538af3d
 EBUILD tzinfo-1.2.7.ebuild 1041 BLAKE2B ff9248b33054054ad5a24df6df40456ee4c47f985dfb2450e10117c612fc1680a0523021a71e41da676d8161257a0c4f6dd7b88108eaac9163a3ff8835d93e4d SHA512 909f0fe46a327691056eefefc5ee0a40f360e308eedf14336c57c0980b381325dffc5a26f8f5418864e3e7e5def53154a473560a79a83c753e10306dfa8e076e
+EBUILD tzinfo-1.2.8.ebuild 1034 BLAKE2B f2057fb51267ed0884ca73e288d8f51710f13a3fe2d51b9a64f8a6172d50cb0d3ebd0da2ba3830ffacda63db7e72ea77e69e38353485b2908fb312734f611bd2 SHA512 7df0b6b03ba279768f1c36e0ca57029e5fe7d28754c1cd470ae4595a16647852b3399f9f3fb6fb2cfdf9c74bc7bbd237d7cc4dcdccc81fa1e107210f5ca0ec6d
 EBUILD tzinfo-2.0.2.ebuild 1436 BLAKE2B 46069296c733f7968826499a3f03155ac027185e9961993ec49ab20e3d79b74c694a2f7a5b005285a6a4c18cd1aaec6f12a1d172a21679290a6956b053b7d446 SHA512 cdc9d83064ea1929179081f6849e1c857e9ce5db2209ff7b5c6c9faf6415b0d7f8cf754e0f205baa422e20af44b02b9e44e29bedd827f59bc4fe8f642bcc6b2b
+EBUILD tzinfo-2.0.3.ebuild 1429 BLAKE2B 3d67d2dfba06ecb16f5ccfa9eb58e74bc4eba774dee00fec47e512c29f7c8e8e8e0d00ca3a50555f2dba9c2284fff18827cb3766b11fcb8789d1a05528f8edd7 SHA512 a6dfec51ef0fdcf46e1904698cd3acaea952cf56e6f179cfa8b862c84be641cea807ba33f4eda1df6b78407c8b95f52d9d9ee7e635fddc9a31dc4525de2ceade
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
new file mode 100644
index 000000000000..516750d24591
--- /dev/null
+++ b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Daylight-savings aware timezone library"
+HOMEPAGE="https://tzinfo.github.io/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/timezone-data"
+DEPEND="test? ( sys-libs/timezone-data )"
+
+ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Avoid taint tests that throw SecurityErrors on newer ruby versions.
+	sed -i -e '/_info_tainted/askip"SecurityError"' test/tc_ruby_data_source.rb || die
+}
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild
new file mode 100644
index 000000000000..f95e0c59ce27
--- /dev/null
+++ b/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="tzinfo.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Daylight-savings aware timezone library"
+HOMEPAGE="https://tzinfo.github.io/"
+SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/timezone-data"
+DEPEND="test? ( sys-libs/timezone-data )"
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Skip safe tests since we cannot guarantee the correct permissions
+	# on directories for it to pass.
+	sed -e '/safe_test/askip "does not pass in gentoo test environment"' -i test/test_utils.rb || die
+
+	# Loosen test dependencies
+	sed -e '/rake/ s/12.2.1/12.2/' \
+		-e '/simplecov/d' \
+		-i Gemfile || die
+	sed -e '/TEST_COVERAGE/d' -i Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/unindent/Manifest b/dev-ruby/unindent/Manifest
index 7b15e027a14d..16dafc542630 100644
--- a/dev-ruby/unindent/Manifest
+++ b/dev-ruby/unindent/Manifest
@@ -1,3 +1,3 @@
 DIST unindent-1.0.gem 6144 BLAKE2B 8720a1f6aca7da8cc8659f5a3943e9e56d15f9349efdd622857bbeffc39b04b61beb2b72a9cd337d516db2fbefd7aae02827b6705a81622ca5904dcdcc7575ad SHA512 1bab3352fc8da8b8a3ade8dff2f7c565e36529a79ca68c0a1ca73cdeca93fa507baa9399c6eed4fa020aa74dea6c4260a0242fa8057931a90bc172f138a5e655
-EBUILD unindent-1.0.ebuild 533 BLAKE2B 970e8b06db837dcdf6b89729103442745fed0f3b1fa5af8799babee46813f131c9938ce1b8c6e83cd9999b3cdb4ddd9c6d89be5392e94ce5cbab92427bb923d0 SHA512 e290027c0b1019c0cde15c6b52abfe9eefcd9a3aa7bb4f65c5db37eba8834f273e759a6e28017527f8dfca483867c4e84927080439c66b62dd1796e67140409d
+EBUILD unindent-1.0.ebuild 532 BLAKE2B 1ec8c9fc3226d4b75489cd7872d5a642b132ab2c1dd4dc323a4d69a3aee004ece91121f7c899f330c543c16fb8cd1dc558f1673e1e672798192c0c7b40d62203 SHA512 c99a0c6ecd2d1fcf01901de237e6d721ed010401238b4acc74c5b18e495e92554f4f4a60686b337dcdfa51cc9bc5e3ae2ba0fa620200b1f19df185b36128aa0b
 MISC metadata.xml 341 BLAKE2B b95139c053f991f2430ac53d70f116c8d70757162b4bdd246283cd3e477afc58c0bb9ce2de89cdf27a7f54148f4958920b04a5066522a7f628a062a81f4bf033 SHA512 41d29de1617293949f2df18b503f931818137f002639578a75b7b6254d78f47d5b56f08ac028c37b3d399dfd8a1d63b2d3f40e22452f9a7ec8beb61c52d88e21
diff --git a/dev-ruby/unindent/unindent-1.0.ebuild b/dev-ruby/unindent/unindent-1.0.ebuild
index 7718c3be5ef4..bb9324328693 100644
--- a/dev-ruby/unindent/unindent-1.0.ebuild
+++ b/dev-ruby/unindent/unindent-1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Ruby method to unindent strings"
 HOMEPAGE="https://github.com/mynyml/unindent"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/vcard/Manifest b/dev-ruby/vcard/Manifest
index bb2bf1466b3d..132b4e120a60 100644
--- a/dev-ruby/vcard/Manifest
+++ b/dev-ruby/vcard/Manifest
@@ -1,3 +1,5 @@
 DIST vcard-0.2.16.gem 52224 BLAKE2B b8ee48d597e00fad376d632813fba61a22ae5b6b16ce3fc9c7b79839fd2f0d0f87b8bede3d3f6ebd41bb205a222fde540f4d3c46fcef8eb9b5a014ce8abf14da SHA512 33c8183d05b160e65a89747587f174dfa91b299c178c265645d271b54506734e818e3d3ac51a5b20fcddbc489b9ff910e321e5a1160f7b6254bc16faa185634b
+DIST vcard-0.3.0.gem 54272 BLAKE2B ed019b7f771dbe2da574fc059dacdc8eb5b5eca735abe15c2d8aec08b4f91b22c413f317d4f39f100bc78d16bf8e3edf0e0a99d55b8fbdda5b47315bc33d37b1 SHA512 5b54bada881f4d6cce66bb76c15b3594e310659024d163598f857c4c434379c57e07f28873646d0a5a5aecef4313c8fc731313e80df5542e982f333c05802d4d
 EBUILD vcard-0.2.16.ebuild 591 BLAKE2B 0e39e04e8bfd82f67653609e50044cc8bf51a4fcfa95b915d34287b7436e3b9e201a8fb9ca5f9fd198c4ff220db2f0eaa756d5b608cf8de1339ae6879734ea80 SHA512 1d9e39c12713153893dd6273d5cd8f9172c3d8a32ab29505561dcfdb1b3d2957797ff15f0857a6b6bfe9aff581e6a4f6c3687d47fcdcde08d76896d5affffce4
+EBUILD vcard-0.3.0.ebuild 584 BLAKE2B 88d67fc0a866f92e9659e6a260679fe2f17fa4b1b2bd3cb1803d16879620c0b2ecf0b4b87807371df626bdf7f04b384677935218d92c052c1ed742e44be9ec18 SHA512 0d7e754ddacc0b0022e62a675232f57423547071477fd137676d6a2d9bd701f365fe163a57dd99a9b4ce6c452897fc0253ae1b4db6a1326d8c2b6363b8d9c86d
 MISC metadata.xml 451 BLAKE2B ec59cfbfdc28cd790fba6719deba4994e01d341432c8adf7f02ab787f7f0727cc457ad00ebecb6fcf186e17dd57e783083ac59760065fed9518ac75cd2d078b1 SHA512 1a65f9f7236506f7d781a4eac82c69d06c769273e3eb906e73c953b2b9a627419207f8dd9def143e4514025e795bf7d517e41febdb8809f0caedd2fd741c3a1d
diff --git a/dev-ruby/vcard/vcard-0.3.0.ebuild b/dev-ruby/vcard/vcard-0.3.0.ebuild
new file mode 100644
index 000000000000..8c9fdf412fbb
--- /dev/null
+++ b/dev-ruby/vcard/vcard-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+RUBY_FAKEGEM_RECIPE_DOC=none
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby vcard support extracted from Vpim"
+HOMEPAGE="https://github.com/qoobaa/vcard"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 --load-path=lib --pattern='.*_test\.rb' test/
+}
diff --git a/dev-ruby/xml-simple/Manifest b/dev-ruby/xml-simple/Manifest
index 89400c9d3e66..42474262ec6c 100644
--- a/dev-ruby/xml-simple/Manifest
+++ b/dev-ruby/xml-simple/Manifest
@@ -1,3 +1,3 @@
 DIST xml-simple-1.1.5.tar.gz 126288 BLAKE2B 0fb7f8cebee23e422d2941de790426e494bce51af90cda8a3b7f3b27129f6272aa277a80fce004aca2658d5ae5f62b7aa9f251b53839d14e6d5b7f5a33b819af SHA512 df81a05a0c32141cb5a0328fb782292438ec3ad6037c150e2ff4fee07b65ba9a739987f25f28c196ff8565af53c62120c3a729820a94dd3da0551fe43948f9a3
-EBUILD xml-simple-1.1.5.ebuild 647 BLAKE2B cd65f4117e2898888ca3c41c7045c77a377a12f5779ee10711f2ce8e124fd5b249fd17ec2a370df524136ff3d65b3963572d1bb78b024782826c197712f50da1 SHA512 b9900fb3b62717f4cdb53730b746728a14a642e0209c19b10123a59102224aa0f44fecd0b744a6626e9b4cff594f92e969cfe1d05126b28302e5f29563f42977
+EBUILD xml-simple-1.1.5.ebuild 654 BLAKE2B 83be16130e8dad62f7501baa7e1b3036f03b74a9000d56d133046a42799b875f047db8f53d76b9b22196c11242cdad4793783e9bd47e9c65c372ae497d34dac5 SHA512 217962ab9437b010ae603f952dd5abf3117137585602fa1f47c1dd52b86ddac9d5ef318695b77f1de46cb933977f253c3ff4d688bff820ad684fb7c7d18cc7c9
 MISC metadata.xml 341 BLAKE2B 0a68913e95e2a3d74b65bb6cb19bd59f0e9c6c7a074e653ab420f641441c27c24f3932a03a279242ef43d718084db94ab3ba23bc101c11a0aae3fbe57e9a5acf SHA512 db7faacf3407eaac7956d64cbe073e4a86a040af4ecf275c47cd532fae8f9331710cb8da857a6feb2d8bf58570ce6f633414790c2a5f7df268382db539987177
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
index ca2221d80898..c5cdea10afcb 100644
--- a/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
+++ b/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/maik/xml-simple"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 9760ffa65cad..f021d5d3fe9a 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,3 +1,5 @@
 DIST xmlrpc-0.3.0.tar.gz 34157 BLAKE2B 862bff09fdd7febfd85ef4fde77a913b77f20024692b1475994b93b394d587f1b2139c82ed7159cc756bd1757ee2fee55f103866c52d4297d8a38be70c066c22 SHA512 370b2fe2ed9ca37fbbc2e85d08328450671019a2dc0c2a31ecf8fc8af95105ccf1b8f728307a5d9cf5f4dbcd93ccfb2f66244b441c0aea1cd1aaca2e820dfe31
+DIST xmlrpc-0.3.1.tar.gz 34720 BLAKE2B 452640d82bd93568a3d36235a1f86f4d2be85b47022d269131daac4e12e759bf1129fc46293f3f4408cefeacad87214d1e34da1b3e3421638e5609659afb7586 SHA512 df47968288592aba4093b8c4d19ea86d6171c1f2cb10ab7b9a03fccc8ed65a9aec35908d831a281970e75becc7feff7242f9fc3ca5b64a54ffb56a717bccbdf3
 EBUILD xmlrpc-0.3.0.ebuild 962 BLAKE2B 9249e6c87e76c5904f5237c63c6ec3f46531ac3f051de2f5b66c559062ac4d5f1803f018cc8f36e4163f84099169ac4b84f862a16c889a98a58eec09f0516871 SHA512 5f4d98b14693000f08c88cc3c86b1351a3704c641da32d537a3319c3427d345492adb4e7aa8e3cd68b053e02f018e0e2f2ea9ffa86f38a10dfef06b7c3f9957b
+EBUILD xmlrpc-0.3.1.ebuild 933 BLAKE2B f6117577717dc1f1bf37357158a189eaa4beda51e5890a3c996d6623d91d99633b66da9927a38eb0ece4160e82c9cdee1e169b2231ed9e90115df5ae38d2247f SHA512 c97c48d284a5e98de67be47409cba27a9e9cebbbc17174a6c2fa264598d7bd4a0d8986d3ac11a67a819d87855125aab98749c8f65032d73e697d9c26a62a4795
 MISC metadata.xml 337 BLAKE2B e45e1b70e063e5f33759c32c987c2afee3283a31fddf4eec4a44c317f65a68926a84af12c5ab9a72e5315033593105dc95d1919fce3de684593755078246ef71 SHA512 94f995e14666100fd2f0e569f01bfcc86cfa319c213f0fb99e7fe104bc9b731dbd06e4e35cb76d94b126b296e1a5b916b4940c59f251a899781357f587f9be14
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild
new file mode 100644
index 000000000000..583a976a94e5
--- /dev/null
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP"
+HOMEPAGE="https://github.com/ruby/xmlrpc"
+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 ~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"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 7d38df0f6a90..e4f8f1e77486 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5
-EBUILD yajl-ruby-1.4.1.ebuild 1229 BLAKE2B 2e7e8a6702fc4865900759346f03cbedca3156dd2b2ed50c79f02cc01a1b5ddd790fd0f02ce7114156af7c65f11255a8d986b36e79fdfea19d76fa40f39aad6b SHA512 1290c4e3b8e8779e1ee3cf5102795c0828e41d9b48301975af564283f8c953fb2a0c74f32862e3f6609410397650aed3e333bce08180bb7b3751705735099bc0
+EBUILD yajl-ruby-1.4.1.ebuild 1228 BLAKE2B 41fdb7fa157e611d50d582e8d7ed3bf25433eb545a7cd546219fe942b5a1f862a5f45f27a262ce117ba0fcf757ea929bc1d4da94ed119241b6bfaa227eabf1d0 SHA512 1d46f6b2211adf43bd00386912dab2cfe79a780f191f07bdc23f5dbc3f46e64be87d151353d672800159045f3f8d88cc7d3291ac5a6cb5f3f1f43546a1bfdc75
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
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 d795e0f61cbe..9b65c9598c09 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="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~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 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/Manifest b/dev-ruby/yard/Manifest
index 6c025822600a..2dede4d9932c 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,5 @@
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
-DIST yard-0.9.24-git.tgz 928072 BLAKE2B 33d0c3c0931b1234814651eaee674cbb18722b15674575860b57c2c7992d160ffe8606290a2c887e61dcf095230a8d98abaa2ac41c92a761272d64ddeacced9e SHA512 cf7f5973e03562c7081b7c213c6dffc01afdc1207f79f52fd51f7e6fd917cdc13e6b5b6e89c93dbe3c05338e3a1418e7c6e8d617e96613b8156b95868b60ce11
 DIST yard-0.9.25-git.tgz 930253 BLAKE2B 35531a7e90ab99bad8d236ea4774a8aebc50eff5d78f60e2dfea8edb2af965dc60e8c02f8a1f95166e80d6f1ce21aca051b92b2511b88a7d87d2cc90e58bcd17 SHA512 855bf05ce45a965d534191b036831ec1cedc848e21196ed93cc7984d744328d9d5ba39664b4539a707a1556984990360cd27e085b830501ac8d72c6cebb3e689
-EBUILD yard-0.9.20.ebuild 1796 BLAKE2B f80109aa77642a6b13b5bb13d750074ae610699dbc65fa7556e1b3c00300f65bc22faa1f8192d1e5c286e3f991be98aee5d025af486ef3717749e5fba87a4224 SHA512 aa284a792427e99a85e3a8a75f753ed4b5981fa35d71868d313c0011da98c03d041217e515fef256ca15ab69f743cda9b3fe7eb267507aed2b4cf3df884611c4
-EBUILD yard-0.9.24.ebuild 1985 BLAKE2B ca3c72673a8e9ef5032dee7ad1b01b79964dc44d336ca53b69edcf55306b0305be21b0ac4eb400a4e9a0da6881c571948e8a4fe7f1783c735f2b39a9bd19aab0 SHA512 43044bba52cb0f7ed596e43686d9a20de4c4f96dda4bf7126e3798e8b08aecbb2197072ba6cac05955106c9c0175fd2e484078bb78b52b470b234aac4c9c3fbf
-EBUILD yard-0.9.25.ebuild 2088 BLAKE2B 666086e76658dff59a5234e7a107854856f25f2bd68c6f6a8fd2808a9e76cbbe70ffbc6e4b5ac47d4b7bc376c2856792ea6de7c28dc25f64dbaff128e2b1e6cb SHA512 aeb3133862cca7efed5aee38d9f459038e7bce870968062bd6b13e16c6b9e98eb61c3d4e1e680bf087758b4e504b57c0a48a6cee14859d69d645368fa019952e
+EBUILD yard-0.9.20.ebuild 1776 BLAKE2B 12b9077bef16561dd12d625c25d5a93d686127b8dbd5d8e57c863a18e51585abec873de1cacee8c3c7e308351f47abf674191e68817d2791226566afc2cc8707 SHA512 22af538c7322a4264564824985aea2bc6e6018813d65d7e543baeb758803846da466a38fc353aaaa78078ef7f8601761c5e777f2cea11c6da2d9244b5f34bf95
+EBUILD yard-0.9.25.ebuild 2069 BLAKE2B d3561aa9c61c9be966f138fc40ed408c1f503a26f6c8adc82788beaf3084f7489b7618c108088d7b5941dc09e6d32749712c321634273f2717597bef07c9dd5f SHA512 fa6d2f1012983738c1886cecab4390d8900584549b46b92967e0d9b68c90a5df0abca10856b3a4b9991ba955a1bcf3496fb544b85fc2a5a9fe50d160f7afd0e4
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.20.ebuild b/dev-ruby/yard/yard-0.9.20.ebuild
index 1857c467757a..e93b0ee66657 100644
--- a/dev-ruby/yard/yard-0.9.20.ebuild
+++ b/dev-ruby/yard/yard-0.9.20.ebuild
@@ -23,10 +23,10 @@ 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 ppc ppc64 sparc x86 ~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 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 ) )"
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
 
 ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
 
diff --git a/dev-ruby/yard/yard-0.9.24.ebuild b/dev-ruby/yard/yard-0.9.24.ebuild
deleted file mode 100644
index 426e58e45e1d..000000000000
--- a/dev-ruby/yard/yard-0.9.24.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="https://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-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 ~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 ) )"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e '/samus/I s:^:#:' Rakefile || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-
-	# Avoid specs that only work with bundler
-	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
-	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
-		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
-		-i spec/config_spec.rb || die
-
-	# Avoid redcarpet-specific spec that is not optional
-	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
-
-	# Avoid asciidoc-specific spec that is not optional
-	sed -i -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' spec/templates/helpers/html_helper_spec.rb || die
-}
diff --git a/dev-ruby/yard/yard-0.9.25.ebuild b/dev-ruby/yard/yard-0.9.25.ebuild
index 929796ad647f..c80862906ffb 100644
--- a/dev-ruby/yard/yard-0.9.25.ebuild
+++ b/dev-ruby/yard/yard-0.9.25.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ) )"
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
 
 ruby_add_bdepend "test? ( dev-ruby/rack )"
 
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index e5f65ed6d3b3..6f262d7277b8 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,5 +1,7 @@
 DIST zeitwerk-2.3.1.tar.gz 97616 BLAKE2B d5b387f9a02c5f0250b709d144bc833a0f20164ab3065483cba177078fc04ada7fda99bbe5efa7c6481ae6c21006b6d9a73a31e18f40b19f9183efcf7f0f76cf SHA512 b0f782afde6f3a60e6dc3440316689ba39542e3c9d57129a433a0ea967869ca32d79ab1c522d84091b29a698e80ced31f94c9d12592f310945c4267d1e72b5f0
 DIST zeitwerk-2.4.0.tar.gz 98493 BLAKE2B 60b03153fc90b371d4b1ef59c7f61dd2f577a39ddcf946d8b1a52a2b982164260bc1fe86f79cb9c7937151e93d38a4dfbad7876d384d88b7f43161e1fd66c4e5 SHA512 2538cda71d5e1d381d8d455eba5e6fa115096ec36765d5ad11ee9f33d34d0d08ab594e6788f92053f76d239ec9b52027cb97c07e19d96852f4dc8767dc8e3057
+DIST zeitwerk-2.4.1.tar.gz 98440 BLAKE2B 619673331f866b1e566603727189cac02fb08e856ca10504c97dd6dcc2cff8e24d0b2bb6b462f62dc88696b96beb1df04161f72da691118c0d8414313d2ba290 SHA512 12d513fd16532ce510d83cf32710d734d24002bd5e77e0a37157e6521f3af67d379e915498c61114b5f9943763b59bbf38b7b6b2ea82957858129a6120c756bd
 EBUILD zeitwerk-2.3.1.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 EBUILD zeitwerk-2.4.0.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
+EBUILD zeitwerk-2.4.1.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.4.1.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.4.1.ebuild
new file mode 100644
index 000000000000..827d557e2223
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-ruby
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)