gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-ruby
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
332 files changed, 2731 insertions, 1467 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 988dd6ad8b5b..2b8512dedc34 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index da7066a8d3f2..7bed02bf68f1 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,3 +1,4 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
 EBUILD abstract-1.0.0-r3.ebuild 647 BLAKE2B 02da6088d13b66590dff9bb92b63e01f55c82de082bdeae5e4f0bf26511ab2e55111ce8ed51a69cb2987ecbe5194db5104158d98b5a86c56088ac0376e41ae26 SHA512 9bc105003a4573da4305fff0fff7b442381ceb39a833cc2fdfc502a3325a8614ddbc1869550e102a254cf2b0495795f79ecc9e401107f680091e69ed4dc6b608
+EBUILD abstract-1.0.0-r4.ebuild 653 BLAKE2B 40c6f0fd55609ada690a81984965750cc5d01d70c8f5a2420531b5c2b61869f2900c198d26ecf55e896b31f06782169a76e52e5d7b2846aeb1fcc8b3f313a217 SHA512 3bbc6d597c8d3b111c6a785a8724ac0a2f6e888fb3d964d4bb6883dc77b0c7c016187f1e2f84dbc758499d983ac5e53d4dfe9409a5fb49a8789ce1d1a7a88f4d
 MISC metadata.xml 326 BLAKE2B 9d949e43d77128e14b13f83c61b85efa1d766d2b09b33aa10957282273b233bb5f6785b570e08249e3acc3920e3c5327fc834e8973d252519ec0963efdc379f4 SHA512 af7919ed026803725ee33c836a16034b32eade1a09f18ad5f5a506454fcdbbd2cab3cfc0e21c494ad1380795439719f83acbae1c3cc45a3cec6b1e02cebba390
diff --git a/dev-ruby/abstract/abstract-1.0.0-r4.ebuild b/dev-ruby/abstract/abstract-1.0.0-r4.ebuild
new file mode 100644
index 000000000000..06ce972ed64a
--- /dev/null
+++ b/dev-ruby/abstract/abstract-1.0.0-r4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library which enable you to define abstract method in Ruby"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test.rb || die "tests failed"
+}
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 8a445ab3f813..f1ca584ceea8 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actioncable-5.2.4.5.ebuild 950 BLAKE2B 403c8cfe76ac5cca772aa47b7820a88a5481192ea6c0193fa34bc3ed6c806d94fa7757fd7e2a4edaf482d9f7d457fcedee2741ee9fc218c14f20c3a58e612e0f SHA512 a4f64ce3e42212afacb9d6c05f20a69243ae4db40dc1b7e668c5ba980b38f757169af664ee62593bc591974020be34b25ba83ebad1bcdf7d1bf718d95da73c4b
 EBUILD actioncable-6.0.3.5.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 EBUILD actioncable-6.1.2.1.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
+EBUILD actioncable-6.1.3.1.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 EBUILD actioncable-6.1.3.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-6.1.3.1.ebuild b/dev-ruby/actioncable/actioncable-6.1.3.1.ebuild
new file mode 100644
index 000000000000..133ed8eb6089
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.1.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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 642ec34953bb..6ffae5c6c098 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,7 +1,9 @@
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actionmailbox-6.0.3.5.ebuild 1775 BLAKE2B 90207c1545b4bba3d5751f7441f10f25bcde49bfaf82fc7472f6ff836328095406a99fe6f4332cec9c9851f8942f368b7f703336a31a1b9c8e0428d483fd3e64 SHA512 3ae91c36cb621c167f3cb41a3058fc22d07fb868c90d143f542e397714b123032bfe1df01fc208c4bd260b336cb9919e4d5ec95d003963cb6a4c13e1c60c6b45
 EBUILD actionmailbox-6.1.2.1.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
+EBUILD actionmailbox-6.1.3.1.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
 EBUILD actionmailbox-6.1.3.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.3.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.3.1.ebuild
new file mode 100644
index 000000000000..06f3358e6aa4
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 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="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 ~ppc ~ppc64 ~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 -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-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 '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || 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 5f6eaac85faf..f9816fb0e295 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actionmailer-5.2.4.5.ebuild 1419 BLAKE2B d6aace152a40760e2c49dc536869f6aa382cc5bdb13f4b35f411df66a2f5698bd02dfc6a9114fc9b3691ad785e100bd75cf8b60b337fc8a57ba1d99084d4954c SHA512 4001cbf68a332d36f8f8a5c107c5334779e5f952d39462a65f66ee2441ed7888b2b6cc84ef1d1f7621aa0b55de9ae85e72c5119300ba5831e354e6c821f806a0
 EBUILD actionmailer-6.0.3.5.ebuild 1261 BLAKE2B adfa0c8b65338e95e0d7f1a768a084a966fc1f4a204c9a7bc32a796ae12a6ac45b4745bfd4e5704ea5c019fc3310b264bc4cc931fdec6087b7a9ce794238c125 SHA512 a31fa8b81382754824398c371fe389114cb1f19d95dc6c5c13525b932e778c5bee83c213a3e9adb11361553a77eb2f5f0de38df5d0a2001e62d01a36757887fb
 EBUILD actionmailer-6.1.2.1.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
+EBUILD actionmailer-6.1.3.1.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
 EBUILD actionmailer-6.1.3.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.3.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.3.1.ebuild
new file mode 100644
index 000000000000..054f20f77e74
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.1.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 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="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 ~ppc ~ppc64 ~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 052fae5ec9be..831bac2e64f2 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actionpack-5.2.4.5.ebuild 2217 BLAKE2B a6c65fb3bceb9176abbab2950749f5172f0a90e7d4cc002f8685519f56b69a0f3f949052aa515eeea6cef63c4f532ef7bf68a48b23f38451ba30566a09601185 SHA512 363e0a19a734ad23c9d7a500a42072a6073046dd8deaa7fed4db20a4476f76ca4cf1714c97836001445795e4ee2f28a73f52b48fae1384b8b6b77db7f81e3b3e
 EBUILD actionpack-6.0.3.5.ebuild 1816 BLAKE2B b902dac6018601ef750da4e242fd2ac8860bc160ecb85d4f9446942f15339afa2f2a087b5168d7f92c9bf4583b58eb601be1e36c07af3cb7f3cdd728d3820666 SHA512 bb99bc2c41925cadaaba9b979077823d1375dde7af3f869dfdd7566d90b51d66ea16dbe7d8409f93102bf90a5d3f6243fbcd68a341b1e6ac8e481061272982d4
 EBUILD actionpack-6.1.2.1.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
+EBUILD actionpack-6.1.3.1.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
 EBUILD actionpack-6.1.3.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-6.1.3.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.3.1.ebuild
new file mode 100644
index 000000000000..74a56ac801f5
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.1.3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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-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
+
+	# Avoid tests depending on an unreleased version of selenium-webdriver
+	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 91e2e61046b8..f4172ce60372 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,7 +1,9 @@
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actiontext-6.0.3.5.ebuild 1672 BLAKE2B 5a69dfb27d7b1b2a052a275600c665b353c57d12d20e86a66da020caa3f4df571fbbc5be2e72de5a4f72b7db2b86333dec6a339943439193bd922abfa7817687 SHA512 35b8cabc849112607bb9d2e3888dec82c5b08fbb23d866b765b69d43042984ba8cfe4e140beb9b6845dc755e366823bc589df2d9ba91f5de993136c5bea98d2e
 EBUILD actiontext-6.1.2.1.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
+EBUILD actiontext-6.1.3.1.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
 EBUILD actiontext-6.1.3.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.1.3.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.3.1.ebuild
new file mode 100644
index 000000000000..052bc4fa1448
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.1.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 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="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 ~ppc ~ppc64 ~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 -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-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\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-i ../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 e0f93bd58e2c..5b3855c78271 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actionview-5.2.4.5.ebuild 1955 BLAKE2B 4c3cb4ce9c908f2ae7e02257a70a75220d0dc8968ffe3fd3ede5c9ba92524bbc215b234149a84c24da68f88a6adb842de09b89dbd0ee8e5388be801851eb784a SHA512 9c28142efeeab99b610da7aa749b7d6c1629e5828dbb90198d4d2e5a07562e7dd9251450f06aa3f8fab4f4298e73995d39a515d2473c77bf614a2b508add142b
 EBUILD actionview-6.0.3.5.ebuild 2132 BLAKE2B 9cc32f050e5e2ec4ed3e893ffc68b45498699dd2c5eaa0e2a04b4b64c7889dcf3a1dfa78656b5e51616be029e23b310d334757ebf3eb4405b0d4ee988d4c4ebb SHA512 34cc51bd9bb1ea703d7a0f074ff29c99587219ceb8579980eb54ff99d7b7ec2dc6d95c932804070cb9db592417488ca80672834d9aeec9da3e6d9c11486c89d9
 EBUILD actionview-6.1.2.1.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
+EBUILD actionview-6.1.3.1.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
 EBUILD actionview-6.1.3.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-6.1.3.1.ebuild b/dev-ruby/actionview/actionview-6.1.3.1.ebuild
new file mode 100644
index 000000000000..14ddbdd81c38
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.1.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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" ; require "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 ddb747ec214f..fbea50007997 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activejob-5.2.4.5.ebuild 1088 BLAKE2B 18db058ffe71f681ab28cb6668ac8cf7fbe3d922d49520f68bce8f5f69c773fcf5627179b9bd7a365f6113ec992ad5f04ee49907f8c4907a602cd1fdbaebbd0a SHA512 fd23cc4e42417afa6ba2091bf5e8ac0b6332855aa72947c32b367d28336412c36a8f02c69b6271bf5c80d3c6282f46afa7a241a90f6bc95f01e559455958f495
 EBUILD activejob-6.0.3.5.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 EBUILD activejob-6.1.2.1.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
+EBUILD activejob-6.1.3.1.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 EBUILD activejob-6.1.3.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-6.1.3.1.ebuild b/dev-ruby/activejob/activejob-6.1.3.1.ebuild
new file mode 100644
index 000000000000..9d4e3d897654
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.1.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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 3033efeee2ef..e775cd90eb8b 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activemodel-5.2.4.5.ebuild 1040 BLAKE2B 1fd431a1151cb50fe1414be304343c94974234af1ed54630a75103641968eb8da72a10bc9d5c894d394677d8edb52dda2ac4cf2a5fe047461c12a106953a9052 SHA512 24fb38b95119ae872d738fb7b0961ef5f94fd0f4d56786304f0876e95bc38ef777aa6a0bfb0951285b9b2dd20bb1bec68e2d73823d1cdafd08d78886653ba47a
 EBUILD activemodel-6.0.3.5.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
 EBUILD activemodel-6.1.2.1.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
+EBUILD activemodel-6.1.3.1.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
 EBUILD activemodel-6.1.3.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-6.1.3.1.ebuild b/dev-ruby/activemodel/activemodel-6.1.3.1.ebuild
new file mode 100644
index 000000000000..cd76ad67cfe6
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.1.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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 8c2c74f54588..191c5f633b25 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activerecord-5.2.4.5.ebuild 2953 BLAKE2B 90b3f2cb10f6332b1db43996cb9ccbc3ad7050be55d961de413bbda68f88573fd6cdb65e547804e441af2bf13d0856037d9e2821e4ca34f030a2c22b2d1cab5e SHA512 cf94e6be6c7b2bb5056078c0bb751376ab55555f704897bbb08086a1f6276707eae85221d426637f8d72ee6df712fac0485cddb67f526badafbd020377dc6389
-EBUILD activerecord-6.0.3.5.ebuild 3074 BLAKE2B f4ab35e48d0d1362ad6dcd7371634e5b08195e19f238de2ae932124f740bfda1e5cc2a4cb1246672caf00e01616eae708fbc66118179420eb55e7cbd908cbb4c SHA512 25bf9e55dc3b7ce0621af4cd123aca8afd5b52baec2df047c97de9a36c5a6ab9d89b12ad39b1fda46b68fddbfd194a93c116cd685f7437300fad03bc2a49261f
-EBUILD activerecord-6.1.2.1.ebuild 2974 BLAKE2B b8f7f362e585a37d3ed785a79e8a0838c8db28e6880535d4f3abcd52631177a6af47f112aa663a7e52abcc903cb36654cb8d722192e66b1fc96e35b90c35d8e8 SHA512 4c1506931d706e3fc7e64631d7306ea2a5fc69ea0e3ff3c1125b15edab4364af71cd43f57432c0ff51294f5c6da037546a4b2e9147ad76cca93c26845e81d24c
+EBUILD activerecord-6.0.3.5.ebuild 3044 BLAKE2B f07649a429dabcce15f3ebb409b071d57dd324aad6ece5d8d2e0a66b7914a1df60f4aef2c015cb714bab01b600362aa0f7a84565321863587706cc0533397b5b SHA512 05ecf7f3697fa388c48e26b44f2384c1175a8a37fe3e3403c9096ba6cc641ae0e65bc9d54d4e9454ae85c18dffd24c205950623682e060092e6cf0e30c92a5c9
+EBUILD activerecord-6.1.2.1.ebuild 2944 BLAKE2B 742767c3c07c72901bebf25508402c08ada14d1ad75fe3ac942f6db85d97dc0f36146f60e233dea308387899060386e76ae122b0dd90e3b53b93cd3c96c5a5bd SHA512 47daae8d655c1605dadfca19cab84fdc5edf8c7bc51a11f6c43ec2c70f775e31a08f377bdfa505db277166ea7174642fc7238ab4463cb869933b96b6cdae6b40
+EBUILD activerecord-6.1.3.1.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
 EBUILD activerecord-6.1.3.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
index a80aa2c8e758..58c3bf61a999 100644
--- a/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
@@ -31,7 +31,7 @@ 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 ) )"
+	postgres? ( dev-ruby/pg:1 )"
 
 ruby_add_bdepend "
 	test? (
diff --git a/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
index 6112916c72e3..3ae472c4221e 100644
--- a/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
@@ -31,7 +31,7 @@ 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 ) )"
+	postgres? ( dev-ruby/pg:1 )"
 
 ruby_add_bdepend "
 	test? (
diff --git a/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild
new file mode 100644
index 000000000000..a1ef44206920
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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.1:1 )"
+
+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
+	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || 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 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/{,legacy_}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 de9a69a06e78..e37fd7927d41 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD activestorage-5.2.4.5.ebuild 1970 BLAKE2B 2558ac6c7fee55505f9e4d11cf6ce9b55819e39c6498478486747e28108026949a4df247a15d8318cd0a659aa35f77880c9c0dc288a3dfec3d0c5dfc2939a5b7 SHA512 19afe1f48f4e800e108a1d11f239999cb0a14ba1318d5bf3076bb3a7cd2bde604ebc1035aebfbbb6444a9bce317cff337524cc007631ad4797259ab6637b6b00
-EBUILD activestorage-6.0.3.5.ebuild 2026 BLAKE2B 47d1e7d489971c98b738a21bc674bb99eeaa31c44d9fec6cdce1ecbccea546d89c950998fff1f1edb5432ac45fc13312fa7112c22a96ffd2eeb7ab96d34a584e SHA512 5dd6bd174328f5943fcd1408252b2cf32fe431a06e0ec0bbb0cc79d28f76a9c0a8034cb22c19cfdcfb3d1f67319c94b75d1b4f511f09a1130b54f8b7f7205aa1
-EBUILD activestorage-6.1.2.1.ebuild 1991 BLAKE2B 1aaf65836d58a871248bac82389bce47cb511c42b95e921c19e5b1c1bc1a1b8c1da662c43677b29932a851637e66ea9ab5acb99916536b8f93823e9b0748081c SHA512 9bd7b2242b09f5be1114b2b5d4e8507980e7c635511f2d9eab85a87e83ccf37b917748f2c35fa866f8cb381bbec79ca03ceee65ad293836ae2422556056493ce
-EBUILD activestorage-6.1.3.ebuild 2106 BLAKE2B f9c415ba867e3594af3aeafd7bdd3e399163fb3b466f763cc9cfb74ce5dc0e0db0b19352331eba7ada08d0ac457bba0e5ef2d32770c3f1e919cf38b74478004f SHA512 528854b949536fe23471a368582907b0a79d4a7faa88cd8668c416699a797d028ad58484df40454f478dbff2260c5a63f2ac4f649e0e28a5e00bd655486bb5b9
+EBUILD activestorage-5.2.4.5.ebuild 1950 BLAKE2B c84cfaf29709d53196d6228fb09bfb187e52724f2e8d792a64b39c1fbe8d72670b486870a870d6819af6ef5c21a9d4a91c6f8cb3da3a2b9b307c60b655055b7f SHA512 a74a871b1d6e1f2a1d9c7f0df9ee501ed67b4c0212ef5531124bbe2c06bb521084bfd6426c626cd1d8725e0ada4ff56e9706086db0c87aa1a7cbba195166d65d
+EBUILD activestorage-6.0.3.5.ebuild 2006 BLAKE2B e5b8e6b63ef12cadf6dfa29dba4a7c8119ebe568d135554136564e18ce728ea426207328856d773678de7bb17a6f54f0227cbde1af2526afb317c9d5623ff2a0 SHA512 5655aaae7e5985feae47f045db4f99090e65b4cba7fcf4fa92122c493fe3722f5bb8808d0919dd47ec0652e0a6979c3f1eed666b4f735a90a29e9199c0c93e62
+EBUILD activestorage-6.1.2.1.ebuild 1971 BLAKE2B 9b50b0730f55fe990f227dd86fc3e45cbcd14d264ac7425a3273be6616e2c2a43bf02fa3224e384d4412568c1b4a10e65c5453e074212aa2e505d7fd0f4fa28f SHA512 91eb4f9275ff68a0a3f07ad7084be8330ba3e6697206f26601cf0ccdec15c0e12d4ecf23b2bad2c56020f08b7fbdc3122e583a606e3e57c08dd5575f3d361e74
+EBUILD activestorage-6.1.3.1.ebuild 2074 BLAKE2B 9990f1bc96733d48b6aa487122db56e48cb9aee5fcc2f4f2ae770497309c4ec1cfb9beace6dcd9198dd40d2e07075bd13659a15e6e51d94b4eac606750b91fda SHA512 6126ff26e7bbf049bf219ff497d6b95160c77576c770e627f74c65ffb84ff38fbb7390a331575faf2a1e859a9f4b6a2cc3ae1e09ddd9033f010f9b23cc8c57a3
+EBUILD activestorage-6.1.3.ebuild 2086 BLAKE2B e4ef3d63655930d6e045603ab2c04540b809162e83fcc1529937e516b91459f8a607359211624cb44c3f02b44c458084d61df28631be017b364585bc75ef80aa SHA512 6324329a4c3791e2c80dd9e8b0f28443c27c71bfc6834d10fe00773e0272b8248094a797682fc80849253825b46b75bdec3fdb5b4855d32d97078a60b0b89fbc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
index cdaa776c69fb..6d033ca351e7 100644
--- a/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
+++ b/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
@@ -33,7 +33,7 @@ DEPEND+=" test? ( app-text/mupdf ) "
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/marcel-0.3.1:0
 "
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
index 7d7b414a3494..971e835a54f3 100644
--- a/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
@@ -33,7 +33,7 @@ DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-vide
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/marcel-0.3.1:0
 "
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
index d60ab6bbc543..cca8924b1b51 100644
--- a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
@@ -33,7 +33,7 @@ DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-vide
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/marcel-0.3.1:0
 "
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild
new file mode 100644
index 000000000000..6064db838572
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 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="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 ~ppc ~ppc64 ~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/activejob-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/marcel:1.0
+	>=dev-ruby/mini_mime-1.0.2 =dev-ruby/mini_mime-1.0*
+"
+
+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 -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\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-i ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activestorage/activestorage-6.1.3.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
index 121a1854f8fa..926cc2421e97 100644
--- a/dev-ruby/activestorage/activestorage-6.1.3.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
@@ -35,7 +35,7 @@ ruby_add_rdepend "
 	~dev-ruby/activejob-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
 	~dev-ruby/activesupport-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/marcel-0.3.1:0
 	>=dev-ruby/mimemagic-0.3.2 =dev-ruby/mimemagic-0.3*
 "
 
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 380d214b77de..ab2057ce559f 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activesupport-5.2.4.5.ebuild 2512 BLAKE2B 19b04f012ba252ec9887c43703ec8408a3a1c3f17583cf3f3bd6d565f70291b3f3be78b48a5af0f3a74db38959a6eb60a4741ffe0112f14c2c5763d20049a35f SHA512 2db42998c4766c0e017f4031b6fe9ef7eb2d067b885a969eea41eb59ec5a909b40bcbbd9cd0ac065d1ed4c68902bc66f59ab950d11f4ec4603f46b031c1cd09e
 EBUILD activesupport-6.0.3.5.ebuild 2527 BLAKE2B 54901c557010951c87ccb187b3995e351b75a08bc733a63a75da1f7093fb765cbe89fb409ff8a636020ae94092d1a5a5690689ecd8b01a402f184a332614f52e SHA512 671953781017b8e14c2d09bbbecd4cf388c1a9cb857999a4aea8511e36da90994e71d045a8e4a2a9d6bd0a63b9caa3dc5ab8f96c1b06ac4b6dad8198c43b68a7
 EBUILD activesupport-6.1.2.1.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
+EBUILD activesupport-6.1.3.1.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
 EBUILD activesupport-6.1.3.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-6.1.3.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.3.1.ebuild
new file mode 100644
index 000000000000..077b419f7711
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.1.3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/zeitwerk-2.3: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.3: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\|websocket-client-simple\|\libxml-ruby\|bootsnap\|blade\|aws-sdk\|webmock\|sass-rails\|selenium-webdriver\)/ s:^:#:" \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^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/addressable/Manifest b/dev-ruby/addressable/Manifest
index 107ef28af20a..a8f7a4be9af8 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,5 @@
 DIST addressable-2.6.0.gem 104448 BLAKE2B 664365962533d31786e2a362b61879fee544867b7aadc2ceb1ae6709374015a7f0f5c0bd32a81c8f2ae711a4ce1a07cd8f84821e74c3b6aa56b7474800567737 SHA512 71aa0ce8b61a07c1d01298dcd29cb2ba73d06ed1578908cae60351214f7d0bc6c9b8b0db7a78044fb1bed258bf00f2f093aa4e2bcb32575f4db2a79ee36b2648
 DIST addressable-2.7.0.gem 104960 BLAKE2B 4bca65d54ef1d3556cf4017ae68082635c0398b6f604eb3edc18da8f8e1e49e38b46485a8716da3c407fe0605dcc9a12c7a95be49a91c4198c2e2b1cab568805 SHA512 4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732
 EBUILD addressable-2.6.0.ebuild 1343 BLAKE2B b225c1f2f7a58272e83b7a6be35aeb220a2f5cc1f94185259179f3ed89356eefc90ec03ba65631c4c676981d841a6f8b7b9782de203b3876a6451f6fb1baf165 SHA512 2305bb1ad32f470d303ab3b702ebb6bcf2056233c997be75be3c802d653e8386bc29d5ff8666dfe477edacb0a2b62bf5a9b3bb0ba44c55e208459197bd6a44b3
-EBUILD addressable-2.7.0.ebuild 1310 BLAKE2B 114064e9ee4b235518ce9e3fa749cce8ade12c78a52f52fb67f0e297b534384e8f89e78df344029adfb425531c6c3429ce1d902a8e667d998c12b7cb354e27a5 SHA512 7d3705bd3f09a315ce4db6c96014443848cb66b1794a17df6ed85a80a75930fa8da0c57a1f7ba755cb8dc3d54314cd057b7147df8f5af61922f1f7d9ac2ca5bc
+EBUILD addressable-2.7.0.ebuild 1310 BLAKE2B 9a404fd941bf78f539164435864da9dcababa6a7188eebb182b2c23511cda0b849ef10937d7fc5728c9cf853a50c588548936f87b359e44d98accaa22a238ab3 SHA512 65256c662589db08c03be5db84c6805a11a685eeb4d47c5f1fdff2651b63ab980b891714d2da11000f2a3b0849049768462c6bd67b15f5f9093ec026dd61e2c3
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.7.0.ebuild b/dev-ruby/addressable/addressable-2.7.0.ebuild
index f4f234b43412..444a23a8b9eb 100644
--- a/dev-ruby/addressable/addressable-2.7.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 6c05afd718b7..135b6fc930af 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,9 +1,5 @@
 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.2.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.2.ebuild
deleted file mode 100644
index ba3ba2f1a000..000000000000
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.2.ebuild
+++ /dev/null
@@ -1,37 +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"
-
-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,erd,mermaid,msc,nomnoml,shaape,smcat,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-}
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.3.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.3.ebuild
deleted file mode 100644
index 9a6dfb6b1969..000000000000
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 08123a1a7cf6..725384f27162 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,7 +1,9 @@
 DIST asciidoctor-2.0.10.tar.gz 613180 BLAKE2B 46125c85276eb0c7cf4404ca04d854449233e2cd14e24687aed9f95eb64ceb6ebac3d3ed73918679b9a5b047e41d82d02383d0e08acd0df5cc9bc216f14c79a3 SHA512 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
 DIST asciidoctor-2.0.11.tar.gz 625446 BLAKE2B 4c4a3a7e019971765efade92da39d5895f54bd3eb927eb1ecc1cc3e3998490fcdb93426c03c9fca82d777b28c6c8027f34d39289b2250254884613670eacf9d6 SHA512 eef126653fb75c4d4bce5481f9e12f1852cf5794f547e1131f2e3f5bc34c3813e32034e6890432e83fc543b4a5dcca46750d052844d7055bfe20ea4b0c4428f2
 DIST asciidoctor-2.0.12.tar.gz 625448 BLAKE2B 242ee146465685c7b5326c343df1e1e1bcd74d85c2bfae3fd3e661c63a11c82fba6a2ff9ddb0cd0131289ef09b14b6039a0c54e35471b000166584ae3530d6cd SHA512 b1fdfd8907d19943bebc9040e3e541df81eb874bf9d53a174e5be8a804e117e7ee3cd21046a4a4142cdc285e6269796d06915b0f42f4f16ae1e8975e444a8a76
+DIST asciidoctor-2.0.15.tar.gz 1633310 BLAKE2B 58029acdf3832459dde5df2835749bb781ccbaa547fa4a09dc10a69fbef36ed690fac7cd0e2b3da1a5de847be678d0ad410c17c6768e466fffc7ad30b5d9d4bf SHA512 4cd0ce922d5db5bc5b31ebc75707c2e9e2a94a2a28eeb68ed25f55c46c416c950d28b880c4b1ab52bbcdda9ee4ee7b1c297049754d214983b68eedf2d96492d8
 EBUILD asciidoctor-2.0.10.ebuild 980 BLAKE2B 56233da21d65a106c8263c61cb52818e87295130a70b9701ba9b0a112d45f15b900d130d8f1bd4c24eb8188f77027bde8746c2188ea74ecac0bf48fc1b3f596c SHA512 5b51f04648b599bd65777c3910e0eaca39ce805c6aaa5fad7295e709b7c1d5479c9f1fbb1f72d3aa89c63f4b361670df335836eb5113acff0d9d09cd2464e057
 EBUILD asciidoctor-2.0.11.ebuild 948 BLAKE2B 7ea5d120583b57a119a9d74e37397984fc6ae2392965d26539554409087a32d6459904a898e12361777ea8e8303db9dd0044eacd97e0ebab9690cc7241af5d47 SHA512 67d54eede232b11f22e075662e7eb36452cc56f15252ef3dd2b23aff0c2cd49df216aebe0dd844d729e4f1b5d02150dda9e0290479ffad142ef37f60f6d01ded
-EBUILD asciidoctor-2.0.12.ebuild 948 BLAKE2B 7ea5d120583b57a119a9d74e37397984fc6ae2392965d26539554409087a32d6459904a898e12361777ea8e8303db9dd0044eacd97e0ebab9690cc7241af5d47 SHA512 67d54eede232b11f22e075662e7eb36452cc56f15252ef3dd2b23aff0c2cd49df216aebe0dd844d729e4f1b5d02150dda9e0290479ffad142ef37f60f6d01ded
+EBUILD asciidoctor-2.0.12.ebuild 955 BLAKE2B 7430d8510ad1fff250fa57c98df1898522fdb4e4288cb0ddbbb7e43d0ebef3aed289f186e1b474913a9a7f4808bbfa885a08ab83a3edea8a25a640190c292de0 SHA512 b32f04ea18132837fa334209c0b8286cd14d63a241607b44a0aeddf98ef03ad74d9a68d17e06d076c7e41d3befdcbd13b2b6ca055339b83809b86d0c4bddcf31
+EBUILD asciidoctor-2.0.15.ebuild 955 BLAKE2B 7430d8510ad1fff250fa57c98df1898522fdb4e4288cb0ddbbb7e43d0ebef3aed289f186e1b474913a9a7f4808bbfa885a08ab83a3edea8a25a640190c292de0 SHA512 b32f04ea18132837fa334209c0b8286cd14d63a241607b44a0aeddf98ef03ad74d9a68d17e06d076c7e41d3befdcbd13b2b6ca055339b83809b86d0c4bddcf31
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.12.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.12.ebuild
index 15d529af89d7..b19e986d2fc8 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.12.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST="test features"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild
new file mode 100644
index 000000000000..b19e986d2fc8
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 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 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/astrolabe/Manifest b/dev-ruby/astrolabe/Manifest
deleted file mode 100644
index 90c89a876d76..000000000000
--- a/dev-ruby/astrolabe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astrolabe-1.3.1.gem 16384 BLAKE2B 4853c4c9c8fb926c8f58f6c940f22e44e20db7b3b7c853a0ea120657074cb0bfb42b3a22832042fcb27546e2ab3e32c526c93ccd3ea4d43f17c8e0c09fd2fbf8 SHA512 db29d26559e4adb82e4a25a3b7d3df94fcb9847dbd65abdb25abd0181b60af2e0fe0021bb8193c5f94d58e074da06de3d1f7170cb341ac675e3c3ab39ba95bef
-EBUILD astrolabe-1.3.1-r1.ebuild 746 BLAKE2B d0957cc4878fdf137c68922c914713718ee51cc634a497254d5e9ad106920a82c7e0bb8ad68660c2b154c10659eb0f388d7e830d34da5117ef1e462d18a3ec75 SHA512 7b4ee02d5a9dbca6c4755b7dc3e1e70b062265245c49590cdaf730a7b8ee67f5960086d6112a75757ffed6d323f82a4d75e3661b72d92c3825da271a63e2b649
-MISC metadata.xml 348 BLAKE2B 7d999da9a49726292bc0c44f26b0ba86f093340a4ffc1d211f0a0f8510c9de6ff4d2dcf90e1307683073c87aa45d77aab6b050a7fb2241be9458a6f649924f97 SHA512 ca7e080c9465cf8f8c1607ffbb9a39a8bc17a00e3f0d60ff35d3d3d21bc33c00a4d6d7e647ac8c309df75d6406e48acf6b02858127d3be247d54f0da63f537b4
diff --git a/dev-ruby/astrolabe/astrolabe-1.3.1-r1.ebuild b/dev-ruby/astrolabe/astrolabe-1.3.1-r1.ebuild
deleted file mode 100644
index 09912a68a210..000000000000
--- a/dev-ruby/astrolabe/astrolabe-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An object-oriented AST extension for Parser"
-HOMEPAGE="https://github.com/yujinakayama/astrolabe"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/parser-2.2.0_pre3"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	# Fix Specs until RSpec3 is available
-	sed -i -e "/mocks.verify_partial_doubles/ s/^/#/" spec/spec_helper.rb || die
-	sed -i -e "s/is_expected.to/should/" spec/astrolabe/node_spec.rb || die
-}
diff --git a/dev-ruby/astrolabe/metadata.xml b/dev-ruby/astrolabe/metadata.xml
deleted file mode 100644
index ca98a067c345..000000000000
--- a/dev-ruby/astrolabe/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">yujinakayama/astrolabe</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index f2cf1322735d..464bb02560cc 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -1,3 +1,4 @@
 DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
+EBUILD atomic-1.1.101-r1.ebuild 658 BLAKE2B cd6f41250e89de974ecc957ebcb2b741f80e90f97285865bad04addf706756d8d0626c97e3f3847695e532555785f26681135047a608d65dff658b8415414f25 SHA512 579a65eb2b0e7f4abe93031c4e814a7d7b83b8c2417b4ab43cc7a812f1ce4bb58e441fa75fba662d5f94b4d39c12629431eb4d95e71eb2c5c3dd2ffd8ebb7222
 EBUILD atomic-1.1.101.ebuild 764 BLAKE2B 57718474b699d68bea220a5ae2818ffb00235cd5f04edee7e3c8b788b3b4535834b3332b0e16f8271f07ef6fb07a4cc21c33c5d0ccefb2106156ba9817f36874 SHA512 1e9747927bbbb284cbb763434f183832901ed6e84d4192e3e18474000f9ad19946c362fa2f4b5924030cbee020c8f1a3f2a10bce0a0fdda2dd905536e680b967
 MISC metadata.xml 345 BLAKE2B 64598e451aa2d3e6225aed11977f43d379ad3d26c0f6366dfee9651544e3c4d565a342d61fd1a2f0d176a5cd0e5f97ad1ae5c1150d97a24ff3472e49eb30d446 SHA512 2fc1039a507f87fab12c537d790d538c6e9abada720edcf9de3748e5d81674f4803221ec940a7f3abc6b12f7c9ec009a2960d88e00b45caf2216a23263e03f8f
diff --git a/dev-ruby/atomic/atomic-1.1.101-r1.ebuild b/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
new file mode 100644
index 000000000000..a30e90d0040b
--- /dev/null
+++ b/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An atomic reference implementation for JRuby, Rubinius, and MRI"
+HOMEPAGE="https://github.com/headius/ruby-atomic"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid compilation dependencies since we compile directly.
+	sed -i -e '/:test => :compile/ s:^:#:' \
+		-e '/extensiontask/,/end/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index e942dc694c9b..d6e85b0d3b89 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -3,7 +3,7 @@ DIST backports-3.17.2.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b83
 DIST backports-3.18.2.tar.gz 158492 BLAKE2B 7ad924758939fe50b26fb845e96583a57a06e0039780eb96c8df9c535bd5aace261a6b3619ca3bc3a772c0db51162e9d340a6a1515c746acde91d8cb608f83be SHA512 3293430331f217c13f754242848f2541906ce930a8683f0ed65a64f93dc1d2387ef33501b1d8129872d536bf2f59c4e975c67abc2cd966277fd62ffbc68b5522
 DIST backports-3.20.1.tar.gz 178390 BLAKE2B a21ba2035e83ab309582a9ad6b01006079ab38d0990724942ffb591e2ed536dbb6f176c940ccc019bd374c38ca9a0ebd271e32563a41a71e06d1c631084e0445 SHA512 4330c1c8928d914fe85dc5d3797ab0b02b37e5ed3fed1899d6368504dc64c2241fc87357bc5155e708902ae93bf2160276d60a6b1ed5a23fbb234e2598a1b441
 DIST backports-3.20.2.tar.gz 178633 BLAKE2B 2e2f2f31099763bb218f3ada9f9d040d4b41fc842bbc8b91d703e91b89bab9d6e7bbf3aae1ecfe34abe6099d6cb34929ae72ba66d4ee473841563257fa85cf3c SHA512 a91a2c9186315fca8e0b33554ef26986abe8565e08a79b9f150f8115f998b2a7a440bbc64b92f89c4e95e1c5e852bfeea6ab337804cf017517e77229f10820e5
-EBUILD backports-3.15.0.ebuild 666 BLAKE2B bd4254e19f91ff02bc0cb3153c0271e5640bb8aa71cafd37f5122759d0e7ceea8d67a8919227bc33d97e162382506fc19377f7ea92303016062749beb964400a SHA512 e1154aa957300f9cd5e7459267dbf2252f20a01fba5de072730b1a20ce1b84489c940faddd0b994974056bce25c67091aaccad5f3bcb8ac3609a07046568b086
+EBUILD backports-3.15.0.ebuild 667 BLAKE2B f38afb21d4795a224fcc909db22086980b3d2a135dd7652bcb03839e34a485a183614d2e42628d18cc1368254ade263d43a26e68dd9ca3d120f1e130bca05d1f SHA512 26542cdf65e3141ad22773e0fd6f7413a8f7e066c8c434c20b626066f0cd69fa8608ad8f49a9ffb0d3289a87a438de475f39a64c5fcc4ccf6ba8d59ace3bf531
 EBUILD backports-3.17.2-r1.ebuild 799 BLAKE2B 9425cb27ede8e0080fa42382a1fd544368bffb78e07562235257eabead40ba2bce22010695007eb3292034c59b447fece7ed26a72033e41108df1193421f1bb6 SHA512 4a3a769a52ef82ea095383fd7bd30df8d95cb7dc23bd35fd6ad67d2bcb4591137524c02d23eeadf8e434284bd8488815b3a84f9c5f3691e4868e5eef3fc05dde
 EBUILD backports-3.18.2-r1.ebuild 792 BLAKE2B e4ef3c9534300ca8baa1a66ebfad865f5c923973f374aa7cf1c52dfd2ad2c35346f5e63c2833f056d45068742804d1a4f189dd755604f837644615ab15f5dbd0 SHA512 6e9556c4fabe5fc87a13079465a2ce2cac1b18644b234066f27d5a70422720f3869ec4b7ce4a4e5063d964554c95f8758fe618a07ac9550381fada6654356504
 EBUILD backports-3.20.1-r1.ebuild 799 BLAKE2B c1f35d8297fdd3711add94e7b452fa5a2790b636bf502bb837585f0831aea921f8f1142af6e77a77b59a402c866d97504322d6203700a7354e1a238f669fad45 SHA512 d0acc8664d774310733f3ab34df1029ae1b50529d4f3446e0981cd872b9a8040b0057c09a3e86506474a101aa953cc1efc012cc35dcd6301229d2c31ef409a8b
diff --git a/dev-ruby/backports/backports-3.15.0.ebuild b/dev-ruby/backports/backports-3.15.0.ebuild
index adc2dfaaf5bd..990c15260f9a 100644
--- a/dev-ruby/backports/backports-3.15.0.ebuild
+++ b/dev-ruby/backports/backports-3.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/bit-struct/Manifest b/dev-ruby/bit-struct/Manifest
index f82e2dccdd52..f4332b5838e4 100644
--- a/dev-ruby/bit-struct/Manifest
+++ b/dev-ruby/bit-struct/Manifest
@@ -1,3 +1,5 @@
 DIST bit-struct-0.16.gem 31232 BLAKE2B ed08c7054cab88ba0614863d706681601615b03e2dd3f19a4a1b8284dace17bf30e92ca9f1b0948c8c5e50424ab41b97f65cb65c804f771a207672b497c9df33 SHA512 8c31592d53daea5f283f8309a52c22c96c519d51c4e3c1657b36e83b802899aafe95eab9b88d9ec692e84207fc6bc952a1f1ff1354fc2b99fc327d58934bec8d
+DIST bit-struct-0.17.gem 31232 BLAKE2B 8dd802d22b543dbde4e59f9bbdf158379045b633e427ed2d01fa0a141f48298e2d3da48f19a2c113426b8dafab7ce139948fa8d097e6b87dc9957eecf65bf95b SHA512 9f3cc652d0f2983edc5a67a5b7ad5a64a2cd73b45414b3636fdd9e6d18fe971ec9d5cd3553ef384f039bfb166489fd303724c8c0c9d882cd757610c7986b0f1f
 EBUILD bit-struct-0.16.ebuild 381 BLAKE2B 56096f2d2ae299efc2f912d3dafe1d6644046004b4b55bdf95cc00a8ba3b24ca0a8ea7027a0b727bc097d8ac0c7ee4e270523c1ff820744ba2a0c2e7c6a7a54e SHA512 8746d1789d7e9402bdc7bfa063f5a6f0f6c159cbb2c582299260b818a84b3c8359f0a7da3ee3f855581aa70450a7d83bac5a9328d73c8d96eea6d89d897845d2
+EBUILD bit-struct-0.17.ebuild 349 BLAKE2B 49307724ef95454d91dcf6b5939e45435cdd865aed9ea2b2217cd582987e564917cb2fee8129eb9ea9b894ab310183fc78c1ac1a276a788d756983bc8463c362 SHA512 12efd6fc87cdcaa87b9b40a323d99cd728ad34358a1d531a76f199d323ff0a0cbc3dcdeb70f5197f9f369bf7a5554baf0f0474f6c74d4383d197198f630ce504
 MISC metadata.xml 392 BLAKE2B 68de2170fa2465f59cc174571e74b5ae99e27a58411de173f8c9ae641e649eb2409bad25973aae1cb6e1f964ecf4490b486c2951c4d7aaa80c890fa30bff7163 SHA512 f9c67aedbeb657cc78964197a77d16117a7526c77aa4deda0e8e4f6f09b5b02eb78ade3c0de64839a4b02692b55eb5afc1dd147a63478115e8b06c76934e03a6
diff --git a/dev-ruby/bit-struct/bit-struct-0.17.ebuild b/dev-ruby/bit-struct/bit-struct-0.17.ebuild
new file mode 100644
index 000000000000..25fc8284a70f
--- /dev/null
+++ b/dev-ruby/bit-struct/bit-struct-0.17.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for packed binary data stored in ruby Strings"
+HOMEPAGE="https://github.com/vjoel/bit-struct"
+
+LICENSE="Ruby-BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index a04b97bbcde4..4ada18f0d009 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,5 +1,7 @@
 DIST bson-4.10.0.tar.gz 158673 BLAKE2B 64a2d608a7b5c048a646e15839be9a77b1203067b018b4cd25174a38c71aa9c7ccc8f95525d1656c76f725ca5b4162e2ce408603a97bbeb51798d4ac0f316bf7 SHA512 8ba561f602e81260ec929271d1275a8393c212948b737b3662ba36e1af0ca9f48904e5497d359ed49b323875b54fac4edf6ed2afdde2505aff7e702192d78f5d
+DIST bson-4.12.0.tar.gz 161250 BLAKE2B 060c33e4192ca433287a007351e13a3de187782675d56b0b90d5dfbf4546821f483348caaab1afa0cb715b20be53028a486f9b18ee8405afc4eeebcfc91c2b53 SHA512 b91619473ba8d4f10fa2a104e26f70d49991e164dd3dc72335bf53f39be6c30dff853cae0185285bc41985ec05717a074992e40ae9b6520d09c0aeb9e0b6992d
 DIST bson-4.9.4.tar.gz 157187 BLAKE2B 58bc8293b53f19fb1f02a33b42845c935046c745222ac2474b055945e3d15dfee2be17dffc00faec976419ab51d6597414884520cb8de5a91470ea485b805b9d SHA512 0e1c2c14782d321df5056439dd9f2b2cfd61daa572a4921acb3d8afcf6c50ab679f4c06c82b8d40c0997876b9599cf609ddd77bf80c005028ad711f57d0a502c
 EBUILD bson-4.10.0.ebuild 1038 BLAKE2B accc5d6edea1904509b244195b903d37ff08669898527c9ac11590ac81fbf2d20be4cd26bdf7a279504c212a020a5fdeaa3bd184d2e3ed363fb5e519d769cecd SHA512 2957bb12ae0ea456c6cc74d6e3514b0577ffdfcc902115b7275af67c43c669f6d3cd6a86df1d6eb552b620f897446b216ca778b65a24cad403a5bfdb96a58bae
+EBUILD bson-4.12.0.ebuild 870 BLAKE2B 1ea899c03373e1f6c8ed97bb3ffddc903513aa8635f4c76957218ca76be9058c59948e306d8cbb3e97bcb83861c814739340bc480ccbad5ecfe8bdcc55b7a045 SHA512 95950fd1a9cf0d35c9ac89b9f79c3e91a8d7c6da6b213e98b63b3214f88b67bbee5f42dfca1e556757b571dffa918e03cac84f64a4ca8656d55be36baede2e67
 EBUILD bson-4.9.4.ebuild 1038 BLAKE2B accc5d6edea1904509b244195b903d37ff08669898527c9ac11590ac81fbf2d20be4cd26bdf7a279504c212a020a5fdeaa3bd184d2e3ed363fb5e519d769cecd SHA512 2957bb12ae0ea456c6cc74d6e3514b0577ffdfcc902115b7275af67c43c669f6d3cd6a86df1d6eb552b620f897446b216ca778b65a24cad403a5bfdb96a58bae
 MISC metadata.xml 343 BLAKE2B 45b4f3d9d5e86b9fee94d0b51c420d48c51b914adb49585c12519a81de40c555bc5ed48b03b751c7ab524464e46836a25d51f824c56cb03837f61ae071e1517b SHA512 a5fdde2808fc5c77be1a62a593215b8b619f53ffd8606e76db34a2eb2006deea409c64e85d6ba8a5b4089133265b6911188a9026c3698b44270ef8ce1f12967f
diff --git a/dev-ruby/bson/bson-4.12.0.ebuild b/dev-ruby/bson/bson-4.12.0.ebuild
new file mode 100644
index 000000000000..1d9b185eacd3
--- /dev/null
+++ b/dev-ruby/bson/bson-4.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/bson/extconf.rb)
+
+GITHUB_USER="mongodb"
+GITHUB_PROJECT="bson-ruby"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
+HOMEPAGE="https://www.mongodb.org/"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove project-specific rspec options
+	rm .rspec || die
+}
diff --git a/dev-ruby/buftok/Manifest b/dev-ruby/buftok/Manifest
index 5dacacb2dd84..eedf9e931a50 100644
--- a/dev-ruby/buftok/Manifest
+++ b/dev-ruby/buftok/Manifest
@@ -1,3 +1,5 @@
 DIST buftok-0.2.0.gem 8192 BLAKE2B 673a14423e6a5b3fedf078f320116c9470b49e26aa7c4ef1bda47856a4befb7653d6b62bbf621ef8614885f64fcf078d9b2e24037c663a22b350ad44dac68070 SHA512 2be11c56b49254f16cadfd8abc7c414a16a54b32ec416402a4c87be72c2ce9c524aaa17ede9bb3535555191f2a7b1d7d863199db5b4af8874880bcd16d3c3b45
+DIST buftok-0.3.0.tar.gz 5710 BLAKE2B 9c00b72e0b4f2f55d6fb66e9665a620a6fe7228293906ff1104735cafcf2043f0a98c0a3dd38e3253552eebe86622099dcc0b97a1a892c17eb1c9e707ff3c1dc SHA512 b721eeda2173cee3276329282524a7173713a901bd338bb2ce6a0e2e121cd48b6647f51579d04f7353590a0da3208f4cced5321aaee77f4b7eb9ed256b674748
 EBUILD buftok-0.2.0-r1.ebuild 476 BLAKE2B b35f1f25a81d85c6c7f0dc9b4461cce21aa8a92118da2ddc99d97cbcb6d28de63a448a89e80d533d2a31a136b0bdbe54b7c413beea25446cc86e7b35fd07b346 SHA512 6e701a819b15ca8400e1cb5d968aea05a9c6c81fd719c2cb6a535f11f4896540f252af4bf4f1dca7a51852ddcb6e3804781273d47c989b1e9e63869bb6f020e3
+EBUILD buftok-0.3.0.ebuild 570 BLAKE2B ebc5dbc1e086df8b741fa3837bf928c1f1e2b266fbefb4e2efdc2a4354a5795e71c363fba1e5b0ac845beb2a505c6ef5dd4b11053c431e1e294079c35cb16bd2 SHA512 27d218cc47649422b0c94117bd0323da4ff7eb8b0443f2e59ce6a3788f72722629550f3eedacb1503e3d5defdb766e9ebeacef097af3828901c0daf81b115710
 MISC metadata.xml 339 BLAKE2B a756fb0a347a566d191297c1bd78f6851e9e9431b3aa7a198be5979aabe54d81ed50427662fbc931a5a645620afa80247e637c0b60e9f0d335ab1f31f28d168a SHA512 8901a4d1934605e2927f1f3e7a51e1e05c638b3ec6c9a027ce21f06570630af8a642973890adfe7bdfdd1624be28798424d66c5d4696121a89a257d2ce5bb52d
diff --git a/dev-ruby/buftok/buftok-0.3.0.ebuild b/dev-ruby/buftok/buftok-0.3.0.ebuild
new file mode 100644
index 000000000000..3af1e7d55bfb
--- /dev/null
+++ b/dev-ruby/buftok/buftok-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="buftok.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Statefully split input data by a specifiable token"
+HOMEPAGE="https://github.com/sferik/buftok"
+SRC_URI="https://github.com/sferik/buftok/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index cbb12c6387e8..edd8586e8cda 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,5 @@
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
 DIST builder-3.2.4.gem 32256 BLAKE2B a2768fe25023631d134f062d8e7ff2aa25f6b4db0358bdc0d4baebb33d93673fca66049b8b9c42382bad3494f6e03cefdedc72d71958dff63d43eb7a2a187c75 SHA512 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1
-EBUILD builder-3.2.3.ebuild 848 BLAKE2B 39125cf7571c36c487e8626f696ff39ed05d8a378e166dc661c88a7a28fc2415ff3fa2cef4bb59ee8776adaecaadff0c9609ad6a67bd1fe885d5682e2a7db157 SHA512 d19fcf7f42c65110945e39dff20797e6fce1430d3725da5072f5f01bbea2978e318d4e5978956c9a278ffeab4dc462d1de2b4c52944b4cd4e34fa6e5abca87c6
+EBUILD builder-3.2.3.ebuild 849 BLAKE2B 9d7bd80ec5701eb1f2fe664e9b80df6ef0ee9319d2fde95f3eda430b714e6ee41ae7ae3108b0e7df02a34123603a5878e79c6645925bd8ebdd2a87116252b869 SHA512 5b764fc76d45cdc3fb799c07209ecead308e1892ca88820d99d120616f826010149f7a08d9c2a16fd94afbfbdd0988c50635b90feef7e70851c52337a6ffde37
 EBUILD builder-3.2.4.ebuild 813 BLAKE2B 918520f9a03bcec9879d9616700dcd7d75ae4bb4f42cc198f29c2e777382fd3b4df827e33d1b247884857d3a52649e060a45b68d035318eb59391c5da21596e5 SHA512 bfb38e0b001097933833ca3f090c8c05daf569acc5bdc2573a640ad130faf52e934a07300d09e850b27eff33e81e3a63bca6e47a929b8da71349ec6184bd07a4
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index 17e483b6c13d..d4d5ce8d8872 100644
--- a/dev-ruby/builder/builder-3.2.3.ebuild
+++ b/dev-ruby/builder/builder-3.2.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 0bceba690a87..c74d1bb70430 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -5,11 +5,13 @@ DIST bundler-2.2.12.gem 388608 BLAKE2B c9ab5f710dd1f240e651501c85dfbdb436f784326
 DIST bundler-2.2.13.gem 388608 BLAKE2B 1d500b18abd7dce33b4780ff6ceef05e51faf465b88908d2a85d4498e8f0fe661e6479af561118d83f0eee7e957831306fe9634698026534db8849113d5abb21 SHA512 321b5110a6c5efca245794b2999e87ef8ecd054df0afae0b6d6840ebc4c9ed428bcc31f5ec06e4c2d7415d5785e780beeb5abcff7270cf6ec11fc415cd232bf6
 DIST bundler-2.2.14.gem 389120 BLAKE2B 6e1a04b82fe2acb68a1525fcc5237cffde8a1f7fc2c3f522932b8819c55fc5aa9b8e532cdf71a8439b6d54a6b9b4bb488ffd498dbdaf92945129981518ab8aab SHA512 0edc95756cac080c7ceb5a435012618727b15893ce6fa6eb4fe1150a21894e0228cc841f4ea59825a430ee72c33247b6915708e3bd0f2729cf446c57421cfcc7
 DIST bundler-2.2.15.gem 389120 BLAKE2B 1f5b9d56dc6613626492321b478607db4a936fa70bb70369c924b721d0a8389542f0c3ec68b4abfe5c3471428240f56bd14b263c66f4146591d8b3ccfd5050bb SHA512 c6fddb5e96887d446efaf5571a1fae47a994a7d8b50332a6b7702af8c99a9c3899b97353041d7393541803a02604d61803cde4623fbb260484f6f17b9d1d65e2
-EBUILD bundler-2.1.4.ebuild 929 BLAKE2B a79ad4ac2dd54ceb6163218b366b45bdaaa8e5b927e232ec6a7cfff0aca675b0b994065c837778619ccf27938d5971990fe3e6357adcfad721910b24a0b4a436 SHA512 c1b5d4cb99131409fd72849a5090366c4ab180ebfbfd9c0416304e0eba18fc502ec51c56120a1545369309c9ebc16b2b4b109760aeb3a1123a2851d85357c91c
+DIST bundler-2.2.16.gem 390144 BLAKE2B 02e9c0a7a67ce80e31ad111e7dc8a08387ca615773e6ca7e998cbff882518dfc0da898fc42916749280e4b9726075491b1dbd53ab5ebf93d4aee8ba6e80100ac SHA512 3a147677cc026df2f10bdd5d73c6c4c483637c4cd507a521ce604fe385146254c653b29618c774545b1c038f08b7101315110ce7f891d83bff4c79412c6e3c64
+EBUILD bundler-2.1.4.ebuild 930 BLAKE2B d544c059292750ec7a8b094c0070db97757046fef2f966b929eb28669ff297a4e9012560199d313aa7b0090f60ab7a05746eb0f72feb24f0d9248547ef0bee52 SHA512 59bb513b6dbd329255ff208b1fce606ac1f812672c21e92f7c962b5334dd2d3b124ddc9e0dc2d2b3e70fc1d1a8fa659389cdbcb59edaae145f7d25f6a0aa7420
 EBUILD bundler-2.2.10.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.11.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.12.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.13.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.14.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.15.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.16.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-2.1.4.ebuild b/dev-ruby/bundler/bundler-2.1.4.ebuild
index 5f123936bd0e..e54f8b880962 100644
--- a/dev-ruby/bundler/bundler-2.1.4.ebuild
+++ b/dev-ruby/bundler/bundler-2.1.4.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.2.16.ebuild b/dev-ruby/bundler/bundler-2.2.16.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.16.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index ef9d7002948e..aab5fc0c3b47 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 86121e979c4a51491d0075a8c89607adf866213d6b425c787fbe3a78bbd63678e2363b6459454dfd76ecef38a4e079a0febbeaf7d25d5c22aef4f6d2192f0d87 SHA512 750811f71611229184f2abbff563446c26a2a1b7a8c617dbca8e7202c5d96cec27a249c58b91df4690092bf6442749881c925f4828e60f7dd1d1aa4e96fd6034
+EBUILD childprocess-3.0.0.ebuild 939 BLAKE2B 2f6889a9eb8d9c66ec905a6a1b85d6d2934bf73e8b3950cbbe084ae59e371c39fc9453f52df7d307e868fedfcba37efff04ad723abd4f7841b939d28461d4a82 SHA512 a36d33da58a4503c804101095d0906abb378bcb69e1286aa464fc353322f367cf964947368c6fe919af5055cddd918bde6755d1bdc2ad7ee851029b156e1214a
 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 780c28cf29e0..8ab0dffa83b8 100644
--- a/dev-ruby/childprocess/childprocess-3.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/coderay/Manifest b/dev-ruby/coderay/Manifest
index 088d102a965f..9b9e46a5be5b 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,6 +1,6 @@
 AUX coderay-1.1.3-ruby30.patch 1472 BLAKE2B c04f821cc2768c50fbc5ddd998c37878fb57ec34b6db64407850aca55d705bb8f40dcf931b97c5e849fc186295ef99530eecedab531681b3cd196b366fe6dd57 SHA512 de06cb33137899001171f2a2fce9e7e54eaa80321df1522df318e91411e6e03990e07485b250fa9b925049069a9549abaeac814501b234b3c1761932d7ca6681
 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 1348 BLAKE2B e7c43e28b7a76ba163f1888f1f51cca9f5b1ad33e797826f023d250aab270f0ab284a06fb95625e0e26c2e53f4f4174e37161e6061ae36afc1e74d1f72509dae SHA512 4b49f01229efbc326adcccec819ece3fb26e4cc0571e978af149206af6697b9afbd7697c9d3f3ee101f6d79a31808007b7861789bec6f212269dc87006335388
+EBUILD coderay-1.1.2.ebuild 1349 BLAKE2B ab08112a58cdadd308cb89a58a2f9260155c7648e1550a1aa796a62a78bfcf94e0343f8141d558648bad5267f257c397ae7623030c87f935425d89ba10134fee SHA512 d5b4745f057ced13541c0e48b23fb134e25d1e9025c26824f5bf509935e28ae425f8b43f21857f21b1188c347a1b6e31adbce47a72605cabcf86e6450eaf060d
 EBUILD coderay-1.1.3-r1.ebuild 1579 BLAKE2B b0326abc1a498f1a42419bc916f3b4ba5aaea6fc66a78b93fd0485fafbc2cebe0def9097f1ec880e180d058ecf2bc282fe0b36b27b571c343a4d984cd5a1c5ce SHA512 a093f2755c71cc4dd1b48c87920347f706ae2536c9874e3333ea47aaf91114f11b9b6ad64532292c27d74bb62b0ab81ce4772d731abf91b43330a2253b54e50d
 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 c4117e4eed7b..171b6fb51105 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index 06aca860c9f3..ac6250c299e9 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,3 +1,4 @@
 DIST coffee-script-source-1.12.2.gem 65024 BLAKE2B 7796ea3b031fe04ff286c023d5de62a1bccff6bef7aa6b0eb01e92bdae59f2e46134c0efae36d647a07cb0dcea61d7da5bf47d1197bdd02a4a2daf0edcbae743 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb
+EBUILD coffee-script-source-1.12.2-r1.ebuild 462 BLAKE2B 17b5834d723c379655b4c7fdc5f907ab67a1169da459d08a6b3efc0a5f8454aec8ad6dead714aca42d8597234ee91ed333598e996789778019f1d831a7ed9a60 SHA512 781d8a663e1c8717cdf6cf78e8eef3647b7283b144f1e412266380213d3f4a28ad36f45e5ff685ddf6d1a305a93d56e38ad1bdbab790eef86071e42151c07757
 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-r1.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..355ed45a4f3b
--- /dev/null
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
+HOMEPAGE="https://coffeescript.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-solaris"
+
+IUSE=""
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index fccc6b57e1ae..946a46fe35b1 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,3 +1,5 @@
 DIST commander-4.5.2.gem 37888 BLAKE2B e78e009a414e432d24a820dea6e85c9240e3a661eb15a17d71c152616dfd32fb02eea1e513a487ae90b8dc81e6ebc208d0bf432c37dc5a116c03c9df12ed057f SHA512 22ea0a5c88d4ec03658ca8e0fe12801a5a5918bc09031400e1cde2883bf061b85feb6d77448b256bc21f5ddee00e4afb2c08b99132cd7862f00c7cad13588564
+DIST commander-4.6.0.gem 38400 BLAKE2B c4adf5b58fe679378012a893526cb00ee71c4cda5686d397ee93aeb11dcf1b32a4aa8c4e6b77c2ed07af75bf2492da65591cf49b2e05a658e753e78a9a12736a SHA512 01e7d4076b6ff632f6852e15bf995033034a71d6320c5b3b41751e86894f5eca35b408311e757c555334d220a9a811a0d60c0fc993414961f1050d948cb9f5c7
 EBUILD commander-4.5.2.ebuild 558 BLAKE2B 1b9232e2bab5ed69eeac9597b6315ccd7846bee6772264a331603494d323ee2d701652e18bc5d97a89c8bb919342a74ebda8c44b452470662eba8d02ece00df5 SHA512 16b89db5ecbfb0de20454588338d0d0cca2e366b1c2e0da350f58487c8605c44c2dcd9ff33611ca20b52bff410c4134200c0eca499f7c19238383d6a7fcc515e
+EBUILD commander-4.6.0.ebuild 551 BLAKE2B ad3a42d4f10216176d440315b801bfe7aa4fe1a4b883ecd4e74217c5e69c703089119500d5f5e7074a9cf544877c74539a448ad0b23194acab1189346bb07cf6 SHA512 b94e0dcaa6a3f9f5c36fbb8fe9a3619ae91eee8e859d6ea666aae6dc0f96c420424518d6ba6cd2a0500862f0211af3663637825e9a7ad81b319ab350d6d74759
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/commander/commander-4.6.0.ebuild b/dev-ruby/commander/commander-4.6.0.ebuild
new file mode 100644
index 000000000000..542600a4b740
--- /dev/null
+++ b/dev-ruby/commander/commander-4.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The complete solution for Ruby command-line executables"
+HOMEPAGE="https://visionmedia.github.com/commander/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/highline:2"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index 28ac53bbc141..24122eeb6d97 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1,5 +1,9 @@
 DIST connection_pool-2.2.2.gem 13824 BLAKE2B 2f52bb3451dec5916d5797596f7bc3dbf39845321ee83736d679c433e96f154db852469b1f6d0d3b7c7f48262f7840087d89cdd40ece22b67a29c20ff77274dd SHA512 74cb64aa3f183ee4e41f438133f60581e9f99a1d5b5daf61607cff2329bfb1fbd8810d87c35d709418a22ad925049e3e9403a602107452414a67aee1c6eecfe9
 DIST connection_pool-2.2.3.gem 13824 BLAKE2B b74666181790e678793023413eedbd5b68836e6d480d79f6c12d512277a1917db0d400e08be98c098305ca065a12988bcac9d46f89b4c1380d758991490a540b SHA512 a5e54b11073723d5cf5150a47c38b37ef8e58e9adb056eeedc4427207ed1ae5d1844cab925bbbcc8a2a9dd3fe9373593ab735ce4de588b89db97800fb74757ac
+DIST connection_pool-2.2.4.gem 14848 BLAKE2B 897db26b57b91183e2a05376a86dc3fa40b2bae136a304ced6433ef4812aa81bb5ade3c744cfd57a4af58f180393c5571f1a2d97ade0bda00091d8ce0358f3dc SHA512 e8b65f270909d4d80161b5b26f013baf4761e8f143852cda848419d6d032b00eacb2f00594850899a5b4cc9a627f361917a61c3e57e4b5b3ff7894b79a4d8cdd
+DIST connection_pool-2.2.5.gem 14848 BLAKE2B d3e21e5d3c330fb501e9890260c0fed003f3c8afc6a9106c139f77e879c45232de1cbc16be6088c757a1204f3c64b0797010fddc0d1c9cf555389348b6f61152 SHA512 3bc4e4d241cd4b1adb00d341aafe7795bbf0eff459ace962670d83c20c0eaa0d42f49a1f5e61c2327ff4fcbf3abfbc6f6c910f7a31d4a0f62bc55c782ab20e45
 EBUILD connection_pool-2.2.2.ebuild 731 BLAKE2B 37ca896432e4aba932c2ee253636932b0dbf14d7bba7ba1646cb8778469e15254628b31e361d4f4fccd23c564e67fe22fdd5d4fbb1bd15b7de4be907eb8133dd SHA512 a9ad336e9ec89a980b630e499a58a0cf2ca318369c5b52b698202521cbcb09ac0cab2fd06e23ea78169d735a9c07a25e4cf062b268768f4d0acddecac59a61b7
 EBUILD connection_pool-2.2.3.ebuild 753 BLAKE2B 4976ae2a26fb6b4d28cf15a787079f6024ec97c050d648a65b2638ff6b0295448e57b3664556aaa8eef2054ebfbd887c642a02d31592adec8367da04b6f6c4ba SHA512 72e5859af088c87a68bdf93c54804e9c0ceca0e0459cb5083ca7f675ac6b61229ac47b6ceaf0d4552ce20e6669ad8d7adecde70633f8a7269afb0b538f406460
+EBUILD connection_pool-2.2.4.ebuild 753 BLAKE2B 4976ae2a26fb6b4d28cf15a787079f6024ec97c050d648a65b2638ff6b0295448e57b3664556aaa8eef2054ebfbd887c642a02d31592adec8367da04b6f6c4ba SHA512 72e5859af088c87a68bdf93c54804e9c0ceca0e0459cb5083ca7f675ac6b61229ac47b6ceaf0d4552ce20e6669ad8d7adecde70633f8a7269afb0b538f406460
+EBUILD connection_pool-2.2.5.ebuild 753 BLAKE2B 4976ae2a26fb6b4d28cf15a787079f6024ec97c050d648a65b2638ff6b0295448e57b3664556aaa8eef2054ebfbd887c642a02d31592adec8367da04b6f6c4ba SHA512 72e5859af088c87a68bdf93c54804e9c0ceca0e0459cb5083ca7f675ac6b61229ac47b6ceaf0d4552ce20e6669ad8d7adecde70633f8a7269afb0b538f406460
 MISC metadata.xml 349 BLAKE2B 7ffc13174f2f47522a66c48922952798d03fbbb15419d9a52e183c633b56d863e85fab4682420aa9fffeb16d474f52de30799489a99221f25438524dbc569303 SHA512 18245f101f862c5880a42121eac9947a22fac206823d85ba650f5766af334208a64f97e7ea44e298f4f3c1191eb6bbf0e37949974c737060dd66434e1963b41c
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.4.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.4.ebuild
new file mode 100644
index 000000000000..ec3d219df836
--- /dev/null
+++ b/dev-ruby/connection_pool/connection_pool-2.2.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic connection pooling for Ruby"
+HOMEPAGE="https://github.com/mperham/connection_pool"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
+	sed -i -e '/\(bundler\|standard\)/ s:^:#:' Rakefile || die
+	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
+}
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
new file mode 100644
index 000000000000..ec3d219df836
--- /dev/null
+++ b/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic connection pooling for Ruby"
+HOMEPAGE="https://github.com/mperham/connection_pool"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
+	sed -i -e '/\(bundler\|standard\)/ s:^:#:' Rakefile || die
+	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
+}
diff --git a/dev-ruby/contracts/Manifest b/dev-ruby/contracts/Manifest
index 6e5592588dbd..d2ef135a3209 100644
--- a/dev-ruby/contracts/Manifest
+++ b/dev-ruby/contracts/Manifest
@@ -1,3 +1,5 @@
 DIST contracts-0.16.0.gem 55296 BLAKE2B 71b058fd2bcbdf5dfc2ff60631ecfc56cb405dea08fb5b2a67fb23c859a3941ed0aa3963ef639e9cb6670d871a6301a0c8b360fff3912413c10ad44ee8dcde2f SHA512 27d757c3a6d25920ada1b24842a5ed8521bc8902b1840b6060c94dc17e5eecb91501439eb764fa2fec97dedc6591d2c2978630f56d4b38e7b607e9fccfb60ad7
+DIST contracts-0.16.1.gem 57856 BLAKE2B 72978a2a47b75411d2ae74521470d5958ef711351e2ce6776f1331b0d3f4b175d43f991a73fd2332ac0e1f6732b05a65887054a0be4452fd62f058a28ba929be SHA512 bc182431de9efbc6d23603c68a64eddcd3f27ea1ac8c2c9ff00840cf38d2f58ba595304127e6b43e504d3aa387559a5c1429b671dadac175d3a4ad2c02edbf6a
 EBUILD contracts-0.16.0.ebuild 517 BLAKE2B 072ccdc8151f17161d6a84da566e8bed9808c70f7ec4c29406f2450dd3a9bc8764c6581a92c2ff7f56c12dc4d14ee5b0ac54cdf23f2514d5e237d362bde8f96d SHA512 95269f78676dd3e3a6bcd504a676eeb13da6fc9ff0b259622883cd739167f9850ff73fb05cf416d1604a6b4eeb46d93450523b14e1f67fcaf9d556518f8a3c8a
+EBUILD contracts-0.16.1.ebuild 479 BLAKE2B ae5cfac8a7c5f3fb7e9f930dba900390e8650fa12bc24eea8bfdd9d43b536f8ea4d3f25311fadb55ad970fe76f6b0ee22df318128af789bf8dbce39e102dcf7a SHA512 0aca56bf44e88b17c0b9600cfc52eb7a777fed5298cfc7784831a1d816f742448e801f148a494584707dea25ad3aee7e91a8347e7e70acadb9aa9a0fd367f9b1
 MISC metadata.xml 352 BLAKE2B ceb4318c56fde3712e3855e711f5caab0cec265180dc1505e5a398f38648f35e4fc7af7f9bdd1bdd315b85f4ef81aa0245bcbecb803d4bd82071c43db6b7267c SHA512 34d461bdbbe0e0498653c8036193dcc8e7bcfbdad11db2ef9c5b159b7218eab8fbbe5d91abe3b4242b297625160cd232261f658a5f637d5748dfbc33bb48ff6a
diff --git a/dev-ruby/contracts/contracts-0.16.1.ebuild b/dev-ruby/contracts/contracts-0.16.1.ebuild
new file mode 100644
index 000000000000..c4807d80cb7a
--- /dev/null
+++ b/dev-ruby/contracts/contracts-0.16.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 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.markdown README.md TODO.markdown TUTORIAL.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="provides contracts for Ruby"
+HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/delayer/Manifest b/dev-ruby/delayer/Manifest
index 0da70df9d064..cbe2d474d14f 100644
--- a/dev-ruby/delayer/Manifest
+++ b/dev-ruby/delayer/Manifest
@@ -1,3 +1,5 @@
 DIST delayer-1.1.2.gem 11264 BLAKE2B b377fbeb5bd22f0e63e6c6135e86a266929ad3e77ac310bf18f47cea4dcb7cb74fabaa58960dd6ec9b1d26f3e28631da960ce51e9a2c48fa14014d5a47a28af1 SHA512 826aa27922c6d0d377db8b9ff0abd19903574a03dd9439548c82400a492127192ac875b839a54031ec7aa27d64bcef1158f0d94986f6b4d55765b6541d177ba0
+DIST delayer-1.2.0.gem 12288 BLAKE2B a4769e8397f4b9bb4e45d7e6c882e5ecf7bda42cc64bfafec7b7cb03fc01be583a00fc7fc6b3b6d974d579be6c0286c920d70d46bef74cd479f13080f6ccc69f SHA512 27a803adce3867d3dca33b184fcc5b6d664be1604696b6014757fde349cc239e02daf91acc8a054122cc25a0eaf17efa949c5268d0816fec7996c7b24626f515
 EBUILD delayer-1.1.2.ebuild 451 BLAKE2B 623449065ad93c19b63d198356303fb33ceb8be9dcaf67b59ada9cb8b0c168a8de71ee5b558225671314720989e5d50d4af3615f19d9692ba73b8a17b4fc76a1 SHA512 d531bb9b3a3ebbda43eaa236a1126fd14aa5f57d56b38a9edce62b404817ff16692e8d255244ac1e5296946a8232508c219c8631b6747a816ad65b5da2f89697
+EBUILD delayer-1.2.0.ebuild 451 BLAKE2B 53b47a12d27528ab6a1f5298f4c160736499c89810474a000d920ba36c6230ecdc6fb525c1d1bee339172e24b19d2c8c6415ea358bcea44744ed9bb2647379a8 SHA512 4edb1d63ec44d44db1b129757fceda84e30657f4de39efa7d74b019fbb4eede4014131181af6e10c3b52c578c5e4fc7a6ddb9762958d1e8d86411898ef35d96d
 MISC metadata.xml 402 BLAKE2B 55d14808082ea735f42e1973414806c29ce83dc35dbc7a9b72c70d22bb00b0f5f22f34798a8232dbf32a74a134387eb47ff014477e336c912d89bd23c388e78b SHA512 9d11aea71d2c27e3aeaa80848458166719daff95243f342b946756e9b2d0d1ab23551a3eafc40a74fad1d029798f2ec7bb67bf224ae9985bd7db9fdf4576ef41
diff --git a/dev-ruby/delayer/delayer-1.2.0.ebuild b/dev-ruby/delayer/delayer-1.2.0.ebuild
new file mode 100644
index 000000000000..9dce438b5b12
--- /dev/null
+++ b/dev-ruby/delayer/delayer-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Delay the processing"
+HOMEPAGE="https://rubygems.org/gems/delayer"
+
+LICENSE="MIT"
+SLOT="1"
+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/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 6363d265653a..4873c8aa900f 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -2,7 +2,7 @@ DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1
 DIST did_you_mean-1.3.1.gem 24576 BLAKE2B 939dc676dd7ba5dc4b64e5796b59e2901b36e5b9e1d4ccdd8809fdd008a82377c6bbd35b8677fa273c2196615ad3b7a09cd3bb57267ba2dd9216f13cd0599aa2 SHA512 14e672540a93bcf89fb41e27cca31190f9c621c5fb669256a26ccd6c1042437a69911b7ee886305b23fa94fcd0979188b423cad88f87b0adbf6c9437ecffc84c
 DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db8659bd07c6e00076efc372f6c64eb3ad81981013bf0ae3c37b942a459146af96fa001ba225ebf1f5486d717a7a55 SHA512 bd8e47e5d0135807d1ec0a5dbf536649cbaca13fd056cefc6f57293b7869608ef92a8cdcbaf4a4c4453738ecbe8a6d8bc450826a8dadb46fc69560ed05a97f2d
 DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
-EBUILD did_you_mean-1.2.1.ebuild 653 BLAKE2B 63fb15eb450551cfb3a9fd77dd4176bc1b4747317eb323256bd1789efae27475744377f7cfe50756dacf3b66d109abd98839c3aee803dc1f32993154c06ac53c SHA512 1ce7970a3408dc9fefc43596e33e0cbad075cffed793225da0df03033f6d90d94ee7b4ee2103a1860929baaf2fccfb6a7d01ce3b8d68304d7198e017f920bc43
+EBUILD did_you_mean-1.2.1.ebuild 654 BLAKE2B 10c32d22dd810f1b31670fa83421136e2c00d865abd3229181951737587ce47e7d3df774b7ea24d2da6f705452565ba13ba48c8003afe831325a192c49b43553 SHA512 ce3a72256075206d39f1b909127d48e3e67a9d39e0a19cfbbc58eff052eb4d180fbab1bf85a2242e76f400511f3cf972c11339dc88c92697b5bb9df1e3481de8
 EBUILD did_you_mean-1.3.1.ebuild 662 BLAKE2B 3883bda20b269918ab5f29944edb3990515fa92d88d2f424cde835eedb2abef59351e964ca448e565379cda95537ad5487a533cf5cd5c03f86878a1e9ef83683 SHA512 92cc1be246c7b3bc39b59f51f209aa84d3578734cd34c7a2690294d3600de749f277a7730a1fcc345a26421aba131e7a70e7dcc36f02e4ff0d0b0aacb113e9e8
 EBUILD did_you_mean-1.4.0.ebuild 677 BLAKE2B b430e3179d9ce3de296396d9373aa5326fa7f580c4a83b00caba0f224a94bc8c0b965b19109cb8d2054ded5deef2c4f747643daa9d0ba1077b7422d9f6d7cd71 SHA512 3f40468d769a9006dce4aba8c0be7084358fba01dc4d148c8c5e112b3913049c0f92ce7953f586f688abc2dd138679c9ca676c9a4eb9b7aacb0cf6f94e630f78
 EBUILD did_you_mean-1.5.0.ebuild 684 BLAKE2B 7bf3abbf2a57e6cd52f5a33002a74d184fd1ec46c2fef3a6bc0fbc48cdac08b4844bea63ab39650e1356728d8efc50e0b4db0501f6eddf0f9e4712fef2ad4d30 SHA512 480c2613442787878fb0faab0fb465c51a162ca075c092b55b494c729de658e3ada4b73ba168b30cc98f1bafb856d9c20c4bd4f9c43e1eaa1d07ccc7d7b25612
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
index 30d3f3b3ac88..31e9d98356bb 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 044b62134ac3..0336f88bfa4b 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 629 BLAKE2B ffffd2f50fa7e45268cbae7ed4fad756d590fd652ab72c7ed68f975f22876fe3d1ff8dd2c2bdd47901432515331beea776fdb4170fa7837446a21acf6dddf417 SHA512 7f04ac6d24b441f5f97ad2df70d72d8064031ccc4cba7098426c6b6a994161b6fad777cc76e18a2c6ec9616995b56fd7b689f6022dcc64755369b7ad98d8f114
+EBUILD diff-lcs-1.3.ebuild 630 BLAKE2B 8fb5f22d409c807f4fc8784a9869a1f651248da43ba2b3acea1a7cb32db8c71f68b0c153a502a9d67440408cdd9c70d6a91855991cc315a8e430499c47b427c7 SHA512 99367b4e2baca6e2609e694f20423ad3b56043478cb565dd9f705fd77591188215267687c86fb049374051c0220de88f19d4d6557f1ecf0ff997655bf81e2018
 EBUILD diff-lcs-1.4.1.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
 EBUILD diff-lcs-1.4.4.ebuild 748 BLAKE2B 2700f20d633295a15b936b96fd7fbacd5fba76238661ac463a825766e61ae32c0779a476a5919069984deaa0bde76517185091f37d4d2aa4423a4e4ce89696f7 SHA512 7a443d9e67a447a9a15d9c68025c78da6c36b3e43b20689f6460c05514ebbe4935e4c247a29282eb58d52c0b514dff17926aa7400668de4cbbb56b3aa16a3855
 EBUILD diff-lcs-1.4.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index d419417e5c06..f2e950fee8a4 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/equalizer/Manifest b/dev-ruby/equalizer/Manifest
index e57d48c7a2f8..a91700e58d05 100644
--- a/dev-ruby/equalizer/Manifest
+++ b/dev-ruby/equalizer/Manifest
@@ -1,3 +1,4 @@
 DIST equalizer-0.0.11.gem 12800 BLAKE2B e5a56aa1620273d393987da28b2a010f3cdf26c6abe2e31c4743130c6308abde8ef7656f3d8b3e1ec0ec8ad15a298af5548e31558213272120707c0f46218e8a SHA512 01273a8e83124178f5b7d7eed08a4ca6286772c26202e028fa957f3e9d655869c51a7710312a52bb654672c7cbaee5de15fa2eee01c5413f2589cf05e02700a9
+EBUILD equalizer-0.0.11-r1.ebuild 668 BLAKE2B 2129d31b6ae01ca118035ac934bd708104b400f9ac22f9d062fd70fb7639d586cda9b80d96a714c190742d007eae1dfecc89ea5c532e4ed7bebe20404acffddb SHA512 566c62470117234a778cd123a569de2fac5bd3fc16c44ea82e59e1ab24f284c0be24c92493fb5d8ab80eb7dee077f69499be1a9cf7bae4be0c3066e074b307bd
 EBUILD equalizer-0.0.11.ebuild 668 BLAKE2B 98b69dc103074497ce043c2d3e752c48c83a0dda63dfc3f034e8d41a7ae71bab34697f697c5892c1a9dd21496e29c29516ccd2f023cc93a7df866b135497ec41 SHA512 d3ce5ee011a61f80671b1de1c9c58e8b4cd96bea77a58c55648fac128f114bfe44afe0c52e0dd893deff4af81b07da88ec06dbbfeb63730da076d87a4ff70ee2
 MISC metadata.xml 341 BLAKE2B 6279f462bb76a9da892158bdeb49d8a41f19efa9ee43f129809a11307959cb38cdf606322eacc0c6b74e62f53584d067d1ff002030963a8f026545b9317e12f2 SHA512 409b5e2ff7c9676a6d1337e8a284219a29060b42e0e547912722026e47c3218a8da7e4a30c809e6b30d6052d134366bd2241a41f705a6cd943835f28315802c9
diff --git a/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild b/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild
new file mode 100644
index 000000000000..f796c0589bfb
--- /dev/null
+++ b/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Module to define equality, equivalence and inspection methods"
+HOMEPAGE="https://github.com/dkubb/equalizer"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e "/devtools/d" spec/spec_helper.rb || die
+
+	# Avoid a failing spec caused by memoizable 0.4.2, and we ignore it
+	# there as well.
+	rm spec/unit/equalizer/included_spec.rb || die
+}
diff --git a/dev-ruby/ethon/Manifest b/dev-ruby/ethon/Manifest
index c21fcbeffedd..b3734789378a 100644
--- a/dev-ruby/ethon/Manifest
+++ b/dev-ruby/ethon/Manifest
@@ -1,3 +1,7 @@
 DIST ethon-0.12.0.gem 56832 BLAKE2B 04765dcb9599e7435c3f71b1e8c35b815123ec460dbb761360146b24acaff1aeb52a75efe5dbbacdbd11e7247743988629ce965604cdfd15cdd75ef03301d9da SHA512 5fea666efdd5e2d568d0e074f205525656e202ecea3bb5ff8a8ab838a596cab349b869baffb7926227d6cfdae5b9c1cb86bb201b4c9585056c6671ab4feee596
+DIST ethon-0.13.0.gem 57344 BLAKE2B 2d8000bba75bb2b047bfb22dbbc11f9ae77b2b2a0a00e75680f8d6eadfdb5e2dcb72dfcd314e5560f1ebe0429f6aab5b25c265c2a6079d638dff5b5e1e2284ee SHA512 835de568dd701d8b7fd8848a4fd48043569b6473859bc17b2214f0d645da270303060a3dc242d9dc814edd58cb8a753a07386b18fd1ef99dea1cec52fc2e346b
+DIST ethon-0.14.0.gem 57344 BLAKE2B 10dd81966e3e11607f3954616d17fed79be4ba0793cb4e67b39d5b0768ce2adcea88551238c57889b6d14b3d4d9b8e96110d622f5fc40c3856788338a288d4c6 SHA512 765454c3c9132204d6cc0ff09478b252e5cbc78d4f3ca35654942ba19b5aa541d846f1c37ec16e51c54aa41e03debdf8fc084b8f4540d230431d0e6f885f1a51
 EBUILD ethon-0.12.0.ebuild 705 BLAKE2B de56852055168ee60793ab88416671ca6072c3db6238f90c99a34c08c482804e765c9115b1fd4799728a21864d175b9e0cf1e27f3af1a392eb8ceb773cb9705b SHA512 5a03e685e3eecc998ecf20acb3c3032950e83b854b9eb7e98e4a4d3c144d44911c156c87f8c4a7c36af782cfca4c86ea23a50fef810978aeacf14e7361675403
+EBUILD ethon-0.13.0.ebuild 699 BLAKE2B 95e35b489f2826e3df5b4c03bc56d0ca4d4f978e2301b1c16618ec3414df6b53eea2e23dc9b90bf22c820cc704954c5524721b2df400e889c009f7928058c622 SHA512 b251d81dff73ba01a0c7ecfc80c8560d1ce20a86451e1367ecd3d130c0019e55d46c1066d0627f8c23fb1c8e9e5247e782906557086855165077711b8ef39067
+EBUILD ethon-0.14.0.ebuild 699 BLAKE2B 95e35b489f2826e3df5b4c03bc56d0ca4d4f978e2301b1c16618ec3414df6b53eea2e23dc9b90bf22c820cc704954c5524721b2df400e889c009f7928058c622 SHA512 b251d81dff73ba01a0c7ecfc80c8560d1ce20a86451e1367ecd3d130c0019e55d46c1066d0627f8c23fb1c8e9e5247e782906557086855165077711b8ef39067
 MISC metadata.xml 340 BLAKE2B e49ffc5833004b5841c276ab1d712c48f8682d73aaa58e0910aead01698be2aaab88f4cde7ebc0d49ed34d177a3477ecbe99928c1924ddce664e2d4523b06210 SHA512 d6fddbbfe4745ef287bfb946576e68e72f135dd9664ad8add271f0d1724b0da518472a7bb26caeff0d62b5a720a2bff223a33b7488c15f5d09668b66ca40cbe5
diff --git a/dev-ruby/ethon/ethon-0.13.0.ebuild b/dev-ruby/ethon/ethon-0.13.0.ebuild
new file mode 100644
index 000000000000..92e6a1ab5fd1
--- /dev/null
+++ b/dev-ruby/ethon/ethon-0.13.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 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="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Very lightweight libcurl wrapper"
+HOMEPAGE="https://github.com/typhoeus/ethon"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND+=" net-misc/curl"
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.15.0"
+
+ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '1igem "sinatra"' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ethon/ethon-0.14.0.ebuild b/dev-ruby/ethon/ethon-0.14.0.ebuild
new file mode 100644
index 000000000000..92e6a1ab5fd1
--- /dev/null
+++ b/dev-ruby/ethon/ethon-0.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 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="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Very lightweight libcurl wrapper"
+HOMEPAGE="https://github.com/typhoeus/ethon"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND+=" net-misc/curl"
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.15.0"
+
+ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '1igem "sinatra"' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 8f54e63fe114..1e9c58f26483 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,5 +1,7 @@
 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.16.tar.gz 407315 BLAKE2B f9637841bd2c1d369d262c77876f08bb248f6a98e0fcb10573c872d521473790ba6eaa8dfcd6a8f0da2becd2f10c2bc7fbfde0d3a44f6a3d38c9e5f363e27e66 SHA512 3adcb7c3ce90a9cb71486c5d86eeaf1f0794194f51faf149052333d2f55a8a8fbe1e5772ecf9a0ed53196cfe732effeb383a42a43942a7803aa8b27e23939d23
-EBUILD facter-3.14.16-r1.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
+DIST facter-3.14.17.tar.gz 409415 BLAKE2B 5884d1244ee869b1e8880bb243996be5a0377adcbcc7e02ccd94a98f3a98d700ad129a457dcddcc3aeae6027fb818032331ce5690019fe7186e8deb9b022430d SHA512 109a7748d883748c516ff7262c7eb589f3c7321edc3882aad242f6fece566d1e6e81f340f3dbb3a7fed16c528ba0da8769984c394178efdd447f10de1841ff53
+EBUILD facter-3.14.16-r1.ebuild 2095 BLAKE2B ce1412348d87e2aee040c59e03d7a9e9929a8bf12fb517560354c6e9e531c83eeebdc0c62eaca833abfb928a36c687ba7625eaa77f490e362573832d91271bb0 SHA512 7289e7af028c550b47ebaf39e533a476a5fa32572a1ec5ce81110d380574088ad1670591d47520a061bfe8cefc9af729a70b39e5976c72e29c35e5f3bfd72790
+EBUILD facter-3.14.17.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
 MISC metadata.xml 539 BLAKE2B 5e7dc30c0696bd913c537091d3b9ea909870a833c82811ceef43633486e6434eacb22dd288e2ac544303e085eb60934619a5d8d39d8d2c70c2fccc319e00cf5c SHA512 33939edfb2a516911b9de80f36d80e1193086ac0f5bce5d2117706f976921fe23b90cbfd8a25311a9d5176c90ec7aed5987ad9821f5e410b97818782b50d83c7
diff --git a/dev-ruby/facter/facter-3.14.16-r1.ebuild b/dev-ruby/facter/facter-3.14.16-r1.ebuild
index b69eea0e499e..663babbeabf9 100644
--- a/dev-ruby/facter/facter-3.14.16-r1.ebuild
+++ b/dev-ruby/facter/facter-3.14.16-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake eutils ruby-ng
+inherit cmake ruby-ng
 
 DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
 HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
diff --git a/dev-ruby/facter/facter-3.14.17.ebuild b/dev-ruby/facter/facter-3.14.17.ebuild
new file mode 100644
index 000000000000..249ddd7569a6
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.17.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 6afef6444a2b..9216881c1616 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -3,9 +3,9 @@ DIST fakefs-0.20.1.tar.gz 53626 BLAKE2B 013f49b57355943eb6624540be93bc069c95409f
 DIST fakefs-1.2.1.tar.gz 54106 BLAKE2B bd1128871a36dcf8f0137c9ee13c581cddf2ace5a2959e863c66e52dc5b682c75e0f4507c7d939f6725bc1b5a8446e1747d188b98b1cf557c0d1fccd1d3c7040 SHA512 e18d9c1c5ac444f2a9db362dac3c4563f27c4f9b6e6870960e85882ab28dadee53bd56f6933f6317d3128a5ad3862980fa9e2a72cbf7352c58c18a6cee68163f
 DIST fakefs-1.2.2.tar.gz 54072 BLAKE2B 6e1865377c6586fb409f6392b0313e750c1810b9479c120622757f711da55644e8224c8245ce0ac187c6d531a80ae54081add5572b5170f367fdf1d58b4df924 SHA512 4bd0995a1dca27a15da49962b0fddc1daf1e11f88767bcc36e57883ec62e4270d5d6873f52d64859301a5f186e467d368fbfbc0dcabfbfe24bfdff6b6a14389d
 DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692
-EBUILD fakefs-0.19.2.ebuild 1069 BLAKE2B ebd1504e668ab82c0c84f22ea51eca60d010e4f8d1d2b1b12560e5db82542c543a8e035eee894bc8ad8eed968cde5f17a0c672c66dacf1bcf088d0f85bca6399 SHA512 45280ab604d730cca7cca32f5e48f2c88ef6b0756bef4140a7317d5e59efe665172a900688f780182112398d478564f143ce76840ed624b193e7b6824258488f
-EBUILD fakefs-0.20.1.ebuild 1074 BLAKE2B b4edb6cd64d7363d7ae54a0b5ee24b5a290b8c93938ade0462d898752380d0db4af8d0243f472249a5d13b8e46aa9ea62d369b1ce20359666b021a801dc71c46 SHA512 cf9fb6ba157dea8004bdb98fa89969e58703cbf55959c50d82e5eb376e065849ba743a571a73d029f8d4d31af71b868201272f20549606735b42478282158f42
-EBUILD fakefs-1.2.1.ebuild 1148 BLAKE2B dc492a7b2f37c5272d002190d7732a4e0e18be2881c58af4e1a6be2ac1917d73a76044e9d041574b1d019c56f2d8bbfeeda9c922b8c3ac4df6625804cb69adcc SHA512 fb046a13857ce521045449bc92c6da4c2dcc5970f66126cf6fbf27bf44f03a66186babab8dce2db3895290562ec5f3ebef221678dc6e666637c82a5f7db5baf6
-EBUILD fakefs-1.2.2.ebuild 1150 BLAKE2B 187f959209a8b79b4ead78dbafd2d94a09e91b62571e13ccc94e4b561a41ecc5f391e5916826e53f1f78ede3d3523c515af0bf86a5cd93987302ca72ff8d0226 SHA512 581c5562d53d6eef8d89d85f13a63882794ed47bb895982b4160acb814c2a998c5e7d7c1e524041b2f8deb23c5d62d2ed5c5341edec309fe9df15221731461a7
-EBUILD fakefs-1.2.3.ebuild 1143 BLAKE2B e1384a0e014b552e0f05f82055b8155312f52b8ce3a9fa7d8828da9472f6a764c2a22ed4a68cbeec96fa5d076d40f09ec8940de386b6bd45f52411fe3db6e749 SHA512 cfcb1924e15391681cb8f0425588ffd0b3ec2cf7ece1d3fd8ac90f8c6ea588c89d9f1895d326c10e8c078195b8e98bf9cd620e55a9ce9c1c209e1b0f4666e925
+EBUILD fakefs-0.19.2.ebuild 1062 BLAKE2B 92c1f1feb018629ab6bb310d1fe11387a9f5a5eb549b0d6c00d5edde95db4ec4f01653c316292246710e713746ba1ff35be062af3a3a01d28224a907881f78fa SHA512 0b86d994e4451ed4d8ea85d05c475dd9e3c40441a251c30c8beb8a638847965b6889c4c126921a44a7c347fc90ba2e19e20a4865a25d7ca211eeed1c62227fb8
+EBUILD fakefs-0.20.1.ebuild 1067 BLAKE2B 698aff2437bfe1840386002d11e156084b512d13d30ef03895d81c46139e570bf0afc540acc7246475efbda67bf3f6462ebcdc8c45170878327beb2cf9769263 SHA512 c7a97751ca2bbea8713e7fe8f1f82407d6b167cdca2e5eb1c08a6ee79fb8bfb592ebac210bdd0968b4848fc7733ca742b77d0975ef39fbcb52cfed9250043715
+EBUILD fakefs-1.2.1.ebuild 1141 BLAKE2B 3cf361bb7c5625312868bf64f710e772706a2a8555022b511c4360405f63e58ab7a060e56f07d0f05837f2968a0b2e5a802bc059ca9a7f55257591e449ffe543 SHA512 b02ee9eaf32ad535b6a1071a161093b4d4e7dde8c53b101b6a4287abbf026b8ceccdb396a15a1d45f3db531d388d5cd48eef4fd512ea2e1e3cd9da1fff0372a0
+EBUILD fakefs-1.2.2.ebuild 1143 BLAKE2B 57e0bbb8d30020e21beece038e497aba0639114dedb1f2fef2de731f5395df9492b2a909d635a4fbfc3a946fd9ddefe4498ac771c57e707c67e8112bbaf96616 SHA512 d32a68c75df57358bd5c47baa41e5ccee9c6dfcf0369ca6103701961aab0453b36683936ef344150a004a5a457de6a9df4681aeca540793a8bfd957ad1bbf145
+EBUILD fakefs-1.2.3.ebuild 1136 BLAKE2B 46769de8301a23b4237ad9f9657d9d07cc75f6eee1c82f43241e6d021da34ddee8004e849e47692169a2d7c532ea15534a93bfda0d4269c72f320c9f35298511 SHA512 45f34cf31d76e80e80bd9357be59773c47fa91a4d38bb01c230eb160614978efa2a920a49d1e24a0904c1f3affe1fc2ba8bebb9614e823bc3fbd25851e3fde92
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.19.2.ebuild b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
index 4defcffd034f..c93a669ad791 100644
--- a/dev-ruby/fakefs/fakefs-0.19.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="A fake filesystem. Use it in your tests"
 HOMEPAGE="https://github.com/defunkt/fakefs"
diff --git a/dev-ruby/fakefs/fakefs-0.20.1.ebuild b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
index 7c11d7213eb3..67991e1962b3 100644
--- a/dev-ruby/fakefs/fakefs-0.20.1.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="A fake filesystem. Use it in your tests"
 HOMEPAGE="https://github.com/defunkt/fakefs"
diff --git a/dev-ruby/fakefs/fakefs-1.2.1.ebuild b/dev-ruby/fakefs/fakefs-1.2.1.ebuild
index 2d80ea9076e5..6de4026637a9 100644
--- a/dev-ruby/fakefs/fakefs-1.2.1.ebuild
+++ b/dev-ruby/fakefs/fakefs-1.2.1.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
 
 RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="A fake filesystem. Use it in your tests"
 HOMEPAGE="https://github.com/defunkt/fakefs"
diff --git a/dev-ruby/fakefs/fakefs-1.2.2.ebuild b/dev-ruby/fakefs/fakefs-1.2.2.ebuild
index a8cd29a621a8..b438141a820b 100644
--- a/dev-ruby/fakefs/fakefs-1.2.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-1.2.2.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
 
 RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="A fake filesystem. Use it in your tests"
 HOMEPAGE="https://github.com/defunkt/fakefs"
diff --git a/dev-ruby/fakefs/fakefs-1.2.3.ebuild b/dev-ruby/fakefs/fakefs-1.2.3.ebuild
index bbdc01afdbcf..3cfa0257c8c3 100644
--- a/dev-ruby/fakefs/fakefs-1.2.3.ebuild
+++ b/dev-ruby/fakefs/fakefs-1.2.3.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
 
 RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="A fake filesystem. Use it in your tests"
 HOMEPAGE="https://github.com/defunkt/fakefs"
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 69a697fe2a29..16a3e4ce0456 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,7 +1,9 @@
 DIST faker-2.14.0.tar.gz 1150487 BLAKE2B 51343e8d45d2615d180fac4845d2cc8a6509b3710528c2770e52f2e4203e458ba07e3fa4f8f7559704598379b54fe38d8d557fc6cc0b614f3695cee8265adc49 SHA512 3a65a65c587f9e2a12c0d7a1e5ecbb12d059146cfda944d5bca950dd2b8cbdb509722b7b181fc619f395ebb526c3f99461ed74803a79cda1b74df83c203db518
 DIST faker-2.15.1.tar.gz 1213822 BLAKE2B dd627078ce1edab63a3f16a5e893c29911b9bf8d88b6d490a368ec16a633e7138124ee66d439738c4f2a8e14b6d0815611ed744d5323817873a0e13f2bddfb06 SHA512 de3721290683a86f985c2783c749be530c3306be73d929517fb54dcde2f64b124cedfa6b10c51e390a38a0b5ac81e2feb0b491c165d0bae9f017463596794fbf
 DIST faker-2.16.0.tar.gz 1234511 BLAKE2B 99c53c85094022b33f2213af20b642fafb885ae9cb99169aa2684697e3af9d393b73476ebcd4e7e0541777d0648a53570cd93c352316a7f86c7a2026bf02b47c SHA512 b33054414ad57dd34ce0448d3b8a411d71a14bdbd66fd969007267d1969b40dc37b8d1b6622f81dfe1ed9d38b95cdd9dec699e3233195cfcdb9289d309c0a6f8
+DIST faker-2.17.0.tar.gz 1268170 BLAKE2B 560fe5ebe8384121e720b540d0375aa50cfb40717e2ea4d438cce1918a7996fa3414a01344c26c65e2e0ac6115b3694985355543290b89500359ddc523e47304 SHA512 fd5e3726d881d6378c21932d97c5d92c23e8cf0e36289f6707d76474dc5ee843a731ea6c6a29bfe33564bd7521c91e1a90adff0c205c19a77b0a944766b1d159
 EBUILD faker-2.14.0.ebuild 794 BLAKE2B bf8cbf0dc5a7992dd7bf20b2352783abbd1d23e71e7ad710641473820fca5ea3e8828f132edefcac7b1c0d992230bc4da6166c0c29386214324fd90af4d0f1d3 SHA512 a953537117984f3169944b80a4707901a654f46f64240f94bda20676de0927ce2be8946412c27dd8599c6d59f49df88e0d6f919decb870bce69fff50e1182a1f
 EBUILD faker-2.15.1.ebuild 800 BLAKE2B 2bb2848c765ef5979b3168ccaab019cb9986f21e39a9b24df18d28956380745caaa32965ab6f6099dfb8a1b8c02aa259d03615f52162d9fb6547537dab065651 SHA512 e9b4b50fdabd07315493fb58cc96cdbe038706337ca8ff0107028bc38a20eebd306c945cce884a882cd86892e1926231897029619f3b42d24e7c5f2f6be049d6
 EBUILD faker-2.16.0.ebuild 800 BLAKE2B 48abf91e902c8827ce02aaf335a2b00b3be49a46be0c5f2d99b0b41102ca91c038b1f66a07c0d2ce9ce954c4b3d1aa511b492729423dceeabeeae4518faf5c15 SHA512 012926c832369b208e0011dbbe61ef176686db5d580953063618a8c4ded8729d81388c260f081a8a70e4015cb62310bb5afeb1d293166fbf9a0139c4e8b7c150
+EBUILD faker-2.17.0.ebuild 800 BLAKE2B 48abf91e902c8827ce02aaf335a2b00b3be49a46be0c5f2d99b0b41102ca91c038b1f66a07c0d2ce9ce954c4b3d1aa511b492729423dceeabeeae4518faf5c15 SHA512 012926c832369b208e0011dbbe61ef176686db5d580953063618a8c4ded8729d81388c260f081a8a70e4015cb62310bb5afeb1d293166fbf9a0139c4e8b7c150
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.17.0.ebuild b/dev-ruby/faker/faker-2.17.0.ebuild
new file mode 100644
index 000000000000..d9a2059ab502
--- /dev/null
+++ b/dev-ruby/faker/faker-2.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 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_GEMSPEC="faker.gemspec"
+
+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/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
deleted file mode 100644
index 209521c14d09..000000000000
--- a/dev-ruby/fakeweb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fakeweb-1.3.0.20170806.tar.gz 61449 BLAKE2B f015f95897383e0b65ada5a7833f7bd3fd61ae77f4ab38bf6bb47f2eecef0c778928090302e46157ae4e2fc6c3df4559e9f5c8004a6474ad8852d157aa3af6da SHA512 1871b7c9f2e4f12cd1c434ef4f760828187078a951517fe3f7a6ca5c5d6f08e3056cae2bb012eca1ba556c2f4d369cb2716c637fefee67eb723428195c482edf
-EBUILD fakeweb-1.3.0.20170806.ebuild 1448 BLAKE2B 9a829850cd91e4c1bf8a889a1411d367549b3d9efcc8722b5031ee5b3b1629fd96f1fffd2d6af32d406a1b6f31a467a93df34c4eb6da704519ee554d1c5ad46e SHA512 fe8ad0a2b5b98e45465d6ec3c263e78d1e3b577b368f7ee1873bcdeb191a329e59256d1aee0f09e9ef64f1adcee558079a58cc7ff95b97f4910dce58abfdc4b3
-MISC metadata.xml 340 BLAKE2B 7058eef4592a28cd630ef9d8ccbd6920dae2909bb1740172464de06215a3a970e2291a855cbad1206205e90cb04bb711e4725b8d566e6388134501706168914b SHA512 4915509da84a354d665c9c59881e83356a8e8b2f7f09afdae68755484a6e575a7502f98ef8da1cffab96ff12264c048cda182f1c5042b95b058b731bf0395077
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
deleted file mode 100644
index 99dd3e6ce4b7..000000000000
--- a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ruby26: not compatible
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-COMMIT=2b08c1ff2714ec13a12f3497d67fcefce95c2cbe
-
-inherit ruby-fakegem
-
-DESCRIPTION="Helper for faking web requests in Ruby"
-HOMEPAGE="https://github.com/chrisk/fakeweb"
-SRC_URI="https://github.com/chrisk/fakeweb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-${COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	# The package bundles samuel and right_http_connection, remove
-	# them
-	rm -r test/vendor || die "failed to remove bundled gems"
-
-	# We don't package sdoc and we don't have the direct template.
-	sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die
-
-	# Use the test-unit gem to make jruby compatible with newer mocha.
-	sed -i -e '1igem "test-unit"' \
-		-e '/bundler/I s:^:#:' \
-		-e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid test dependencies on unmaintained packages that no longer work
-	rm test/test_other_net_http_libraries.rb || die
-
-	sed -i -e '/test:preflight/ s:^:#:' Rakefile || die
-
-	# Avoid tests that require a network connection
-	sed -i -e '/test_real_https_request/aomit "requires network"' test/test_fake_web.rb || die
-}
diff --git a/dev-ruby/fakeweb/metadata.xml b/dev-ruby/fakeweb/metadata.xml
deleted file mode 100644
index d7fdd1dd499c..000000000000
--- a/dev-ruby/fakeweb/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">chrisk/fakeweb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 0c609600481f..24f6b5c79e3d 100644
--- a/dev-ruby/faraday_middleware-multi_json/Manifest
+++ b/dev-ruby/faraday_middleware-multi_json/Manifest
@@ -1,3 +1,3 @@
 DIST faraday_middleware-multi_json-0.0.6.tar.gz 3455 BLAKE2B 3fcdf69d90fe2da5cfe16851b5a5050429593c39c3d56eeab3e687ee89d036822197273fda44370878fb4087c29d6e2357b3220526c9adb8566a83f8d50bbac4 SHA512 4abc794a06725d4a584af08a58874162f1bea6424569f0fa6683ac0df7882708d3872e6a42024d7fa764d08688ceccbdf61d9870f23b71ea3c842440b495cc61
-EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 896 BLAKE2B ba2383753ad41ce636aacbe8e184af0cae85bbb0f631d41fb83b6ec670c2d0f8098a122bbeaec450c9957787a26fde0b9e9d0375eb5c2e955875d9cca9851a52 SHA512 9890daa324a7e39bfc6f3b629c759e8ff253ec9850b0ccaaaf16c2927991c4f33694ecd7e8b7187524798f0563272b4358acb6a52e286b8df02018d437fb296c
+EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 889 BLAKE2B 0e1da545a766360827156ea53bc3349c0be8810be913dedd20328c8f44264e374c797f092a45ad5a41219eb75bff96626cf9732cb3bf3ddee7c21c0fa7bbc693 SHA512 f1e8e1b879ed78b7b2a1ab3eae0b5c5b500933cd29c0529f75af9b342c05d7c59d69af93cf39172be5c162703344ad72c28df1c9a9517b4c2e4246340ea283e8
 MISC metadata.xml 623 BLAKE2B 7be969984baa0dbd08ae9c667ab8a6dc7144de07d5a54721a0f8630ee458b02f8e21f2a693d43224d860daae2464e5e88e43b437c62dc695cf2d2c61cea13e9d SHA512 df56fd21e8b99a769ea2e9c214a2720f90e32d410b78bf884c13fca5a4f79d84f3c3f02163e7b3f39d86f15aa54e6bf1fbabc15e0bbbd4bac8c516f241b0d2e7
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
index cc3b566db30d..8a361475fdc2 100644
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
+++ b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
 HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index bfbf5bc85bd0..65bdc413e376 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,5 +1,5 @@
 DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
 DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
-EBUILD faraday_middleware-0.14.0.ebuild 1766 BLAKE2B 06dddaf28e89f8fa6be75f51125d472fbbcf2b3e1752e8583785e2930ff737e166fa657314fd4360c06c10ddf481a08c2fa0e7f674ba3d620fb31ff9ce5cf9b0 SHA512 817d213301f0a64684596af1bd4d6878fc3e627955d6b4ad4540ed794623f9f1e26c5e4f671ec326bfa725ca445e577854d498bbea18af1ef6c0cd06a962fb75
-EBUILD faraday_middleware-1.0.0.ebuild 1639 BLAKE2B da1dda0398e9b177038aa8c60db762257ff56f856408d137de591c06195814270d0257539d2657ba98f0c46d2a23beb04e507604e3a29b9a1f3e7dee577bd5e9 SHA512 2a297657377589a918516d1d63aa91e8c4ac4aab3b1f08070eb68facd33f6fa3678f3035c13e0fe42f048b4d46f04e03fd533415f4dd23f479849adba3faca0f
+EBUILD faraday_middleware-0.14.0.ebuild 1759 BLAKE2B aa619b492a17e2b4361d0e4f28a2d10c5c18b9f5628620e74639f5cf77ab53ac222dbe4cc3633577770f29bff53ce851aa4953572d4118e001ecdfc4bb915d9d SHA512 b0059c01e7f72f5910664fe1d826e87b80c741a876ac3ab23e0f5247a0f3028f5b4bb38bf6f33fc3adf4908a342a5463f45ef953d97ce04a1876868da0aa58ae
+EBUILD faraday_middleware-1.0.0.ebuild 1632 BLAKE2B 5e4c72e53cdd85e3417e864d24c4d0c1181c6fc6ad02f53785fcb79195ee89adb32858a2f30e1293bf7d738171f9911d992a735557fa2b80f12368d4f3cb4273 SHA512 d356320068e0cbb93102739128c9aff3c47c4121e9107a570fde1d97cb4e2b54076b4e3d02d63db8db820adb8b1a412bb81d3588b20f939de6c478b9d16834c8
 MISC metadata.xml 729 BLAKE2B 684a1b5173fc890eeb563bafd76307f16fd74207ad0d16b08ea57eeac54e9975dc080dc19341c4cb9afef747d659a41d42cda8a43fa0a5a4f87f835e8cf08c7f SHA512 29fccc8e1b7554d73c75985809b7e9fece60e481f1926f4f8188fec19e32b3c4c02dca2a1fbe30ff2d6264e60a4f88436e3143d5a0137312e396a19dbfe79875
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.14.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.14.0.ebuild
index 9f9051bf59ed..335ed09890d6 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.14.0.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Various middleware for Faraday"
 HOMEPAGE="https://github.com/lostisland/faraday_middleware"
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
index f95b46aef9fa..7434e8efdb68 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Various middleware for Faraday"
 HOMEPAGE="https://github.com/lostisland/faraday_middleware"
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index d74716f9d635..f54fb3967641 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 45516a831b889fd56ab86ef256a5109881cc31d101baa06dc5b793b13e361b82d9155c67986466de568901d3430896ea1b71b5caed6ade66e09d61046c840ed8 SHA512 98d461e6327efd3bc9f1f6bae3df70c1b002823040a68f2f89fd5dc6761cfbdec3e60c68b5e32298f2aadcae1c4218adcc73a4d96177330808487ffd4353894b
+EBUILD gherkin-5.1.0.ebuild 567 BLAKE2B 989921fcd295f60a8840907ec6cf5453dc9098d3ede27337936ed8363bec24cdfba31709ff497cf8ebf948db95c262cbfc46431d16b62444f00509836d0b3070 SHA512 85993ec22ec039d8d83905deffb371cd7fa6675c9966f673ac3919551591678ca5452173e689a262fa4238e60385337447c6231bcc609c6cb8dc99c4fb9a0ceb
 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 39c87437f0ba..fb6de66d1c2e 100644
--- a/dev-ruby/gherkin/gherkin-5.1.0.ebuild
+++ b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/gruff/Manifest b/dev-ruby/gruff/Manifest
index a5dc678029a8..e0e0e00eaa07 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,7 +1,9 @@
 DIST gruff-0.12.1.tar.gz 27157241 BLAKE2B 18e0fc5398c16bc6eea9e628b4be887e9bd9e260e23476fbf7115a0db952ec036d36e5d28edf1b0dd121bf6193cc01fd00d629ba88da33b796db5618e3d401ab SHA512 553419952279cb26043d394286de26b0b63a57495a51e595d344cf8613bbf08b6838fd07d77e8c9272a1f3cb45042f88b9d3500ebbb6acca2bae8c6ded12b3bb
+DIST gruff-0.12.2.tar.gz 27157493 BLAKE2B 230e6c70226e3754719f8ca059ba6cfa68909b98b63d7a4ac753f7c6d5993117e3aeae2703565c8202c75863f142c3caa1d52e65fbcb8f26f173ac4f95e5ecd4 SHA512 a278066eb9e22dc1c30b3b607fac78e0f232a1c086412d895a648f640aaea5812b4783ff9f2fbe96e3200ceef7b58362571dd857da75266f124f415ca5527d9e
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
 DIST gruff-0.8.0.tar.gz 24712264 BLAKE2B 836ea41e8c7a91ec09ef5356e4f021f99381be4ba437bd043ac628a31ad02f1846cfcf182c2ee038ff90918386413cc9d213d9958412c2bd0c89b1ee2d5c481d SHA512 867fdf50c41bf0e1040ef954c00bced11df0c3d382333aef42f6325a30a950f2ab04e0a5beedf1ab5c3cb23d1682b56d2a398d8afc8d7aa665980ddac4e6cdcb
-EBUILD gruff-0.12.1.ebuild 1588 BLAKE2B c278067dd23bf1f656678a50a59057d04da7ac8fd451789b3b858c8fe32bce3c823f1b2a4d487578edcc741c85d806f296f26001e8d62828bbec737ef6f98470 SHA512 73f090a75de7ddd94a7a0e48982307a261b11fec481da88b47d34fa4951e4678ceb5f9ffd388b0b966a340c90520212ac04b689675c9a3d29cb05bbc2fd607de
+EBUILD gruff-0.12.1.ebuild 1593 BLAKE2B e26f323d958c2cb9c1a977ced3887ffb920535de99571a73ecb423b9a53800cfbc6a4895b87fa272e487098759b75af6f72c5bbb5c69b04a303b9be997a40440 SHA512 ea15cc517500e6814bd171bfd7ded6ef23c50c5a9214a9b2e544e99eff79def8bb67147053c179c02e2905a337cf471817f15c794bb63c7a35e9ee8e435d7a78
+EBUILD gruff-0.12.2.ebuild 1593 BLAKE2B e26f323d958c2cb9c1a977ced3887ffb920535de99571a73ecb423b9a53800cfbc6a4895b87fa272e487098759b75af6f72c5bbb5c69b04a303b9be997a40440 SHA512 ea15cc517500e6814bd171bfd7ded6ef23c50c5a9214a9b2e544e99eff79def8bb67147053c179c02e2905a337cf471817f15c794bb63c7a35e9ee8e435d7a78
 EBUILD gruff-0.7.0-r2.ebuild 1448 BLAKE2B a177b6d58f8fb977308f86fa0372919d90cbff9be96d1a1ffcb362c1faad11aa0d423d7894ed8aab312bdd22f6dac58506401de873ffa18de704111fdb08092e SHA512 4790cde6289b55df95aa2ea410c7aff604b45b5056d1251c130e87939d0a06f6ba2c15c808c1920246fd5af6af5559a903e569a12c5858a2476bb155aafbfee6
 EBUILD gruff-0.8.0.ebuild 1416 BLAKE2B e77119bba425b5ecc75e1adf342f10e41487fb012a94fca1e8bab5bfce2d55f682756cb9acceccf3e04ca4941ceb096ec298777d9bfa12437ad4047d8a160bec SHA512 97c2e62b99ce63e11355fa7e94f530d909b31342360b91a93ac4c8d8ec01b57607535b404c8b1781608bcf46b958c43119bfc2974b6edc6f6ba299e941725748
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.12.1.ebuild b/dev-ruby/gruff/gruff-0.12.1.ebuild
index 9c7cd283b200..93d003f39581 100644
--- a/dev-ruby/gruff/gruff-0.12.1.ebuild
+++ b/dev-ruby/gruff/gruff-0.12.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # imagemagick is an indirect dependency through rmagick. However, for
diff --git a/dev-ruby/gruff/gruff-0.12.2.ebuild b/dev-ruby/gruff/gruff-0.12.2.ebuild
new file mode 100644
index 000000000000..93d003f39581
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.12.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/reporters/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find . -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 0d10da6f1b62..e56c420099dc 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,3 +1,4 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
-EBUILD haml-5.1.2.ebuild 1665 BLAKE2B 7c556530f3f0025a063044f9b6ddddd995c2cb66c8fc9bf8006e2acfbaff162063d70444f477f951e87568ff0acc1655d439f521d5937e65b8ff2bab17e7a58d SHA512 7840f679c227db74c26c0df4a6eda77108d6929d0a24f0a482a39a925efe9754b693f51bdad283357ede548bd9886fd071ebbc1d0e76f2b446e521874fa619e4
+EBUILD haml-5.1.2-r1.ebuild 1680 BLAKE2B cb73b65a6f73e3e555a34b4f59800ef7338eb3ef0ac3e40b9b64b6252781b1f715b4bf9ceb2a12fdec6bdbcd5830b2f5efd3b72cc388d8333e1dab180d24e809 SHA512 06ca53ab7ed464657aed8c5b4c09d7357ac47e58f9f38c922d4addf257e3d7e16506244fab6328112f93e8004f675bdee49ea02abe97d894b937e251095e1f19
+EBUILD haml-5.1.2.ebuild 1659 BLAKE2B e9a2581d41907f0b6a587829ce8243e57c9f4582ad09f4e90eeaf02bcddf2704c9f96a0a384a14cefb9b4a1d93979df7a398cf7e69d1bd7e7b9bb42ed9b34aae SHA512 dba0fa00d2eb9b29acdcb2e707132b9a8f23a25e254cce611e04dad239eb8f8f885801cf52212880105f176fa96a0ac7e31337d3c59f2cf38a528855db241d38
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.1.2-r1.ebuild b/dev-ruby/haml/haml-5.1.2-r1.ebuild
new file mode 100644
index 000000000000..b90ecb0360da
--- /dev/null
+++ b/dev-ruby/haml/haml-5.1.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
+RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby web page templating engine"
+HOMEPAGE="https://haml.info/"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
+
+ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/nokogiri
+		dev-ruby/railties:6.0
+		dev-ruby/activemodel:6.0
+		dev-ruby/actionpack:6.0
+	)
+	doc? (
+		dev-ruby/yard
+		>=dev-ruby/maruku-0.7.2-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/bundler/I s:^:#:' \
+		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
+		-e '1igem "actionpack", "~>6.0.0"'\
+		-e '1igem "activesupport", "~>6.0.0"; gem "activemodel", "~>6.0.0"'\
+		-e '1igem "railties", "~>6.0.0"'\
+		test/test_helper.rb || die
+	# Remove test that fails when RedCloth is available
+	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
+		test/filters_test.rb || die
+}
diff --git a/dev-ruby/haml/haml-5.1.2.ebuild b/dev-ruby/haml/haml-5.1.2.ebuild
index 0d3672e4848a..19f6f3fbb573 100644
--- a/dev-ruby/haml/haml-5.1.2.ebuild
+++ b/dev-ruby/haml/haml-5.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="http://haml.info/"
+HOMEPAGE="https://haml.info/"
 SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index f51e0f782426..98d3f117bdb0 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,3 +1,3 @@
 DIST highline-2.0.3.tar.gz 234205 BLAKE2B 4748c3ad8a15e551162ab9f2eb6e176297d833d13e6f5db7898f99c71f25e8a2a01057b0438c5d30b56a66333bbba0da1a435cfa07db97f2ffc5e301157618ef SHA512 f432c8836040bcfb147a84efa2dd3feee7f3f6e03eafbf4232e9457aeef8cb9ca83fcf854d3b261f59a166666abc3f2c8fc0f1279a7efeb07dea8a13be22ebde
-EBUILD highline-2.0.3.ebuild 1049 BLAKE2B 5b1164128b7b7795e191f006122a9d7b6ea95a6b6b2a7fff366243e81a41d9153e97f41c07ff00755bcd25f220db536830336e3f18dcc8b36ef2cc453a2dcc07 SHA512 c698539ba2e2c5294f66f3fb28bf4624cb13f13b7c390a1dd9646b97b60bbbe1f67d2173c8b39c08e5949846e4a189db902b8e1a788c2cb3578f74957f6d8248
+EBUILD highline-2.0.3.ebuild 1049 BLAKE2B 509dcf60ae5800057195b83361992ad6961afd95da51437d0b57fc409fe599920aa5ccfa8abc868157c8dd097d9a03956b08b4c8831d851d89161653496ad7f6 SHA512 9a2770abddfba0d74f4228559f20571a6239030833de90f8641427dfaa9ebd01b1fd2bed8a0f3445b2fb733d7d4dc0fed320bfbd3e75ce49391d9ceba7f70288
 MISC metadata.xml 339 BLAKE2B 58671f84213ed36194c80df5fdac1618917b26161ddf8a8829980f5ce7e7aa242c84d17aaef0be655a36ccdad24d93714ccd6875fc073ab537c2186e33da5e8a SHA512 723488f3e201d857ceffdbc6779199469aea1d3d21a391c5bd5ab9402388e6c32e4964491a609d7065d0684a256811be04f2df20b3db745d83c4cb8bd769a945
diff --git a/dev-ruby/highline/highline-2.0.3.ebuild b/dev-ruby/highline/highline-2.0.3.ebuild
index f1e1f8a949f6..1f0eb296ac68 100644
--- a/dev-ruby/highline/highline-2.0.3.ebuild
+++ b/dev-ruby/highline/highline-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
 
diff --git a/dev-ruby/histogram/Manifest b/dev-ruby/histogram/Manifest
index fc4dd3902866..2eefb21fd474 100644
--- a/dev-ruby/histogram/Manifest
+++ b/dev-ruby/histogram/Manifest
@@ -1,3 +1,3 @@
 DIST histogram-0.2.4.1.gem 15872 BLAKE2B 4c416b32e348564e9a938138ac22697acc480dd88e4a879cde6485acab481690cca5d8f61c1c026635a000ee45386e78169143ebca282ae3577e83da66c3e88c SHA512 b2358c648f528e42419b52155273613e6da560ee839458a888d47588a442effec3ee78ad18c33de2b2eed8c6a9f84fbc5b97f7d23ff3675871e9e58770dae36b
-EBUILD histogram-0.2.4.1.ebuild 498 BLAKE2B 4c4030f7ceefad0488b7a9d7e2ed7f99588624d8341937cd6413cc803b1b6cee28360157795896da0375b89e93db8c7d80d521566b54da117f62334a9b2729cd SHA512 9ffb5e899acf8f078b0663bcd967566d23daf559a939b56c8786095506187c142554bdd7229dd0cae0570232ef97d3afe80ac8025d5200166764b16eaa70dc88
+EBUILD histogram-0.2.4.1.ebuild 503 BLAKE2B 1e8f53cdd3e7dc4a4eabc80bbf8229876350fcc7d99eacd8cd2e809f52bd10f9d6687a399126b198697c1c4656d6fc7078a279845f0cc879398baecf657d79f0 SHA512 cefec16bac92dbcc7c7f36efe63b2416851e7ba369bfacb75e6eab747b86ede0d8ca77cce4b341a4e3814347602ed8d9e1cd3fb69a10bd197f839d7e8bfd6009
 MISC metadata.xml 344 BLAKE2B b6d38aad2c3dcff9ce71bd7a23b33a4dc6a5ac1cf8496257db5c9082355689318265c625dfabe3ebeb99e7613190e3c9573d4ed44ad5c01fcbef4186258fc29a SHA512 e582ca1af54b82f0670a36a7bfce0ae2ccb3ddc99f2c74ca0dc8cecfc28673a02a1781faee4c6b1f9d773f9363e74235a96edec96886646e11ffb62f8184b4ec
diff --git a/dev-ruby/histogram/histogram-0.2.4.1.ebuild b/dev-ruby/histogram/histogram-0.2.4.1.ebuild
index 09c6f9f62f93..d9d8cec9c174 100644
--- a/dev-ruby/histogram/histogram-0.2.4.1.ebuild
+++ b/dev-ruby/histogram/histogram-0.2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/jtprince/histogram"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 791c5b97865d..9ec5baaca3b2 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,4 +1,4 @@
 AUX hpricot-0.8.6-fast_xs.patch 650 BLAKE2B 5ad93195325fa1e26c2d207fefec83c8e01bbcbfdf933e6925a10bcf74a56c94b8517c7000a3c1aecff091b4d5d1cb3c29c9c899af7a5a5f5f0a17b1967118da SHA512 cbb1aa6138ec98e2eac9bcad8d06ed7c435a8ca503e062776576cfdddb944b294b270dd30e2c2924441ea527445df149e7ce34d085652ca6f184c4e66d209b8d
 DIST hpricot-0.8.6.gem 293888 BLAKE2B 5c054c6fcd5c3365dbf44f3c502bc4c1c3885f4aa43fd1fd15365aea19600ef0ef48157c39ef1709386bda0bc3fb6bba6d98862e8e28bdb5c173429969ef5ab9 SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad
-EBUILD hpricot-0.8.6-r5.ebuild 1657 BLAKE2B 63bcfbabf090d1fce820bd6dfabe29e723f81bdae54cd47bf15390abf1488203dbbf1079b70c67f5fb5cefcb11858f681bd46a5a5b249315fa18e0378c379f23 SHA512 d6a1ed0d49e28d49490f03a7ee9881fb9cd1a4ba9079f544e620959d0781a0fc4cc46a98e6a87611fa90718e48ff1d4c88c5ad195be62738681a0a21f590c0b5
+EBUILD hpricot-0.8.6-r5.ebuild 1657 BLAKE2B cc952f3491113ec1bb392cca66fc3c42dec0d6cb83ddd52fc9101b1ece2e8c4a68b7c57d13487400c68ed466f3dea663d210be40d03e28781819891827c7c37b SHA512 7ce07fa04e050fb247833c2dfd3cb25298475c1bddf93ae86cf4fdd0087cd7c090e22f1d6d3dddfdd5f34a58be99577a2451ccafbe869312f1ca9491fdce6a69
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
index 427600a8ca0f..4fe2280623e9 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
@@ -8,7 +8,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem epatch
 
 DESCRIPTION="A fast and liberal HTML parser for Ruby"
 HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 398d7c49638b..6e06bc2fe23e 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,14 +1,7 @@
-AUX i18n-0.7.0-frozen-classes.patch 1126 BLAKE2B 4cfaca964ed676d4b35b7e2aadeec36160541843a48f8e71866ca3b79467bb057502dd102944540045a156c55c97ff7c455d75de8484e2b5f3bb2173696931c6 SHA512 11e1777e991f6273c47a860bc0f4b390052231c9d14fa0f6c51e06b70b09d223e4fdb1e7e76df51abbfe0a957858d086ef58be0e14b09744eb9642697c2caa56
-DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f90eb52ea01e8bb7e0c6288abb9055a4f80a199deb93c9ca66efd1ad568950d3f505206e0ba9ee9cdb8bc6 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14
+DIST i18n-1.8.10.tar.gz 67943 BLAKE2B 58e8041f8cf652627a305e3d987ff2450913d3dc919ea7aae641cb484524d17312ebd3e0ee68cde1c01091e42713ea229ccb41ed3998c6bbf772d32f855ca107 SHA512 e8b10bf380241d1e6b19250cd63e727366215b4ad7e63479a02cb81a5b46a48e06db827d9df9969c2052895646ee30c237fd17c3352a2bbfed97615bb9b6cfca
 DIST i18n-1.8.5.tar.gz 67840 BLAKE2B 977bfd086c83f86a47413a5d332f09ee521fc269f4e333721ee8bf71334cff001975fe3a31fc84e600b34d0037050e00afd5f59db5a51b566d8648fec50de016 SHA512 0fd51cdc059c17b1581d187f39149bec1de4bcb06e6c9867f084fce26a8d6a6570b0058689cc30ff7ae14ea562b64ecdaf10ab3d4d2fbe246717583ca20100be
-DIST i18n-1.8.6.tar.gz 67932 BLAKE2B 779bbfb042777abd44d157c2bc8d716afbd3b1a20da3252007eae1c455cf38b1480f6e7e0d3a8407d239139d22cc50b9a6c472943f00fddacc8e48e4800ed10c SHA512 74088250e84390267dfe1eef84235e1dfc8546fa64bd49ddb76a46b363ebc260d4c18354cee6cdefc1ef79360a1e9186096e900dabba19f61cdb948f1ec6287f
-DIST i18n-1.8.7.tar.gz 67999 BLAKE2B eb0ec1bc8ae1fca99756b197f8a91b9fd7b72ea9b781b1958085ea4caaf93f0e1af0c6b70508669958b74859093d941a8e58a10be40a4ca3530db2e18a43da4d SHA512 bfb12cb1565e3eff597639199d807cc3a468cc29d1afe48a4448ea7e100fe9684c6bb1ddfc9cd258c64efb809f7bebd077fca390e16058f468511f430ace7468
-DIST i18n-1.8.8.tar.gz 67915 BLAKE2B 2f169a5c04218f4aa9e2ad3e702ba5c178619126c52aa3b436d1026c15265e98b3bc59ba65cc1db715601d06e982b89f24452f2e27a00f310cf757ec34fbe3aa SHA512 0068764336f81e704d18f9c920d10279a21145f6a22780b7678e2dbdf31bb00739b30b2e5c99a57da3caa6e9f38e77bc6d0a0624f3b2d61c367733a8373261e3
 DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
-EBUILD i18n-0.7.0-r3.ebuild 1611 BLAKE2B 1484a92ad9f46fd5ce3c2a98370ce8b66c8752b0482d1a67f411240a0fe1adf9a12af121ac7a5fef1792f791929525c504ce377b8bca89993da4d68a1c26603f SHA512 991a21901760e6c88503b8f144a6cb14af57de2d2ef90856177ea3b0535635c2a6c7573def25cab1c56283e28b0bc8a4706822ff727e4dc1d876eb2eb5fa62e1
+EBUILD i18n-1.8.10.ebuild 1573 BLAKE2B c245da7197985b38668aaefcbadf93c3efbc1e880a618ed46700a2039f49fb49a3f65aee5d542777e2ab887d4b00f0f98cb380d7edeb4f7abc8389fad5c7f89b SHA512 7c4f9c9b595c09791896e121062b53b194569ed27b4ba07b4aa65dffa11bd08a9ef95c72c5075e3ec76fd5c479dc3ab6fb3a0bd7b75c05b67db074a1abaf800d
 EBUILD i18n-1.8.5.ebuild 1554 BLAKE2B 01ea2c6fd2cec8c6e34a81e377138445eeff6fd3c658dea1f48f1fdc101fe5dc0c0064496753da5a918af47fb626eb8006f1d1120261303a65ce38ddbc34d00c SHA512 d0ca2c9fef218f5a97e065b66789fac5d8da8a8b4fb6e30e68b0c7dd30971e8dab3c03d6170b2af1756591ca1eaa3e454c79c9c1493f37d2066e43d7ff21f467
-EBUILD i18n-1.8.6.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
-EBUILD i18n-1.8.7.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
-EBUILD i18n-1.8.8.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
-EBUILD i18n-1.8.9.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
+EBUILD i18n-1.8.9.ebuild 1572 BLAKE2B 0495e43acd4b892882f955aa9f7393cdf5763d7deca7566ad7ea770372df8425ca8211f6c00aea2e29bcd3b58ca16c71b42e8c8c17ec6673e69085fe1f87df30 SHA512 a4bb852026ec4366eae9185c9db9a94589488e644d41c16e9e36493e755b5d8ef537ee84750584e6a3ef329f4b633b12f5fdd3aaad54968af3139bfae9a5decd
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch b/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch
deleted file mode 100644
index ff6019498fc5..000000000000
--- a/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bbbdedc0c78ec941a84d161d5c610a358310cf99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Tue, 20 Jan 2015 14:34:44 +0100
-Subject: [PATCH] Ignore metadata for frozen classes.
-
----
- lib/i18n/backend/metadata.rb | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/lib/i18n/backend/metadata.rb b/lib/i18n/backend/metadata.rb
-index 52c0a29..a8d922a 100644
---- a/lib/i18n/backend/metadata.rb
-+++ b/lib/i18n/backend/metadata.rb
-@@ -21,11 +21,15 @@ class << self
-         def included(base)
-           Object.class_eval do
-             def translation_metadata
--              @translation_metadata ||= {}
-+              unless self.frozen?
-+                @translation_metadata ||= {}
-+              else
-+                {}
-+              end
-             end
- 
-             def translation_metadata=(translation_metadata)
--              @translation_metadata = translation_metadata
-+              @translation_metadata = translation_metadata unless self.frozen?
-             end
-           end unless Object.method_defined?(:translation_metadata)
-         end
diff --git a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild b/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
deleted file mode 100644
index b595e4109ce2..000000000000
--- a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( ${P}-frozen-classes.patch )
-
-ruby_add_bdepend "test? (
-	dev-ruby/activesupport
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	# Remove bundler lock files since we cannot depend on specific
-	# versions in Gentoo.
-	rm gemfiles/*.lock || die
-
-	# Also test activesupport 5.2.
-	sed -e 's/4.2.0/5.2.0/' < gemfiles/Gemfile.rails-4.2.x > gemfiles/Gemfile.rails-5.2.x || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			versions="5.2"
-			;;
-		*ruby23|*ruby24)
-			versions="4.2 5.2"
-			;;
-		*)
-			die "Unexpected ruby target"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.7.ebuild b/dev-ruby/i18n/i18n-1.8.10.ebuild
index b4f94ae7c427..2a5c304cdfb5 100644
--- a/dev-ruby/i18n/i18n-1.8.7.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.10.ebuild
@@ -36,7 +36,7 @@ all_ruby_prepare() {
 	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
 
 	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/i18n/i18n-1.8.6.ebuild b/dev-ruby/i18n/i18n-1.8.6.ebuild
deleted file mode 100644
index b4f94ae7c427..000000000000
--- a/dev-ruby/i18n/i18n-1.8.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.8.ebuild b/dev-ruby/i18n/i18n-1.8.8.ebuild
deleted file mode 100644
index b4f94ae7c427..000000000000
--- a/dev-ruby/i18n/i18n-1.8.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.9.ebuild b/dev-ruby/i18n/i18n-1.8.9.ebuild
index b4f94ae7c427..3e97a23cc862 100644
--- a/dev-ruby/i18n/i18n-1.8.9.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
@@ -36,7 +36,7 @@ all_ruby_prepare() {
 	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
 
 	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 249d92430385..57fe79219c99 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,7 +1,7 @@
 DIST json-2.3.0.gem 114176 BLAKE2B 329f1305a0cae3d44c74cc7475c7340e86b8447d5e4ffdd5854620669ee4ef5bba0ed7dbc617b0beffb7bfd8b3d79d46ce26feef37685413a4a5a9c230d0ce0c SHA512 9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
 DIST json-2.3.1.gem 118784 BLAKE2B 6852f5d1733fd5d596b44d095c37d11a129b02fc61dc81afa90aef3623eefdb5515f6755dce42f055954baf2ac45e87620940ccd7c2c839501945923dbe62d18 SHA512 a9a0c54ac1faacc412ad708b630c8bad8c6f99db6862e8fc80c46207f0f0972433fbfe51d0c93a5d91b91c59b1fef5ad8e64e36cc49e32b3e51ff390a380a2a9
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
-EBUILD json-2.3.0.ebuild 2009 BLAKE2B d36aea49d26a9560c3dc178143932411969c63fe353f13230357e18a10103e04c61d657483059f62df79d9ca0bad8c8c8f5063bc96ae701b7722b006b18fa249 SHA512 552c9cc17d79bc8b16b6e6eb2c4d6d6bb561a8f200c3706faecbd0b43715f60ed63e52bbc8ee915a88328fba5db2bc5afe3443bea4e90d693c34638ab5227f20
+EBUILD json-2.3.0.ebuild 2010 BLAKE2B 6ef2f9402a1ba2e54467f832f1b133c298c16c3664433ea459d0f8bc7d28141eeb9ac1ed11d9b8263fe469c8837b1849ed3859be23d5f44b7fbdf32a79a14abb SHA512 b45f896a497fbdd248152abe45a56b1b81c36a043db82e5d93661432bf6fe9061aaefe378c08e2e160a2d9c87510627aba66920f7e75405bc0b0c505c1fd8c7e
 EBUILD json-2.3.1.ebuild 2011 BLAKE2B c84cc2365edb9c5d5bdbe10e685633bd6686d2010b251bae57cb1b0eb03ffe1f2836dee1d3709d0f28d34c5f92ef46aac6b88603e1420baa05cc961b30fd4771 SHA512 2365221d5f20d97fec7f091ceaa4b5629f3caf8fc1e2f2000cae41815c13ea889fe0ad8430e17605d737576cc95bf98c4a2415cc753be9ba6220d3d92f31f419
 EBUILD json-2.5.1-r1.ebuild 1943 BLAKE2B 8b8d2e04bd4d491ddd3bee215c6843412029f03c856755733d07991af3afc5dab4bfa37816bd46e3c5ced33381cf172b90258bfd1565ab1ab8eedba85637f0f6 SHA512 29d35ed79592bd409ea5eb63078ae6a8704b0724174fe9377ae4793b06f56b661378268fd1a13dbe7b3d90558f693e6cf8c652dd15ee3e6a9343a10db92ec6bc
 EBUILD json-2.5.1.ebuild 1995 BLAKE2B 74ca3a0ad79c798925abb2ccf15d0f57284ad7e3c2909b3680695f75cffe8326a7f15ca1673edb6c78a261da946692f21b54a263c1ce778656d1b90aacdca05f SHA512 1905491e97d2672b588e0ed8bc45a89eea6e0798121d3626f81a440dd4447a324b085f1d13b1baed51be7a6fea15bae71387cc0f82bf7ef9e426e342aaf423b1
diff --git a/dev-ruby/json/json-2.3.0.ebuild b/dev-ruby/json/json-2.3.0.ebuild
index 4d4ad773d37b..815eee4af5c5 100644
--- a/dev-ruby/json/json-2.3.0.ebuild
+++ b/dev-ruby/json/json-2.3.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 7631c785d2a8..15eb03148872 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,4 +1,4 @@
 AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235b3110807d1a3fc9068684cf367f6a312e6adccbf93fbdbc783d69eb8e14a536365f8c72e1ac6841a364171 SHA512 eb0c3b6d3ba32e3496f7f115804dfbef949dfb34e842886cbcc3c8b49a0bfbb21d1ef3510590e335a2836eca09cd031d9e75a8d601176465c84e5424fceba663
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
-EBUILD kpeg-1.1.0-r1.ebuild 719 BLAKE2B 6503f1c208d886638631407b8709aaa5155bc84c8f4283bb7d77f9686c5eee7ea1c3a424aa0ca07ce4be661673b5b2fd0d0c5d24ca3193fbb7564f205258a83c SHA512 7ff617f70306ab80042e6676c787ab1d8fd1c9a8f862cfb56799fcda5bc65211ae5ed3d24ee0f6cffe46056ef9d622bee3485e5eb6888c9658c669cca229e598
+EBUILD kpeg-1.1.0-r1.ebuild 720 BLAKE2B 02aff0c6e41fd1e503fc33e334a0564d434d7e72309a5f499521e0e010ed948908f1954ee2dfbea6082b59b06e69e8f877ee3cfc31948ca3df70bbb4af2c8402 SHA512 ac4b0a7fcbbec0c41b80ba83fa3e4e26e0bd61da7524f4d1f7c11f5fa050b2438a53ee42f6c840ec6a75a763d6fdd7243c535f88dad668abe013820229766972
 MISC metadata.xml 338 BLAKE2B fc0c3e4cbb7613cd0fb29651974822b31bbc14da28427772026ac068c6d8ca698c4c38073df6a5d06a864ffdca14477d71ca32dd7b4ca4244cfe02e9e052d4c2 SHA512 981524b3599f2a7a812c468763137a4e38b445c87224f91dc12d128025bd42657b62ff1b5fa9797bf437f46b9f9195bb0469431e77646ad5f0cfbe2c6b5e1f21
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
index dc613adee85f..229517189a1e 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index 74e7e5661ffd..06157c6dddac 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -1,5 +1,7 @@
 DIST liquid-4.0.3.tar.gz 102242 BLAKE2B 4a025fd8501e237f7619ed989e185a6c55a234577c99423857a826b616c40625c1fd205d998a368488306a88c0b84fc3d3ac59bd01c1231055aa9f60a3d14338 SHA512 5aed3b98fa486a00744e0225f7a3b8004be8ded1e3347f9118fd062684fe33b725b84d1f88bdd5e881399e6efa60b4aa32f57cf10f4583aa27ec8c8288b52bf9
 DIST liquid-5.0.0.tar.gz 119166 BLAKE2B 429811adde3aad74c354eb9e129a0cef9c994839881246c9bfd06a9283e65eaa8b7786ff0d6cebdadf7363a9f2f67959b12b57d39bdc4343823116d3e81849de SHA512 77179bfb764a947bc3da0eab2963f951b189414ca01633b3817196d1267f8b098aba8c2ab1ce3129f8ae5a95fa8b39ad60940736a0f89f9ecd1a14b46d7d62b4
+DIST liquid-5.0.1.tar.gz 115523 BLAKE2B 52194481aef296785812a76979ee215e5adffbb73c4dd80de8f8dfb6995757d22a698a6acb950281f69cec32c2c06ba51fe273ba54c7454f308f5547faa9e1cf SHA512 e82fe4b67c338ef2e13652d2c5ba5d52e968c368aff724516a8ed2c157d149441fe73c66be866c0283fbd3472aeb83fec710f77afa1a92dca3206b5c8059ccf4
 EBUILD liquid-4.0.3.ebuild 776 BLAKE2B 8f24660c238c9bd6831bb6e60ee9985ed18a356ef53281064ae2c0f21d0aa00cd7b4dd95126519fbb6cbc40db0330af92f6ac1075bf874cb1b63825f38d67440 SHA512 7cdcaa8ee37c7c600095a678c8eb78536483a6a6fe0f18d2f8bff34b7288f8ef98cd06a8e491644b41f02e728ed1eac4bdd93a258764b349fb4488a050e005a8
 EBUILD liquid-5.0.0.ebuild 814 BLAKE2B 8595d5ac9c0042c60be21d190445d54add9f9f53b3b31ab0a8f91f1812c7076cf235e617cd0bef0ddbc99cef5fc9ce4f44c4cf9639d9f05b84f09740b419b581 SHA512 1f6e347cff859a070dbd79db8e82659943f1ccc790a0bc3429e8fc3f698e0934eebdb379cd34a47b962fec7c05ab050b7b027c01811ecd6b56866ec3ef45741f
+EBUILD liquid-5.0.1.ebuild 821 BLAKE2B 8ff2bd2cd01b6f4347bbb4806a546880745f414cf7cd03cdb4f9e8e4a445331139ebb8aec2538c10b54944b6b0e85f814b73cc9f96b7d1fa1621176dc7a26dd0 SHA512 b454a7780a1a64401dd8b3fdf3f0a865b95c104daac7586ff61bb211d4cf52ea55464d081a219d8ad1ebec9f425bcf7390dd746429b20128ec4be99807c7d2d8
 MISC metadata.xml 340 BLAKE2B d7b2ddfc79a4db0e45aee4759b455288a423c1f2e7364a6184fc49ab939b1ec792cbcb9175b302299217f8dda55253985a03770290e825618fbc490f44facade SHA512 cae45b7e74c0400be7b37f2632f7221e776ec8edab030e6520d1b0109d0448c3d18bf8c9590cae14403acc3f5bb6ca2aa3d29289db3ae8e10915faed16ddd02a
diff --git a/dev-ruby/liquid/liquid-5.0.1.ebuild b/dev-ruby/liquid/liquid-5.0.1.ebuild
new file mode 100644
index 000000000000..9b9aa14a586f
--- /dev/null
+++ b/dev-ruby/liquid/liquid-5.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Template engine for Ruby"
+HOMEPAGE="https://shopify.github.io/liquid/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# liquid-c is not packaged
+	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
+
+	# Avoid test requiring unpackaged stackprof
+	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
+}
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 6ff95d9904e0..aa56e7187bdc 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -3,9 +3,11 @@ DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa
 DIST listen-3.4.0.tar.gz 55390 BLAKE2B 44f0319a19cbac9535b585380c95a4c538a19f9b66a837ccb78ede4d2e8d2c49d0c78ff21913a8de959de43dfb62f4e5489ce70b06e0d5c47e19be81e42fa8dc SHA512 b247c6ec907141549943fd1eae4075c18efb653dbb666bd8b71876c4bd96ae637d4634746815ef1f35335414ff833479fbb2a5a997df994d16bb42b21775b5a2
 DIST listen-3.4.1.tar.gz 56014 BLAKE2B 7a44a1ca960d8ae0cedd3b0128c4d8048b6f4f4168fa522c376708ebac1996076b36ce3054d179f5bb2267328473f63ef3ec2cb0c22a1fd56c5aff957a3c77b8 SHA512 fc745b7a825beda526588a5227c81c6f3c686d25968fc67c9c0df3c2beba343fc558453dd5c51b4cd82b072b3834526403ad5c06cda2cb57362bfafd105d54f3
 DIST listen-3.5.0.tar.gz 56232 BLAKE2B 55f7c70625165b368ebf62c1327a86daa512f6597e3fa0ae08b6069a9cde5a69ed2ae9928258e61b06838c058f8d5d3fa968a6caf2848ef958f04272b55db88c SHA512 9a855f0ee3fd5d542863d6d9ee072b1fb85f52a00d79dff43a48a43530697613cc17672f30de71d0eec1139080836fa1b316a07fad5c87d43a3cc1bfa3e48dd6
+DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.3.3.ebuild 1201 BLAKE2B 5db4e313fc8bc0a67e5ba7a2b8a14330ed78e02ea82989981c64ef3398e30d9f12b555eda9e11cceb242302daff8252b6f2772a843ffb8f3f3147ddc2bdfb1ef SHA512 2715c9493641cff9f1d980cc298b7ce85d8b6e27d776c7461e273e85a8327a57ebfd81ff522bdfac1b8dade7fb47c161a0dd7cead9fc08965bcdcebeb65c4c0d
 EBUILD listen-3.4.0.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
 EBUILD listen-3.4.1.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
 EBUILD listen-3.5.0.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
+EBUILD listen-3.5.1.ebuild 1209 BLAKE2B a96d3a942c34c585bfae4da0e520c50495eda4135bd67793e35bfbbb7d37792fe8c7f7d59cd6320f57a183c6cfaed0c0688165feb87badea9a66c3e864adf171 SHA512 14df22b66bd616717b635c70e51ad030f8cd794baffe886b3ee91f173d126d28ce2f707c9aab929c729070a7770ad8c7586512e9666464e8ddaaab0bc484355d
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.5.1.ebuild b/dev-ruby/listen/listen-3.5.1.ebuild
new file mode 100644
index 000000000000..4f0f5cd73c9f
--- /dev/null
+++ b/dev-ruby/listen/listen-3.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+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/litc/Manifest b/dev-ruby/litc/Manifest
deleted file mode 100644
index 3e228bed0fbf..000000000000
--- a/dev-ruby/litc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST litc-1.0.3.gem 9216 BLAKE2B b7ca4224e3a0fe0d5b109ed1b2dd07e93faacb13779ec245b1e6e2357cee54af137d5fee0685705efdb10c19131ff9eb8142fc8e9a77eedb7702ee441300035e SHA512 7fb36a051d0056a8ae2c7c48a404b8fc71b3e8f40d6487c7ba5c8d3896ff6c936604c47f8ccbe011c4ba7c1fc4ef863f9a551cdb06f40a93896692b1375b8b31
-EBUILD litc-1.0.3-r1.ebuild 783 BLAKE2B 685c407d853cc21b757c832a4cdbb89034f7917cf2a10676226a3903f034c636f4f48db29f89a983a1ae9dd909924e27aac1cb610c7464f9a87e72c2e1692116 SHA512 f5f8887bb559efc98bd15937bfb5d653221244822a21108a543b2db363cf9d180bcd74741c4895a92446a17f7e8ae70343410fd8770f9f8787b914b87582872c
-MISC metadata.xml 337 BLAKE2B 5e6798687c120e4793e8f589c901afc1bc1e3e75d36b5894e4df1a9104e5fad3b33bb5888ae5a4e1725b458805139c9a570651ceb092b3339a35e642fb59a441 SHA512 ac749026093f65ce973b75cd1d9a0ec5c4d95d7b2966a2514251dba89cda3acfad5c12a18ffe97f7764afe0b160277517ab1b1b512a6fcd17c3db0dab6738014
diff --git a/dev-ruby/litc/litc-1.0.3-r1.ebuild b/dev-ruby/litc/litc-1.0.3-r1.ebuild
deleted file mode 100644
index f38a0d9b8c67..000000000000
--- a/dev-ruby/litc/litc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,29 +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"
-
-RUBY_FAKEGEM_TASK_DOC="rerdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tiny ruby module for Amazon EC2 intance metadata"
-HOMEPAGE="https://github.com/bkaney/litc"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/fakeweb dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Don't check dependencies since we provide slightly different packages.
-	sed -i -e '/check_dependencies/d'\
-		-e 's#rake/rdoctask#rdoc/task#' Rakefile || die
-	sed -i -e '/ruby-debug/ s:^:#:' \
-		-e '2agem "minitest", "~> 5.0"' test/helper.rb || die
-}
diff --git a/dev-ruby/litc/metadata.xml b/dev-ruby/litc/metadata.xml
deleted file mode 100644
index 28033edc57c0..000000000000
--- a/dev-ruby/litc/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">bkaney/litc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index d347ec71e9f5..6968ab253210 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,7 +1,9 @@
 DIST loofah-2.7.0.tar.gz 69272 BLAKE2B 1578cba4b4b12fb35a1095060af8d764ec55d3745a44cf756f1de5bf43bc0bde37276372e7aa53a3a26c2c83a8c3da417140d3addb102cc0429f7d47b8c01806 SHA512 698f7976e6048615643d8875aa4dc09c4bd261234bdc9908589edc08be9073a83f84f04fff7e32b518712d63cefe2611895543733967a8b8de12e6cecdb902c9
 DIST loofah-2.8.0.tar.gz 68844 BLAKE2B 52b5b5c7a70939069d84d0f66c4262e456d2ed81ab4ef2541eceb9068ccdddbb1c7b470ca7504700f6f66d4aa4507b9edfd4720c1302f6026008c10100c1fecb SHA512 a9d7c21be733e1aab8353ab7bfb3db14d47e8da2c3f20eba11d0041b782e4f2cb82865bbd5a2a9321aae7ea04089f6a5fd1bd3119cbfe8a00c2ea71a40cae53b
 DIST loofah-2.9.0.tar.gz 69098 BLAKE2B 097479b8de0f2fdebedfab9b1a0a656811c4650c13cdb73d2594c513a6be7bd9d6e6f81b5594367e7f0d783ff22664d22dcc8e06014cae51493057069831c174 SHA512 9dfcdd1142256b4fee10038ace13e33f5086aac0ab8e449fae878c33d66bc0882e6e032a9251dd16188dcb4549260403768771f2c7f5f38d55686a6a88792b65
+DIST loofah-2.9.1.tar.gz 69652 BLAKE2B 76bdd6c1ffda325314eb28c4bea6e5c8b8a69c3a7e9a661f328507a523ca086c2caf14f58b2e83cc2213c072342176bbb2de7be5a68d68e54675f30e81657b92 SHA512 625c38de7fe5fcbd8e3fb01aa7aa28560e7f3bb4e5354912bed072bd83cf35e824cf84e491155fa44b50ae418c46a187f02d4f605062abbfde05653d022bb663
 EBUILD loofah-2.7.0.ebuild 1202 BLAKE2B 7bb633aeb44c799ada5603b8f1b6a2e60c31aa7a392c394cfd672d3981c018b9f12150d93a82f0d6bbacb25db6d702b1d74133aad7dfbd95634b5ae77a673d18 SHA512 f5a776571965a1cc497565cbc27f59cb2ef47eeaa30b3d6ff022852b6bd42bd19843b01371d4a39dd59bdef869df02d8411b2ef1508cde09667e0eb768ef2365
 EBUILD loofah-2.8.0.ebuild 1203 BLAKE2B 9fc912673ccae3465c0052ddaaeb3128a48e8ca7adf001c9edb84e1ce6b07e405f85b7a27534f02f878b288768682a85aeeca325e9709cedfa6daa18903a8ad3 SHA512 71d7f379ae47270d7f811a6e7532091d76d2951ae7c3755412c865e0a5f83680e4a9f87929dee382daa4a63db2fb4780dd9925448b7acacd78198d4c22f0bf5c
 EBUILD loofah-2.9.0.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
+EBUILD loofah-2.9.1.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.9.1.ebuild b/dev-ruby/loofah/loofah-2.9.1.ebuild
new file mode 100644
index 000000000000..000d6ae80a3e
--- /dev/null
+++ b/dev-ruby/loofah/loofah-2.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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="loofah.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
+HOMEPAGE="https://github.com/flavorjones/loofah"
+SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
+
+all_ruby_prepare() {
+	# Fix version in gemspec
+	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded development dependencies
+	sed -i -e '/concourse/I s:^:#:' Rakefile || die
+
+	# Avoid test failing on different whitespace.
+	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/magic/Manifest b/dev-ruby/magic/Manifest
index 08f883de6dd3..f52f79fd2795 100644
--- a/dev-ruby/magic/Manifest
+++ b/dev-ruby/magic/Manifest
@@ -1,3 +1,3 @@
 DIST magic-0.2.9.tar.gz 11642 BLAKE2B 1208e40e1c95ebd8a31f71d860b68acf9663a165fa5f775459f874d79f41c51268a0f0be5d9f6ca416b85a838879d179ccbc10e40047cba1e330f891dbd6297c SHA512 5bc6d6e1b2646b12af7dad15273dc125db68be2d6e6c109484339c8f651349827a90ea81d8feb0441c5811567d85130cda35167e2dbb426842f952fc2ff8ea15
-EBUILD magic-0.2.9-r1.ebuild 708 BLAKE2B 09e1739b9979d76ec9ada45cfe7c80842b2b99ccd36c1faa5c52da5dbc9d94b9f80b93f3a38a6bdd1fe70155e1b993b34eabcbd07f4fcf5e3ddaab81ab8b7a9b SHA512 7915f57c52c88eeb2d8efdf78a6c1a1f06ca3709568f97aa8e2504c5f5e25bb0fe73d8f02fc20a2cbdbf54eff225d696f4f51c0d0447830a534f66e614e609d4
+EBUILD magic-0.2.9-r1.ebuild 708 BLAKE2B 9c143dabd64d7846632864b046a3c0b94498b55e6c73dece5736358794b2c9a99c0775bbb766c47906cbac9cfee38dcfd68266800115e6f6b4bc77985f8a88f9 SHA512 aede495082c8ab22bad78f4456daf47057fe5821f6b919effe81bcd00f0e42bfb4719858a35bff881fe0c50c08be08460e197b8c279d51c0874163ee5ec0c03a
 MISC metadata.xml 338 BLAKE2B f81dd992467b77188ca7dab18afb9a054899aa7317e417f6564e0857267e5f644b9ddd04b1877190050ea6a90eb4c3a6946ee240532f5b62449f5f4a518e78c9 SHA512 db6b9f165aa7ee6e276f417dc31297ed6ba53ba7a08c4fdb579fa33a936ba16e586756a991ea540f492dc8d4c99145bb2514f7b9ad065d2da673f20e4f47edf4
diff --git a/dev-ruby/magic/magic-0.2.9-r1.ebuild b/dev-ruby/magic/magic-0.2.9-r1.ebuild
index c23ec29f5edf..5de63843ea67 100644
--- a/dev-ruby/magic/magic-0.2.9-r1.ebuild
+++ b/dev-ruby/magic/magic-0.2.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index 95db728fad50..d6c5688cbc3e 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,3 +1,7 @@
 DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
-EBUILD marcel-0.3.3-r1.ebuild 1017 BLAKE2B 63abac02196f77f5d8df3261fc1e59b777e858476a5f67cb357fd3289d12c42ae78ff47f3df50416d8014622d12f59d819ae0188b9073e7aa88e72559fadcbe6 SHA512 bc2831e022b2200839a4b970e91593230c92db21c1a24fb707743290aee27419c79774d1e955a9429d079e7e0e3d9983a799f528c0ee7b40c89acbe6eac3c103
+DIST marcel-1.0.0.tar.gz 7929941 BLAKE2B b8f956e9876a86f26ceb789d59da4821d512f83fe619b81a6ebf4c638a03eda245d617a504ff24ad89295797ca98473f613eb46f635f45382ba4e6ce92c57b1d SHA512 1c8addecc7ab2a7c58a22ff114f3bc453e7cf8f620cd212a4213da4743e5992d2becf947bdf91ce8976b8c0819ed6799bfcddc1948ab08713e9b01dd2410954e
+DIST marcel-1.0.1.tar.gz 7978633 BLAKE2B f65489e7a398099b8856d6bdffdcded56547a601d8d23f4094673694904b00a9aecb545aebee8863a2f7b52fc36956450ed293b725971e65fdb0c275ec39bb2d SHA512 d72580e6bc626173e17485996773eef895c44eae26c0695b6aec16a5b194e8cf23693b1a1b981bdbbadf1256b91c8918896ba69fada9897287613ce17c4ae533
+EBUILD marcel-0.3.3-r1.ebuild 1061 BLAKE2B 21993da1a5ec3020f53b2371311e8d2a8cbfff0857e89574e0adaf458179a3b0cf5e3d5a0cd18920e741e230658d9b366ba1e1d66318672d4b9eabab6e65e336 SHA512 b40d11abedb93fb38e355e10540e0a15928f9b879c734010fafbd3340f25a9f2d5ad0e3d3a86f830d3a10b6f4d4fb9c84007feed0632116d5c7f2181542642be
+EBUILD marcel-1.0.0.ebuild 734 BLAKE2B bd896c582254af298d87cb598648ef38dbd3e1a8993d04f4afe95b31bcf5c66c0d2b9bd936231eb539d209f6a0690752d6e66f289a01ccaf339aef99df8f9174 SHA512 1a7fb2c2a773392d596dddeb5606402a1c99c95f7e11031b6e842c25fce4549d1628c760288763b018ad4f565aef941d3a75d65a95aba25d330ad284e1ddc965
+EBUILD marcel-1.0.1.ebuild 734 BLAKE2B bd896c582254af298d87cb598648ef38dbd3e1a8993d04f4afe95b31bcf5c66c0d2b9bd936231eb539d209f6a0690752d6e66f289a01ccaf339aef99df8f9174 SHA512 1a7fb2c2a773392d596dddeb5606402a1c99c95f7e11031b6e842c25fce4549d1628c760288763b018ad4f565aef941d3a75d65a95aba25d330ad284e1ddc965
 MISC metadata.xml 341 BLAKE2B f284cd2a1df740c004e9af77a1aaea9254ddb1672b567faff9c65be99171a69abeedbc229a05db711d2f91f5f8bca0f7e2e6c5442a81b1776ba299db47ebc281 SHA512 1c71acef93507dc8305c65be9fd3e90978f6a2a14781b019f06762aa6159539596404afc32c0d9c718b361ecf90cb4e93b0b0186e7b110d895a14216d25b3360
diff --git a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
index d92cbf438233..10ac4471b7ec 100644
--- a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
+++ b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,8 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
 
+ruby_add_bdepend "test? ( dev-ruby/rack )"
+
 all_ruby_prepare() {
 	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
 
diff --git a/dev-ruby/marcel/marcel-1.0.0.ebuild b/dev-ruby/marcel/marcel-1.0.0.ebuild
new file mode 100644
index 000000000000..e7b50e045730
--- /dev/null
+++ b/dev-ruby/marcel/marcel-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
+HOMEPAGE="https://github.com/basecamp/marcel"
+SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/marcel/marcel-1.0.1.ebuild b/dev-ruby/marcel/marcel-1.0.1.ebuild
new file mode 100644
index 000000000000..e7b50e045730
--- /dev/null
+++ b/dev-ruby/marcel/marcel-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
+HOMEPAGE="https://github.com/basecamp/marcel"
+SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 5c6208e02d42..cc323825021f 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,3 +1,5 @@
 DIST mechanize-2.7.7.gem 139264 BLAKE2B 9a60b65fce16058e24e40ec50433653975b41210d3e26a560f6c3627c3de363c24fc0bf3325548dba87c9aaebebbe7fe9bd972c422989e5968e0447cec13fc94 SHA512 759bc6b2da8e0288edbe484b2ced02ce6ef49686a7a4c4ab0065e0f88799d23bc536a0ef160703726e83136857e893135a222aa295974e12f2b6988ecfbe7530
+DIST mechanize-2.8.0.gem 140800 BLAKE2B bfe02e8c640e0bd870cff12377b560cba62ee78bc41149813c678496282364db7aa5954e4d25321545fa8f48b4f067f0f01aa0332e5a118ce409fa935a49f906 SHA512 364b1e38e38d825ef89963ab25d463dbf51fd2423a0df1dceb137cdb58660f123b7c4652cb053fe1d0d21df229a108a5cb6c1fdf2489dd7f0747c6581e4f89a8
 EBUILD mechanize-2.7.7.ebuild 928 BLAKE2B 52a0fd4d9fcd19da5e2a3dd8815bbae51ef59aa5dd06dba6013f82b76a63a98c808568b42bd392a5ec8b0b0e55bcc124e97b03755d42033e7481a7762d4c94d2 SHA512 901935feb7d0038a9bbaf71c1eaf83f3e5a103af3d1aa28f7a3f6da398fe63cdb02c80898c1ff1c887424ebbf4b09fd531e090edf393974a10624b0848bb004d
+EBUILD mechanize-2.8.0.ebuild 1017 BLAKE2B 7a9d311648ea5b1c9d0288fc105f3e3fbb7005348c559b8a45f3742e472a5b78526edf96781fea846cfb629f7d49d34849873a45b3278a5535213cb7c907483b SHA512 acf93e92069291fdf7c6199dfd3bafc615c6192039f3ee22012c85571cb1330b6fb57991cbb17a5d4f878be9971f54bde4d87e226f91ac35b861810114d900d6
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.8.0.ebuild b/dev-ruby/mechanize/mechanize-2.8.0.ebuild
new file mode 100644
index 000000000000..e95872439988
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 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 EXAMPLES.rdoc GUIDE.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.7:0
+	>=dev-ruby/domain_name-0.5.20190701:0
+	>=dev-ruby/http-cookie-1.0.3:0
+	dev-ruby/mime-types:3
+	>=dev-ruby/net-http-digest_auth-1.4.1:0
+	|| ( dev-ruby/net-http-persistent:4 dev-ruby/net-http-persistent:3 )
+	>=dev-ruby/nokogiri-1.11.2:0
+	>=dev-ruby/rubyntlm-0.6.3:0
+	>=dev-ruby/webrick-1.7:0
+	>=dev-ruby/webrobots-0.1.2 =dev-ruby/webrobots-0.1*
+"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/metaid/Manifest b/dev-ruby/metaid/Manifest
deleted file mode 100644
index e89265772abe..000000000000
--- a/dev-ruby/metaid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST metaid-1.0.gem 3072 BLAKE2B 56a316b1cd56d918e6feedfe7f5a946415ed32d1f2ff9d43ccc31f9ecd8d80755492a52c1ce5aa1e71b8fcb33a8edbe316eee000d18757e22ff0eeb684bea08c SHA512 3c841a759568b9273b1e8addbe58a23df643e93a9d1f24a75a5686e26b7f16de1ab0573fd9f5032451ef813ab29c0801442a8bc74df94fc1d58f09062569ba33
-EBUILD metaid-1.0-r3.ebuild 444 BLAKE2B fbb870c64536546ec2516a774af34e3e2b53fcbce06be2cf9ea2fbd8b8b52fb88884b32e787cdc7b87a6f7e81410ba092f4a1440c721ca98726b7a0462af5387 SHA512 08139dc36c6684243533f24fcae0360c3ac46584dc204c8485a6fb78b04431d4f37d380df3038e031bf90c2fbb3c5630deb16b5d47fe837e92fde9cc8758f2e9
-MISC metadata.xml 324 BLAKE2B 015a12d37b040c5081a47bffc3a16a9656ef6c8f796bf0479d4e848806d4fe9fdd1c3b65d6342828e9c9ee939c310930fc3d2d137349a951967e911257f064c2 SHA512 16bfeb23347b5cf905934e59ef0e8dc54afe5cfff7e5f360701c6bdf87621e6cecf3a181ced5ef543580586b326d22a0cf717af237d5c141077fc4c28a2ea0d2
diff --git a/dev-ruby/metaid/metadata.xml b/dev-ruby/metaid/metadata.xml
deleted file mode 100644
index e7651a17c247..000000000000
--- a/dev-ruby/metaid/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="rubygems">metaid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/metaid/metaid-1.0-r3.ebuild b/dev-ruby/metaid/metaid-1.0-r3.ebuild
deleted file mode 100644
index 0e5850cbb410..000000000000
--- a/dev-ruby/metaid/metaid-1.0-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="metaid.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An aid to Ruby metaprogramming"
-HOMEPAGE="https://rubygems.org/gems/metaid"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index 26624ea4d5ac..3c2592b6ee69 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,5 +1,5 @@
 DIST method_source-0.9.2.gem 13824 BLAKE2B 842277a0a38331430c3c6a9f45c01d965de1997d8e9aa291d1948103c9812a23c5e67f3e7b7a2e6ec982de2a5eb841a78f6b8d1633ed17c5b7fa916698737ffb SHA512 87bac1d9ef2f1b09a26358d6d2e7e1035703d1bee9b6689567e8967baa544a456b63b2a1271305979ba077ebae32062708666588500e5810dd9f8e282d444b8c
 DIST method_source-1.0.0.gem 13824 BLAKE2B 1b6b4c23b2e73972acb69bf488f39d88fae3bffdc4e28559d880ce817199b9c1da8183f10cf8be5122535415b938c9f3964c9b4bade1dfba7fb4457c052185dd SHA512 d3a2dace01d987203d0520583120bfe08812237602421efc3ec7ff8054f2403b0aac13f15b8b91dfdb6e6679a519f707ede67ea6fed72cd8242edacc828a9caa
 EBUILD method_source-0.9.2.ebuild 476 BLAKE2B f6a213ef1e29263316b9b3793df3f61d76ad769856626d8d88d89010d3405689da2978dc66a2aa1ae6ac58c57d4b1f4d6cbc5bf46479b182957a81158e2c2cac SHA512 5ac9fa760b314feebcd75be01e06c0913cbd507eb5112bcd403a0226658810767516c8293d2c752a0a8325aa0bf1bc67097e47eac77ec9179780af020bd4e9ab
-EBUILD method_source-1.0.0.ebuild 446 BLAKE2B 2e4487bc73762bea7052e3400a8ae0f7b5f1f44d4d81c2bcbfa08cd9732d6975a87b6684746f1db490e11067f8b29c7ce051b6c12a8220bc36ec6f9603545990 SHA512 2349cf88f1ec4db81a85a12666358446ae00665b2682ef24766d033026151ae579a6d894904b676d76b37844bbebc04360c24894b7935b33b2fab5885599fe16
+EBUILD method_source-1.0.0.ebuild 446 BLAKE2B 6c4d061d8cd5a0a8e582c0bd534f5f8674a438d8d2c146776cebf88128781dd37263d5e5aeb93148ff1cf3b23917df76fe386448d6f3eea9ebc941a47a79ae8b SHA512 02cd035ce8e283f8c3944b5d150f71293d0e747623680348ce20ac12fd509cb8f0d32216911ef926d5ceda466d38c07f169504abc7218565c0360d379655b23d
 MISC metadata.xml 348 BLAKE2B 055674d709a654248c63bf20a1867646170cd6b9e2d74cf54b6640ed14b5b0255b2e23986ed068a96412b0c288262fd207d0e267b70f356ee048635732f8a965 SHA512 425721c75e37753f9df91fdc628d1cdad2ab61fb9c49af31405df4070bcf429a703b8696ba5f0a596416f7d7f14ccb4285e39afd15302da6ec753a630d098e88
diff --git a/dev-ruby/method_source/method_source-1.0.0.ebuild b/dev-ruby/method_source/method_source-1.0.0.ebuild
index 2a4204579b8d..1ba70efa2cec 100644
--- a/dev-ruby/method_source/method_source-1.0.0.ebuild
+++ b/dev-ruby/method_source/method_source-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/mimemagic/Manifest b/dev-ruby/mimemagic/Manifest
index b0582da8963a..c4315b04a87a 100644
--- a/dev-ruby/mimemagic/Manifest
+++ b/dev-ruby/mimemagic/Manifest
@@ -1,4 +1,6 @@
 AUX mimemagic-0.3.9-path.rb 107 BLAKE2B 98fd43545719eaecb359c00b89a12c7d08de12df1994288cc47a1c0c6e740752738d14e4118b11a9a58ce8079e9c962887fb95a98e577b8e7fbf55ea4b3ea7c9 SHA512 1036c2e01b9614d05f2a706e18514a0d383821f61814c674ff6ef35f61fbb0cb9c1c7c8fb97d894dc8dda6d8bb1916d12a9dcbb7b5b8705f0ea11a2329416599
+DIST mimemagic-0.3.10.tar.gz 56979 BLAKE2B 5a3113172747b911abe92ad8c20b04992ec4cea5eca91d6fe0c71c2aba14a0e5094a6d6cf710815ef8f728fe67c25151b5997e74b8dfb3c6de77b78960f054e2 SHA512 1c967509bb3ded1512859d9542fb56022debfe3864a63f2fd45c899a94e5c6aaab1e8714bfb797dc0719baf8bafbd3ba56c67d26d8c6c5f18c967ea6a2efea72
 DIST mimemagic-0.3.9.tar.gz 56322 BLAKE2B 41904211bfd0912ef3a161a26c3568dd1cc39ba0a4170969fec7285dbb38302bc94b6bc088f96a1d68e1367deccc9c5616d047cd1946be96dd9e44a892d28f0c SHA512 139ccb23418c476425cd850d2268139b7f1657713ea706c95bf116535fde2ffb4b7902c62f057992d3fa02fee7520a31433c97cce084b7abb5682cffa12b82ce
+EBUILD mimemagic-0.3.10.ebuild 864 BLAKE2B 2195759917eb49af48c4aa1987c7b2d583b79b6c546177050633b0e3192084cfda17605b61d274845746f4bad3e73dfff0dce26eed1d8dafa6870c33a45c2760 SHA512 e9f3f2338bd560d2b70da26f1c03f80f986b2e203dae9b45f5efb05d6cfd38b5df6db446dc5b6adb2946af2942ab994b860d0927c0cdd208ebcd522e1cefab9d
 EBUILD mimemagic-0.3.9.ebuild 857 BLAKE2B fdde6b989f3db49cf5ffa1eb940206e44ff7fe31ddef49214235e65e014755b8400916fec6933e375f6c5a3cf0705951d2d038710c8b301b553f7d5286f644a8 SHA512 21d6cc2d61533cad4656450405be18dcc6f15641c241fc3092fa942a98134d075faf1805cf670f492202eed74ecf32b0e19bce5fc4814d76f6f47c482bed4573
 MISC metadata.xml 341 BLAKE2B 6d21edf9da7e6ae6913d3101cb96b5e82376e080baed3c07b9d4a9259eb0c097522b35807a89e4b9b32fbc6a6288dba17be7912bef5654dbdf32c9b34da567db SHA512 601856326d3da975f418b59996f89c68b33d089d662b684b9db13ea79481f34706fd4726a531f7f2fee55f25e2c7b3d1ecc69cedab1ff627109c80effa7bc406
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.10.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.10.ebuild
new file mode 100644
index 000000000000..95b97506ad87
--- /dev/null
+++ b/dev-ruby/mimemagic/mimemagic-0.3.10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC=mimemagic.gemspec
+
+inherit prefix ruby-fakegem
+
+DESCRIPTION="Fast mime detection by extension or content"
+HOMEPAGE="https://github.com/mimemagicrb/mimemagic"
+SRC_URI="https://github.com/mimemagicrb/mimemagic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" x11-misc/shared-mime-info"
+
+ruby_add_rdepend "
+	dev-ruby/nokogiri
+	dev-ruby/rake
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	cp "${FILESDIR}/${PN}-0.3.9-path.rb" lib/mimemagic/path.rb || die
+	eprefixify lib/mimemagic/path.rb
+
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 55a8947b85aa..ee7afde6d6bd 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,5 +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 2073 BLAKE2B 5874157821dc45e5d10606b89bebe4bc54859bb376fdcbd663f153222992d011b1ed2b10e2cbb4227b511e2b4ec80470aed9fe3aada20b1d4bc8860f76081260 SHA512 57f18a6fbe0ab9da5d39a5cc1da572b5c5826d3cc7674028668447f161f29b9a8d556b55153231b485038cb8072a5aafd6a43eb64aa5bc4900dc91d35f14d3d5
+EBUILD mini_magick-4.10.1.ebuild 1990 BLAKE2B 630ff5d1420dc6051221da38ecfcb1be467e75919332ed9e55feabf1585cfddcd45966d5bff3a0b87fc08e583e06f0314e9d9e7cb26461d19ecedf60fe60155e SHA512 ffeb65b0b2fc5c98e2f5ed706f1f2d42763698a9da30b30e4f6b0f6522ddd8c194b5f7c779c854ca3f661e589b971765cb7fa2f40e9e9eca47501b60b0c95ccc
+EBUILD mini_magick-4.11.0.ebuild 2066 BLAKE2B bf5b94eb0974cf5b0491d8cdf870f3fa0a0f78acaa5565b296403e1a13bdaee0bf0daf13c46d086d74422987c85f0c965fd15fbb3f1b350e9593f2f1383f505f SHA512 2c91aae2284eb35944e070d445a15a038dc0cf3bdaf02da8e4004ceb191c0a6a1cce2a847f3bd0896188a0760f81805558eb457c316c5642e1858d3f2b811775
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild b/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
index 155b9385df44..a9f8f5aaed8a 100644
--- a/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Manipulate images with minimal use of memory"
 HOMEPAGE="https://github.com/minimagick/minimagick"
diff --git a/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
index 28c13dbcc36a..4617f26bb68d 100644
--- a/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Manipulate images with minimal use of memory"
 HOMEPAGE="https://github.com/minimagick/minimagick"
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index c15adc2edb2c..cc6c22cfe77d 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,5 +1,7 @@
 DIST mini_mime-1.0.2.tar.gz 31971 BLAKE2B b2783f9376d5299ba77d1cab0326f706cc671a96aac58e8c65879f9180cf3f1f359eba1b8ed4028c775728d4d633d6e8cce06acee90cfe9b60cde2e53f9a2360 SHA512 644eefdc9277642b8b94ce8071826ec993f7da1a5bc8903bd17ece05a374f286014d05b5765ec5a5f7f0fa9252b56d3bdd03109a3702075f6e8ccb68a4cef98d
 DIST mini_mime-1.0.3.tar.gz 33554 BLAKE2B 7be4a7b8ee066a1106a42ff28ab57684460d061dc9205a992af471f5e9024be080388451f6f0d171c09b96f53c4748c9490afcfa23a82f478c5e96b559c8c97d SHA512 d8259b81821d35ddb8f9038ad2f672816f20e098ff74d8245fdc2a8a6e4be6918b865a25372348ef8dd777483883238919293a683df064d15ac7045f9b40bb0e
+DIST mini_mime-1.1.0.tar.gz 33748 BLAKE2B b804cb6c9c321dcb43a56fecaa04202a88a6233399ca0343c2e101bc3e583071ba5c0ae68bf5f89b220ce338ce6995c41c11ff7e05dd2dd657686ecdba107a88 SHA512 14f369a8a0d35c474691abf71b58597b31ed82d29083173b2c03e6e36d7b20cccf3e3f653c6d53b8abf21aec7d7f3198115238dd27b0e49e1bc9c65426d0dfb4
 EBUILD mini_mime-1.0.2.ebuild 1077 BLAKE2B e5350813078cead7f195cc419a44fe18c00423043ddd21b57943e02481b038ce7eb704e9aee5001f201ca7e3abf5d6f17c11e3bec344c197d19c8bde27d5c05c SHA512 97e4af23d1f278e58060e21e8e72f4df6039ae62ca24ef2e5349fa3f3200db539ec5f274be8120dd5d38a0b6d299ef5f6c46476c36e40e0de65e7ff3593b7682
 EBUILD mini_mime-1.0.3.ebuild 1047 BLAKE2B 1f8901cd09e28c20ec0695e373f0c78b4851d3c4563702ef91c7c996c42df19baf9ac189b4b3dd26963512de32fa203f10731757ffd4cba47147f16153238718 SHA512 bea01071f5a8e1b9fa4ff6a668408f345c142c79d2a67585ba0d1d140ebd92981b93b18c1fa3ce8597edd70e3dc9b40bf1f78da63ded495d180c3442aadd78a6
+EBUILD mini_mime-1.1.0.ebuild 1047 BLAKE2B 1f8901cd09e28c20ec0695e373f0c78b4851d3c4563702ef91c7c996c42df19baf9ac189b4b3dd26963512de32fa203f10731757ffd4cba47147f16153238718 SHA512 bea01071f5a8e1b9fa4ff6a668408f345c142c79d2a67585ba0d1d140ebd92981b93b18c1fa3ce8597edd70e3dc9b40bf1f78da63ded495d180c3442aadd78a6
 MISC metadata.xml 345 BLAKE2B fc6de1be1e40f5e450d784f3e2e2be6f0339687cf728fd6b63bf6f4fd1927200f3a5262a2fca9bfa5a33310cfffdab9fbb817ea40072dfcecffc963b5193107e SHA512 bbffbfd689e60f39f73d5117f6327b250a917446edc6d0dc14cb43a5fbb00dbeaf6ebd92c090f3e7b2168dfc0c409c58be287acad9243a420bd5bbde64f80c43
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.0.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.0.ebuild
new file mode 100644
index 000000000000..806ae30061f1
--- /dev/null
+++ b/dev-ruby/mini_mime/mini_mime-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight mime type lookup toy"
+HOMEPAGE="https://github.com/discourse/mini_mime"
+SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid comparison with MIME::Types because types may vary over time
+	# as they get reclassified leading to random harmless failures.
+	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
+}
diff --git a/dev-ruby/minitest-pretty_diff/Manifest b/dev-ruby/minitest-pretty_diff/Manifest
index ef330f286b7b..ad06a2fe9920 100644
--- a/dev-ruby/minitest-pretty_diff/Manifest
+++ b/dev-ruby/minitest-pretty_diff/Manifest
@@ -1,3 +1,4 @@
 DIST minitest-pretty_diff-0.1.gem 4608 BLAKE2B 4002f4f2df03885a0c1f13c5561bbf48ccd707f44af44f4e91d4f6337a31791754b3e38160f088abb7aee8ec6d9abb6734d3305dec808033697611864559efa1 SHA512 e04cbbdb9cd12f2b60824dc0e20f5f3ee3e97b6cf3c8b290da941f26af120fd8eb47e33cb501380954ebfd84db817095f2f8a205ea8ee2095868befd443172b6
+EBUILD minitest-pretty_diff-0.1-r1.ebuild 635 BLAKE2B 934254f1396ffae5b87f364a726fdff1ee4b5e98372314912e40d7aafe0cb84252b7b2e55bb02c6a8a28267f312cf302f0d6650ba7905e1a4d2e94deb4545079 SHA512 3d3e7bb72589f8b80eab2f94443ea8fe1917b9fb218b5da49c8579f1f33cba8e8667a08ad595122c9c06c2bacf19180042d2c0d87394f2c4165c4228b6c4a49b
 EBUILD minitest-pretty_diff-0.1.ebuild 666 BLAKE2B bbb218d4b6c16949ad76ff6844440ef1c57e31601b7b168ed7fc5ea722b3e2315ef96fccd6aa277e34cb5e965996abc523333fc3376701dbeee1143cfa7a78dd SHA512 353a933a435bb24292898e1d356381c5072fd6091bfe65f50783225beec8e4120d2cda6bf6853198066cfb9d269c64734d7512f084baed79a1cc933c27f15258
 MISC metadata.xml 354 BLAKE2B 2e5c062ea73990a1eaf3b5f4bd4f4cd1171e4590f0065dee618eeb46e796d75d8c6c9f7a54f7fbc384a8c4ea8a3d3c9071a48a1483b5cda277177430d06d9a5f SHA512 88eab741974382c3cc5fa28e639b0c5d8cc5f74d9e6135348e9ad663ada2ff2b882dfdc99472bf47586db537fcc1c05939b2c7bca6ddfaece511c58ef810348a
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
new file mode 100644
index 000000000000..4033a8a3a327
--- /dev/null
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pretty-print hashes and arrays before diffing them in MiniTest"
+HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 4fa87037840c..fbc2c7676d7f 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -7,8 +7,8 @@ DIST minitest-5.14.1.gem 84992 BLAKE2B 1bc258ea21ff887381ce9d13ea08f07d6242bf1da
 DIST minitest-5.14.2.gem 84992 BLAKE2B 2cca1cbbd7588d2bd77458008a0dce0dcf34e9e68fa0ab7eaa79a72515c3d2399030db61905e84835596dea5e854a4a0708096f3b401ca8fb61c3da0823a8ad5 SHA512 c1cdb87824382233d4ae0570346a6888ecdf0dddbd5fbc9bc136e1c8ed9e1ce57d08d5994f57ba1eee99a38e48a04a10a32288d34ce10ca4ecdfa15587cf602e
 DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
 DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
-EBUILD minitest-4.7.5-r2.ebuild 855 BLAKE2B be819c08a86dad67f4f72be519b5ea978658ae98087c1171879db92656649ccde4755a29a50f4f05816d5c41476f316032102bcb2062e7bbf4378f1369da042b SHA512 326d2ddbc4fc143ef9086ac0582ec76e5ae2739a31b3c80ba5e420682f1b1d2f082f94adb12971450f3df8b9007afd62d8320561dbb40f476373f67421235fcf
-EBUILD minitest-5.11.3.ebuild 751 BLAKE2B 07e8bd48258eaafa3810e7122695024910d50ea4a8ab529fd8a3fd2cdc3a027af48f4807bc95c242988ba56d7daaacfe770614c32a8196b63445326d0b18f0d2 SHA512 692ca391bbfc7927d31a9e663b584cffbaedcaa27774bc7eaed4fd0080c1314f98e90fcfd547df462882d9e5935b502a7deb99992041fffe1227b6c0f2cb25b3
+EBUILD minitest-4.7.5-r2.ebuild 856 BLAKE2B 037aea7db96dd5a1527932f4ecd421ba48d039124492e2db19e11b09b5402cfe080555733097f5bedb1c1e6742af47e2b200f6174efabcf9296a85ce4f97da5b SHA512 6b6aa378b9321e4b4d8899ae1483630f10eb1fa5b433c7a7571d9c78f8c87e461296e0f058cc359d19df0b3e6b01a142a40c620ec7a682ba8f188709f2588bd9
+EBUILD minitest-5.11.3.ebuild 752 BLAKE2B 48915acc329f6639fc20abef18e420a51d3d76087e642cc8a58c55caf5a5f134d7690ecc60702890f598dc51eb8208092d179c2f2d1934e1231e8d1f1789a17a SHA512 7b44b8c01f1327d50acb399260575cac827ebfa3ddd463b582fafdd8197957d1225f9ca3a00355bf94b3930f0d10a95ece0f9747857cb011ae55a34f9f8c5c72
 EBUILD minitest-5.12.2.ebuild 721 BLAKE2B bf109a1758943ee0f8f4d7d876ea27dcdda8ff21fe81cb6a5fdc621e0ad83dd3aa44f9fdbd2e2f16d22bb745100fc433deac24c2227358ae669985e653536157 SHA512 44802ee3cdcb312fbe791f9cbcc9d205186fcc4e3c8a05bd7572cb52714d0ebef26d6cb317740a8db9ede5e6c6fc4abf2c970eba2a003370e2a82eaa601c60d9
 EBUILD minitest-5.13.0.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.0.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index d4ec4b2f1b43..7e90ce511f7d 100644
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.11.3.ebuild b/dev-ruby/minitest/minitest-5.11.3.ebuild
index a6496139cb03..a12171d5a2c7 100644
--- a/dev-ruby/minitest/minitest-5.11.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.11.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_test() {
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 4d4e0bea2b33..641ada24df21 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -3,6 +3,7 @@ DIST mocha-1.10.2.gem 240128 BLAKE2B 50c638a729cf7e11b982f60b3e511166ca896d67167
 DIST mocha-1.11.2.gem 242688 BLAKE2B 60df172257e8767fd3b48e3716cd31cb69ec6f10cc74908bee2e0dfd2d042550b10c7ffc8d2dcf05853c96cf2745fae776bdc9abcd6728f5a4f3fb349d997bec SHA512 8408d7b4c4d979caebabb75b1b870e6473fb0a5abe6055bdf7b4c4679b92c963138ec9a2947e60b9741a2cb50ea7ddfe949544dc4b0bdac22242b2a7eb5fd54d
 DIST mocha-1.12.0.tar.gz 244820 BLAKE2B efc4b40509cef44d976b1556e4977258f1b37a314e37f492943fcac955c681d17008a1db30f963d7a6adcb788b1832439e0585899c99ed8f2ece69c887952e91 SHA512 969a6cd48d925845004dffa12f8a9dad155d3bf24b974957e9921a2e13dc67985f01080017ef9e82dacfd4bf87533774f3f5d15226923bdf50f8b90e95e1730f
 DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5d7fd4133c3d9a67a8e5d55626fead7a70de363c8564b687530d3e0515ed7fc167a65091d9e17d89dde47 SHA512 b0abd6234f34dfd92d44019001e97914dff80ece5fbe2b53ccc91192f99f06a79f9c96cdb136b2a389a1a1b7038076fce688d8d8ee8645538d3c58f73e345fe4
+EBUILD mocha-0.14.0-r1.ebuild 859 BLAKE2B 21b52a1a7536026edaa71da09aa1f25b41c88284ed8660c9b3d675ff41c5c54758777c27860ff8511d24152d120cec8bdb85980ba0789baee1a4f8a1dc80a2c1 SHA512 bff61b26bafa6d8aed42c4cf00493c88c2f64cc54e723cc04d069f9d399c88c2192298019bf048e16da93613c106318c45fece5c10d889f608273f71f29c0756
 EBUILD mocha-0.14.0.ebuild 885 BLAKE2B 7bdb2eaddd983c06460cac0320e6ab2f4ef3ceeb76f0e64a5b4db3f61d9338f50628d946294667a47a53b1d28e23710af1e7ff4e6efdd0d32526418ad5600b84 SHA512 d3c0ff9fa348c19cedcc4aee99ecefda3a1db963b9be5067dac4d31d074e08288f8c03455220b00f7f6d65ccf1a1573c3fa629fb4cd3373dbc238bdb890eac70
 EBUILD mocha-1.10.2.ebuild 786 BLAKE2B 6b30a8ff71632be937cbd0b6cd4300ba3313eb49d5ba980721349a7c0f85f3e3b803b69da63c05487cf2a7c682a1e9844070c0181438a60b89375c6de9f54d42 SHA512 6ae0eca663ed3c2054c258604166a56bfe2466bbafde758722f0c51393790459fdcbed2015ecef94745c53a5cd18e53b2bdf89a43b663cd5b46610ee4f0a80fa
 EBUILD mocha-1.11.2.ebuild 793 BLAKE2B 9ac48088e0140794d0cacec7d33254750e12fdf0786933dadd7358da1dfd48dfe308659fb4185e7600c2b5200652fad5b7125ff51a7c3d6913d1f55392815e62 SHA512 c5764b88fc5434681ca0126d171778c58bd4ccc0f6963e6cf2f009a82654e9d856db564363322349156c6288e563c184dab0fe54ad5a8358850473438130f547
diff --git a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..0e4a590535db
--- /dev/null
+++ b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="MOCHA_NO_DOCS=true test:units"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="http://gofreerange.com/mocha/docs/"
+
+LICENSE="MIT"
+SLOT="0.14"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+	sed -i -e '20irequire "mocha/setup"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 5bc9705a9200..c2d7912d140b 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,5 +1,5 @@
 DIST msgpack-1.3.3.gem 82432 BLAKE2B 75a77773d8e7d07ccb2099a806f845f4d4723dba82ad642da1cb1b9ee0c55567b6198b86ca22093fdebcd4ec40ce05d95aad658104a1e9072dab5a496bdb0317 SHA512 18d78cac70a14a22fab6f7743f702cbb1a636434e881dff5b6eec89be137a47fac1649e143dfa8c3c9e65ccc099b2b3c778cb333613d750cb6b296e3ce7db3c9
 DIST msgpack-1.4.2.gem 83456 BLAKE2B c3dec1fe3c1cf37969f435b6ed36c68777e650681a4779721b635a83f08fabcf01f161c8ce9c43358b98e159c5595eadf72b3533d609e174e303854196ead26a SHA512 b2f703fdb401c023dfb3064cb9c4b8f1458c0420c6f6f17bdc9230aef1a6f943a605a3f7369a20e7402e98db77a62fadc90aab40de90fdf6ea16924f33eb7ff8
 EBUILD msgpack-1.3.3.ebuild 1057 BLAKE2B 2b7b3ec99ab8733d1e2aed31ab4284b9ddcacbad1a64f14999c5f413d390324d2030e69b5884d19082d0379dce18b2264cc42e389c75370b13d9e35ae91ed324 SHA512 97801214e34de73e5002283f985a81749c1ccd6e7de2beb6e825fae1120bc758eda1bc65f58afed474bed49de6189f90f23889cdf509c2a344b6450dbe7d8acc
-EBUILD msgpack-1.4.2.ebuild 746 BLAKE2B d65aa3e050af664b7eae3502cf0052729310c9f7f2ac21c91ed83dae841fd6f1dbe3c37f3c19c349a1ec1f979f7535d9d10e04239fc434b2c189389f0e3924c5 SHA512 ca15cd788ee422883a39b67357b10357f400243ed0de15ee3faa3854be53b12358418efa854e2377bdca5c4f8b5bb88a358f91efc2e26ee448cb8b6d97cb368a
+EBUILD msgpack-1.4.2.ebuild 753 BLAKE2B b7c69f10ab2cdd042f1e024762e423657a8c482420f3a950275e90ce541ad1dfb346c0d00dcf2ad2585756679040822bb8f85c2f73eb81934a5a65dac4b4b9dd SHA512 d43d0046569a006806c2f3a9e38035bf319c31543357bd3d540b727dd31b212a288785350f2316f60c0793d9ed5ebe7bc51c3f1e3525c8f109ea0240818d1be1
 MISC metadata.xml 331 BLAKE2B c964da6cce4e1e413377a6bf37282aa6ba207c33f3682ca5738361bb0df8c45dec063abe22f3183354b79b70707f897382a3412de1f6b185460a26ac2006f082 SHA512 5cff44a3b9425bbdccb3b682a26355c9526931b2826d7ff91da0d6db5e0dd139ae556a47dd06757b5cd209413b67181483189ba2dae819f70ffa58a46751c4c0
diff --git a/dev-ruby/msgpack/msgpack-1.4.2.ebuild b/dev-ruby/msgpack/msgpack-1.4.2.ebuild
index c8655adeb024..0b4f0f2fb217 100644
--- a/dev-ruby/msgpack/msgpack-1.4.2.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index c6c2728a8870..04ad0eb4095b 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,5 +1,5 @@
 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.14.1.ebuild 1956 BLAKE2B d517d2287fb035f6de164513ff9c2cda386cf567711bdf2b0978ddef887b6b6f4783ac53c5acc18bf50d2709038acac2ef18ada040ebd9a93a7036233582a4e7 SHA512 639ff15bf3842710d39d6c55edcbffbc303b784b4c238e2a98c9c4a3e1824524a616c4e381979be982a218d42514e313a1bd37f29164455f53f997454f45b408
+EBUILD multi_json-1.14.1.ebuild 1957 BLAKE2B ca00098daf555e2ea8cd6096cf3d7b55b59130e52193abc53b794e04117b6d37daa47a482a958c42d752cb957664488519cb08555c6c8c70574402d0e7dfe0ad SHA512 007407b9978ed0dbf794698217b037c72c336082aa08b031dd7d03566e26ef6a2af63f4549c71672cdb72ed9d0d1626c20bf56309a9b26e0fd86582c19eb06a1
 EBUILD multi_json-1.15.0.ebuild 1957 BLAKE2B 364d94f09dd7909e05afab5df5beb4b0e3f60844dde573e9f62ff5f49f306a76964ae3ffe49a27c9cc3dbddabfb1d0f6542ecc77f119e205bb40962fcf74e19a SHA512 7570dcc3ff8c43651794f537df6aff23151e4b02f47123b0e580a726715cd47cf5b3ad2d3ee457be5f4039f8889fcc4d2c4c33e2e04864115849421dfa78ffbd
 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 35719d69df26..797521a074c1 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 ~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 ~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 d931685ae28a..bdd8ed7a0f45 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 976afffee7977489ffe332d4cd7a7c82f8bc9523c1b0db4a3ccdcf4a6d3866a7c6b562087cc1f0bdaec3c387359f6dcb6a0bd3885583672dbf6291ca0c44fa10 SHA512 444b87b8e0a7c23f25015c8e4c643490e917ad34c7fac4568d4128f289ffdd23ff1fa2e0ba10b41f010840fa504f31635b87b6e84ec72230e718bd85f19aac08
+EBUILD multi_test-0.1.2.ebuild 550 BLAKE2B c580624a7e4be8674657f047a408847d4129f8dbd570bf836636ff347071aaf56c9bb34c74419e57c2c8ec202fda6c5adf5f1ae869623e64b4f118263c5a39a3 SHA512 d195dbe2ed2e4201a594f97b74dd1ad00fe8f5d2b1ed65a3623bdc687965fb9984a19fb7cf176e0f6052523570a801f0157f66948a3048c4305e15117650075d
 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 c9a294accd92..ceb73819824e 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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/multipart-post/Manifest b/dev-ruby/multipart-post/Manifest
index c45a356e9a30..eae94552ebf9 100644
--- a/dev-ruby/multipart-post/Manifest
+++ b/dev-ruby/multipart-post/Manifest
@@ -1,3 +1,3 @@
 DIST multipart-post-2.1.1.gem 13824 BLAKE2B 70a706714d14d284e2fa69aa56a69682e16eece75eb1508c1707b0b7f03b0d1fb11d1a187c7b7681dc0654a280c59bc20a0754d30e80807a4dfe5e56976b4ccc SHA512 afa16717ee136f0bbbc20fe243252831604740bb61fa7288a2437a4a67638f660a4bd491b5326b034173e9e8352f2659f27dc8aaa761721f7111b7e9e704582f
-EBUILD multipart-post-2.1.1.ebuild 575 BLAKE2B 310e0e47c45ec4196ac65d06d6add24d341049a945ee054e030deec3d4f1d4dd4d6382da10f4b33e60ea2b241aaf6c7de27a839c4d4a4ae2479e122ae013d7bf SHA512 f90750b2c6088a8841eebe79f89e9e4b2e9ebbda5368ae3a736b66a6f4afc0c161b81db01671c615f479fc55c387bb668043bdefda1dac7c24f523b434d436e3
+EBUILD multipart-post-2.1.1.ebuild 568 BLAKE2B f1b348c277c30cdc1ae11868a22c4d54646c852bb9ae85b98ad9eb195069071c157bc1b12fa93bace1ecfd53c0deb05b00070703157182d7270426b60426baec SHA512 2e1ef80f94c9b3fabb6191bc39cfb101a9a30c1804b99009488099e2bd8a3b4ae70706c0049ff40237c988f012d98ba144b5c59ef303f2ac070278037dbd4392
 MISC metadata.xml 351 BLAKE2B 1b91932f0fac0566cc3a283f50d5162f09b9ae0f06ee2419f5be35cb6fb9b6b7234c4c8974c89d38eae80ad2a642b1ba5a927506442ab2906a4d43832a2207b5 SHA512 d25464b95046a3df4a9989cdc012fa2220f9d0008f48bc16bc54e87fe6cb99ce0e4548e042ed96675d917a68a2c2e7fcbc3054c66fe5879eb6761cacddb7c51c
diff --git a/dev-ruby/multipart-post/multipart-post-2.1.1.ebuild b/dev-ruby/multipart-post/multipart-post-2.1.1.ebuild
index f874def78f3d..1c6771f9441c 100644
--- a/dev-ruby/multipart-post/multipart-post-2.1.1.ebuild
+++ b/dev-ruby/multipart-post/multipart-post-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_TASK_DOC=""
 
 RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Adds a streamy multipart form post capability to Net::HTTP"
 HOMEPAGE="https://github.com/nicksieger/multipart-post"
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 1dc74581f853..1b4513c6a7f5 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,3 +1,3 @@
 DIST mustermann-1.1.1.gem 51712 BLAKE2B cce8b5237b8dea0dae42822ec58c02a88b07b6d75a09bff6d8699c41fbc53c900dd3bc157ef66c863ad7d646bd5380cf935f5fa3cc1b322cef39b73d26682dac SHA512 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747
-EBUILD mustermann-1.1.1.ebuild 603 BLAKE2B 15a13b2960807f6546c0ed8d3d491ad258df49a597c8cd752d027494bcde64962656c59bc01cdff77a4759376672f02017da9f73f31190e2dfd4711281077906 SHA512 5949d5377c5839467571266e25fa97892ac44f212d1cbafba11749f4d32a76686a5381e258349e7f340fc46da5a32aad6473e4f5e4433dce287af33bfddf3b69
+EBUILD mustermann-1.1.1.ebuild 603 BLAKE2B 6e5f7a1b01a8f35912bfbb7d586a63780967a1c310d595f1fbac96158869261dd3426d0c16d1cbe6c519a84688e4d1fca4a13b28bdc9e0fe87b0ea0b57ddffec SHA512 828e0c15644638323ef0731a1be9ce2e07457bd07396ba6990965feab4e578aa2f42146661fcaa68deaafe1bff26cffb3bcd37fb7ba9eba7ad13dff9e43ec103
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/mustermann-1.1.1.ebuild b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
index da2b84ef7cbc..6621377ede5c 100644
--- a/dev-ruby/mustermann/mustermann-1.1.1.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # There are specs but they depend heavily on unpackaged code.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/nexpose/Manifest b/dev-ruby/nexpose/Manifest
deleted file mode 100644
index 01a45e1c7372..000000000000
--- a/dev-ruby/nexpose/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nexpose-7.2.1.tar.gz 123143 BLAKE2B 2bf9a022c6695fa759c5193510c2cfa793b8014b36914c7806f1ee888ac8eb21466efa46539a9e9b7dab31454b8604b10b71d59faffd001254ee0561f456b707 SHA512 8c0d8b4537513396c9c7cb01330310ed30f8995890c60fdb956ad4760fda6e89a4d1d400e6b71cad1fd2d8c5f2176074c415d35597b1c8740233ebcccbc7d870
-EBUILD nexpose-7.2.1.ebuild 860 BLAKE2B 4169c4207201e77711111aca9eaf4c1ca9f6da8e77a8fadac1d87676e91c13a5ab422f753a045ce60cd952efa603c8f94194b7daf2ffe82c9a82a0a77c4b0395 SHA512 8667a8013297163241e64beff8d267568ec1cce84c96ece5522da702eb3336e9dd75ce462d1a395c1f8a977c19a9ca66d40f54e78fb80fded39e852957452207
-MISC metadata.xml 386 BLAKE2B cf403f48decf1f8383c56eac901492154f4bc9b9d6299fbd2c68e192e866ba771a0cd969ad8659b4f12ddf87d862abe19163f0f127abe357db1757481695fb05 SHA512 e82518c57de2f6166cc1c0256102039ced6a06cea335446cf96a1f2c4b8533c752864b99a5b0c6b67240409fb0fca1f0dbee38630731e6666c8a030641363359
diff --git a/dev-ruby/nexpose/metadata.xml b/dev-ruby/nexpose/metadata.xml
deleted file mode 100644
index fddedd1e4038..000000000000
--- a/dev-ruby/nexpose/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>
-	<upstream>
-		<remote-id type="github">rapid7/nexpose-client</remote-id>
-		<remote-id type="rubygems">nexpose</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/nexpose/nexpose-7.2.1.ebuild b/dev-ruby/nexpose/nexpose-7.2.1.ebuild
deleted file mode 100644
index 5fc4cc695cc0..000000000000
--- a/dev-ruby/nexpose/nexpose-7.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="API client for Nexpose vulnerability managment product"
-HOMEPAGE="https://github.com/rapid7/nexpose-client https://rubygems.org/gems/nexpose"
-SRC_URI="https://github.com/rapid7/nexpose-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-client-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/vcr:3
-	dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(codeclimate\|simplecov\)/ s:^:#:' \
-		-e '/SimpleCov/,/^]/ s:^:#:' \
-		-e '1irequire "nexpose"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 7fa19d18e930..223dee521313 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,6 +1,8 @@
 DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
 DIST nokogiri-1.11.2-git.tgz 5838718 BLAKE2B 2310ce25699e1afa507e4428fc2d698018cc2e07590f85a9f97954c583b02122f2356e87537b3b5d11459373582fb3dc367a4d7969dc871e86065b739becc80f SHA512 9d155647fd400ad34c05c0b0e7c3d459eea07c68cbe829b5021e5040c034d7032c0e8878121d54d3b3d1233dbe8a1c0c195d6189a84aac30e68657b82b4f1eaa
-EBUILD nokogiri-1.11.1-r1.ebuild 2882 BLAKE2B 5f4ab084dcba0d83a28f4ece88aeeadb1ec77260ee8fa721db030f7432fef997161a2dcb66b86260f616affc0f20499e702cb220abcedefb11ef1f6d8669ea55 SHA512 8c6ff1bf9dbca9d3c945808e14664224e056c7c329015e314becafec284820ae784206de511952869ff0b1f58b6f2eb6834f283142737919f14e38ceaeef17b2
+DIST nokogiri-1.11.3-git.tgz 5868894 BLAKE2B 3140c875535f3ceb7e13b27c4905c7caeae09acc8319a8649066469936fccba311a25a4923fdd5042d8af69144d606fd58f8b22a6d1fe3030ca30f4316d91448 SHA512 7a0d2197f1dcc67adcae7219891cc59cfdb3234e5a7b843686b1dd7d02bbcc57a2b7589ea880f856ee630a0335053bada02b99ac2d994d785baba266f994e20c
+EBUILD nokogiri-1.11.1-r1.ebuild 2883 BLAKE2B f57e4f27c25dce68560d50bdaad3fbe31833088bc0b4d486e3fc1036e2ebcfa5c2e449babd9a6cb79bf70dfb3eedda2011dbedb1ddf354b6abd8921b4a4be437 SHA512 22bee11c3b28a0be289c884f92a6ddab91afb45e40b6044bf0275e16698a2afbeb9c9a28775d788a8bfccba38028615e86ea32834ccf249c58b2dc8e3113bf57
 EBUILD nokogiri-1.11.1-r2.ebuild 2948 BLAKE2B c1af732e42d94ab8251464ecbd9a9612115f1d3e02e46c14ce8b1c0e8612be61718994ab65f0538c6aae1dfe68f7a4ad50d4935ba6ce26edcecfeaa017a91721 SHA512 7fa73f106b6c82eb43eaa223ca6a653b7fa4d2535bf46b10c38451a7d04ace31e3bd5ba2a249ba37fd556a22ec25bfa76108826802d5548139417a77b3bfaef8
 EBUILD nokogiri-1.11.2.ebuild 2938 BLAKE2B cc021ee4875686e30f06a142e8966ce28a85c17c81f7f1c60cfdf03af3ffd75ee3a5bd1fedfb13a41b97c4631323ace4e0beb772f9b78927f04dc641f574a2e1 SHA512 9c508357a027fbea0ec4d26820cc8b2049790741d88ccd6e55b802949d96191fdffedeb1ab0c040e2f78485aec9e4deee802cd9708270e7be37fe943697c27de
+EBUILD nokogiri-1.11.3.ebuild 2938 BLAKE2B cc021ee4875686e30f06a142e8966ce28a85c17c81f7f1c60cfdf03af3ffd75ee3a5bd1fedfb13a41b97c4631323ace4e0beb772f9b78927f04dc641f574a2e1 SHA512 9c508357a027fbea0ec4d26820cc8b2049790741d88ccd6e55b802949d96191fdffedeb1ab0c040e2f78485aec9e4deee802cd9708270e7be37fe943697c27de
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index 12f3cadf0f20..77baeeff1663 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -18,7 +18,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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.3.ebuild
new file mode 100644
index 000000000000..66e091dead9d
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.11.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ext"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.10:=
+	>=dev-libs/libxslt-1.1.34
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.10
+	>=dev-libs/libxslt-1.1.34
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.1.7
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# Clean up "ext" directory before installing it. nokogumbo expects
+	# the header files and shared object to be in ext.
+	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
+}
diff --git a/dev-ruby/ntlm-http/Manifest b/dev-ruby/ntlm-http/Manifest
index 3fdbf5250418..5ca354cf67ba 100644
--- a/dev-ruby/ntlm-http/Manifest
+++ b/dev-ruby/ntlm-http/Manifest
@@ -1,4 +1,4 @@
 AUX ntlm-http-0.1.1+ruby-1.9.patch 657 BLAKE2B 179668ac8377cb16485f934027dcec83faf2ad790f45b0382facc3fd25eb957a501099b346b1f9a7d1a90d96e96566cbd6307fd3868bb5702945a88da75785be SHA512 c1cf26169cfb7eb8e5759b143f49dd7eaa124cb9e22314e0d2d36c3128080e2dd85b84386ed219cd35e3022e1ba36926dff6ee603400362d8ad59bb627f3080a
 DIST ntlm-http-0.1.1.gem 13824 BLAKE2B 179baff2b4b00306b15aa42bad3e91bb41bdc6070ad2eb4681075474839dafea06c54ef7b3fb9f997951ad7b4ddcfa78caf5345b35e5944366b60f27bea63530 SHA512 1d2868582a194fb3a3dcb48a7dfb031014e51a93d57afb83aaef98be8e57789506b71e6440770ca7bc48979d9dd730f398d01d554d6d0575ff01046a227c7669
-EBUILD ntlm-http-0.1.1-r2.ebuild 863 BLAKE2B 38201ba2956e561d7ba53dc065cbbe71ef136696712749e9ab4b7175c152dad3ce99f5ce9a25b19835703d6dadd98788146bf93cfc5ceff03001dd7cb05d45fe SHA512 11b42cf12cd45958a1068004588b83389e9f334bea1ba7fb5e840dbc6ed63bd4dcb8536f84eddd467caaf7700571b1fb8ed63f913bbff8251731bbb51d9548e7
+EBUILD ntlm-http-0.1.1-r2.ebuild 863 BLAKE2B b3c123b00c16ad8aa03b278c1c7cfed7f1dc87d374653e9749c3b5db7c972e6f0005531a329e9fd6d9d91b029c30f3255022493d227b19042b2d6666213428b2 SHA512 103a7d4cbde6f1e871bcfda4dcc02338bc96b14139ae9a75abb025ca73f7d7df040c8e099a39d5600f32b7615eb168fc8e3250b33228cb54984e78d27769800a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
index 3626fb0277fc..541cdb6ba866 100644
--- a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
+++ b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOC_SOURCES="lib README"
 RUBY_FAKEGEM_EXTRADOC="README"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem epatch
 
 DESCRIPTION="Ruby/NTLM HTTP provides NTLM authentication over http"
 HOMEPAGE="http://www.mindflowsolutions.net/"
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 3bf6390db43e..8433d9c033de 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,5 +1,7 @@
 DIST oauth-0.5.4.tar.gz 59141 BLAKE2B 1e588d411795b7c5b4ae5b7b3c9928b69aaa005bef858137759757e9f06d6de144408e4dba33d7fbf82a3f2586238a71b85b89c681f5d633453dfe0da954a2fb SHA512 f114f80255944934a276d0f9556ed37e4a0a72b221269cf7792f2c3a5a1504c5ec726fd5b7437b1102c648a6cf451a1c83de4689f53d30ea8c6a1d62662de535
 DIST oauth-0.5.5.tar.gz 60289 BLAKE2B 28a283bdb251b791ab6e0d50e6ed7db09445177bcaf5a99258c465e3783c5535f7d6acee356ec2f7559a942d1146ae8487260f8945f3138de670c20c60d7068c SHA512 9db8d68950b46b469777e320dea88e14506be846233f7c24e7dcdf9b57e761c43a7b715fa70f32a41b15ac7936a586e8b49a33af971fd0e9509d62827c69571f
+DIST oauth-0.5.6.tar.gz 60887 BLAKE2B 8dea7bc6b1a3c9d5befa5badbda105fed28004d6627624fedaf1572cc261421e3a8636019bb0a600a28fb6aa933d2b1be5faf613ae3062f7d50b314b86059b17 SHA512 dcb516b90d6cf0ff3f1071fa7bf1e1b30cd998c79205f9a6df001d5c04784ad23ecd430b4e04565a6351efcc780b552dfc38ea962d0a938c9e19a6e5bd3fe070
 EBUILD oauth-0.5.4.ebuild 1054 BLAKE2B 0171f7c346a4aa6a1d71cfdad59223accde4e560d60d185c5e8accc78ab583395a88dcd94f26c0a937ad92d4fd3fc1222c01cd042740b91c99ec9eb6eb9e73b6 SHA512 cbf832f21e6676dfb2a0584bdc2d4e59e1594becb178babb9b4abf866fe348f20b86d9576584404b00f10fbe1943efb10acb80ea11070351700489c406ce94c4
 EBUILD oauth-0.5.5.ebuild 1053 BLAKE2B e7304763762ecd688764cea37c0bbea669caf19ef4e421b27d848b869dfd2b1bd54d1226410c70db6c48b333b41d3af174711277f5f9df0b22f6de866a89d56c SHA512 297239d72c4bb9873697365cd466efb856b2d999cbabe94025bea30c1b51365c0b027d7e46c669ce02333ae01cdb44ed9a11c65b633b9726b11380b130e946e2
+EBUILD oauth-0.5.6.ebuild 1053 BLAKE2B e7304763762ecd688764cea37c0bbea669caf19ef4e421b27d848b869dfd2b1bd54d1226410c70db6c48b333b41d3af174711277f5f9df0b22f6de866a89d56c SHA512 297239d72c4bb9873697365cd466efb856b2d999cbabe94025bea30c1b51365c0b027d7e46c669ce02333ae01cdb44ed9a11c65b633b9726b11380b130e946e2
 MISC metadata.xml 335 BLAKE2B 47e21b22542a232a341077c69c8c138cb7a9396c1316206553c56ac9492180686dc9131179748612c98c0d6f706e79c8de78a03aa2b2e33587966718eff9e704 SHA512 844bad15eb4d2808ea6d150256a969c97f11e93dcbe44b9c8bfadfbdc6215a949ce7d846dad2c41da79fd82d91b3ee97769dcb0a571e3e88cfc9072af2537205
diff --git a/dev-ruby/oauth/oauth-0.5.6.ebuild b/dev-ruby/oauth/oauth-0.5.6.ebuild
new file mode 100644
index 000000000000..7fdf4be49c41
--- /dev/null
+++ b/dev-ruby/oauth/oauth-0.5.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
+
+RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
+HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
+SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/test-unit:2
+	dev-ruby/mocha:1.0
+	dev-ruby/webmock
+	dev-ruby/rack
+	dev-ruby/actionpack:6.0
+	dev-ruby/railties:6.0
+)"
+
+all_ruby_prepare() {
+	# Require a compatible version of mocha
+	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.0"' \
+		-e '2i gem "test-unit"; require "test/unit"' \
+		-e '/mocha/ s/mini_test/minitest/' \
+		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index cdd52ea257dc..1e32de285b68 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,5 +1,5 @@
 DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
 DIST oauth2-1.4.7.tar.gz 32341 BLAKE2B f3db3ff7ebcf7bc0958a564fdb0812c1bfb613148c5a16655f276fda4d6dac7769196305d854ee0fc3f8b4b53a93b4ae504b348029e1b363bcb704293887347a SHA512 4a43b3f75e827e9a12a74a6fe13a29b141c0d5bcb6a0d5c86dc8d8726f650a9fd5250ecc2c31cee5e985f0cb50e02f828d27fd07577bcac4dfc8ff4e009bd710
-EBUILD oauth2-1.4.4.ebuild 1436 BLAKE2B 44a59fa034c7072572c3cee2c7ea8ec607f65dc9aca250b056c21d69b2ecd843367d9035086d098192d8f2757e1669025c4514e945c77e66c2591283cce2c2d9 SHA512 e71b59e6f05600f133258aa212f4dcd1a55e9099f156dddddc1d39406e34c512d137f5da00c10f4ba676bf6ced4951f08cd2c7239aee6239e5a72abbc8089535
-EBUILD oauth2-1.4.7.ebuild 1485 BLAKE2B 80e0f69730cccb197b36fefe63a134fd8b8ebc0410ba90a90caf2fead878b453387873feaae4417274b8c42111ff82aa22c495235cfacfac7351ac40f5c65ca6 SHA512 1f0cd51dbc5ecff49624226a52b4c5db605bccfc2a357c70711cc88d7d4e9273df33706b6e410bb979e83fedb1f504c99b96a2a2e0a14bd86ded2943d7c329a5
+EBUILD oauth2-1.4.4.ebuild 1429 BLAKE2B a665d826a2b4094e5a48c8321efd4cab23f13fa9eb2b183590d35c4cd3fae6a6c7d5b8800bed929538180bcb7316538b2e161633a8c88a7232e9392fb1967b76 SHA512 965168e464c1d2843756eecc19e7f3527b51aca89b7d5dd0ee87f064660f15dc973c6c7d955414aecf5b7b28f6c8209b40aecf1774d4111f2c5a6ec665ab02f9
+EBUILD oauth2-1.4.7.ebuild 1478 BLAKE2B c6e2af684800de7eeee2fb5ebf444da6e928ac0478c40e4b3eaf0529343ced1927a26a9c05dda3546a12d0824a150ad1f22d86096ce30f58cc6f7e861802c78a SHA512 42f3584ac4e977e206d1566479cbcc19770ba48cdef09a5677d3358fe104cefaa3af4af1820319e470b9c946d987e0f4fea5caaf73af43cabf37895344247be3
 MISC metadata.xml 341 BLAKE2B e2896d1d266992c01ed373b489cf71b9c4a7a5f57a2af37899ff63793dad41b9213eee0fd94f269735f630815819f0a08e51e8739b89a7e251b60c2f6894e26c SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e
diff --git a/dev-ruby/oauth2/oauth2-1.4.4.ebuild b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
index f6e739a9594f..0604c34eae04 100644
--- a/dev-ruby/oauth2/oauth2-1.4.4.ebuild
+++ b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
 HOMEPAGE="https://github.com/intridea/oauth2"
diff --git a/dev-ruby/oauth2/oauth2-1.4.7.ebuild b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
index 08c977da7165..b63605b131d0 100644
--- a/dev-ruby/oauth2/oauth2-1.4.7.ebuild
+++ b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
 HOMEPAGE="https://github.com/intridea/oauth2"
diff --git a/dev-ruby/origin/Manifest b/dev-ruby/origin/Manifest
index 7c7d7357b61f..ce8c5f262d87 100644
--- a/dev-ruby/origin/Manifest
+++ b/dev-ruby/origin/Manifest
@@ -1,3 +1,3 @@
 DIST origin-2.3.1.tar.gz 44392 BLAKE2B f58b5f977070a3e14a3b80c5ce7fb2860eda6ea41a0b403e67ff6159ccc86d078e3cc42f7269cc9640f2e3f71d66a4c0ea02935efa6d6096c6eccf622595589c SHA512 f74e3ed163b2c9a6184be624f85bc810fcb414290c5701beee291f1c227f889bc75d78ab3cc008f92780823217c7cefe916ebb3e902e807a40f4d901465343fd
-EBUILD origin-2.3.1.ebuild 796 BLAKE2B 1bba5922828c70dacdf99c2455bdb67e7e83e5113283bacb1433784d2b1930effb9427c948c6de6cab00ab73c9e760cc1c72bc0a9c1ada6db671c1188e228710 SHA512 858aacb24b13daa00f53bf66c400d921695879b6cb3984b70285238c53974418fe1e95baf5710b4ab99cb134750a24b9edef1167c9fd62c9ab2f9cd8ba9c0ed6
+EBUILD origin-2.3.1.ebuild 757 BLAKE2B 5a15dc45412974ffcb10680229eebcd8e23f32d271fc76ad6fe9f6d72f8d0101f1c12711ed96598c9bf2ac34b01962f5a6537073b13589014a89ccc7564dd3d9 SHA512 b445fbbc237007ccf20c9f5a59a524f7c81c17cd96d7a7f6be42b26ea34898fd59ca06bafc9cb8370ae3ff658e75e91f2389605bdbb21fbfc67ffcea6d886fad
 MISC metadata.xml 340 BLAKE2B 6030e5682a5bae2575c0fab80cba1e6961a93510d743a3cb79fa81d113e51b2ccba5c73d7b00b19ee200d6bc6d65e5f0a603d0a334a9cf0edd0f1b0d495a65fe SHA512 dc82aefa45cc9e2017afc6604183c9e15c6776224ec50e9957297d3dc2e517df89d5154a12a4c30cad0d54f9d27960efc9f36e7648a4c397f882785e2e9b27c2
diff --git a/dev-ruby/origin/origin-2.3.1.ebuild b/dev-ruby/origin/origin-2.3.1.ebuild
index 47d10002e2eb..ebe6cd4f4362 100644
--- a/dev-ruby/origin/origin-2.3.1.ebuild
+++ b/dev-ruby/origin/origin-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -31,6 +31,6 @@ IUSE=""
 ruby_add_bdepend "
 	test? (
 		dev-ruby/activesupport
-		|| ( dev-ruby/i18n:1 dev-ruby/i18n:0.7 )
+		dev-ruby/i18n:1
 		dev-ruby/tzinfo
 	)"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 587c5160b957..2252e5a12afb 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,8 +1,10 @@
 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
 DIST parser-3.0.0.0.tar.gz 269035 BLAKE2B 185cff099ea38813a0db43a0d929a8bf8db0c50e5550a69a85e676d0471523fd4bd8c8fbe61b7b5c656310f23c85563d302f2d452b964993e3bc03600a25dce3 SHA512 32848628d084e4d75fd2da13d39d31653f28549cf35d6144c4eee3c3ee4fb60522b261c972afceb284aabe1e2c38c58331fcf65b1db32e36a78e02e12885eb16
+DIST parser-3.0.1.0.tar.gz 269562 BLAKE2B 95a75fabd5818439bace9e0a8bdf30cbd08eb13f07b8c63ef6d86916359bb38dad36c907556f2e64a2a1f8c7283e79ac8d158914364ae550de7cb427f21cab05 SHA512 e65cc11ea9573dfc7535d302770067f206e67ff1d86d44c95061d92b6d64331bd1694053c26aa71e301aa0b00af6a39ccc4a5491f3b8a934f45176f6ddb2fd40
 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
 EBUILD parser-3.0.0.0.ebuild 961 BLAKE2B 7b640a4417f8207d551bed77033fad859cafca4671e9763fef58078e6f8ad14eee83b9526a49503e2eeb9a48b9c163ab7d4f6b8d31687aa0966a531e642b7053 SHA512 00c75b48a6063de0371cf5c8b23e267022bf46dfd9db448da9b8f6c92f89e47f10f325f2c86ea52f6021c5f92b87cc0974a2d1ec0f45d87aab3d88212f30bda1
+EBUILD parser-3.0.1.0.ebuild 961 BLAKE2B 7b640a4417f8207d551bed77033fad859cafca4671e9763fef58078e6f8ad14eee83b9526a49503e2eeb9a48b9c163ab7d4f6b8d31687aa0966a531e642b7053 SHA512 00c75b48a6063de0371cf5c8b23e267022bf46dfd9db448da9b8f6c92f89e47f10f325f2c86ea52f6021c5f92b87cc0974a2d1ec0f45d87aab3d88212f30bda1
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-3.0.1.0.ebuild b/dev-ruby/parser/parser-3.0.1.0.ebuild
new file mode 100644
index 000000000000..9fcc1bd5357f
--- /dev/null
+++ b/dev-ruby/parser/parser-3.0.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 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/parslet/Manifest b/dev-ruby/parslet/Manifest
deleted file mode 100644
index 13c888b19874..000000000000
--- a/dev-ruby/parslet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST parslet-1.8.2.tar.gz 244557 BLAKE2B efd5355672a148189176349946e7cf3b9f11d16e75739792b42a89d538ae100bf0f2e36d0b25ea281f2559b3f37d2b4043c8216c4d52f8df289e9df3f6b3d3fe SHA512 7b6ccfcb7651c7844241a99747a97c822facf1fd84cf2b680cb044623d600a5bd10ddf5db76ab25208b18949bc2041306740931da4327934b241a5b1f706ca20
-EBUILD parslet-1.8.2.ebuild 639 BLAKE2B 850df0c38acad99bf3c50621ed3364c3b3912eea2b32386e2371c5a652c0785c38d92be69501fbe2e9b930a61db655f7b0a0dd9b10c88b747f7f1b6ba106bf60 SHA512 d49017bd2412517e4940372ca2c901bb6034632f88e22677f6ec2202557bb3ed0b9d60e0fbb96a6930543b4b7117651c8eacebf62001bde2f8d06bcf8688f5e8
-MISC metadata.xml 342 BLAKE2B 170ad7433c2befc93e2c9c2a43bed2a9d4fab725e05dab0faad7b97d6c276ff96f9c51dc0ab0268a179a060273e85d62181ce18a4363a6532baa50909a41432b SHA512 5f33d69efddacd5ca9ef82b0d07619ee77828904a9df4f0cf327d93b96dd5da1ee6597aaedfbfa644d66d53e9f14d7cc795c409ffc46950fc0d1b07041dd2410
diff --git a/dev-ruby/parslet/metadata.xml b/dev-ruby/parslet/metadata.xml
deleted file mode 100644
index 1d1c657088a7..000000000000
--- a/dev-ruby/parslet/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">kschiess/parslet</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/parslet/parslet-1.8.2.ebuild b/dev-ruby/parslet/parslet-1.8.2.ebuild
deleted file mode 100644
index 589b70c4941e..000000000000
--- a/dev-ruby/parslet/parslet-1.8.2.ebuild
+++ /dev/null
@@ -1,27 +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_EXTRADOC="HISTORY.txt README"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small PEG based parser library"
-HOMEPAGE="https://github.com/kschiess/parslet"
-SRC_URI="https://github.com/kschiess/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_bdepend "test? ( dev-ruby/ae dev-ruby/ansi dev-ruby/flexmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/sdoc/d" Rakefile || die
-}
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index 160026def942..8d37baa2438a 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1,5 +1,3 @@
-DIST pcaprub-0.12.4.gem 36864 BLAKE2B c2e86624431cc758059a997ebae716adb1d7de74ba62a375787608f6c68f7b85a614ec5859e251724475e1b68e8e90108f408a2e833f896461a95bda04d4d9ad SHA512 707221429dcdf95eba24076589054dd022ba8a479148c3ec8ce9667016225ee64bed13d3fdf8ebd46027244feec8e77a484c67f040d0439bfa44d9212997645b
 DIST pcaprub-0.13.0.gem 36864 BLAKE2B 0a0ca07da261de2e8bd7aaa131bbda9f6ee3cd5eb5fa214c552179c707d20345bcedc8db5d49590e69c41220e69f93a6d9f0b1c1b6f768c25ab648d50dead388 SHA512 6099996cca317194582a50ac89769d11ba802a9658c67f707e342b3c345bcaab26fba5ca2dc245a39eeb01f9ff6fdde1ae64a3a1ee4dd0e5243bae2ebed37e5f
-EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B bce93ad392b6bc13a498bb927b0f27a45f20fd952d7f762074d5730bd9dd6a3dafa301bbd74652e193de92348f125a1741b12114b01b9a6b2a36a54a6a4dedfe SHA512 aa620e625f70ad17d7354f1a953d413b7c349d58255b74bed08dad41f5d2e19830ad640040827915c204bf3bd8708743ac838f9f029964a5e2c7d740bd506fb9
 EBUILD pcaprub-0.13.0.ebuild 750 BLAKE2B b8f22a42566584aac53a17eea9e227b12f9001d2361a85d54a9aafc1e7fe2d458d5ea89b93500291fc18bed00e8966cf2da597be37395f28084e7a7cf678f434 SHA512 04bca9c2e233ba6d85e99ac20d048171d370c4fac3b35bcae4ad044cab46f61d3c8ab607880acd0b41fb7aaf12806c0bc5f70515b70b65bff7ed851298d54da2
 MISC metadata.xml 433 BLAKE2B 2782f98bbd93dcc77f98585870e85b8031ec65f752050a382d3fcb637f57ba330bf40b592dd5494792977d555373abd316209df45263d8b2d411c9a4fd4271cd SHA512 0e1abd6609263bc8770684a59646ffdfedffcb5b14a4d2e160b3edeb44ce89154b58ad14e6c830e63ca39cf6799261c40182040d570d422cf4e6bd9732a30eec
diff --git a/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild b/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
deleted file mode 100644
index 0583d22c61a2..000000000000
--- a/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
-
-inherit multilib ruby-fakegem versionator
-
-DESCRIPTION="Libpcap bindings for ruby compat"
-HOMEPAGE="https://rubygems.org/gems/pcaprub"
-
-LICENSE="LGPL-2.1"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND+="net-libs/libpcap"
-RDEPEND+="net-libs/libpcap"
-
-# Tests require live access to a network device as root.
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext/pcaprub_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/pcaprub_c V=1
-	cp ext/pcaprub_c/pcaprub_c$(get_modname) lib || die
-}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 18c86e1e8c19..f0238f67c7d2 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,6 +1,3 @@
-AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295
-DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
 DIST pg-1.2.2.gem 196608 BLAKE2B 068be98d190cb4074cc89bdb5b376322f323950909f7a6fddc8669a3ff0f85eef9f512bd2ec7121707e9ea077b2b428f698e84f2118c76e34f5def75ca303fca SHA512 5c7cc90afb75a66e80cfc34c4875cf22b005aa0a27e78db6f71d1829f870c6409b73326a9925f79c0d642e93ea51d1f84c7383323fea44b7488e83deb7754951
-EBUILD pg-0.21.0.ebuild 1668 BLAKE2B f0ee08a6207cb8e9ceb5dbc2cfb70030fab6e5b9fd1b293b99f401807fc55759e76411a2d30e0f5966b9d24c56a05e3e5db66861f90d1db08993828afc47dad6 SHA512 bd5a27376d319aee0cdd7e49ce46fff883f26769b11bd58f14cda9211c3e6915c31becce8fcd38d33f3f27027228a68b1bea6c48b66feb69dbd2c1291fe2ad94
 EBUILD pg-1.2.2.ebuild 1595 BLAKE2B f3dcdc64b69e3e8da9a9981ff97c72ebf9f58044e43be2283cceb70e45a70f349970f003d12ec469827170192c441044e92547e9ae0bd8959fc9cd34fc6d1aa1 SHA512 b90c98ddd7ee4de299f7bfad52955e76a54cd615218c8e86ed1cb20e98731cdbee20e0f8cc3b8faa125969233f3b974803f38085feece6c0cd125cf04261835d
 MISC metadata.xml 337 BLAKE2B 1ecaa6a65230c424031ecd8a3e462240e10caedc1107b6818bf866cd0c698a5f534d450a467031755d80a242a84e55a5e29a48a480c1b55387597765ae0f4b1f SHA512 9e38510b1ad726a3867df6b39f26f887f65dda5e60a46f0f867c65d5759a534c7adb6ffd072882437cd3a6f7fc1ebdf91c79def51a93f4360427e6f14aa3455a
diff --git a/dev-ruby/pg/files/postgresql10-tests.patch b/dev-ruby/pg/files/postgresql10-tests.patch
deleted file mode 100644
index f9b7c1579a91..000000000000
--- a/dev-ruby/pg/files/postgresql10-tests.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# HG changeset patch
-# User Lars Kanis <kanis@comcard.de>
-# Date 1508756565 -7200
-# Node ID fe63160e8a9803e257231d879fab2841ba44c37a
-# Parent  d6d5533dfca85b618232fe3e9e56e59dbee99de6
-Adjust tests for PostgreSQL-10
-
-diff --git a/spec/helpers.rb b/spec/helpers.rb
---- a/spec/helpers.rb
-+++ b/spec/helpers.rb
-@@ -251,7 +251,7 @@
- 
- 	def check_for_lingering_connections( conn )
- 		conn.exec( "SELECT * FROM pg_stat_activity" ) do |res|
--			conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid }
-+			conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) }
- 			unless conns.empty?
- 				puts "Lingering connections remain:"
- 				conns.each do |row|
-diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb
---- a/spec/pg/connection_spec.rb
-+++ b/spec/pg/connection_spec.rb
-@@ -232,7 +232,7 @@
- 		described_class.connect(@conninfo).finish
- 		sleep 0.5
- 		res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity
--							WHERE usename IS NOT NULL])
-+							WHERE usename IS NOT NULL AND application_name != ''])
- 		# there's still the global @conn, but should be no more
- 		expect( res[0]['n'] ).to eq( '1' )
- 	end
-@@ -1537,9 +1537,14 @@
- 		end
- 
- 		it "shouldn't type map params unless requested" do
--			expect{
--				@conn.exec_params( "SELECT $1", [5] )
--			}.to raise_error(PG::IndeterminateDatatype)
-+			if @conn.server_version < 100000
-+				expect{
-+					@conn.exec_params( "SELECT $1", [5] )
-+				}.to raise_error(PG::IndeterminateDatatype)
-+			else
-+				# PostgreSQL-10 maps to TEXT type (OID 25)
-+				expect( @conn.exec_params( "SELECT $1", [5] ).ftype(0)).to eq(25)
-+			end
- 		end
- 
- 		it "should raise an error on invalid encoder to put_copy_data" do
diff --git a/dev-ruby/pg/pg-0.21.0.ebuild b/dev-ruby/pg/pg-0.21.0.ebuild
deleted file mode 100644
index 99553f10c3f5..000000000000
--- a/dev-ruby/pg/pg-0.21.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://github.com/ged/ruby-pg"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=" dev-db/postgresql:*"
-DEPEND+=" dev-db/postgresql
-	test? ( >=dev-db/postgresql-9.4[server,threads] )"
-
-PATCHES=( "${FILESDIR}/postgresql10-tests.patch" )
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/*$(get_libname) lib || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		RSPEC_VERSION=3 ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 8657208a1dc6..23d458bcb931 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -3,9 +3,11 @@ DIST pkg-config-1.4.2.gem 22016 BLAKE2B fb8f32c811f856d11653fc0450e5615d83dea07f
 DIST pkg-config-1.4.3.gem 22016 BLAKE2B a23bfee3790a03d4224efe16439b1c43a6174336b567d7c84d429e848035f7c77d96340e677a7f75e3cef415f236cc1d09cc0f75bee5d8769e9490bc2fc5f4c8 SHA512 4952636442d585b555d048666937e568f237789329ed6110475efe149d607f4b1946ce1b616574a91de7e4c17ef9cc5cc3b4bb2867a7dc08344183a41303f42d
 DIST pkg-config-1.4.4.gem 22016 BLAKE2B 6514405160fdfaa2be0938cb976ae779b964fdf54f0c49f6480ca09d3877459cf88af1f7b17519ee511d24c9b9bdc21087091b3050fcb252487d880f330a7beb SHA512 bb355e2183c9077d0e940d768b7eb12dff2b31fa518b1d28be751c52ecbbb16a99b326c7d6953501056074156faef9f30682dc82c3350da00f80f9a55d491550
 DIST pkg-config-1.4.5.gem 22016 BLAKE2B adbe2447e676c04eaf5e2d7dc6b1a165278f309d01c3d1b34b2a528d6639b525307cc40a62c06026e0c16fea5b7d48f2813f9b8617332586065e2f66ae3e2037 SHA512 4c3f4dc8d414efc9a140f3438c6977c6b534b7944356ac0c4a95233924dbe372c47b15296ba0f8e35cd6520664f28381131cbaafb33f8d004bb34adfdcc5c236
+DIST pkg-config-1.4.6.gem 22528 BLAKE2B 7d040576e0d035af75218e7efee6d3a8ee27206de8e12ef112c6fa7c5917f300c07149c08d510f26f89299cb73c384775403ff7f863379c195fb524c8127c59a SHA512 328fbc46bb549d4cbcd4995cb91545bd13f00f3d24610f9a70b39ea3b58c595d96801fcfe9ca9848d6664d7c9dfce44ce2702a58b894b80744619678e10b0e50
 EBUILD pkg-config-1.4.1.ebuild 782 BLAKE2B e2ba8b0981bfbd85b1451a912d0589fdf518612514dc58805bbfe9a446bb7a34ef45d8ef0d2b86dd1f67526d938ca526d9c1e88aaf6cf0785de6a0987585dbd2 SHA512 4ca32118847ce4c0d63218f323c53d1a2d86bc10caeacbfd623cb77ed22afbac7bc1dae47269858eb08a1c1cd2c248057fd6a12705c9d657ccb1a0b237196880
 EBUILD pkg-config-1.4.2.ebuild 782 BLAKE2B c98e5b89f526daed4e5f6df0b5fbf74ecbe22d7c60177d43c11ff271aaed89f44f5b161946ce59995840c7eb31b72c656d13cbe900417c2937e9b3642d036698 SHA512 cda391497ad497d1ad7d20a9f731aaca1af862ae34ff1b063d26dea6aed75a497f69d44ce7a2b255a8abc7e49d909e2628a51e3672dd6c5fd10ebb4f08911975
 EBUILD pkg-config-1.4.3.ebuild 789 BLAKE2B bbd800055fab6aeaf9330028be5c028d5ba213b60b334f816651b6a79248ea72503a7c9f2a54d93cffb0ccfc88b0dbbae604731f80f3218fdd322db6d2876a35 SHA512 7ce7ae53ba76ebc321b14a02041fafdab819bff40bef5acdec81e411ecefb19ef082b3bd2fc68fc8a21b0405033b0ee37ce71f75bd2869961588cd12c2b42576
 EBUILD pkg-config-1.4.4.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
 EBUILD pkg-config-1.4.5.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
+EBUILD pkg-config-1.4.6.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
new file mode 100644
index 000000000000..6ad94f426799
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+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"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index d6a2a96a379e..c590ebe2b8af 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -3,7 +3,7 @@ DIST power_assert-1.1.6.tar.gz 17331 BLAKE2B 1165f092f7a6dea45c8f12d61e2ea77d300
 DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336 SHA512 bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
 DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
 DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf00185ed1821ac966587461919210d7460e30aefdb5a880e7ef59e4f536121371d0862df2af91cb274ed79ded8c9771 SHA512 e6faf3cf50d2c70ae421bae20b885ac858fe11b10b1a8562d9ca88afbd397fa4812631f2aa02638c273eed518091dfaa020b6c002c0559383ddca625404bcc1c
-EBUILD power_assert-1.1.5.ebuild 1411 BLAKE2B 78a8625e6b7a12c3da784d3055844ff3f6f33e6ef5ff72f9468dbd2e6ae55fee237722f07153ce2cdea3d0017e0669e97785959b93df480f47769b2f8ae26034 SHA512 7083f1c05d866416e7f215acaae24ee8ce7b7ef4b3570139e326aec5f68b248c375266fc9e965028521d99b06d046c0cbdaf4c8d263f300c1ad218bec675c3c3
+EBUILD power_assert-1.1.5.ebuild 1412 BLAKE2B bfcc18a05ad28ce098e70a7d936b336630a1135cf781e36c8d533502cf1e55610b579c32b52354736d8de18a583a3d29cf0efb397764d74bf1ad8094230a6259 SHA512 c2fe441390ca188dcc1be729f558e8ceba61d4b2f2d820e2f29b06d55d72abedc293d839c782aab017231d692047cffe0a0924256efdd9b7bc41fc1d9ee88972
 EBUILD power_assert-1.1.6.ebuild 1420 BLAKE2B 1064ba29ae2ba017ce13b7da5188b40121cba718e5e7fef30d9e0fc27173a8a4820309d608f3f69f2905f80e7b6f2f86fdde0b039c68a17482a5cc62e04731e3 SHA512 99ec836a53a313f4195248613847180dccc7ad952bef0b84a3d8cc865afa470b11b165303766bd3eecf751f86a3b6be8ce7e591a1f17058c1ea72db6d4eb43d1
 EBUILD power_assert-1.1.7.ebuild 1420 BLAKE2B 1064ba29ae2ba017ce13b7da5188b40121cba718e5e7fef30d9e0fc27173a8a4820309d608f3f69f2905f80e7b6f2f86fdde0b039c68a17482a5cc62e04731e3 SHA512 99ec836a53a313f4195248613847180dccc7ad952bef0b84a3d8cc865afa470b11b165303766bd3eecf751f86a3b6be8ce7e591a1f17058c1ea72db6d4eb43d1
 EBUILD power_assert-1.2.0.ebuild 1418 BLAKE2B 718d355df9a75002823eb6ef8ae10dc4ddff649c314be77db00252a34a7f5daf95a5979195f2fc3e8d7b28ff3af86ce4bf9b2e5d5faf2484ce3eec325a7843fa SHA512 fb221535b77d9e84daf56cfbbbbe5bc9d05d0ca93c68d2d9bc6b2a09023f7eed2df7cce5221c5c9f50b687f97d29b78f079b5ace1cbe17ada16b6bf8507362f5
diff --git a/dev-ruby/power_assert/power_assert-1.1.5.ebuild b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
index 912787352b39..1056c61f570d 100644
--- a/dev-ruby/power_assert/power_assert-1.1.5.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
 SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Ruby BSD-2 )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 546d1128f6a3..f1c828ff23ed 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,5 +1,5 @@
 DIST pry-0.13.1.tar.gz 240103 BLAKE2B da4797e36aecba8bf1a785738339ed4be1e06ab28b329b66551a908898cd0515fc0da2434ba96e9fa0f350c9d32c13f850660bc0236c6c0218a4bd3182ec4ced SHA512 bec52c75dce365db68504634b2eaf6b0f312527031401199fcdbaa3ec5a9272148239d93305f8e66c4d36513f9fec3fe045e978c5a10f012a2880ab4a16b7e85
 DIST pry-0.14.0.tar.gz 238895 BLAKE2B 325a7eaa03836cf78c8599af15aa6758bc36cccf20937c3a7f222a5a831d2ffd8fc990e005b587779fe2a15077e0b8b38628c6f075b2b73de7ea44b5642e8635 SHA512 c10ba16d7dbd05308079f98a68fbcbb367d07977fd71a7077a80938b10c7588f585651e046d29a2f1499f136f56c062598f77ada8fb47a31608a4ea8536c5ef8
 EBUILD pry-0.13.1.ebuild 1254 BLAKE2B 6dcd658e86ddb9421b6203956870e7912f4e6d1eaa5eae93d4f66071667c3f288bcd5fad93855604fe49fe676dfd152a83d45eb410ef4c3fe200e6e9f45304f6 SHA512 c3fb2f31965fa566d0e52ea9e379e25b68cd9b0d608e8f0d9b05306be560fcc1a2fed16deebd9029f6d068eac3ec8917cb5ac47beaa9d482c1ab5a3fdfa4c22d
-EBUILD pry-0.14.0.ebuild 1247 BLAKE2B 0a5f52028f4852451a983346890a76d1f3ece5c7f50edd08cc40defc774ebaf1f3d3fbb593f04d7bcd95d6ea453496d988b5d862f26f18d178340f3820792a84 SHA512 b9415e69093b048fc080746e06d1fd5b3997209a00c7e59d1d9dac8056b2f28cf74f306957e70cce96dc649dacb34f4fe11fdbe47ee128cae79e182a0031531f
+EBUILD pry-0.14.0.ebuild 1254 BLAKE2B 4d193e15767a209bde06488f601ca5e4a4f9cc721384211cafa57832bd436eb1a9f793db09b519ae6cad2537d72719fa94d6affdb4c9e699173e014a85ed10e3 SHA512 28d4b39554d6db628011a85593fb888791b141e51c6c0fa5ecbd9cb72cafa781f4c7c2ba622ace4188a6366feac6871e0b28ed3c2cee043a67777690f993f82b
 MISC metadata.xml 333 BLAKE2B 0c32ac9d2cb59e7aa1dfca56e88a2a38b783bdb2779c9336eca40d06770f02252442afb3372c1a786bc491693548c145079b3aa8e61fefeb0b81209f0afe3fa5 SHA512 4bd968aba7e36044799dfb4abba1a0127c4aa4ccb4e7d1830dafbf27c6c9e94fcc29ad008dc527cf2c409c8308dee14f803946afbf716bc22d9d3f716b951887
diff --git a/dev-ruby/pry/pry-0.14.0.ebuild b/dev-ruby/pry/pry-0.14.0.ebuild
index 16efb0d3f5fa..8d4d5fc87dab 100644
--- a/dev-ruby/pry/pry-0.14.0.ebuild
+++ b/dev-ruby/pry/pry-0.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 4065ec4ac5c5..69a849107791 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,9 @@
 DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
 DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
 DIST puppetdb-termini_7.2.0-1stretch_all.deb 21158 BLAKE2B bb74c11735a557bbee8452f4eb356c1ca038f8cf41bf1b5404f6f204d1d89e8bb532b8a6db8a92ebba9045e744a8a0b68629d60ab295660381a582273a0a67f3 SHA512 6dd4ee1e3d2fd069d5689cbaf0faeb417e5c12bd6d06c721923cbe92b739fa39a658675b40f0474010b3c6a6cabbff8a3fa49f8f79cbcc7bd4fbb1c68b1805f6
+DIST puppetdb-termini_7.3.1-1stretch_all.deb 21144 BLAKE2B 34e925a93b9f0c882e051ca0ff4368c06ef2467211e645a976453e60008e1a02ccf76ba8b53270ceba830e43be5d8ababf601c6a5ecad5f9d603dcf56c78e19f SHA512 745cb5fe4eb6e4bb720028f794a767fd7eeb936f310c18f153a94bab28a36e35fc1bd5559b1be20a3ef5573227cbc4f013673eca3d85ff15e8a29d238ffd0370
 EBUILD puppetdb-termini-6.13.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 EBUILD puppetdb-termini-7.0.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
-EBUILD puppetdb-termini-7.2.0.ebuild 665 BLAKE2B 493069cdb3bb7b80150656a5e4791b8c8e5906a5b3b3470efb8196903e404caef5d9319fd1018939a86ad4a4156434a0b52c9b931a424ccfbb5c1008b5222e50 SHA512 281d8569336911f65b13b2d16730d2dc17c8476723746d249919add79f103c45185dabd9f98165d0ce7780e218265791584da14703e69eadc65a660cb9d526db
+EBUILD puppetdb-termini-7.2.0.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
+EBUILD puppetdb-termini-7.3.1.ebuild 665 BLAKE2B 493069cdb3bb7b80150656a5e4791b8c8e5906a5b3b3470efb8196903e404caef5d9319fd1018939a86ad4a4156434a0b52c9b931a424ccfbb5c1008b5222e50 SHA512 281d8569336911f65b13b2d16730d2dc17c8476723746d249919add79f103c45185dabd9f98165d0ce7780e218265791584da14703e69eadc65a660cb9d526db
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
index 57a8294eabe9..e88438205f95 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild
new file mode 100644
index 000000000000..57a8294eabe9
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 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/racc/Manifest b/dev-ruby/racc/Manifest
index 63fe77ba0dae..fcac56fbabde 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,7 +1,7 @@
 DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd08576247727b11beb9e32ea45c54d0aadefc26691972fc40aad1b009c55bcd90a5b89aaf37e37a1097c1 SHA512 7401ad1722c92101c24f881226e44bd8b21033c7bae8b13cbf329f9b426c312ce61d14ce584b4f94d6863b77f30d6ebccf26f9fca2de724f8e0659f0e2d2173f
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
 DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
-EBUILD racc-1.4.14.ebuild 1823 BLAKE2B 009cb9df7a173f3b4d3ba4e96bd5cc3cd5a8ef964aa6b6f371a788e88615357f76389cc8669cc7f26e2afb5b3c41acac00f752dccbcedcfa3d1db30ec94c1d4c SHA512 9be18964a3978ee19f91e02778b163788efc352d29a04c9ad130e52018b80917f52f668191ca098b62b2edaf5de58b76c38aa70fcd8591608e286d8f499a12ba
+EBUILD racc-1.4.14.ebuild 1824 BLAKE2B 1707d38bb941dcfa20e737da4281c9d588830aee6a25c23698ee25cd83831e4c187e181e60c5942e30d4016f9b864354b0c7045bb3bf3811785547d37185c5a8 SHA512 8ff0842b29957a15d063bf7496127d24777af11881b307aa88fd9250345f90d59cd1e749cec8d44e7ffd46e02ccf120d142318deb446d199b75e850150bb95cc
 EBUILD racc-1.4.16-r1.ebuild 1929 BLAKE2B d8614223b4136613ce7d6182b702b45ec7bb37e59c942aab0fba33abb3c7fa7fe0232665e50f7d04891373a50b6139f01862f869d14790f13359aeb35eb85a86 SHA512 3b239f1132a2806d32cd35e66f7e15aa7b2c1b8744e945708c3a27825646f10bd6002985cfe7524d7f0b3ceb3c2349f28eeae7f562d81ff681676f75cc846d93
 EBUILD racc-1.5.2-r1.ebuild 1735 BLAKE2B e911a30772a13a744c312738d687ae8b9698d21d12e9e1123011a602e9c1d9d29877d52878596a622f902b2c69f5e9647946866a804832bffbaa2192b48d6174 SHA512 ec5dd0716975a9ca685a6042e3c3da67a02c8552d688b9c96fec9a88003a7d684b44e8be977c9219f818125f20d39581e6f9073b6cd08c7ddef40a12d1105f92
 EBUILD racc-1.5.2.ebuild 2001 BLAKE2B f9c86a3ee7065e818e7dd6d1f865b1c6450e77d786946d6f58cbf87d07c4c413e9838a5183bacf9ab9576392b803add944d8ba92da20cf9915e0bb58fa9f1067 SHA512 9e9aaae14b6171189122c8616450a246a7969b35cb8f1ae7fec1bba22bdb332ac5cb180a77636a069077c7fc03497694fb67e45cba0cfb0eaa5a49e3fee7de26
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 4a515f7c8d3e..37c88a48322c 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack-ssl/Manifest b/dev-ruby/rack-ssl/Manifest
index b79f4f606644..1e747c911b34 100644
--- a/dev-ruby/rack-ssl/Manifest
+++ b/dev-ruby/rack-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST rack-ssl-1.4.1-git.tgz 3238 BLAKE2B 7861fff6dd7b15505e008d150a515dee6749767b3e2056553baa85e3696f4c9fb63a5a0d03b99588ee09d79163c0463763824a9bb53fdc86f857f9c472c9fb2e SHA512 700a2cbc848be8e410186e6af709c5d7a8bae65ada02b405711dc60f8c6e1fe4fb00c3acc55ddc76a1d79e9468ba8f92d0350c983d5c1b83e4cee2b91aa68f23
-EBUILD rack-ssl-1.4.1.ebuild 718 BLAKE2B c760b6f77d65dcb82f6b456c3305b64f3cdbb8e2afd6c7b02f050a5cc8789d655387add6eb3376218f8181ef3d5b35e393e5d576f91f14098a81fbba23b17f70 SHA512 95c140229b59e71388185a649ca7f90ed893608b10a2b185cc59b2c99628a26dca7cfbb994455ec22f9aa175e4bc4a98b8aa49488a0245936cc1e53fc0c31001
+EBUILD rack-ssl-1.4.1.ebuild 711 BLAKE2B e28b3d5311a917519813f44e3d4979ccbeb012cb5b9e1db9e5c0a4d7033cdf414c449da9980177adec2a52193ab46e115284db5d1bb6169c894217cb2f77cea0 SHA512 392edf51f548b3455b128cdf54e129a349eec71bee0707ce069d8977dd4c5f6c1db2346310f38e0ece8de2312e6d994dfb26f6328df67001a50d98a408b52bef
 MISC metadata.xml 482 BLAKE2B 67ca7d55352609b11359b8d39359e3b79158dbbbddbbdf44b202d807204dbc60c71bbdc0af20ed275563ce4f7c00adc4c892f32a2daa7592b368c196c483ea5a SHA512 53f23a19165373ecc6883bdb632db201f38e21d968f787e7345db51b2c145d49dca0d005551e6e7d5699c97af1e16563b7e5f6fce239d82c4235e6e19b0d5659
diff --git a/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild b/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
index 6ef788b468c2..dceb205d0010 100644
--- a/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
+++ b/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
-inherit ruby-fakegem eutils versionator
+inherit ruby-fakegem versionator
 
 DESCRIPTION="Force SSL/TLS in your app"
 HOMEPAGE="https://github.com/josh/rack-ssl/"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 85dd20ccec24..71c3d7091969 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,3 +1,3 @@
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
-EBUILD rack-2.2.3.ebuild 1490 BLAKE2B d4f44da51d95db72d57f468f9daade4d77878eed8da95d96368aafd624809c7764a745627fedfac731659de03a4c3dbe5a9a4de065a68f23ee546250a8de2cbc SHA512 76e828ae0f393e3b5581613ffcfa049c5dbd796a3c33119ea30e701cd1b60c6a2f7169fa6fdfc80b39efd6220cb70e8230c54e6480751a9c9e651901ae915985
+EBUILD rack-2.2.3.ebuild 1497 BLAKE2B 1f6b9f2269300f3cb3964a03dbf9fca2b6513ce9a986a331a55924539d7b88d08b2a447088644a231598818df3a2c141249001e90ce4c3dc9dc5192fc8b021e5 SHA512 0a23e194f60820cd42f1dd57d3932ebb3da358fba0b8874a0e5e42a56bbbcd2d3136fe1b89daf62c0b0c91f90aa7c217aa2d33d7c4fc5393256bba265a00f54d
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index 482cecfe3a75..ae17712cf6c2 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 8e5c18a8f901..8f2e50b500c8 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.gem 6656 BLAKE2B b6e0b99fd9316c8ed04a817465c89ee9aabeaa60e1f81e0e65c900e19904a5c50fdbb47a6899a8829f9c5ebdacdf01d9dea4ff9a5f84b34262de0904b4d99731 SHA512 28b91ea8f9a483cc4cfe02f2173b308fd34b16f254266f19a7a8f6fd7895546b8cffb08f48eceae80658e32e564595cefb1695047a9d58390cbfe112d4f1dfd2
 DIST rails-6.0.3.5.gem 6656 BLAKE2B 0c1a10bb92a249bde203adf128052258f2471b85d7bdf8efd6f4293b34d51157b31d21a51c37f5ffe46b360866a9a9d570276534dee246d81f1feb7715174854 SHA512 308571595e54d1fc92fef1332ae449f484d9b6f66504eff43da61b74341dcb32671f84a5481899ded1a0b32f1b78702b2dd4a671db5b47d267b60d67bc04041a
 DIST rails-6.1.2.1.gem 6656 BLAKE2B 5a1407b4ac324acd2a1c9bf45222cc7fe1f35fd4e666fbcf74df37e78afddebeb4910b48ed90b2c481734dcb324fa8b050b2bd757f9a9d41a0ed440c9af2c6b3 SHA512 a604ed34d3fab4a549d7bbe1054ba396ee201116b1cc26e466776ba3bf78a6c09b7178d79927b87c04ab17ec49801c7c1a41683c9ff50559b06ee986c88e00b6
+DIST rails-6.1.3.1.gem 6656 BLAKE2B c339d78f0461e885bc4355aa45df74a83423b1c4480239ecdb046dee483ae4f71d5568cb60a43e8d61c4de8f62286da068c10a02a3f8772a4b85db09f45d8430 SHA512 4a938c7341da3b1c4cb831bb2c16554f2868716a24f5db39f95d6ffb0f0b6c017fcd1ec4d7010f0c9a011517600912efae9eea2d8cf7d1350edd31e6e9f84568
 DIST rails-6.1.3.gem 6656 BLAKE2B 68ceedd4857d9a3676fe493e79aa9c7b448598b5cfa2ec2469be4a64f70f495326e032204cec3ce63367bd96559df7fa4eccf041a4e59be9f63ecbec9992bb13 SHA512 085d05096d14c1132c43291b4082f7db9ddb4ae0674e058e38f821524c17fe86d302c56b28b30fbda6f0883e9ab079fa9afdc2d02a9121478e8c2d7d9b39b8a4
 EBUILD rails-5.2.4.5.ebuild 1049 BLAKE2B dad39d6f247d08f10dfaf1f275d2976198b3345292eaab303e468358e1908199b54f13295a4b62ad3ec3efb999d9b40df8e58dec638141ff095289f2a747b26c SHA512 068d411668b29eb2713e63e03b3d1b50576ea753f60956f5bccbb87c98ea78755102f7582e77e946be8ef3d4666f311fb8781186ca0c355a83a082051693b2df
 EBUILD rails-6.0.3.5.ebuild 853 BLAKE2B 031f75c83a9ccfd985f38325c00a3297293859ab898efb6304e3683bd006d699c62d8a086c1b1db3258a072f365d07d5a4a6109ef2c9914d0f4c8e9bdff21ac4 SHA512 b8c050a95d72a2a0bfea3a83475e86f10963750ef35b98c0688adf5d7b73bc06e6c361c2cf3a536036bd9dc76555c29507f85d5aa5f43fac5db864a5e45792bf
 EBUILD rails-6.1.2.1.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
+EBUILD rails-6.1.3.1.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
 EBUILD rails-6.1.3.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-6.1.3.1.ebuild b/dev-ruby/rails/rails-6.1.3.1.ebuild
new file mode 100644
index 000000000000..8e4850d7e743
--- /dev/null
+++ b/dev-ruby/rails/rails-6.1.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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_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 d8f9625a37b6..e63369b9e665 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,10 +1,12 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD railties-5.2.4.5.ebuild 1677 BLAKE2B e2d2423c876779e913dff56c258f51f506a85f10c30978da55e9f28d660a1dfb215e49218a5c75d6348903af91764372af191087f4c3e618d6e4f8149d79f407 SHA512 2cfcbcdc7918972ff33d3535be3758aeb029476a2ba59bac84b6d33bbd780307ae57268eaa21edac627b3b90bbd966b0ea744aca2e26bcfe11c1e651034bbf2c
 EBUILD railties-6.0.3.5.ebuild 1644 BLAKE2B 68c7a591e1d878187527a47971fb5b9b9aeeed214cae78306ec2fb025fe085385cc873596dc9ea40546c69ea62efe835f4bf440d6f15d4081d278d8733914eb7 SHA512 e3cb33817af6e18781f4e80ee3cb68cab35f50852bca0cc8f658a7f2d84c456f445d22b9fd3b994766c61478a103bc0c1613603c805bb84130d3fa6ec96388f3
 EBUILD railties-6.1.2.1-r1.ebuild 1612 BLAKE2B 2282f8266ec199411356c3e2885cba3bf8cfd57f196c23fcddcee8b73e6a4e8016e7006b906262ddd7d8ec03bf538cf0bc7c7bc169297e4e922578a40beb9148 SHA512 420246895bdb137ca40b6f3dc64d6695201fa1b5fc34b15d352951a83d69a39bd4de5084aa1b847e752a7e37d4fc8d635f8bceef95fe82be8df0b6b6fd47361c
 EBUILD railties-6.1.2.1.ebuild 1644 BLAKE2B 68c7a591e1d878187527a47971fb5b9b9aeeed214cae78306ec2fb025fe085385cc873596dc9ea40546c69ea62efe835f4bf440d6f15d4081d278d8733914eb7 SHA512 e3cb33817af6e18781f4e80ee3cb68cab35f50852bca0cc8f658a7f2d84c456f445d22b9fd3b994766c61478a103bc0c1613603c805bb84130d3fa6ec96388f3
+EBUILD railties-6.1.3.1.ebuild 1612 BLAKE2B eab6f4e79d43a55178dd268acc187d7e08591e445832ba401e0e9e47281a952d739ca0022ffe365a550cec54366f2de2fda932275ddb44670753af35e99e36d1 SHA512 2dd04ffe832f7fb2da035e1eb4a9c6f32eb53de3af20283d80dc8c5878ea6909e6e701021e531d29603d2ecc3b9fb59d6ba6baa3b6c6eb70c6d5c28edae386bb
 EBUILD railties-6.1.3.ebuild 1612 BLAKE2B eab6f4e79d43a55178dd268acc187d7e08591e445832ba401e0e9e47281a952d739ca0022ffe365a550cec54366f2de2fda932275ddb44670753af35e99e36d1 SHA512 2dd04ffe832f7fb2da035e1eb4a9c6f32eb53de3af20283d80dc8c5878ea6909e6e701021e531d29603d2ecc3b9fb59d6ba6baa3b6c6eb70c6d5c28edae386bb
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-6.1.3.1.ebuild b/dev-ruby/railties/railties-6.1.3.1.ebuild
new file mode 100644
index 000000000000..c0b9e766ecfb
--- /dev/null
+++ b/dev-ruby/railties/railties-6.1.3.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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.25"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	dev-ruby/thor:1
+	>=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/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index bd928ce9898e..542b66302ffb 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,5 @@
 DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
 DIST rake-compiler-1.1.1.tar.gz 34692 BLAKE2B c6862f24ec57c25fdeb7faeeda9eb96cb64ac972c852a81b77ec9b35d21018a5647089cd38d80b03a79e2c07d3f9af42bbaf9998457ad3beed27c8285c23689f SHA512 e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d
-EBUILD rake-compiler-1.1.0.ebuild 1464 BLAKE2B 9e21460bbc0bb3ab6513f6cfb8658ed89ee9acf56be05978b5b8d86fcbaec82690d7a9b2ad1a7c47bbb4a7000cbf699a0fa072cb929016c675d260abbb9e9169 SHA512 4cee0780659d23af7a1dd8aa96003dc7ca1bfd675d7257b9ac894c796a75737dab6f47cafa98b7e49440136674540171c491b4d3f8967f4217a0f62a82368260
+EBUILD rake-compiler-1.1.0.ebuild 1457 BLAKE2B c15c0f17fc7418431e08d0f217fd96c726863231cefb8ad5ef3bc7aee1253b52f7fd41fac0f1385352afd20cbee9bff0ae7f428f54d0ac155ca9a40429686bcf SHA512 fb4b23dab2d0462bec8cae3269a21e851d685684bb1fb7b288dd49fcd81c18323acd7a510fbaf2f6bdd2eb0b4e48581b35279260a2a4435ed46ee58a2c3af592
 EBUILD rake-compiler-1.1.1.ebuild 1462 BLAKE2B f967963b9d4e059aaaa0ec2b08a5da3e44808ecbdc5d966ef2d39c5db9260b7656b1032884a5f93696b0d7e6f6363b61cfbde38986174ff644a738c5850acdd0 SHA512 16a0ba09140ba98e51953445c9cc686a829b6c7045a2f8f0844721eb0da6a999a07c6fd7fab76312d3b7f65077c1feea4807907ff5e702449958a66b7b930ea0
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
index 32e9c65e37f7..68e836908a96 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
 
 RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
 HOMEPAGE="https://github.com/luislavena/rake-compiler"
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index e3b6d2aade9c..22eef0cebd77 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -3,7 +3,7 @@ DIST rake-12.3.3.tar.gz 122233 BLAKE2B e6c913b833092ef5d4203265bb5daf725bfc34ff3
 DIST rake-13.0.0.tar.gz 122378 BLAKE2B 996990f061a2604bf031926670043773b029d03e092513be3566763b04474d88b9bd05c085f25fc9d66b26a55e191b45fa34dc4aa215376703ad28750d71a6b1 SHA512 56038199fedd952994459967173d298afb13ae7fe9d7873dfe18cd4030b37f841ff74c944835843379cd66da96a6d1ee8c38294203f9d8e514c4331d65f5db79
 DIST rake-13.0.1.tar.gz 122821 BLAKE2B 698e92d32d4bedf523bc81636f4183ccb11da1f467d116f7ff4978e121bddc41b66160798e2c0a2b00aa8f79171a81df7e214e556adeb386bdb00a72a18b82b7 SHA512 50d82b3a9bbe194467c7669000ed9dd8e55fbb22307fbc7180aff6ab77095108a2519b3095965ad08b52cc984d0384016d7b166676f2e97394409a069d01545f
 DIST rake-13.0.3.tar.gz 122825 BLAKE2B a36cc6d8e5f560bc502455a756b89d763899e71b711ba6b11d17fd86a460b4cb3ac47705645d4ccbaef9b6d8964cdc5d4d535b4470582cb3658016a399f78d58 SHA512 aff09bbfa58620cd6902e6679ae3f54d90424bfac40c7ad6efcc590a1c9624ae7a0c5597b8b05b378d90e422285c41d781485b9aebe1819c0c2eaf5f2624afa2
-EBUILD rake-12.3.3.ebuild 1262 BLAKE2B 1d6dcd738a78d78cc1594ada8d551dea2d365e14f9f62a9d2fc8fb5c6e34ca8cf7c6f3e302ea9786d40772b4f6d7eb677e2ddbfa20a40bb3f19443ef9d0be8c0 SHA512 a38c5335b4363d37553d52afa7e01c53569e0c2d8e53023ad215d46886be7150a7600718a32ed0b6fbc7894c4a79f53924ec7d3273e7d7eb69b86e7fefa3e400
+EBUILD rake-12.3.3.ebuild 1263 BLAKE2B a866e416a95844a8769325352c83f439e6cd9eb72ea586ea62881203fe99b4e4b6a81553e32f3396321907a2595f789782440ac96bc87196f1ed4d32215a6cc5 SHA512 9bf0bbe94d8098e3bceb3a29f67b1779d089c81a4f0b0d978460d8c44792484c3217c62ed8d5c48ee96745d59e68221d0bd91f02253cb748187158dda722f0ff
 EBUILD rake-13.0.0.ebuild 1440 BLAKE2B 3cd568481985f897a051329b02fbd011327cb0b0b18f3c8e5c6bdcc29732d00403e191f5cf09affadfd0f41b062aa36b4039554506e2681b012df12fe9794096 SHA512 2130e165851c685a59be81b45511ff689296e76d8bacb3dbb504bc35fc461dcc2cec76f5055d9889c4a6c08d82229d84a495e61d9df0aa73cd6fbd26f6d95e9b
 EBUILD rake-13.0.1.ebuild 1447 BLAKE2B 877bb61e85fb6eaf829142fd0f68176c1ab9bc947d2bd0da4b6d6c7f21cd48afd0cc307cc44e322c5693892ddf4593ca736f5e45b9e0766e766f13550ae3ef3f SHA512 54be8b3e195f8960844b38ae3171b50ad73ee71a8903e24e2eda6df2a7b49a523d1c67543e892dd42d2caf424381ab5e4930a75e2140af81dc6a152c8b5b8bcc
 EBUILD rake-13.0.3-r1.ebuild 1455 BLAKE2B c08d008ddd4c9fbbcc0bccdbeec69cbdf74eacb0a35a5f2440ee09ed4f02f926c6b15251f8ae3aa6a9fc4a8e70ae85c75505992acf78edfabc17442efab0157a SHA512 d0992df412ab18f7d724658f226c5cfded487417b0d27b44b3cfe6301da9f4a584de6a5df862c5fb1d079ae0f9945ee440b539d85918941ab14c4a5f1775cea4
diff --git a/dev-ruby/rake/rake-12.3.3.ebuild b/dev-ruby/rake/rake-12.3.3.ebuild
index 9644d17d3af1..56e8a203e5cb 100644
--- a/dev-ruby/rake/rake-12.3.3.ebuild
+++ b/dev-ruby/rake/rake-12.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index a46218765a07..882734011a10 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 1022 BLAKE2B 33d6137fe2260e512f2011e3a8e9a66c8cba92d0256ae897fe08601fa89681fe5f399d9c9f0d95a4f2b04e183d5860a309bc81172d8afe21bda4a5c1a06bf60a SHA512 54a8293a827b9c1ab73d26f4296839d8fa1a79c647ef807ab21e56daccc27baa5dad13b0a68fe3d6c42912ec6431ccbdc8bc1bd6e843d4023084a1f43761c283
-EBUILD rb-inotify-0.10.1.ebuild 998 BLAKE2B d754ff118debeadbba84f8ec6889d551869368e94e7dbd04ba483054a15e27ea0ecfff6bd5f688f5a223124f714547a45fbb6aa1667eced52414a1fa2e7ad742 SHA512 279a31cb7c613ce3d644c8e5b690509dbd02148e3e740f08868041685c58b87e68ef80c256f5abc25d9f7531e3443031e2302a2bd7ddbfd2b5c3655c1ce53e50
+EBUILD rb-inotify-0.10.1.ebuild 998 BLAKE2B 68a910ee6d8c7297db9454819be70a43e7db18a3b0232a34ac8700f0ee6c8e52ffe64c6c35eebd3f1d26ebb8b383b7ad80d4f6746d64ce4bde6f2ec516d4d285 SHA512 1b07ca00050679709c02125e446d9cf7e3890a19733cfba8dc2e67b1a0d964c33ca009f31cc69248dcc3239e62ab42ede89851a91ea1fbf02c75789f192900d5
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index ad9de98bdef9..4ab19185548f 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 1c25fcb8db52..d9f6ba0ab051 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,11 +1,7 @@
-DIST rbs-1.0.0.tar.gz 497065 BLAKE2B 3cd0d583f3048e11c70882c783766ed4bcd5e464562900d4528da2218a7fcc773be8b36eb79a517314cba0db8360d6b9312531fd07b618d70575c7aef54d0efc SHA512 512e8abd883403697fde537844c99a0780e9f8d1dc59ff827c0372274573967981735065b670afed50c13ca87c6abc44bc6cf47caa9cdc6e6c117c6d0907c405
-DIST rbs-1.0.4.tar.gz 512875 BLAKE2B 7d301e2f6c20d13249e031e8728089ac6291a1ab9bfd81513dae1633604bd45b16bef94c7ccc680c8f78e4a954aab29dc5d1025b05b5f8e00e830c09c5192b3f SHA512 d998a1613b7653278460f5cee19f38bbdd13aa46d9deb8e4da8fd710a78c6ede2784580481cad43700f3d2c4c51d0d0b70eac23b156215ad3df2d227d1f6a3b6
 DIST rbs-1.0.6.tar.gz 519090 BLAKE2B 1614320b8f77fcf4880cec6b7e4dc5fcb6b73f59410aa4dc51fb61b2868313acb242dc5a572c6cb96d9a819bade4b1d3aee2196189ea3fcc84d718ebbe9ff1d7 SHA512 a63c5781e6f73e998ea10c1a821d4f33388387caf6cd8e1ea607a9cd009d3f793e59c93b140e2539291a6b1d50b6ac40be7b484a8de0594f0ccff8a2db1e8425
-DIST rbs-1.1.0.tar.gz 547367 BLAKE2B 56bcc83923a55f7f80ab3439bd9350f1b5d2c97dafc2d74d47c02ffccf7995f975cc8ac6f0cb1b103720a5dc4b6e98f078031689ae09ddea623da89de6e941a0 SHA512 4784ba848b4cee6187538793eeea0caa6e4d3f147a23d6ac9289b14ba4c481b55469d2885d271c1f2bfd39d1709e3d62daed52fb7e7935f96282b180286bea05
 DIST rbs-1.1.1.tar.gz 547506 BLAKE2B 5bfb64214d4fe0d19ec1c633b3f42567d2615fb0ed34ec78dd3defa3d185adbeab71ad523285d2877babcac4bb61ed2ec60eba80871cd4c631a2017f49768488 SHA512 f31894c1a52679241ef04f03d1aff545f9cc53a460d8933b7064b8403bbd6ef46fbfcdbda00189b158770389bba38b3978ad7d5dd0e7e0594540841e237adfc2
-EBUILD rbs-1.0.0.ebuild 1083 BLAKE2B 9ce2d41a1f2ddbe8c1b4c012c985cd1bf1254ae8048ffb3d7100d928e896c9f4242b2180170223d7b3ac3365a1b32ddfcb04d7338686a98acb84662137664482 SHA512 a0177e009dfebf89c85cb50f3bbaf22a17012947ee53ea9c95d0ee0dc9b021030ccfe638a75724f21cc647beaf2b0a6a4c44454dbff547c8ce1d7f7d60ce1165
-EBUILD rbs-1.0.4.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
+DIST rbs-1.2.0.tar.gz 560408 BLAKE2B f1f1491018897ca445bb1e49d6d8965af7bc8f19657130fd1f6233bb2d63cac9ecdffba8e41232d2152a6db3007f597a62b7a1cce6c1cf9b2b794b8550b45de9 SHA512 877341ecbe9764431de95c431aa757533c21ba3b51b625a5b1d74d9b76be4c32829f64859befe252162e5dc40ddb1d30ea569e0d7a1e739777f7c8143389dfe9
 EBUILD rbs-1.0.6.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
-EBUILD rbs-1.1.0.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
 EBUILD rbs-1.1.1.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
+EBUILD rbs-1.2.0.ebuild 1181 BLAKE2B 25f78efd7c8b626fd3440cd438b0d50b69780506c3230cf0e307d55855438511c5ee89efd5a6ba7098fe3682b4373726aae81e3c66c3fa15acff692410455088 SHA512 5eb3c4e31348e760d3386edcbc89f209505ca2e42a9821629dbb420402b0d9c7e86926f9aae8d5e2b2012b3212be72b42ad234259153ad54e82255b24fa603bc
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.0.0.ebuild b/dev-ruby/rbs/rbs-1.0.0.ebuild
deleted file mode 100644
index f5fb2dd22c4a..000000000000
--- a/dev-ruby/rbs/rbs-1.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/askip "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-1.1.0.ebuild b/dev-ruby/rbs/rbs-1.1.0.ebuild
deleted file mode 100644
index 74d2c248f835..000000000000
--- a/dev-ruby/rbs/rbs-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-1.0.4.ebuild b/dev-ruby/rbs/rbs-1.2.0.ebuild
index 74d2c248f835..900ed36a1e92 100644
--- a/dev-ruby/rbs/rbs-1.0.4.ebuild
+++ b/dev-ruby/rbs/rbs-1.2.0.ebuild
@@ -26,7 +26,7 @@ IUSE="test"
 ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
 
 all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Avoid JSON schema validation tests due to a large dependency stack
 	# that would be needed.
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 7683f03bf5c3..00f4f82d9eb5 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,5 +1,7 @@
 DIST cairo-1.16.5.gem 196608 BLAKE2B df84e6b0b4419471cdaacb7eaecf23b9257b8e0933dba0e3058afefc288cbb2f14acb38d4f5302f095ed37c46469eae61d934c8da2d0b1ef1cc48f06e794179f SHA512 98c10e16a3a2d964dd9b5fd450118068042e721f9655758ca567ed45f418ce1c2b9fe8cfa991a94778eb17d69fef65008d2c21244592f4f1819104bdeb76bdcc
 DIST cairo-1.16.6.gem 197120 BLAKE2B d5c1f1704592afb096d30504f2d74d27e29e6222fd1648895beab786efae071de70f942b31e2f49960ec91bd87f0297a2d3b07013e894951d4ec1e8d376e73dc SHA512 f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c
+DIST cairo-1.17.5.gem 197120 BLAKE2B 6788c4832331407802d56dc429d665d8a82d9e69a7bf9958391b02003e71d7449cabd65fb97916e8e06a16fa599bae1c514e8ace75304f746db3051bb6bc21ee SHA512 f2ade6fb6b9fccd81a11061b277d4a9077936e0beef42c61225bd4d5630586a57a3fa192a20a0f7e4922313e2a8215268bc9a5d007d2805cf1f80714fd9ad1ba
 EBUILD rcairo-1.16.5.ebuild 1850 BLAKE2B 9c5512c5bfd2430614351e2d042112571bec231a5948f46711699f56a838ea601b36f24c2f85548722ec49bb9147f817bbfe4d70ca81a99e620960ab374f7b5e SHA512 ab5c12e5d02cdf9bb6ccf4a569c51ea12371250251f29a5864ae23c067ca010f1f03bc5b4513e9db890a3b4fe6389a027be243299a2bf77db0622fc1335bbef9
 EBUILD rcairo-1.16.6.ebuild 1812 BLAKE2B bffb4cbc3a6af87f881a3f84a405094edff6fc6219e498fb3944fe70a3d5c6236f3a2d46d607f7002aa9af6f6b360f3a509a20feb4b5d181202aac0613962637 SHA512 2f2be83f7b2de88d7112d255139518a0b308eaf86e503b4a7540035adbbf5f69ffa91c57b42cff9f3a867b87eb108837e8c423039e8490a3200bfe08b4fd4b43
+EBUILD rcairo-1.17.5.ebuild 1645 BLAKE2B fb25c1b758ba80951f7361f22b4d73b648f519fd4e23a66c8ef8222ba7e5e61d011514b895d906329e196607c90f6cf2d5cc9e66386b4aec5f96dc7c2d77e80f SHA512 a93830477f752c617cb0d1d4a0ac1f95570b138cd5dc52d64b0938c7e1cd227dfd83f84c61f986ad425b694fafd0270a4891538b144d25bb297cd984c6379197
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rcairo/rcairo-1.17.5.ebuild b/dev-ruby/rcairo/rcairo-1.17.5.ebuild
new file mode 100644
index 000000000000..07620424b8b7
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.17.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cairo/extconf.rb)
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~amd64"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+
+ruby_add_rdepend "dev-ruby/red-colors"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.2.2
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency
+	sed -e '/native-package-installer/ s:^:#:' \
+		-e '/def required_pkg_config_package/areturn true' \
+		-e '/checking_for/,/^end/ s:^:#:' \
+		-i ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/helper \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 6fe93616701a..3e46b5ea62b4 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,7 +1,7 @@
 DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.2.0.tar.gz 668152 BLAKE2B 9c92b27c427d6229778aba54ce7f12fe883fd3e40151f518f3d023d4f6dd10d4f1f6d05c8d6bcdce80d1ac81ab25cd99ccbe9479a4fcd950b895e14d4fdc4b83 SHA512 15352889833436c0a243e4f79c4ae8113fa3b8c222950baf1fcd272773a7a17198c2cd91a50c92e225c282a37ec743a38d8e9ca4dffe0b66c39d56412fe56ca2
 DIST rdoc-6.3.0.tar.gz 670538 BLAKE2B a7eda5d588c0089e36ee4197940e762e378de24b45435f8d9fa9ef9292b5d2f50d7b48ed40764794c4a20e8b159ab6f2e0d86a9289c0706744eeec7a016e05e6 SHA512 7e5da42905416d12acf6528b5725ea9fccb7b50bb1ed95c03975d16cc2ad22c58f48c3f14b4f118deb978649cec184b98ccef915a5cb4b0321e0114438f75745
-EBUILD rdoc-6.1.2.ebuild 2635 BLAKE2B cffa14dc839b9f4c65c214aee4f6cb4dd9898a88a8f2c6cd3a5e973f6f2e3eda83b219e5148b0d36cae42bb23ee8bcaa9c63aa11ee4e648317467a2f3a239232 SHA512 a951d4b56622bf77b7d03d8bceadddd054d1894543effd22aaca6c0f3c39f24eb973e72b90ee1f81d833b04c0b1c6ed5e10d9c7c4bebe0b649279e84f84de485
+EBUILD rdoc-6.1.2.ebuild 2636 BLAKE2B b7e269de9371299b8c7580e928e48f250a417120553d1f3520ec0a6e590d3bd55679e0fbbaa2a7e9de2890ed7c4bd7e58b70ceaffb4df5daea47e255b5feb4b9 SHA512 8ba41314f28de3f789fc4f527092ea2d97115b198a99ff1c38edb6ab6b2ca62ad3f0b71cd435335fd7589481d90e2c2fc133d72b096a91ac0bc15b2d52d3c15b
 EBUILD rdoc-6.2.0.ebuild 2671 BLAKE2B 9cc8cab8754a6bbbb7dbf9ed895c2c121318c706f5a835fd7dc4914a282a81344d09cd49d241294723cab97edcd87ef44ed3effdeb8463a23f6159c8eaabea15 SHA512 eae8875f7f2e4ddaefd8bef638e3a5d75b0f9d95eafdfff8e3cdddc18083e6ef693b7411971b090f3ee71f879042746f7687bf42b64d3c983a3a1adfc3f3ef87
 EBUILD rdoc-6.3.0.ebuild 2671 BLAKE2B 2d9f41f99b60bb989064d99e172793674310c732b603a57e4bbe081194efaeda6829cc65e2edff330520ee2e3791a650c48161d81c750a34589bebc7937e0b68 SHA512 e5817665513852fdbe44ba30d73cc6bfe953f76abddadb8ca3e609fe7918530b86e268baeed69004354f129957226d79ae05a4d06a5e1ac4cbc853f3c2a85bb7
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
index d8d39f4353b2..a14a325b929c 100644
--- a/dev-ruby/rdoc/rdoc-6.1.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/red-colors/Manifest b/dev-ruby/red-colors/Manifest
new file mode 100644
index 000000000000..35e817f7eacf
--- /dev/null
+++ b/dev-ruby/red-colors/Manifest
@@ -0,0 +1,3 @@
+DIST red-colors-0.1.1.gem 28160 BLAKE2B 3b730332ac72d5a2c1dabacd678d94489cd0d29c9a546c69ec8a8e2ed7a1a71109535dccab5409c82e64c4322c5d9ee4be144fa963a4aadc9632d76594ed2655 SHA512 a935feec2e6ae25f009bcd913b37b0daa180c42dd7056cd42aac3af3f8b9f50bfa8304f7e3919e3cae9e7d83c5a3778fc06934042efe7de3561c24241cba708b
+EBUILD red-colors-0.1.1.ebuild 355 BLAKE2B 04e4badd26795378668c08f62b06c6680fdc3dbc93e73c36bd789319b9302a13257fbb2ce2d1abb85b22ccad5e4ec9ebc36872189b6388c7c0b7b843caa080b0 SHA512 5d963164f364d0f4b9c99cfe4c7635fb81f9e7f9bad2a191dd4eb4726581a8b4d988544015dfc55762f93276bfa2a80d44f3792ea5bad6a92ea5d3c02e29562f
+MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/session/metadata.xml b/dev-ruby/red-colors/metadata.xml
index 28ab0c15f206..28ab0c15f206 100644
--- a/dev-ruby/session/metadata.xml
+++ b/dev-ruby/red-colors/metadata.xml
diff --git a/dev-ruby/red-colors/red-colors-0.1.1.ebuild b/dev-ruby/red-colors/red-colors-0.1.1.ebuild
new file mode 100644
index 000000000000..0176899a019c
--- /dev/null
+++ b/dev-ruby/red-colors/red-colors-0.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Color features for Ruby"
+HOMEPAGE="https://github.com/red-data-tools/red-colors"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 503e88bb95fe..0da29f43a794 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,4 +1,5 @@
 AUX redcloth-4.3.2-load-documents.patch 988 BLAKE2B 75e2a385abaf14caef523ae418e87b000900c93d3afe4491300335dd9d5a26fef28a34b3318fada0625e91cafba42a82fb05a2d8acfd6c5afcff4e8ac491890f SHA512 cce18ba0c30d6820020d71dd032d1b193976eaa103ca7bb294a7b1cfb0e61b82aa31e0d8bd8b8d9305e8c087a4109563897a7cd77ec9c020b453c8dc97d48003
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
 EBUILD redcloth-4.3.2-r1.ebuild 1503 BLAKE2B 9c347450a57a184e67388e4c29e661e13aac23060972dfa43a9894d52f1938cf2ae7395be21caf33f3507fb4e8ee639c3ffee3c2a5ae5c3e9106a64184d09090 SHA512 8628c0aa015983329502b2b71ea4325990b562feeaf2f8e62c7f6e015508380229f908dd8c6014be542af371557dc63008ef030e2c037e633701a4837146a6cb
+EBUILD redcloth-4.3.2-r2.ebuild 1536 BLAKE2B 48d35c7e1cf53f4e55d71f11cb4aef44439ec361bef40e6ae92a33c119831fe99968b18ce25cc3f03bad967025295294853d7de2f15700a938b9ad8c69d020b5 SHA512 93b41aaadd19aac334766172bf520a28363aeefa7f3e822a2733aa0ff791a01ab0a1fd4bb7623a996c616fe1c4c4c01ee4fde4291ffb05a8f74dc4bbb223e16b
 MISC metadata.xml 342 BLAKE2B f28d0e6234cfbeb3d398315b38e8dcc614b32aed150b047e61e7d99b2f6083abbabc36515de2cd2aa4d451dd3372dfc15018c1d8ad02cf64ff8e87b147a441da SHA512 7a6f73a77cda62ea21a2d2fdfcf0bf848ffdd90e7272e0b06aef67a8147e5a6ae14e871d216750ce20d12e18823d3e3d36e60a99972019fde7195a2350480791
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r2.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r2.ebuild
new file mode 100644
index 000000000000..e442db0353e6
--- /dev/null
+++ b/dev-ruby/redcloth/redcloth-4.3.2-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_NAME="RedCloth"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
+
+RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
+
+RUBY_FAKEGEM_GEMSPEC=redcloth.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module for using Textile in Ruby"
+HOMEPAGE="http://redcloth.org/"
+
+GITHUB_USER=jgarber
+SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+PATCHES=( "${FILESDIR}/${P}-load-documents.patch" )
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-0.8.7
+	>=dev-ruby/rake-compiler-0.7.1
+	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+
+	# Export the VERBOSE variable to avoid remapping of stdout and
+	# stderr, and that breaks because of bad interactions between
+	# echoe, Ruby and Gentoo.
+	export VERBOSE=1
+}
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
+	rm -f tasks/{release,rspec,rvm}.rake || die
+}
+
+each_ruby_compile() {
+	# We cannot run this manually easily, because Ragel re-generation
+	# is a mess
+	${RUBY} -S rake compile || die "rake compile failed"
+}
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index f93c713b8a14..45f88fcf6c29 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,3 +1,3 @@
 DIST request_store-1.5.0.gem 9216 BLAKE2B 75dd49c33cfebcf0deef78be1fe054feb7198b42409ec4b339cefdbdd4fc066159bd18ae6db8001edd0fe20e1e8be1021812e6ffd033eed0bd9730603aaa2daf SHA512 c01d4505d2bc0b88456d0bc49416fcbea67da1e2ab6ef0c7fc900fae8856d82157dc39d2e1d2f299000f74b140f6f13d7352f4684e247d103bbaab7b1705910f
-EBUILD request_store-1.5.0.ebuild 483 BLAKE2B fb8097119fc727cf85319c873a8f93d2b05646a6da22ff2065cf7fad6c96989d2c27c8a41119c96e4de3cfa20d58e188d673399bdcc74ced9553f7e153f1f6b7 SHA512 5913f1afc41b25c924dad740af3b09b50a9fde0443776873f0d9d8d01f126089f806b83069abf834d866251ed77e95d650cafe823adbe40f04ecb70e8e7d91de
+EBUILD request_store-1.5.0.ebuild 483 BLAKE2B 658d6589b26bc67daa8ea7f4f4e2e1c41214920acac7a54ae27d5a6e0fea1f6763949d398aec1080e633dff9fdde648db3024cbe9cd82b13b804ad113cb0d402 SHA512 a2e77a7f960e7d70e5583f6f8bf76a168ba6b45820b1316d0a5b85c93a6c521eea36fe3a767721d172645225b0c66ee734deed25ba496c01d64fba50278ea34d
 MISC metadata.xml 352 BLAKE2B 96f0c7bc363401045297f0819f643d6bb4673c196b9edc4d40ec6aa3c66b9b4921cfcb0e5d5082778a720a68d7fcc26f6d814843f0177f7f548cc0d1f56f34d6 SHA512 ef219e94da98dce395d21d81db23380925391207d00dd4e39d2000ba841f62b237b13733ded2fcd67c36e3d18e9ba28b33fa3905c7d9cd7466fc8c942d577c39
diff --git a/dev-ruby/request_store/request_store-1.5.0.ebuild b/dev-ruby/request_store/request_store-1.5.0.ebuild
index 09f4d51a5652..3a5247cc5319 100644
--- a/dev-ruby/request_store/request_store-1.5.0.ebuild
+++ b/dev-ruby/request_store/request_store-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index b39ee8bfd9bd..b407a51c22dd 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 985 BLAKE2B 88c876917424e6c0aa48a4498887abaad4ec15ee1497f236fa698c390704a29d8fd690a9debe47076702552bee1c9d936c85f9b08c1c43b0d606b6cd985b2306 SHA512 239374a9f15ad07c85ce10f49071a7776dca5c19b754afdbdf5db93e6f115cad2ca584399e0ce35d664f58bbe2107f77f09f1a9870bc9b29a9a40dccb6ec140a
+EBUILD rexical-1.0.7.ebuild 979 BLAKE2B 848f2d33dc30619e662d435cc20aa3fad421ec9f2ef37bf2ca6895e4a79339ae87a766cd4729c59e996f025506102589537eed92320fc0b4ca7bab1c0d40fc5c SHA512 58059a9785613a20dd58b11fa61d1dfd40001e57cba9701ac739cc1b4342758cc13dcfaedb07c48938b0f9d05e535fe2e24dd7e642f12029feaea60b7886a89a
 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 c63c66cb5849..d64e82c10cfc 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -7,13 +7,13 @@ USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc	DOCUMENTATION.en.rdoc  DOCUMENTATION.ja.rdoc  README.ja  README.rdoc"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index c982cdd8d2ef..8fb323538184 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,3 +1,3 @@
-DIST rexml-3.2.4.tar.gz 474955 BLAKE2B f0b9a2003b6dc2b90fbab9bac1b035ebeb89c57dbe9bd50514352a8bbb790593ba5eaf77a9c898de033b5721281a06be2fb4996fe2e5810191df015ede3e44d9 SHA512 8fb52814a93dac8e5e963b7e0686f63fa6c1a88f6842a4e401bde76acb2d85b874ed6243439921bb0cebf53a5b97e0b096424d736409240aa9a5224e617ee88c
-EBUILD rexml-3.2.4.ebuild 770 BLAKE2B 66ee78a570bd4edac6e283ceb71c1841c5fa512b5c8b8ed227a6d681f7f2d756ed611ed84e7a38674473506ab19b4146c5d6617de6b88d37f482618b0fd3de34 SHA512 c9f7af803a5d963bbb65b9c9191090880da99ea39d17a2f82a8c75e622f75d29b23d3a49e8dc839743acdfcb82d2c22158580bd37a90dc054aaa12a6b7368f54
+DIST rexml-3.2.5.tar.gz 447881 BLAKE2B 4b922d51f9331ae17c2deaf3c617fbb6130b111ec0fe27892e524b89f298c3b962e64ab276b71213f3482c0a480b52cf71b3866aacc45fd6de82589baff81354 SHA512 9c62b789988b407bf4b02906768300b256734bfa342ef6b3551428ba2c1792b7e7e5a5480251d7df52318a5e5155757ab1377c0cc8d1d7c33278f33e367a5ca5
+EBUILD rexml-3.2.5.ebuild 872 BLAKE2B 7979f3121f821d5bd5cbb7ca41589d9edc1b9a1c89656c72ee050c197530a864dc357aa1592400e0103ea2e18238872c26a5af156bb76c0f2505c589d519cd7e SHA512 3d9f0d877372f204b0da689f0269e377134da87fe048471778ac0a58488798ddbbb05f86193e5075ca7776cd2d4fcf5bd577ddacf66ac54d4b525104c765fd2e
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/rexml/rexml-3.2.4.ebuild b/dev-ruby/rexml/rexml-3.2.5.ebuild
index b3070720e902..88aceef6cd49 100644
--- a/dev-ruby/rexml/rexml-3.2.4.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.5.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
+RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -21,6 +22,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~a
 SLOT="3"
 
 all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run.rb || die
 }
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 92075f96b3e4..8ce68f8b24fb 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,7 +1,4 @@
-DIST rjb-1.6.1.gem 74240 BLAKE2B 103e3885634be9c7dd842c2737c420511fea04e4e2d18f77dba7689c47da996fa37af5d08827de21ec38effd3fd99407e99491c8b99d134dded219ccf3880b79 SHA512 5b78fc4eabceddeb901145af39b1fc76e9a44801596ea4bacf9ce601cc109107cf042b1aa4c27049abd766ffca3206364079866ce7b88d25657fa75e7593adc3
-DIST rjb-1.6.2.gem 74752 BLAKE2B 5b5c61933da5603c805d68c6a2514d193efb87f8a1ffdd38193152463338d963de09848d6d3ea027338c045d24b9e884c7befbaed75b288bfba7573fa4b1f10d SHA512 3147d606698d5dd99798fec71d60e09cf964dd9649d4cba6c2bab40055ecb2b129d39beba67063745ad884bf3ad1eda9c1e91350f52f6767b20d612b5b279642
 DIST rjb-1.6.4.gem 75264 BLAKE2B a678eb0b57e930bfcc7ea059da8ee6a9319b7e0e5bc632a5b97ec617e77d844491469ebc2366ba4290ee7648b4201f1d34be560e325c6099237d413c9ed8aa46 SHA512 49a0aaeb1a0e945ce373af74e01f33f531e27b205c33a382975125357ee1ceae0bea12d6fc32acb2dd66ce56c6034691520f355688cdaca5d01abff295d1a6c8
-EBUILD rjb-1.6.1.ebuild 2156 BLAKE2B 6be233ff05435ad3911ac10bc5a3e3296e46ce8a2a6f8e985d630f0a19736300fcbfaa88026d608e77e192700ce744c6031b5a1d8ebbcb4da392a69ba0fd8b5a SHA512 779a6addb448832a41a5a117f27fba090eab184ac59b0feae46b0377f97c50dfcd24ff4e39a9d5116f078c649256dd521411dfc67e4261f551009f8dd2baaac6
-EBUILD rjb-1.6.2.ebuild 2149 BLAKE2B 15ebee1a10095beb1b89f49e7d66ca3886f3066b3b57fef96511303d9bdea167095222d575951a13b33e818df73ef5f95be9138d0ab0a5a0a533eec43158feba SHA512 b31af1c817d730bcdf56336277815ef2f923ba8496f559004849968d02c403c8020779cc80fb6ca4ff4558440a232888d28ef814d01c200abf5fd4c5247a1f89
+EBUILD rjb-1.6.4-r1.ebuild 1914 BLAKE2B a77cec9382c95bdeb570292d487a28737e24b9f3a2053794ab7ce226cfa10f8c5e1445e3e52a8be57254fa7908468b02cced941998a7b4e7e0cdca81bf8d191f SHA512 e0f825ece719016ec9704eec7a95b35f3b0085b3cb94cbe60bc25201262c77eb25bf132af01885d5c911c15a9f56bccfee65dc194d14f737538edb74a29f6eac
 EBUILD rjb-1.6.4.ebuild 1906 BLAKE2B 3b996ac28efac9d1c22328b16e3a787566f2a2fac2caaedf97358c9778ad24e210e8d0d0fb959ddc33d53b658877db21325a8c61158b56a049ed1c6c6210883d SHA512 2872f03676a465f880dff18f8fe0bf869acdb714aca8e0f7da987064d3987e352a8cee0b7e60c358a9887bad44087b26502a3e695fa6969b7b776ad2cb0f654e
 MISC metadata.xml 433 BLAKE2B f23feff51bbe88032b365e2cd7989e91f0d09bc20a9d0f3a3084b593d5c94e220ab86f26cf8bb6ad37044130f17b4a2724d339f36805778a739fc3755b8b94b6 SHA512 9e71bf1595b1f96faf1a13f69c4a045ad498382a196a2ec6960c85909c699ae4d49c25b993130ad2328c565862186ce6343f64baba8c9c6fa83c1954960b7264
diff --git a/dev-ruby/rjb/rjb-1.6.1.ebuild b/dev-ruby/rjb/rjb-1.6.1.ebuild
deleted file mode 100644
index 75650dc2ab9f..000000000000
--- a/dev-ruby/rjb/rjb-1.6.1.ebuild
+++ /dev/null
@@ -1,82 +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_EXTRADOC="readme.txt ChangeLog"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit java-pkg-2 ruby-ng ruby-fakegem
-
-DESCRIPTION="Rjb is a Ruby-Java software bridge"
-HOMEPAGE="https://github.com/arton/rjb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples hardened"
-
-DEPEND=">=virtual/jdk-1.5
-	hardened? ( sys-apps/paxctl )"
-RDEPEND="virtual/jre"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-all_ruby_prepare() {
-	# The console is not available for testing.
-	sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
-
-	# Avoid encoding tests since not all locales may be available.
-	sed -i -e '/test_kjconv/,/^  end/ s:^:#:' test/test.rb || die
-
-	# Fix build on openjdk-11
-	sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die
-}
-
-each_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
-	fi
-	# force compilation of class file for our JVM
-	rm -rf data
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# currently no elegant way to do this (bug #352765)
-	ruby_fakegem_newins ext/rjbcore.so lib/rjbcore.so
-
-	if use examples; then
-		dodoc -r samples
-	fi
-}
-
-each_ruby_test() {
-	if use hardened; then
-		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
-		if [ $? = 0 ]; then
-			${RUBY} -C test -I../lib:.:../ext test.rb || die
-		else
-			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
-		fi
-	else
-		${RUBY} -C test -I../lib:.:../ext test.rb || die
-	fi
-}
diff --git a/dev-ruby/rjb/rjb-1.6.2.ebuild b/dev-ruby/rjb/rjb-1.6.4-r1.ebuild
index 564fb048d402..3f2663da48e6 100644
--- a/dev-ruby/rjb/rjb-1.6.2.ebuild
+++ b/dev-ruby/rjb/rjb-1.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,9 @@ RUBY_FAKEGEM_TASK_TEST=""
 
 RUBY_FAKEGEM_EXTRAINSTALL="data"
 
-inherit java-pkg-2 ruby-ng ruby-fakegem
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit java-pkg-2 ruby-fakegem
 
 DESCRIPTION="Rjb is a Ruby-Java software bridge"
 HOMEPAGE="https://github.com/arton/rjb"
@@ -20,9 +22,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples hardened"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.8
 	hardened? ( sys-apps/paxctl )"
-RDEPEND="virtual/jre"
+RDEPEND=">=virtual/jre-1.8:*"
 
 pkg_setup() {
 	ruby-ng_pkg_setup
@@ -49,20 +51,9 @@ each_ruby_prepare() {
 	rm -rf data
 }
 
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}"
-}
-
 each_ruby_install() {
 	each_fakegem_install
 
-	# currently no elegant way to do this (bug #352765)
-	ruby_fakegem_newins ext/rjbcore.so lib/rjbcore.so
-
 	if use examples; then
 		dodoc -r samples
 	fi
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 1c19d6057062..c6d14ce2f7b6 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -7,5 +7,5 @@ EBUILD rouge-3.19.0.ebuild 970 BLAKE2B a5a5fca185c436833cfc31d8ba1d7acf897c274a9
 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
-EBUILD rouge-3.26.0.ebuild 968 BLAKE2B 8b40b7ab7ff0a479ce1be07c2f13fea239c68a049e2d0299eac636361d2fcd02e21deace2fec2bca849c03cb7c0f646afa7438a7bcb243ae7540001d99a150b8 SHA512 1036c3fbbb696beb42be0a62abaf86a425253dac563015ea0ae0bb78a4cc547a6fbc96a40b8c308fc228001ccbbfbf41208c9538a7492c06ef2377a2d9f4e7b9
+EBUILD rouge-3.26.0.ebuild 975 BLAKE2B 5290f36f295cecc2656e54dd94ca31b3bc77145c115d5402b670ff200fa34d7535cce318a8139a5bd6137fc352f4981c588f1323f12616eaa7eb009c4d128545 SHA512 64c161a6c19ffe3ef4d79ab91b8bd62a646367e57d277428025c27b90774ce2ee8aa601df5ac4efd7032794c9772428ff0647746a5bfec1b20638bef79a0a955
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.26.0.ebuild b/dev-ruby/rouge/rouge-3.26.0.ebuild
index 09b8e1223bae..42e5df2adef5 100644
--- a/dev-ruby/rouge/rouge-3.26.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.26.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index cc2d622fdd49..f59eb560eab8 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,3 +1,5 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
+DIST rr-3.0.0.tar.gz 137978 BLAKE2B 707678362370173c3cb088db9003a5acb54f42b579955239317738027ede63d19217c9e76dd693d09226bac85b41cf9422ac7a580f502c1cbc338b0d4ccb34c9 SHA512 4d162a88868dde9a300a0783869d7c7edae840960c26697e20db3858cc3cc9db942a52c22e79584d3e7371da59156ff4f026ca9052d9d4b203159223f78b1030
 EBUILD rr-1.2.1.ebuild 1094 BLAKE2B 49caf7ccb853a9545414c8bd7dc82a7fa0ac3124b5f3e9029cc8b7428df9a53b278495fb0ea2458df358853881ed010ad0826e1c76230c46891aa93057670241 SHA512 26d86571134dfe9e89746f3f65907d6ffff218d6790e6aa1205c705765098ec6b8f22e8b6d6b1196ade5d955b30a715be901bf5abae5bba451db99ebfc986358
+EBUILD rr-3.0.0.ebuild 1127 BLAKE2B b8d68170ee3930b4c2376f3e2d6678636aeb42e6f902687740626ae96daa0638f76305384a8ec42dce01fe46016dbb258fb8c28b57273a213587b8b03759a214 SHA512 cbb783f8dc81e92d45ae3eafda05b743fc9af1a28824b87b0fce0b97c606718e837edfbf3dd991c50f4c038a3aaa546c314aaf05da2cb107897474479bfea9fa
 MISC metadata.xml 331 BLAKE2B bb2b9b8afc411541f4cbc3f3ae7034761b8424dc81bcfce4c47d945a974a13c1519c2b46968dee270bc76beeca6902fc42cb0f8ac1ba3d944d96e4146993094c SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39
diff --git a/dev-ruby/rr/rr-3.0.0.ebuild b/dev-ruby/rr/rr-3.0.0.ebuild
new file mode 100644
index 000000000000..85b47d8658f8
--- /dev/null
+++ b/dev-ruby/rr/rr-3.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=rr.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
+HOMEPAGE="https://rr.github.io/rr"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? (
+		dev-ruby/rspec:2
+		dev-ruby/minitest
+		dev-ruby/diff-lcs )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '1,2 s:^:#:' spec/suites/rspec_2/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# Only run the rspec 2 case since we don't have appraisals. Setting
+	# up everything correctly without it seems very complicated.
+	ruby-ng_rspec --format progress spec/suites/rspec_2/unit || die
+}
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index ccff58027a9a..663d3fa2b2d9 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,4 +1,4 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-bindings-1.7.2.ebuild 1377 BLAKE2B a64e59a53acd7df20f6116be98fc91b38526c487cad5e4783c0d4a676e9fa7a34fb0a684d9245ea85060cf3db2083abdfef3832f069b72dc7676ee4f618f7823 SHA512 300a310d1dbf9b9275bd41f6f14c10949531d0bbc9c97add9f7130f2d1b4d21c3fe4e2c12fd8f8de6b9babbc78c16c2a8c8834f2e915e9e15984b981ad947070
+EBUILD rrdtool-bindings-1.7.2.ebuild 1377 BLAKE2B 7aeb6367a8f7cc14af180b129e6be0c077f029fb03e42c9d7afa0498fe673a35f119c8f1f1e3f1e6602795c0a0ab58b8681cab84cb6a597f5870627b2694b32d SHA512 f919eafdb88ee0903c99f202835dfa15449a1229512da5c2323f7803bad9117c3e5db211f4e32876d0437357dd016ec24f8bf32ed5a104a167c655b66c96f418
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index a0573e9e4751..888795b41f5e 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_TASK_DOC=""
 inherit ruby-ng
 
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index bffae32fd7ef..0712c2c06707 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -3,9 +3,9 @@ DIST rspec-core-3.10.0-git.tgz 396978 BLAKE2B 6fb8947598234351595a8832e47baf941f
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
-EBUILD rspec-core-2.99.2-r2.ebuild 5099 BLAKE2B 110fd632f3b1630b73eb41e876bad1817580fb36ba39726838a6e65039ae93c45f62e4ffc3bf263ce36c1904fd0c3401e29e3644ab44118a244316755f645421 SHA512 5f4f15f61efa55c4f3b250d9c39dbe2d2b5a7f4fa84d14c79cbfaf49dbd62503f1d219f221a6b337cc6b22cf62ffecef68bb1c5ad6147eec282e72588a80ab37
+EBUILD rspec-core-2.99.2-r2.ebuild 5100 BLAKE2B 44d2904b5aa3f222fad677c0ac53a5f46602e2fc5505b57f1e4b0d8c68bf8222b506d9cf0c1403a4e05292fbbba6eb658cec5727e48e4c79b6bb4af338d8d370 SHA512 6feaa484ecc73472c5f5909b82d9570fcd617c5eecd08e70037fc96f1695fb801f21baa12dc4224c79f54f615a0afb0b53c06d7758e215e08c2c34f034a7367b
 EBUILD rspec-core-3.10.0.ebuild 3122 BLAKE2B 58bd8badcbb0964abb5423e670851cc5ef92a3a5fa9d6447d3e3aa956ed68663ceedad163cdee1b444d38c430951e13e3e1d8c36e602997b0f6b5390c6d9ddcd SHA512 6f3733d2bb0d380179660affa708431db24eee41d1893efcfde3e05ba7ebcda304aa1ddd96f34b4ce979e167e4dafc91e8545b01180f55718ba022f3c2b0a8b8
 EBUILD rspec-core-3.10.1.ebuild 3129 BLAKE2B 2ec064d95a419e5b85ef02891a610a3866c3f6f63aa5b3088c933eccd05fee80b2eab641eb62dea411649e361fc5acfbacb35297bdda4a6cda025055c3ce61fb SHA512 56b35b1a76c2857ea957e354d742d1b8368244c4cd4cb509c8f50b77b4849755f0e9fd3837172b5b6a59838fe86fdc9c9586aece51065f53feb7df85c5919c2e
-EBUILD rspec-core-3.8.2.ebuild 3154 BLAKE2B 18a751083c7e36cf7fef603b15c948ea70a6db4c480cfcd199e09dbe98ba7a9050235d1b9881365ed66855ed1d5899d8743f48bde7510aadb0d5d8107de1768a SHA512 a3a55302597ed4059ebc648fd21d708c8681c8ac5601cd32cefa8f629ce16925a3b1c10d3681776b902d1d924632e92b88b9929d9bcaabb71203d0686cd31007
-EBUILD rspec-core-3.9.3.ebuild 3124 BLAKE2B f0430e3237cc2a4f979a9cdfb712c275367ac7d400fa6e02da9c406f58b948aedb4f06dcee5342a48ba36a2784187e3edcb87a7c871e1cffa04e1a0800071285 SHA512 80e060ac5a0093e562a279133818114da83dc39b488c8322be52ada6eb768259eb670f036b8c6034f509f247a81b651941527c309a88027516b63aae09bf6a0a
+EBUILD rspec-core-3.8.2.ebuild 3155 BLAKE2B 501c18233366fbe9e5f45f9ab3bef568f23c546255b2d206a24384ae9caaab50bf5fc354119452eaafa09edc0f959562418f9bc7a9b8465b72d6e8a762557c89 SHA512 c9c05b12b6f55337e9faa271fed134fccd8e8b1b851c8192bed1a582c7b344f91bd30d0e41bedd5a705d6f76d426b770c890def4a6cd72a40895d7ed8433c253
+EBUILD rspec-core-3.9.3.ebuild 3122 BLAKE2B c8dcd45114eeb2f4acf1aea3934f9daa173ff57899cb234586f7e720508953d960bbc5d8bee29695140f4177660f0ab4081639a5b274d747b7b0f6b4a7530053 SHA512 6050a529b3c922a832403288731ac2b4ded5719693d735e5e6650c62b3a7a8a22a3091d2f66376b23a51538c2c36a61f7b638a0f5f6c701a58e4ac071a8eb076
 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 ec0a17977dff..1b261a08012a 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
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 800ee70f12d3..4e6ee66dbb71 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 ~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 ~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
index e5993df40f91..08da7b72ca8b 100644
--- a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
@@ -21,7 +21,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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index ba9ac735dcda..f9cb568c3382 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -4,10 +4,10 @@ DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48b
 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.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
-EBUILD rspec-expectations-2.99.2.ebuild 1623 BLAKE2B 01a190b296cc4dccb178114c105ad33bb266278cf87b63354a4450a03c667e085bcfaca61aee8fcb8926406f45d33cd429b02a750623e885e315c39d772fa831 SHA512 9d4fba250dab08c2405370a0dfd5b56abb37a6bfa48406d19c127a651cd360483206e496664b6566de5baeee733d9a1047926d9078c5f2a32b3dacbb57dd45c2
+EBUILD rspec-expectations-2.99.2.ebuild 1624 BLAKE2B 4cbf18eee1c7b553b3fa9fb96e7c08f9f46bdb681dae046f8305e1af545746bbf77331412b0b4acffd522425c43c2d773524e4e29a8d8f68364f95f9e52c3166 SHA512 3f7a1635a4f8bae6a87f9523b42a1cd55c8e48ae2e580d7cd7066da60d6fe98c1a449263cc8e593e451bd5f2eb245065548faf1d540021ebc83ff90eba614b8b
 EBUILD rspec-expectations-3.10.0.ebuild 1304 BLAKE2B ad2aabe0ea5dc817aa69e8de604a4cc3ec8d0f796d44769ee652bf468f9dad38902a2da949f09970e8c393e211c247c1a6a8132ab4e5ec318af2fb572cd8eff7 SHA512 ca0c3b67e5418123b152a46e33cafdb6e79ff76c14c4f7bf802fd172e3468c5b1cf8c291effdec7d11e324897016fa8a09008da135bc67f5acae85946b5f146e
 EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 48188a1f2266e9f4e438eb24d3e3440fb8a4ddd355cd4d89c80c6b5556ef099534efaf2f1b29180abfa79fba41a075d2055ecdaf1ff1fa9ef504a91a84cc1828 SHA512 68e428d1980b7527d0cb9009ea56d224c0b2d81e76df9404a538a9e5a3df6a698e72b1d30731c895495532e481f406d70cb45515c954d8c5ff2b19b05b20d4e2
-EBUILD rspec-expectations-3.8.4.ebuild 1299 BLAKE2B 2d152af47e6fbccc9211ed3c1669e68e73f70c79306af5258967686b29706c6c748b441fee855880463015abb18ffaa771c7f535614dc3dd8789e0db22eec785 SHA512 c11432c627555f53566662313080dccd7e8ddc3f3ab316b3a815e93c215eb39c5c2ac0b6ff73bd01683b6e1b6a44e4070df8f59db5ab767eae848c710835dbd7
+EBUILD rspec-expectations-3.8.4.ebuild 1300 BLAKE2B 05a36d67c616f520bd08f0ed9083de0ae39398b9dbe3838273b9985e016742fbafbd52949c983d39247c6df113e74ebc3ca159e668139663dc8d995029473061 SHA512 274a5b9656a7b4abfd98f39aca21b4b082585b430e8b24d8596807381cee0a07e7a857d38b49e0ffa9810322e1d70c6cd70310aa67e6a8f93ee47759802a23f2
 EBUILD rspec-expectations-3.8.6.ebuild 1303 BLAKE2B 2c40484e29ab7a72beff3861fa6ab65716d4699de5dad11d3502ab85a1aec89161804baf427a711a1a650c4e789236811cc032d253b6478d304b7b331c2a82f1 SHA512 921ec7cb34858a17d79d8bf5ff9dc34c5fea372e9f8dd3d2ef4be6136c57d9a26f2b36ad8c338bb640ad82ba8f06553715499c4bbd8fd9d1c61fa083ab8de66b
-EBUILD rspec-expectations-3.9.4.ebuild 1298 BLAKE2B b67e5a7e85f3a3d9759cc0ed4f4b6fd2f1e3dc0becb4695b4fe3d00ddab123189af4eedf48e47fe663105405ac70f1c894b6af1c3173bb2b67527e0382f4827a SHA512 3995eaa471a31f5f8ea58c10cad1de3be44b86a9d925c8f31252e1c68aea431548e8cb7ee64bc54d5b895b84b3c46b3b67149a37890b71b764a90047c4e419c4
+EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 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 de9d0481b977..1e6a4c2af165 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 ~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 ~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.8.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
index 5ac4ce629b00..1177b5849e92 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 ~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 ~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
index 81a67810bd64..a075d100db38 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.9.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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 373a52b8811a..466ad141502d 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -5,11 +5,11 @@ DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c51710471
 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 1509 BLAKE2B e3ccde747f2f4332247f8bb49e0d0acbea5372e1bbc06dba73d51080269d8935c1b9f2f6a74810e9f2ae6277ca67f8b21c149b22f917455136a98e4d904f21ca SHA512 acfc0df5921458ae89d8168902180273f1bf060196ffeb6d4e345ea2e85d3b2b4d865cbd646b4bfaed6898dd52668e2c6ad699a129f99d84852ea3ff76b20a0c
+EBUILD rspec-mocks-2.99.2.ebuild 1510 BLAKE2B 73e9ab4e1931b72fc900af16ca022a6ce1b2c053e32904b5b07f4023e3347c3e9974e6e834c0688b3feefae0720bad1000526b2702779ab19f4aeaae468b9052 SHA512 057e150cdbe87559c945285ba98ab615fbd900e538b48aeeb73847563cdf9e0b05fe287cbcbb0ed687c644df5cd085c68d078ac02b2182f998392fef04ccd56b
 EBUILD rspec-mocks-3.10.0.ebuild 1435 BLAKE2B 6cff4a15f91e0f6b0e52f15a2b55afba66a4b85672e517bb3fa30ff4c282c7204be194b8bb73a879b0fb70088c11659ac60344d3826fcfd54b94bc20ac302595 SHA512 09b34aed37d5bbd8080a51d69e6f6101e529d28cf1ee4079e768779ff31a25bdaf102f6c5db0bba65f6484eb8d4a04f6a4082d791cd8c509f7f557183cc865d2
 EBUILD rspec-mocks-3.10.1.ebuild 1435 BLAKE2B 6cff4a15f91e0f6b0e52f15a2b55afba66a4b85672e517bb3fa30ff4c282c7204be194b8bb73a879b0fb70088c11659ac60344d3826fcfd54b94bc20ac302595 SHA512 09b34aed37d5bbd8080a51d69e6f6101e529d28cf1ee4079e768779ff31a25bdaf102f6c5db0bba65f6484eb8d4a04f6a4082d791cd8c509f7f557183cc865d2
 EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B 8f4293beb74f1833b97708277f276cffc18b8e465837a7140dc52647ead51dba228a95bb31130e09aae59e0d8efd779f702121456c8ee0c4575fd9c7d1c65e79 SHA512 69b9eb07f49f2ccc576447d3dc608d11bf3d679aaaf2a94ac16bf4857a63214b03105d64ca2f9ddbd7ef78af50b6171a43ec4d457b1c6715abb3a88241e96f9d
-EBUILD rspec-mocks-3.8.1.ebuild 1323 BLAKE2B 3c0e52c22d6ebcb1cec7568c4e1acdf5511a027bafcc6108e92f83984ac84e8092344244be5348a0d0382ef73bad67288b00cf4ece92cc2bd3ee44be0ea5a8dd SHA512 b4972655e538067025c8cf6e2bc2066802585e8d6d7e1d2f0f8843ea6ef3c4dc19f1a600e75eda51fb872f32c6d119605e4518cae098df66873194c58ac65b88
+EBUILD rspec-mocks-3.8.1.ebuild 1324 BLAKE2B 782f86b9db23490be405e24bc559a23955b21d90d19c19991fe69e94f9912cc435604c3ee23ab39f3ce4aec7429b43c5360edc0b3c36d76c9bae3d8faa728a38 SHA512 5580f5837b0341cc07087cb6e693e5a97b1c9bce0f4d478c4c17c934c77826ed203f904d6b594bd3092defd67dd159cddbdd24fef6edaca78ce2a054a00b43f4
 EBUILD rspec-mocks-3.8.2.ebuild 1366 BLAKE2B 0cdc605e786cb06766d8669b464c426b216aeda9b68bbc5a7c998c6169206ba0a07bffba618f690e251e54ea0bf2f5cf844d321f21b7f7f598143a22c5bcf733 SHA512 21422cb8a959b03728f4d609e8c82324806a530f1d53baaea9f0bd23936142930e92535c2e30714e43201f9efb286a87a17a2570f8996352808ba12aa9dad5b1
-EBUILD rspec-mocks-3.9.1.ebuild 1437 BLAKE2B 9b0badce18b65f61422d133558f1312c87ac1a5726ee9aec6aa475f2a12992bad6629f6d96c573422e5cfb74048552ab24446e4d5ea9feda2a1ca4cac3b3b4c7 SHA512 25e0046120696589f8c7a6c16d70754fda5e547ded448bfab95c465949f74bb6571e98161c4bcda5083426f796726585a5770f8d1f0c624020b3b04f0a2714d1
+EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 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 c426fb6338be..13c8935cccb4 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
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 983af7e1811a..1348e1d322c7 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
index 4133a012de97..cbb2f5de921f 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.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 ~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 ~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 28bb125b6a25..9ae6a6db5fc7 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -7,7 +7,7 @@ DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b
 EBUILD rspec-support-3.10.0.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 EBUILD rspec-support-3.10.1.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 EBUILD rspec-support-3.10.2.ebuild 1765 BLAKE2B d1c34dba172b33add7e0ca49281935f11799c3ca934cb3779254fb5e046949636ca749183fe3fb40b1a5722f05ccd97175d60a489dbed5aac56c5521ebca5fad SHA512 840ae6fa8efbbb568f20b067b6dedfa3475a6c0e30f551d6a633cde08bbfe8b3a49eda356511e387ad2c95a3123e822092addd457894c30e9c977d24fb60453f
-EBUILD rspec-support-3.8.2.ebuild 1562 BLAKE2B f937ddd8e24d2c6207b1c4e96871d64d3c638c609364eb39f652f5036661f860d7c5038998ca6c6d9bea292d93c917aac4af099ab3519ac0d437580ab9a1fe77 SHA512 c53557a26f755767ce56ce3c041370845a282a3440b82e242e06c444ad971b3f7d6b21a4f3e7335f05e7fd44242e7289e4600a10c0c51d495b81f4fc4f48a468
+EBUILD rspec-support-3.8.2.ebuild 1563 BLAKE2B d388a0d0d0cd4fe9f6b0e1091fa8ad236ba4d23db94b803a70f0f6975c81526471a5a9bbbaff630cfa74e8e95aa288fdacd9d394b582120ada677dd3a5d54bd5 SHA512 34fba145dbc3e3087edf5cee218846718495b466e4eae087c471606055d7838fb0da7e2188f7b4012fa2cac6df340a606ebcb58b4131f2c62054adae4fd41b21
 EBUILD rspec-support-3.8.3.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
-EBUILD rspec-support-3.9.4.ebuild 1753 BLAKE2B 40d22feea1413517a4dfa8f369fa781fcb3c7f4bed474bb5465a5152daaee115cb5f82cd70d93e846e82875ccd5ec2a43b2bf110f2fec5fa2274893c29bbbecd SHA512 0281625a628c6904b0d927af2a47a51ef9995c34c703cb1c6570723d59f721000098883f2fc02199d9a2977cf9784fc1bfb64a8c1b11c9e0f46e0c8684869a1e
+EBUILD rspec-support-3.9.4.ebuild 1751 BLAKE2B a68477e2a7e7deb6af3b4d4ff1a31cb3810b1e545ccdb309f73b9665527f14952caf2471b4f04da4174da930c25da66a348c804c80b214ce0a889f93d87fdc54 SHA512 ef906eb462681dfc4d95458228a9f796af4ccf59cba157392492601382a4eefe629bccee1f7d6359c877c159de40e31ca604395973f08cf700843b7604ae15b2
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
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 f23b0bb0f0b0..65f0b8ad83e6 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 ~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 ~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
index cd3f49a31ce2..0bcf347fe79f 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~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 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 971cd3e9714c..7cd54d8a195a 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -2,8 +2,8 @@ DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a67039988854
 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 773 BLAKE2B 067f26e5ef22454ff96e5aadae27b4d9598a391de7b6227de5e975457358c0a6b964f6c522458c276591509944a2ae0c1eef92518cc4d34d2117669ada3563f6 SHA512 dd33f7beddab9f948e906c719ef30c893724a0b39abd7a9fe89c1679104ec18985e6fba0213a12b1f3b3e4023969ab0c9d19c8712fb74aaa1be0d7f57003e45d
+EBUILD rspec-2.99.0.ebuild 774 BLAKE2B 7063d9c2312d4609dee333c73b6c4f60f7762d27efc93cfc18f305aae582e55144635a6c7bd0178a4a86d02010cd932552c3fb801df1c31af46ea542c5d5de98 SHA512 481067515fd46d721fb2de15150e34b5d1652fd725e9af505a1ec3b074c100cdb5bc0996d305c9fa010dabbac2545c2980ad748cce101bd92aa56bf561fce104
 EBUILD rspec-3.10.0.ebuild 623 BLAKE2B 0bf5bc7f10109a4a7064b19c9869cf77624718589f3bccd7cdbd044a2ad53fd38f47e1a03931693d8fed36a7d6b4025e9dffd74aae08115aacfd4cb527080e5a SHA512 3bc176a32152dfe7da29d4c061f25eb7b9d6e67566b8c24b922625d27075ea5910d1c978bfdcfda6b4c5c974877dbd4617a0aeb9611c771b43f627e6d121fbb3
-EBUILD rspec-3.8.0.ebuild 650 BLAKE2B a3c4d42393d1c8f4f62bb17f49db1ac7fe98a0752d91c08cffb9ea9e83607aa9ee079878695eac1f44f21db2e4337d4885da4dcb74ae8012960d164a9b7696a7 SHA512 773c29d24dba5e15c6a714e10b2bf99940f1b1385b63752c1945f1c4e64373add6cd0dddcfde84228d531ede9bb15594b10d99837ecbf4e13ece70f8182d0f3a
-EBUILD rspec-3.9.0.ebuild 618 BLAKE2B c3df784dd8af1f1e830a71e3cbb10281a414a4ec6d3eb959ec781612e34e0de3c52167252203ed4dc90b9f31f8d6b661ce1bc3066187c9df8313a017e0d6aa7b SHA512 49b2a776524fab4f35bf68c562f20858b93edbd57c6e8a2283578cf3ce92f6be45652bbc6495b08ca28ec11616ccf716edb595a5ded55eef45380eff93840864
+EBUILD rspec-3.8.0.ebuild 651 BLAKE2B 56a500ff238798ffee835648b4406712e3a750565e6dbd483aea8d35ae943995804027fbe54f15fe63c2b6ca2ca787a40000ff84de1e4373498d72aa801ca0e0 SHA512 f19426693fb2caf540c55c11e6f27f9dd4924291fa735192f526a5e5e82a38a1e29222086284edefb6e510bf075a7729dd853e8d197599a1d03b243a0913be15
+EBUILD rspec-3.9.0.ebuild 616 BLAKE2B 5ee7420b2f39d491dd42555ffd63047cbfb40d598b39912210b37a09bc0e7f7ba633a2e4f3d53ebdc3e6658bd1fc869cdb08cb85b033bb8d18fb4814439924fc SHA512 6654d32e2f13da07e83513131653defd0717f63563c30e631e68bbb5d2ddb5dc00649b19002d94dfd5071a6af56c0234f595f4b53705929ea61e936cb615c8b0
 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 c26736c20d34..c2425910bce2 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
index 74edd01d143f..6ec99af3d2f6 100644
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/rspec/rspec-3.9.0.ebuild b/dev-ruby/rspec/rspec-3.9.0.ebuild
index bb72423d97f7..524c08e7e727 100644
--- a/dev-ruby/rspec/rspec-3.9.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.9.0.ebuild
@@ -15,7 +15,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-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
deleted file mode 100644
index e0a935bf65ad..000000000000
--- a/dev-ruby/ruby-oci8/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ruby-oci8-2.2.7.gem 337408 BLAKE2B e5f9d620e7df2b64643981614a3df877fd2bb9c5047e16d5aec6885259190faa437687c440c226a03bb70d4ca0a14155da4d64b442e9a532234b9cf047f7455c SHA512 03ecd7d0b94a8a8d164afec0f71c862c10d57d6d227b971384678a39e40bbf7dc14e7267c9133f3ec466fcaa5da46d78c6804d34187790cc8c23289ab9093fcd
-DIST ruby-oci8-2.2.8.gem 338432 BLAKE2B e1db0c29ba71fff190b94c5946bc5025d4809ad92e154ddc5de2c2e1a4ccf856e81e33589ed17e303fe8708cd9f47e131e803bb534981da496f9f5820d895d0d SHA512 4184a7899384a6dd6ce9f152371015aeb1d6f09c37c48a368a1919168ddf0eb340bc8d576abdc1f804c2c776685ca9afc660104e35e2666d7c59cc16fd2c84f7
-EBUILD ruby-oci8-2.2.7.ebuild 887 BLAKE2B 61222901f8d00c13f9bb50246eb9f98e3ba1444dd737d0418a8c3858e06e5e38ab2e39557e31d8feb82a6719b713b20db2f16625a0c10e1f6811ce1fcb1c7d01 SHA512 6a99ea3783c1116a8d8d3943026037fa016f3137831f58d2c6264375bf84d73d01cf19aff0df5776980fc39e7df01dc35b3ba8aebc33d8190cd5c7f37786970e
-EBUILD ruby-oci8-2.2.8.ebuild 864 BLAKE2B 289fff9bc904390015aa8eb34ca90b2aa55265eaafdde81a29325a33163d80c7e9286c2af67ad186342c422764fb91914a747dbe8cb4c492ed0dc7f51695e36c SHA512 d1b70fec1611e6d70160370ca123b0e23079873edd60f108d337c385c7e0a9b37353dac472c83f6900d9407349b10729fa504f8fb6ba51a723af9bc9d23050f5
-MISC metadata.xml 327 BLAKE2B 9811e410dd7d02afbede5ab77c86fb63b0dcb4a59823eb18d935b4364ccbdd6bf186d9aa49e4511aed401f046f6dfc4f5a2201e4f6298347808414fbc7588678 SHA512 ea4202f5b49bef7ed75fd0651d26dd63cafb09bb4ee58dd0571725f5c80e9ab545158dcf7daf6c0014d0cc1c4502daad52078183fb4921c0a03c0f6efe3eb838
diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml
deleted file mode 100644
index 1b76a1139e85..000000000000
--- a/dev-ruby/ruby-oci8/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="rubygems">ruby-oci8</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild
deleted file mode 100644
index 4e29e5166b57..000000000000
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild
+++ /dev/null
@@ -1,40 +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"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-DESCRIPTION="A Ruby library for Oracle OCI8"
-HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-db/oracle-instantclient-basic"
-DEPEND+=" dev-db/oracle-instantclient-basic"
-
-EXT_DIR="ext/oci8"
-
-each_ruby_configure() {
-	# configure the native libraries
-	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
-}
-
-each_ruby_compile() {
-	# compile the native libraries
-	emake -C ${EXT_DIR} V=1
-}
-
-each_ruby_install() {
-	# install the native libraries
-	emake -C ${EXT_DIR} install DESTDIR="${D}"
-	# install the gem files
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.8.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.8.ebuild
deleted file mode 100644
index 0eb354ca1b47..000000000000
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.8.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"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
-
-DESCRIPTION="A Ruby library for Oracle OCI8"
-HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-db/oracle-instantclient-basic"
-DEPEND+=" dev-db/oracle-instantclient-basic"
-
-EXT_DIR="ext/oci8"
-
-each_ruby_configure() {
-	# configure the native libraries
-	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
-}
-
-each_ruby_compile() {
-	# compile the native libraries
-	emake -C ${EXT_DIR} V=1
-}
-
-each_ruby_install() {
-	# install the native libraries
-	emake -C ${EXT_DIR} install DESTDIR="${D}"
-	# install the gem files
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index 54ba33a58e35..3a8d3eae3f73 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -2,6 +2,6 @@ DIST ruby-prof-0.18.0.tgz 93925 BLAKE2B f7e0825e5291fdab017035b2a71029407d2b0116
 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
+EBUILD ruby-prof-1.4.1.ebuild 1314 BLAKE2B 1419b093586c754b90b5b7178c7095a24107def55933ba924ac722f5a53c183cd0381fe8e996ec947fbdca027cf5a626804aa22a8127d7713d9915a9f66ba533 SHA512 3415902005abf753ddcef077af7c654a9d455eb9f39eb7e80b298007ea9f705d0f3f24ffb435a2984f1b34ccb311513d002776cc95cb26a77a611ecab2c50764
+EBUILD ruby-prof-1.4.2.ebuild 1336 BLAKE2B 244a6ec8cf01fd2726f6c7b5d6f0bbf379b63aae51b576bee68d7bfaf753bbb2070425c5640550f4be27041207305be0a544efbedb90b7bb7b194dae21daa77c SHA512 4367d812a86f884fb2822d1f140746b8773f67cc7ba8f4863edd605a9ec90d454e1849074f36fd09fc8484d90beff228785c9a04670d2784e15dc41abb9114b5
 MISC metadata.xml 345 BLAKE2B abf08843e05ea5a260b8d3b1de88259aa5b593ef0be34c9066cc9f53aec48f13e962ee77224e28b7253f45850af20222d672578f57111bbca2d250458515c26d SHA512 e1647ce0131d640e8de67cdaf4bedd36d5cf3cc1d251e08b3f36a7c82bf356f80a3911984adbe14d25250b2f5c3333a988b5baed8978adea0b68594d985f22ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild
index 49024f019914..0a16a9c15184 100644
--- a/dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild
+++ b/dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,7 +45,7 @@ each_ruby_configure() {
 }
 
 each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof || die "build failed"
+	emake V=1 -Cext/ruby_prof
 
 	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
 }
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
index 46325890cca0..716e4bf8ce7a 100644
--- a/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
+++ b/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,7 +45,7 @@ each_ruby_configure() {
 }
 
 each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof || die "build failed"
+	emake V=1 -Cext/ruby_prof
 
 	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
 }
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index de2397e31a1d..2fc4c5c0fcbd 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-sdl-2.1.2.tar.gz 178105 BLAKE2B 84870279edcf2616159861267ffc8666b482786f43a30c8729cd4c59f25219956648270452bf38b72115e05235786ec8c0f0e7913469cc8573d9eda813d25726 SHA512 1ddae367fb4145cc8142edbf3c61acaf56604054f710ac37cadb8d04f93db24fc3595c1bc8e0fb5f330aabc815884f31b5f2a39c0108026fca442fc0b3bc2807
-EBUILD ruby-sdl-2.1.2-r2.ebuild 1911 BLAKE2B fd537922fe54915e97a2c7788f30a6a98488b08d834b9eba45a996b5daaa3de6f4f69df30e4ec52fdd877ea137aaa502e89807fd16261ed54913212ef2a7b295 SHA512 296dbdf0f1692413e82a14332efdd25324702d41367f8c1f5776ccfdabd120eee055e3e13605779b6ae41f14f4d9cefa8d1a7ce33568f590c5b5fa2872dea0a5
+EBUILD ruby-sdl-2.1.2-r2.ebuild 1904 BLAKE2B 087a42255287aac196d9f9bbf57afd667bb1fed656f0c448ab2c45987f749bc7840d786560a8cc0b90ddc57c70c943541ebdbdb0df54d5ad9b8205938452ea8e SHA512 68e3aae400697b6cb2f6d3b52c19bf6eb0a93db5d0ac1aca6d30b937b001392a3746bf24fcfec904c1af70da828411e9db98cc75c977d0eeeb06a7f72559d2f6
 EBUILD ruby-sdl-2.1.2-r3.ebuild 1924 BLAKE2B 7257ed13367eaa07529ac04d6e5a883d71914624c735d1ce77568b2c777a98e8e8a4be2e5a317286196c1c2c541bea52cbde9f84c413142505110738708a9b3e SHA512 e783ec468ce3c60e72bd24c516339c6b477d84518eef3cba88ac66282029f7907cfe3b85e6e222b286b36bc27acecf039fbc3fa4f306515a65c01afdacf304ce
 MISC metadata.xml 560 BLAKE2B 44c2c964436b58f2f3d088cc598db576b71e5f42a490e1ae616400686addaf188c82b0f5a4dfab56a61712d5858720007fb31df3f6b71d0e37e5b617dde67984 SHA512 a9eaf9e6a1cf02821fec770e3499796993aebfdf0a7f251773a12950cd42770beb1d5bbc34fad694e74522eeeea619cd659509c31f914f4ddd257a9ce1c17fbb
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild
index 59c0ee86f366..cb9e8e2db868 100644
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild
+++ b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
-inherit eutils ruby-ng
+inherit ruby-ng
 
 RELEASE="rel-${PV//./-}"
 RUBY_S="rubysdl-${RELEASE}"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 4a84fd879ffb..10bcc1dbc844 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -15,7 +15,7 @@ DIST rubygems-3.2.13.tgz 987809 BLAKE2B 20243f6b81592d62f033ec96485f8b6af6693c28
 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
 DIST rubygems-3.2.6.tgz 984320 BLAKE2B 846202460722a9212df0958fca9bc8df9e3b0fb9aec3fbd0887f166ee5d25226d5325918ada816b5b166544e654d501a8db80ca2d9d7f1de42decddfb39f13d6 SHA512 b9303994bc2ef8a4e66f14f745f8ae493ee2725737cea6caf557f8943ac165a4934c865542c7080bf2d7b0c0be441d4e818ee8d42fdd9ae4419540943ed695ec
 DIST rubygems-3.2.7.tgz 985071 BLAKE2B f8075429c42a53b648ddd11128c91789b214f04f048261fbb071c0ee1250241a06c0dc2ab4e608f2282a0fc9690a35df371c02f5d7f0b6397a631e4a2af36b2e SHA512 b01c9d78ac172981650aa94e26d9b07fb97e63a2d1cfbcb55462d6333c45ce16635491dcfa95a177ead429f22a5ec450ab049a7024e14e20466f5f60cf4c53b7
-EBUILD rubygems-2.7.10.ebuild 4512 BLAKE2B bce66fda261d27daa57b853de1b1605003c6557de15e3471ae9d426f16990da292e19cd48f0dc29bc09c2652adf521b93fa6a059dd1a6967fac692bde4d084d2 SHA512 9cf064646d60eee8037ffde0a059af6d408cfec13cde5715f8f172012e3f9c402a46139781f7e99c18a80d1fc9f81fd7519b3f7c19bbade22adf7c277b11b949
+EBUILD rubygems-2.7.10.ebuild 4513 BLAKE2B 324e63a6f09a1b3deed3b0911fb4838ca7369f26750da327548bbda070877deea4f4428f22fddf524480c21dd1eaca29c6f8d3cf392c5fd87a5608d59dad1115 SHA512 e9a51c8772490a9bced46b0279fdb7b35d1204297e4fcdab700414495fbb0ebadb583dfc15e0c3a68a3a8897f72863c958e1476597b0707591c5371ae29b1560
 EBUILD rubygems-2.7.11.ebuild 4521 BLAKE2B 8b28842aed8ac1c6387fe52b2639b5afc42c70c9f2222d9567068f173140ffcc51534899e0e0d0ac132e6a1e395126838e0a7b82a17c8ff5c09829a2fc02a017 SHA512 e9dc2072951259dfe568eead50b32aa6bd28515e66926a18568f85d330b05d2d900399ac3a506254fbca9f4dea49064a5d517e4e4de9e7c60929477ffb953d42
 EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
 EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cacd5a0503d3ba946cb1f13b0f00f54a90adaf0d069c2550d510e912fa2619cbcbb6b1f65421075062270fc7bb367 SHA512 e2c67911e5a521cb630bdd071d0dadab5a775e965918cf73fa3f3f8cfabfaa81a64d2f189c063d72689d9f6a1453f61a95044c52d9f3f4e36d3b91f3e97225b0
diff --git a/dev-ruby/rubygems/rubygems-2.7.10.ebuild b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
index 8b1737eed5b0..26cd1d35aae7 100644
--- a/dev-ruby/rubygems/rubygems-2.7.10.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubyntlm/Manifest b/dev-ruby/rubyntlm/Manifest
index 8de9e7ab85e1..48bc7ee37794 100644
--- a/dev-ruby/rubyntlm/Manifest
+++ b/dev-ruby/rubyntlm/Manifest
@@ -1,5 +1,5 @@
 DIST rubyntlm-0.6.2.gem 32768 BLAKE2B 2459dc14c5eaa00c8728bafc0e30fbc1ad09a1fe012e4c6e428028f6232045ddd34fda1654e7b8ebcbc9349cbe24f6f6e44dc4af34c86e6b219e86d3a0caff88 SHA512 11c5a4affc47ac9c4207718856549e202946a0d75f40b508d9dbdde4f5792de0737e03342c653a0cb06f8ca91a260859cd386d6349c909c7ea99c31c77fd6bb3
 DIST rubyntlm-0.6.3.gem 32768 BLAKE2B f9e21068e684620e2e54c685132d034a805fefa4eb90261babac9d58e38167412e0257f0d9b018603772dbd6f152eb9478340d7a390174bc908d1ac8640fcff4 SHA512 7e50c1bf63477fead9189a5ade06db65a3fad04d82bccfbffb513517ab97766053c800af9551e027dedc3aee6fb35288c234d98b1a02815299bcbc463e0edd87
 EBUILD rubyntlm-0.6.2.ebuild 565 BLAKE2B a87d5d7872ab57cd4457618c341825963987025b7dec7a2dafe0a44ef6b8c1127c00cb064752ea02e661d06057e172b30923ed03e22d0a57644197bcb2ea724f SHA512 5a85c9dcb74d23870639537de6cbcb214dfa5746fa55fd019b4950ffbdd944dfa578b707bce706f38655b7811197c81144a0c8122a9a19a698580550d8f79836
-EBUILD rubyntlm-0.6.3.ebuild 527 BLAKE2B 27741a0cf2b3a9c483f1933d1096989d7a89ae9d339b89cba985f14b1a261191bea0fbf3da02c5d795e63ff8a9d528fc2828839b4334fc06ed2092718fe3d95f SHA512 fa1b37c231230ff0f24241ff311101d712a1f2c01685bbd786ef2b97afaa0ecc65b39c4954cf6d0c71366c756df0643daa1702096445c305625bea22a5e2a9e4
+EBUILD rubyntlm-0.6.3.ebuild 534 BLAKE2B 01051090a4f10c13e11981d987fcbe9c2663b97fbbdcfc80266dc09aaebb526732486f0710e983b4d1efbde3f3e47053d155231c17e42bc75b3116516c6168ad SHA512 7b5edb437f08d02b28c906af70911e58eb6894f799f285e2c4ae84580b87eb9367af7f5682274ebf983481c3362cdefa080a1b786f418d8f0946ab151a5859ad
 MISC metadata.xml 388 BLAKE2B af72c50e0888c7ead9ece64b81cb359606dd50326aeed54070cf3c4d0302d502a9e313222a696ee3e5db789ceae3953699e847b1988dfb95605a4d36e3086895 SHA512 d40f4a26779ef2675c242119cb67ccac72d00ed53d03148af75a983877091ea595f3c2c413c0f3c85701374705d83e2df647ad91131a20a255ec778638a8c678
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
index 2df81e4f0328..9c8cdc00eaf7 100644
--- a/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
+++ b/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/sdoc/Manifest b/dev-ruby/sdoc/Manifest
index efdf418ab91d..166f2bda59a2 100644
--- a/dev-ruby/sdoc/Manifest
+++ b/dev-ruby/sdoc/Manifest
@@ -1,5 +1,3 @@
-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 722 BLAKE2B b6adb1bf4b1d8ea985e404c3ccd873b3517662a3cc40d90d3765bb270f26accf28df7fcea7e3afce9bf595264812892be697e3d2948f48358f248e454dafa5e4 SHA512 30586fd60136889ab6028e722dd6883bc342c9c89c83b101d8b73734a9b4b317bf1cf585c3adecd48572a460a3df3b0e04ede61908cac2cb409ea348aec80efa
+EBUILD sdoc-1.1.0.ebuild 722 BLAKE2B 93c18545ae0e8c88909211338cf19984e917abedbe56eb509539b82b113177eff8f9607c745f4783e201da42c2284e70451c3ff3368c8627572f11ecebb6b649 SHA512 1cfa6de42438192190ce1faccd77205e1677aefe38579746aa428b9d6e54311246e01de7a64b62f14443a9de08a7bdf718bff755687d429b798e88449ccd7bc3
 MISC metadata.xml 430 BLAKE2B 0aef69f5cf64546a53d97f95bc931935c2e00a4dcec015467aebd1e100349c9808470b536583dd91ec53337202286c6b5837f0fe0571b0df732bab734d692a39 SHA512 abf1644b3da843261358135709a6f6895c34da54714a1d2e83fc6960e2228721e767b44c75e942af360242c9959619e7fd2323fbb96a46df2f652f6c9325d277
diff --git a/dev-ruby/sdoc/sdoc-1.0.0.ebuild b/dev-ruby/sdoc/sdoc-1.0.0.ebuild
deleted file mode 100644
index 7fca6821b724..000000000000
--- a/dev-ruby/sdoc/sdoc-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +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"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-DESCRIPTION="rdoc generator html with javascript search index"
-HOMEPAGE="https://rubygems.org/gems/sdoc"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/ s:^:#:' sdoc.gemspec || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/sdoc/sdoc-1.1.0.ebuild b/dev-ruby/sdoc/sdoc-1.1.0.ebuild
index 2eba8de69eea..d29c1cab8df9 100644
--- a/dev-ruby/sdoc/sdoc-1.1.0.ebuild
+++ b/dev-ruby/sdoc/sdoc-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
deleted file mode 100644
index e644c94bb1ed..000000000000
--- a/dev-ruby/session/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST session-3.2.0.gem 18432 BLAKE2B b50ff6f52dd0226cdfbe07ea434ac35fc19d695ab474d2c240ce3a6ab707da1d03db5006d68594de6a75ff356154a1ba5ab06fe17a766d3e4154fd11d3abe4b9 SHA512 57c0676fb4a4254e86dbe68e36309c8eb85515dd659de73a87e1ae2e8e5dc7f979192ef665135e75182c26e2a5c847d61daf855639772da7c66af888ed0dc91a
-EBUILD session-3.2.0.ebuild 1165 BLAKE2B 6e529b2f08c855d09a4437904062ae76383a55e6363c524d2509cd7b5829420586d705df5e4c24199aa5738af928214fde6f048ce8ef56c4ed76312af5920e87 SHA512 281f3f9953490a63b0fcb2f4858e579c83fcc7648ab87467fe3224a516ff8f47e4beed0c948eb14d5b2339687d12d45ac73f35155cf1edff756919c3a2da18cc
-MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
deleted file mode 100644
index 821e134141b9..000000000000
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A set of classes to drive external programs via pipe"
-HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
-#SRC_URI="http://codeforpeople.com/lib/ruby/session/${P}.tgz"
-
-# License info based on https://github.com/ahoward/session as indicated
-# by author.
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND+=" test? ( sys-apps/coreutils )"
-
-all_ruby_prepare() {
-	# needed to void a collision with the Timeout::Error alias in Ruby
-	# 1.8.7 at least.
-	sed -i -e 's:TimeoutError:SessionTimeoutError:' test/session.rb || die
-
-	# Fix broken test, bug 662514
-	sed -i -e '/cmd =/ s/sleep 0.1"/sleep 0.1";/' test/session.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc sample/*
-}
diff --git a/dev-ruby/shorturl/Manifest b/dev-ruby/shorturl/Manifest
deleted file mode 100644
index 5fe9263122b5..000000000000
--- a/dev-ruby/shorturl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shorturl-1.0.0.gem 10752 BLAKE2B 6d6605dded6584510abaf09168cdb2fbe7bfeac804b2da9e1c80a9a17fcfdd7d594948394838a8490e6d1c186fb166aeebc81ade40bf352db44073816dfc4625 SHA512 d2323107449a5a66065dc225fbec101a653cf4bc1c719f18e7e5d78c89aafc8c4863aace08ed2a007e33c72f6986ea56a0307e856fb4bbf4c213206155d22312
-EBUILD shorturl-1.0.0-r2.ebuild 885 BLAKE2B f5b933ad74e98569fdd0b3f1e9246db5f2b533004a8e984133deee1b8cbb5cafe70930f51dc7f7344268f4079f973756c9097ec5947c262c2b6ed48f72f7c4da SHA512 518858639f3b6bd7d923546cff483d9a18bff14b1722112f1d5989439a6f22b0d85ce31b6db377dbdb3052b7cb06eef7367747e4fcb2ac7087ac724e3be96cc9
-MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/shorturl/metadata.xml b/dev-ruby/shorturl/metadata.xml
deleted file mode 100644
index eb1e47f2edfb..000000000000
--- a/dev-ruby/shorturl/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/shorturl/shorturl-1.0.0-r2.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
deleted file mode 100644
index d6d67b4e529f..000000000000
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.txt README.rdoc TODO.rdoc"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A very simple library to use URL shortening services such as TinyURL or RubyURL"
-HOMEPAGE="https://github.com/robbyrussell/shorturl/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-# All tests require network connectivity.
-RESTRICT="test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/ts_all.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use doc; then
-		# If the doc build fails, the doc directory might not exist
-		pushd doc &>/dev/null || die "pushd doc failed"
-		dohtml -r .
-		popd &>/dev/null
-	fi
-}
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index 7953b602a518..b66fc931b877 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,6 +1,7 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
 EBUILD shoulda-2.11.3-r2.ebuild 874 BLAKE2B 2441a2b6a261de6de5fa10a17f92dd22bead3ffaf6b75204b6607821dfdfbff876dee36dcf40c89bffbfe84194ba5525698ef533856d433f0d1c17165b25fc1e SHA512 afe6e330b0e5deb1453e64891fc42243cd9f0285adf300f588d1936b4a991757190d9a03c4b02cb7b5fc5b914495689cf7c3061ffee7dec543b2e7d5670d4426
+EBUILD shoulda-2.11.3-r3.ebuild 841 BLAKE2B c41232118979ff733e191582e086a306a4d3608c44c2835dc44e296cad2e27ff748707618e944d027e998cdc8f8b86a57e610d92d6de4a0399da561b3b3a4ac1 SHA512 9223ba175f0874f868a64177f43005567f7a7616951899aeff02f60a0db8209d88e9a17e0c0ad35a1541d1c73ddef6860afde4518da8a9ded3328510d777cec6
 EBUILD shoulda-3.6.0-r1.ebuild 924 BLAKE2B b0e4344f4255760b5ce637eb53e58af37d08e772218c77fceaafcf4f81195467cc1733ff9380f36b86d2d900378d54da046f0e1196ae6237ea5ea6fee4901fee SHA512 1a14864d13555c3631653bbf87fb5d77195e8b7c7532c889ff916a0f187c05a28f2e35ad13ab3c794bf8005a42b96e7f900195ee001b59284698f26370e8f7b4
 EBUILD shoulda-3.6.0.ebuild 931 BLAKE2B 02504a8fbb249eb1899083362eec53048d6b1a994da86cb5cd215480c3c663277db56eb0e37db4b41c74f7729d1037675869c4e4756e4728027734bdcfafd6f2 SHA512 7e6bddcfaa0eb3228022d1025f133fd04f14040286108d6db25447f206fd1376ed713c2a5529550dc7bf785795d9d95a34cc8e47380d2fddd845df6c91198f89
 MISC metadata.xml 344 BLAKE2B 4f4a9e5d5bc1e6a6a10552ef0285ca16024cdd9bc838a25397b23de1f873a3ca87194d0912f8d0a0c24158d4f10fdb92fcecb15f246e96dc12a95e56604770fd SHA512 b4fa8d5ce8421c5541cdaf288da9a8589ea6f4682470b376921e987d5a5344352afc2f20edbdf1f54ac46fe658f46c4863ec4dc5dc8eebe1c3223a15c72f450d
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
new file mode 100644
index 000000000000..905694b9e654
--- /dev/null
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTION_GUIDELINES.rdoc README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC=shoulda.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="http://thoughtbot.com/projects/shoulda"
+SRC_URI="https://github.com/thoughtbot/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+RUBY_S="thoughtbot-${PN}-*"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# tests seem to be quite broken :( They require working version of
+# various rails versions. There appear to be unit and matcher tests but
+# they can't be run on their own.
+RESTRICT=test
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 67f2eb2d2c14..e3217c0f9349 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -3,6 +3,6 @@ DIST sqlite3-1.4.1.gem 70144 BLAKE2B 5a850296c804223cfe7673f72a1e303fb80c49569f2
 DIST sqlite3-1.4.2.gem 70656 BLAKE2B ef7fa7667fd080a6f175bcfbd1fe8dfba00d3fdf1214cc3d776f0576dc29386b627db8d6c0dd06f07ab65fff877a6803a6dcacefd4fbc5bb0f7d2149e355c88d SHA512 c4630dd2fa13914e2fcc70092c35568103f61f976958b439fe205abdfcff61702ca176d10bea40ff0cfea3169644cdb9146b7be94dff883cad3b753e84629545
 EBUILD sqlite3-1.3.13.ebuild 2372 BLAKE2B c969f8887e11fe903c30b8bf7e716650230f7a4774b6aab307daf92b5a5fb8ac526da0f945ab1fd0c53cd9fd7511b97be0d7d33b82ff4d458a8f3fff4af8e124 SHA512 5e4a39c994205f96ca75057dbf49107068c5dcf96e8d47d06e2e00c1b4347448372a7bcb164ad2be1a8a1d24277abd9e6fd505e67759cccc9b8a1c3a624f86b5
 EBUILD sqlite3-1.4.1.ebuild 2416 BLAKE2B 1f305a2aa53bbe7d3d893a533c8b885792246f19e96d701a8cc120665ee317ff410b5377e3a52ccda7889413f55460c112145571bff2c42009c19564412794d0 SHA512 7249cacead74dfccb257b55af218f68ebd776072476f97040d15af34a70011b2cfa0d3b15a1643b97833de59ebb79260f0b97bfae4ed29f3c6a7a5bc7dadb6c5
-EBUILD sqlite3-1.4.2-r1.ebuild 2325 BLAKE2B f065508573ac5456abecc06985d229bbc68ef3adcd26b8ac022b244d2d41b5fcbc1773b1f65335d54d93f237d91f6dcdcae90d5aa43a5ec15ddca4b0ea6f8c1f SHA512 9d7a4b39d0c36a5a9993b7515b4b1d23070ebe8090e7ce9909a01393e16d5a96b345fd0eae65494bd8243d34e50972e1459663509a7d6a3f6150d2cb16494744
+EBUILD sqlite3-1.4.2-r1.ebuild 2332 BLAKE2B 8e87a4aa8eb52b61597060d2ddff7158699b057a5791a3eba0f6b230e313ad10dfecaa34a7119ae9eaa5822ecc73cb6c197b4ab6b20f36b3bb1a643d54d7f97c SHA512 6b549d44fed018222e166ce8caf102a903a130ae4cb0e6082ee1dc57c2c8df61a22b68bce8b16f8bbe5382b2a25949a526bd8f4efb223e58ba5e65e1ae1cfdd5
 EBUILD sqlite3-1.4.2.ebuild 2423 BLAKE2B 151e031e16c6f8cb9efa0736e37046328f1e87d6e02935c396546ef5189b95192e0e743af7a6527c0b3c3cf95118e4c79af6790812e8695fcb15b64b086d1cce SHA512 2f66a0e104dc9200ee56fe40340e86da7d015f242ded48131173fd3a873b7bf73e702e00fed784b92cfba4a60f32c1d7eeba310cfcab080fe39484f7f65f1981
 MISC metadata.xml 342 BLAKE2B 1f46148873c3913fc0beee10dfd433f84a477f2f5ba8b7a8bc97e4cac6765d3c07829dabef7e697791cb42902184fbf034c5701a433717c1516c725c0b5b48e9 SHA512 3272f121743335cd749a606648660e8650664fec4f02aa6499c8f5ebcf0ff727de28619d800fc5cbda350f3076e81dfbd1993ec825cd4ca43163e160813b3f77
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
index 8eabff0df5b0..4733b3915fb6 100644
--- a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_DOC="faq"
 RUBY_FAKEGEM_DOCDIR="doc faq"
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index e82fd6a4939a..2038d4f1f3a8 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 879 BLAKE2B caf390279a34fc722c8807c8253d5265d2831786ee6c4eb7845c1285e54086d22e5f4b81d85dbb6c39cd6e7a04aeb17ce63d2f336268611fb334eebda6d0a9e6 SHA512 fce1d1328025e5c960e035d84544b0557c95f4e6c0006cbe93346b80f59058923e4f2eb55a668e0a1bc221ee684282ef3b963ed53d05bc2b5f09e43499c34210
+EBUILD syntax-1.2.2.ebuild 880 BLAKE2B 716824a9525010a52d3bd537731e61c2f461f56e4faf27afcc0061ca62e75011740d764b2c11179e3e69a8964d540933cb0db719de3e3c55f5d8e33eb0587555 SHA512 4c21845939ec72e85b642fbff9dca873b79644506008728af2af95deaf6f6c10a89d1442d1cc3b572467eed9075265c76d77e65a6e885db71f1ecbdf205cc94a
 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 b2ff8d8d6f9f..325db2885e28 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 1f3f75d31503..0e0f00c776f7 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -5,9 +5,11 @@ DIST test-unit-3.3.7.gem 121856 BLAKE2B 507c9c538e89156d620b229e0144258def17975d
 DIST test-unit-3.3.8.gem 121856 BLAKE2B f47ef205c566fc404d7ffb9380502ae18224c395f65e3ab663472ec4874d0e77b0cb13a5ba80525965ff340c3941168773d6ceca6891036a8ec57bfcaa4ffbd8 SHA512 fba6a7ab4c87c07950498a372a21f888d87f1e1b0e5b49deb97aab4e2815fb85b979aa8afc6e8a6c4a9ad648371f1d9de968958350d0ecab10dfdd2bc0a2c112
 DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
 DIST test-unit-3.4.0.gem 121856 BLAKE2B ff975888027ba6122146f074926074ad7eb94e7fd442ab3d9f5d4f2eba83695e7f7ff2d17bd4578fa81caed5971170d0d8d287d8c87426dca63bf7ace1c7a850 SHA512 b7fd84165c956975f758b09c13d6d8f3a613e5d72c381cc3ee7522b5c6e1ad2751d8709bf1d45169823260769909ddaad487f51cdf68312b1e29c1d861f8107f
-EBUILD test-unit-3.3.3.ebuild 903 BLAKE2B d9ef0634df035eeeb4c6c7f9d8270c1eb17273ec48df197ca8d19c7199200596c76795cb7cc9981bf7ae95e639be3f13dd7c452a6213eca515ca75f1ca0d1458 SHA512 e62f58e28b139f207004db0013cf135e6eee866c98be949278dea9cf749a5f381f9729318bfb52c6d8bb756153e72d20956a200a91b0265bd172133a6051362e
+DIST test-unit-3.4.1.gem 122368 BLAKE2B cb1677c83d11c0edbb6ad2eedda63f777832993d262ad0b1b5022fcc049d82d8eaf9284bad22f9a49f3d43febed6f72291eeb30d8844f3ef4703f93b9f556f7d SHA512 08c5877cf6ae80e6ef5de7c806dac74405329cd08a97431d174b756ad173e727a536fe315a624c5e1d5b071d5b887cb4b8498675f5f54073bdffe9d5ec4eb745
+EBUILD test-unit-3.3.3.ebuild 904 BLAKE2B 7c4251d9e4113cc1a3f90eca98cea78f8f288d107a4e6e37c567cf614fd8e21f8f20d46bde4332aa48ba33d0c401ebeeb154cda9ee657ca2ec5de9f2f9daa81b SHA512 ccb513f456f01217a88927a8532c4f0d8bf9630dabed5b0321b4b3d068902cc756dee598d5cdcb1823ee508a2a4d2e2eee028725a74b833de87ec98038f08c16
 EBUILD test-unit-3.3.7.ebuild 874 BLAKE2B 15fee01d1015bae7196d2e0d022520337845b4f4f6fa001ed5bb7cc2ac2c74f5c187447f0ecea8bc139f8a020f9605bbd28cf80f0d6970eae7dbfd982de6df15 SHA512 272febdcb0cf394379e5b7062ea7bc24a51933574a18a47f1c83d9bbcf7c1d9438a5f47a61f3e7c87baa4dc7eb6364e1ec49b0da322b5be348110ff2010eec37
 EBUILD test-unit-3.3.8.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.3.9.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.0.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
+EBUILD test-unit-3.4.1.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.3.3.ebuild b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
index bc1ea80fd21c..6518be294874 100644
--- a/dev-ruby/test-unit/test-unit-3.3.3.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.4.1.ebuild b/dev-ruby/test-unit/test-unit-3.4.1.ebuild
new file mode 100644
index 000000000000..805bffe784ad
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+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 ~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/thread_order/Manifest b/dev-ruby/thread_order/Manifest
index 01c6e71e860e..29b5ddf3b7dd 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 804 BLAKE2B 0990c221906a1a4f0d53c2ba8b0f95353ae29cc4585d22e7c621f9060da06ac50120adcceee7617e9ea2e346409e96bf3a23fddce7b0592699f935106f54244d SHA512 7888c315aa0ec1a94012f0b6b389444593988ff3069cb50981ae53b76a0437b8493a5bdbe20be58406c5b88f134b4ea3afcd7c9d8ce769c6ffcacd0819e70a60
+EBUILD thread_order-1.1.1.ebuild 805 BLAKE2B cc8342667d97eb72ed6388b691f5323a7608022243c2813bc7817192b9a78fa9b03a40e823ee6fc91d438c9c85b84b49d627fd4b5ee10fed8b32c4f83f5aad04 SHA512 e193cf0f7e4174945280d15c28aecb300c3b972d285f98b664628739f538d0ca7d3a91532de0c6f162449cab18e985771c35a726b6eabc9d659a8190302496c5
 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 1bc90a94a353..41508f0eef59 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index 798ed5ec3567..b985a1323c91 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,3 +1,4 @@
 DIST thread_safe-0.3.6.gem 120832 BLAKE2B 0e3a1aec1d34119dc1f673acdc3d2e18b8c5f970bf79726e4729a806a52ce6ab265fd713972065011e8a04cf2776dda871d3d747eec77b0e94235de776d0cb2d SHA512 a11808576392c068e1cb31faad706be2b1bbfa4837c655c2ab1d5a235b62b25ece62065de6b65bd25496fa827ed89eb0796b90467107df255825e01316ff1805
+EBUILD thread_safe-0.3.6-r1.ebuild 1046 BLAKE2B 587ee5eeccdf6a790cbf6d45e291226cd6a787f5c701a0325ae0860a16070affae808bf87c3185912c18385ea92eb8a1be4af2da761413c2b70a74599320f5b8 SHA512 efb3786a55e7b3a1bd2d7026ed4ee7bf17935a05f7e402922e97ed7be0cb1dd3e89cac197e6d1139f260d0b2e206fc80e680e76c3db36d1806ff31d6ee4c6e85
 EBUILD thread_safe-0.3.6.ebuild 1072 BLAKE2B c7410102cbf480e9b7d825349d0ffef547cd1d5c41e5fe8bde4441f33597826b66b605c47a9897d00204d8cc05f9b410370d02ed5287e945f9cf3bcfe18ecc8a SHA512 9458fb5986557b5989f0406dd107039730d555b84bd975f2596209b3bbaa865da1ca98b0d4a915fa3d72b5135ba462b76a46112e67ec2950bb1ac33e67c86fa6
 MISC metadata.xml 354 BLAKE2B 00b77e62b42483c496a99390ca3e024b0d26e0a3f40275299401aa9f587e8bd3e5495522ab91a00c5a785f61759493ca0bcaf7f2a7ea71adb1c7790e669e7e4a SHA512 07164e076aa4dd3def9a69d2690b5044359562184040f63a2f09476771eddcd77d2723179c91173f877b99a23c9e24d2b6e959482ae83458c4d71cd099c1ab01
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..180c2937a11e
--- /dev/null
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A collection of thread-safe versions of common core Ruby classes"
+HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Higher atomic dependency since earlier versions crash on ruby20 while
+# running thread_safe tests.
+ruby_add_bdepend "test? ( >=dev-ruby/atomic-1.1.16 )"
+
+each_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	einfo "The test suite may take up to 10 minutes to run without apparent feedback"
+	each_fakegem_test
+}
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index 911326519090..a31f67fc9100 100644
--- a/dev-ruby/tty-color/Manifest
+++ b/dev-ruby/tty-color/Manifest
@@ -3,5 +3,5 @@ DIST tty-color-0.5.2.tar.gz 11437 BLAKE2B a123a46f855a3c5b2c56b658ba9dd1987ce2e7
 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
+EBUILD tty-color-0.6.0.ebuild 694 BLAKE2B 56dd912bb9820cc383d9277b73421c7ec2eead1a0fad62aed08e67afad6da1763a61ccc317880ed60e1e262aa3d5a157aa057644902d1a8fd26003a1594a8d17 SHA512 889f228d62c0030ad3388e95f4f5ab34d9cfcf3cdb84872df961aeba780f1d7c1a643a25d5d90cf1436f3a132bf18b4416af1e78d5911a37012529dcb028bd22
 MISC metadata.xml 337 BLAKE2B 0da0633a903a0e58597b8d73bb5ea564c6dc581191dcfd1311801e8e2c7cf399c6520095ac034a4d93b7938f57abaf098304a444d274432bd0ea1d497bd21003 SHA512 95fb8fed44f8a1ee5d26cd7fe2ab1f7117208a736b45e0d10e3d06f4b1174729ef3733efe2fc455fc398f17605c84c6cd050805578255073b2a1b64b483c082b
diff --git a/dev-ruby/tty-color/tty-color-0.6.0.ebuild b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
index 26f62942b75c..fe1f7aeef14c 100644
--- a/dev-ruby/tty-color/tty-color-0.6.0.ebuild
+++ b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-cursor/Manifest b/dev-ruby/tty-cursor/Manifest
index b14bc838883b..4dccc228874e 100644
--- a/dev-ruby/tty-cursor/Manifest
+++ b/dev-ruby/tty-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST tty-cursor-0.7.1.tar.gz 11015 BLAKE2B 222602d7dd3ef2372555913dc59bdd4b4965ac5c3601268d0f77060835d4ae9bc9fa23d54f811e7c0a453b80786d4ef07e0bd26cc8d76f6b963787a04b17569b SHA512 7c1f664bfb3c8c46aab08cb3806b8a00d92b45195fae47e851967f88040cc64d598bdd80e37f782be83fa60dff82c607d93026ffbf003125fea8230f4e18639e
-EBUILD tty-cursor-0.7.1.ebuild 739 BLAKE2B d7b8b1f028a8cc742b8fa5039e757c6ae3bf6f8e1b475b84d4540c85547748a4f3677066df53663bd869c3879529e5e46f0c643a977ff40048cdd76d19bb3fbc SHA512 03f5817f4e0c00ee5379a616b6e074224926f6eaf51326454e7123b187b0bf56866664527eb034abbfdedd5fc22ec581d74d62533bef43df86ed0621f5c87f3c
+EBUILD tty-cursor-0.7.1.ebuild 739 BLAKE2B c672f8a771c5538263ae1613e022d5a9dde10cee5cb8fe02d093c961536464805103246b064251b2faa8ea376f078a386c98c664a0bdccde24cbdb412a43da17 SHA512 ce4c9c922c5c066c343530b94cf0053640b48bee1d07308c62db9ee86f90c88058392400ec55c4b2ab92dbf353892c35d65c5d4b71cfa4b70f86742f26b7df9f
 MISC metadata.xml 338 BLAKE2B bdac6bb02b0cae81856493016a56c9c3b3b0debe5ac10b6f6756d90efdfd417561daad174c3c5efbfc779a37953b2dd94f79b8e0205fd07b8a4ea78e713a92cd SHA512 ca2c7a398c08e9c8488f280a3fcb603bdc5ae678da282e7c194f958c3691272fcf07d0473b61e8bb4757cdc5f3825a9b12f061a02c96f24ccecc21abb5f8e9fc
diff --git a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
index db36fec431af..ff798696483e 100644
--- a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
+++ b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index 5a47b07cfc10..7ee37483b429 100644
--- a/dev-ruby/tty-prompt/Manifest
+++ b/dev-ruby/tty-prompt/Manifest
@@ -2,8 +2,10 @@ DIST tty-prompt-0.20.0.gem 72704 BLAKE2B c3a24544459bfd70aa1ada029211d8873665794
 DIST tty-prompt-0.21.0.tar.gz 72679 BLAKE2B 1693a2ad49d308975c0f03d9bbf01a192bc6e5c66eb04108a08a7d338c79d20ac80e8b45b0833f57b6a4f5191880160a8df0a9b9751c3af1f3d77b4952c99393 SHA512 e2963951523f9077a6aac20d12b88d261902c1f6ab1ab01bafd9eef94df76e37fd1448d5b5f81a3a8d2335eade4618896a64c77e80e369b3a660bc8d361cb53d
 DIST tty-prompt-0.22.0.tar.gz 551572 BLAKE2B b18e3acba984c6848161deff659112ee2342d4021c0fa8df1aed1f19d4530382b4c2d4e215b42820be9939a8a563333c163217ac59809b3e9b1e4d68068647eb SHA512 2bc87d41c9359da1bb04a53c2f3535e4845e1a55594624235434b4e6d5f870029ae72436487fa6d2a795101d1fc8263d63dd89cc5d3e59b0756b80448c23e514
 DIST tty-prompt-0.23.0.tar.gz 553952 BLAKE2B 32ac89708b89550c0e46e9dd76cc4acbb1a8bdf6a365019e463c30bd60ee0e06a74a7c5b2c4f8f3cbda70f3a37ec86d6b5be788aec5f73411381f6195c13a467 SHA512 c37213f37c33c756e99ac5aa3c6124c25b94d53a72e013ccca31427a4e9bdb05284926cfc89d39b444cbe75946fe64f1ec40ad61e89f9440b946d9d32ce3ca1b
+DIST tty-prompt-0.23.1.tar.gz 554471 BLAKE2B ae39444b80781ee5c85df87f4ec2b2231b4551a23202070c4570d0e4807a3e4465bb026299dd775de9abf2b8cefe3157cb3fc5297cce4d248f6f8e2aca8c572d SHA512 5e2762d2b229f0aadde7fa09e43ccd317dbda057d829c9003fc6b18f9aaacda1416357af733c4e4f308041c8119ef344b3adc1954a6d31abf801cffdb1848a61
 EBUILD tty-prompt-0.20.0.ebuild 604 BLAKE2B 4ad825cdeb6c476bb1bfa23ba4519bce927089ebe9f4a8bf7c97c81b3c35b670095aa7a8fb825140aef527c4a2afc21386ae72e7dd3f8068c1492b13512465bf SHA512 a3289054a294a48d4821e32aa3e6c65d3821655628c649083370be5bc7d3ed0359393e9d32c063a793c5bcdea7bcc98dd97241816c72f5b8aa6e4e74df0db551
 EBUILD tty-prompt-0.21.0.ebuild 783 BLAKE2B 9d318e9fc03df8a32db4cc5965f18de8fdb0763cb1af6fc27c809784d2a0a8af4dadd822d7f324f5946f57abe0e33eaa6886bed37eefba3aef11b38b1869b5b4 SHA512 81b63b91ed97e36ae060318992e1096da5fe5f022a2671614085a0b99818187530b5260b02db80ceff77c6b4b78de7fa0e88f84786d638c227519d28c74945b8
 EBUILD tty-prompt-0.22.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
 EBUILD tty-prompt-0.23.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
+EBUILD tty-prompt-0.23.1.ebuild 759 BLAKE2B 42666c98aa7906cd58486dc55f15fcc78ec90e71d59522233f4c6bd2f88f6f47571203b6d8ec6075f43edf696be2c92d3366aeb7a1538c6170fa7707b08ec199 SHA512 58da9f154244a48694ab22729294ba933fb4d8299372326d41d5849458809bfe82ebbc9bb70dcbf67ee8e00b853d7823c6f41d1fb8e7d582ac9a55cfbdacea9d
 MISC metadata.xml 338 BLAKE2B 8d0c948aefd302a8cbb6e42214b6173a4f8c0349875576c0210fa01dfa14f8574638305952feacf56ddfa087d773ee7465e5c9c19977701c5d6e5af65b5b1693 SHA512 bfbf88166ca6a7bbf39b9a0696d750cd2e75412f732a7a4267e604071e3c4bc28af3a5297cdee5b27bbeae18359710c9ec707f390fbba70e219e94e6803a6640
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
new file mode 100644
index 000000000000..ccd06d3c998e
--- /dev/null
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 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-prompt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A beautiful and powerful interactive command line prompt"
+HOMEPAGE="https://github.com/piotrmurach/tty-prompt"
+SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/pastel-0.8:0
+	>=dev-ruby/tty-reader-0.8:0
+"
+
+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-screen/Manifest b/dev-ruby/tty-screen/Manifest
index e30728030a0f..66bb07867124 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -1,5 +1,5 @@
 DIST tty-screen-0.7.1.tar.gz 11377 BLAKE2B 485b5610bc81524cfe525f8a837e99d13788da499dd8fa0f7c3be3f580ada63861f04652031e84817ef6ee49ce099c5fa97104b6634fc306d9ee0bbed0828ac3 SHA512 1ef5ce12cdd6337c47f09e5b6ae116985a80efe9f493d52c404496319f1377d4308cd829343d84f5c653b70327c033955232ca62fc8a134503a87a33a264130a
 DIST tty-screen-0.8.1.tar.gz 13019 BLAKE2B 9c9ccb49ae323ebc67c5bca918303586fb749813539aed32a892f3135aa392f6c77b078bab2c7bd116d9f152ee2745d72aae38a91cf4292d1f360085d88060ba SHA512 b0a01c49bb0c56f23c8b384a2d4f4b5c7168863a35c3ab7160d0f34c7d63a2b10b3b9f0f54c6d56e2424a8b16e6ba74268ac81af631976876fb37eb9c347c393
 EBUILD tty-screen-0.7.1.ebuild 735 BLAKE2B 60f62ca1543f4d20e1ba4531de9bed610e43d3021c1f8a75605c38e3e61fed8499dd8eeffadbe35137ef2ffc7a8522fd981959ee03bfa82bf8ea6ed1b76af657 SHA512 26715c2e8d7cd957a81b3651b85006f428b28ab90011cc34a73790d15c8a161a34eca8d69731e2aca67eee30b97233f1c8407f71a137b391e3bd0388d79c96b2
-EBUILD tty-screen-0.8.1.ebuild 765 BLAKE2B b2f9bf11857595a397643b5c527d98d4ef85fbca697ed3947a8a2f0c7f98b2f0d0c1b47014901d1c28fb307bd6d75ee8dfcf5d3808340473b7b35dece3a64ab8 SHA512 f44b4ffd55950918b0257e3e68fca9c86e34a7f6e00ae243ceba2e8b0c34b64cc5bcc9b2bc2ed5a33d2d30ab26c6d7d1a70e54642762f1d77010ae5cba0349bd
+EBUILD tty-screen-0.8.1.ebuild 772 BLAKE2B e69773032558d18ec1484c978cd1061fcadcba8f5ed7289d14312f6777a665c98c6a902fa25b02b64accec4931ca9c4d43338efe8ca4403ee53a1bff40b5e7d3 SHA512 8b11d03b7b925f0dcee033f6ce8b36e5f78e01f389404949126dfeda2a8c7d9e04d7482221c07d038a7e37ad7a2625c10a2925c4ba765414ac4bf7160d02d7e7
 MISC metadata.xml 338 BLAKE2B c7415669713e2429d8d7cf1a727208f00e860e959481199e88e03b8bb3eb47d1250d4815cd2c38ff544cf3dc53c5ccd05e717312f004eeb7cab716565e1db8c3 SHA512 d192914129dea0f28d740a3e0754b738c96791302af9efcecaae0de3d9a3845a37827d23876c9f5eac4f6533976f06cc070fea375b1b795c9928e651765577da
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
index 8ed94995bac7..ccb7ad58d426 100644
--- a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
+++ b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index bb57bab419f8..521a285371d3 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -1,3 +1,3 @@
 DIST twitter-7.0.0.tar.gz 831181 BLAKE2B aeb888bf1551116916cc10a4c0278dcee541e953c6e1be09bd95f348b8a2a08075d44c4b8beb736b13564d550b5797184c725141c5c3866f5423afddfdfbea19 SHA512 4b0f831ddb1f54fc5894a15010d17b54c62f6caa3eadd6a1f0e0ef37235f29f53f6315c49213244d79ab3708d5a7b1e1b9735d1f35fa291a66d439db916d3ec7
-EBUILD twitter-7.0.0.ebuild 1386 BLAKE2B 1e7b27a1e9c6a93ee3ef96f940c5e0557f2d55f9ebaa4ec6a6478b0e0465456458621c866d34d140f6db8957dea1c07f0c2db162aec5e922395858c38085cdb4 SHA512 039c23cec22655ba1680bfc6cb99ec6e0f02f694477d9f96bf449dbfe2c8dada7e47c1765514312347fdbacacb94f7af00527e26cc565f8819c8b47f3b2637bf
+EBUILD twitter-7.0.0-r1.ebuild 1386 BLAKE2B 956be0cbd19d41248e8dd03c51cd9c60a0dcc9e3c506d7b9d3efb4bb9f603f6a5615b1035510183f23f1d7c534c9e793e5f38bec2edd3c96313ae658b4ed8eb3 SHA512 5b051b0fda6c65f85c9a284530f9081ce9deda4b98bcc096c0d5f6a2721d529545bd3389b043ffc692d6f78cbb7d7d746402d5a73f0d0e7cfdcfff4d808c192b
 MISC metadata.xml 340 BLAKE2B a354a967597b16b9fa93b1f41274674bd913c39321768b19ae9cf81937e53eab05bf616bcde5b375bdd2de0e91f141edc6def3d60d3d7f75732875c529d2e153 SHA512 504babcfb5a3f49934a8eb1107a5777206c134e5f39d96badd9333c57909e2e378dfa1d88dc49c945a9c5cdcf59406f7e6658c177098fde1cd2c12314f9ca239
diff --git a/dev-ruby/twitter/twitter-7.0.0.ebuild b/dev-ruby/twitter/twitter-7.0.0-r1.ebuild
index 8cf53c9edc4b..8691d9c18edf 100644
--- a/dev-ruby/twitter/twitter-7.0.0.ebuild
+++ b/dev-ruby/twitter/twitter-7.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -22,7 +22,7 @@ IUSE=""
 
 ruby_add_rdepend "
 	>=dev-ruby/addressable-2.3
-	>=dev-ruby/buftok-0.2.0
+	=dev-ruby/buftok-0.2.0*
 	>=dev-ruby/equalizer-0.0.11
 	=dev-ruby/equalizer-0.0*
 	dev-ruby/http:4
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index 005c7804863a..568c72a0329d 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,5 +1,7 @@
 DIST typeprof-0.11.0.tar.gz 496673 BLAKE2B 215bd738a4a4b9e7de78943a944fd63dd4f166f215a493cdc89270e0452453683d3fdd1f71ccc05f4399f61e120248a73ed9b77b5b24ed4aa8b54e97d9e0073d SHA512 cc64bd805c57a16c275ba5622df08ff30fd64ae82b18e29fb30e03d17a6ca0e889c03696c745597bfec6444290f1f33020c4bd9c49a02fc3053add33e3e60084
 DIST typeprof-0.12.0.tar.gz 497398 BLAKE2B 149d382c5598ce3cfa023133095190e00e083ac445019c4aedf59d66005db93241dacd9c724f2b62e64d02aa3d7f4a58a3fa4546256c872030687574112c7333 SHA512 a28bc10ce19f7a3afe940cb01fd443c89a87497be2be0b03d92684581c4ffdc061e8e5119652116884e4cf0e5c0ea7d9a73c0f8be2a666d6bbe71e81bada323b
+DIST typeprof-0.13.0.tar.gz 498218 BLAKE2B f6b8566dd25cf08952c136bf59cc7f10f01609d8c2e7633054892f296c6c35cc0f0121e086f465d9ee97776d803829f27895e1544772bff33e3fdb562ad0b9df SHA512 dda9b5d84a2fc6473ddf71b897e13aac9675a4e4ef5dfe71fe6929a3025ac2b3ab051a5882d936112de86ecddb96e0b665741ba08748a6d94c6540bc13c171b0
 EBUILD typeprof-0.11.0.ebuild 939 BLAKE2B ac7b27b3b598a3800d56d93d959d4579f7a861adfa7f472651267db0184b9c38f6839220a739aedfe079437c7bc0fe2f7e909c89fd5c4c4f9e65ce5aca4158dc SHA512 db5acedf0051b6607584ce5290b695e6cfef8ebf564adacc12201cf39e0b87b72bc395686a0e3bf73bd1217ed5494439138e2d3ee5f4871fd3df8abc09331742
 EBUILD typeprof-0.12.0.ebuild 939 BLAKE2B ac7b27b3b598a3800d56d93d959d4579f7a861adfa7f472651267db0184b9c38f6839220a739aedfe079437c7bc0fe2f7e909c89fd5c4c4f9e65ce5aca4158dc SHA512 db5acedf0051b6607584ce5290b695e6cfef8ebf564adacc12201cf39e0b87b72bc395686a0e3bf73bd1217ed5494439138e2d3ee5f4871fd3df8abc09331742
+EBUILD typeprof-0.13.0.ebuild 978 BLAKE2B b94c723691165ef6576b3f71aedc48e47873b605fae9ec5e8c9258e37ae077500475f087db9cab0c98856593915fdb02a8d630445c6371e9671c88a4a7ac0340 SHA512 53fd39c4503faaa9093716fa22788723adcb416d321bcbd0aa143f5f6c57568c26502850365561a12a5cb2377ea07adf9f55b4e7570d6ef2b88de2bc204bd27a
 MISC metadata.xml 339 BLAKE2B ca2bb0c0a59ddafbf4c57b268985a52e02a15089f6784cab9dfa3aa6645275c51df7a95288d2464e357a2a1f9a53735e9e9fdc13195a7383eba5d821d89baa2a SHA512 79d803bea464c53a176d07b5bb9bba5d434b1f24a97e8091fd85fb36a842abe93cb0adf82ccbdbd1ef7adafab3210f4bcf80a79c99b0a792869360f7e47e6b70
diff --git a/dev-ruby/typeprof/typeprof-0.13.0.ebuild b/dev-ruby/typeprof/typeprof-0.13.0.ebuild
new file mode 100644
index 000000000000..495c43dbf0b6
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.13.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.0.0"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 56796ee48ca6..4deb7bbe442c 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,13 +1,9 @@
 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
 DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
 EBUILD tzinfo-1.2.5.ebuild 1051 BLAKE2B 1aebe08a8a828f4a2de3ef3d3d8fd96d0427741207659219a8fbb0e630629fc377ef25c12cfd54a8975946003fc260160773cfe7c999334e68aa725e1f5a7d2a SHA512 89c21fc54b9ca7b12a7f8e7d4e3a1a9285a44666b621231194296693288ef2f9cad72bcf7b13a617c85bdcac2f45d14c1a382698ea8e61a7b3f840d0989c6d39
 EBUILD tzinfo-1.2.7.ebuild 1030 BLAKE2B d90b21887564c14bb95c3367ab374299ad167119b58796a0504a1ca5cd075d1cce46847e7bf366cba03e066604f07d93a30642cacebe36fa669146c94b6df7dd SHA512 3747929ed565c22083cf75fc82cb1f5df58136f342df05d7bca0f13ffaaaf9c63cc3fe5e43bafefbf6d0138ac8c611961b96250ad1f30621535ac3a8766a1727
 EBUILD tzinfo-1.2.8.ebuild 1023 BLAKE2B 3c7a9d1b003d817659cd17e32d6ccfab73b576369606b7e786eabbdf41df3c59c61db766d6a5ca2e790bd6779678b06543994b3488d994ed047153480ca108a2 SHA512 2cf403232ec92ca991e6440e1f9b110d20e7ec354d0a4ac93e535b091d8cb2efaaaa18483942c8c1c06f0fcaaae026201887508a6ea64b8c08e932fd6be6fa4f
-EBUILD tzinfo-2.0.2.ebuild 1425 BLAKE2B 7aeb10b7a8053cb37b6b073d963daa058577d9d31943149569612c17bf78dd171488b9d6bc9ec994010fcd2046dfa40f58cd27d9e049d2ae224e0cba3d2dd9a0 SHA512 2a4b4f2bb0612d322d6c1820a13caac6a5725d4609b86e77d9ad498a272e30c08c9b17a1e042d9dba4cffc8062fd9a840649d8d585d8bf2fb79654c7784c5184
-EBUILD tzinfo-2.0.3.ebuild 1418 BLAKE2B 3267bc8cc7d76e7f1a132b4fc104039427a3a7c59310dc16075ef9fdae69368966bf047cb78ebf9c9afea88d9fba8c50bd4f6c579681bc5b4f7253d0b00f5506 SHA512 68b677e38eaa3d102e0febd1acda4fef376d75798acb5af89ca1a4dd55d9e219d4dcf0ddefea643de9c447343ccd5a4ec2a8ab1232fd8a2eb5be70515b16767a
-EBUILD tzinfo-2.0.4.ebuild 1418 BLAKE2B 3267bc8cc7d76e7f1a132b4fc104039427a3a7c59310dc16075ef9fdae69368966bf047cb78ebf9c9afea88d9fba8c50bd4f6c579681bc5b4f7253d0b00f5506 SHA512 68b677e38eaa3d102e0febd1acda4fef376d75798acb5af89ca1a4dd55d9e219d4dcf0ddefea643de9c447343ccd5a4ec2a8ab1232fd8a2eb5be70515b16767a
+EBUILD tzinfo-2.0.4.ebuild 1425 BLAKE2B 08b1cc9420c12a6ce87caa0db3a186da7e2faa91c9bc6fd1097ed4072a87622e21b8225a400bdd5b4d909fc866d79e4679f624b2fc3fa19a0589fef1a4126d1c SHA512 0df2d8e0f1286dd3b2335a233827cf98c66d092fc86db08058e4ca51d931ef475d61278b82f2bc1ab24293f7d1c581c94059042c31aa313ae49ebe5bc7acf156
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.2.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.2.ebuild
deleted file mode 100644
index a4afd6bd1f77..000000000000
--- a/dev-ruby/tzinfo/tzinfo-2.0.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 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="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 ~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/tzinfo/tzinfo-2.0.3.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild
deleted file mode 100644
index 755cd034b199..000000000000
--- a/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 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 ~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/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
index 755cd034b199..0647fdee7b7a 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
 
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index 90343d8d5e6b..e16aa4d093de 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -3,5 +3,6 @@ DIST unf_ext-0.0.7.6.gem 399360 BLAKE2B a805d991580ced26400194bb45d4e4ab395e4936
 DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a3386a520220252aa970c715462fcf242985527b23618dabb291db346d23afd02282f735df1fdb657e021be9d SHA512 7dc75f071be4d4f3cd44f64a26c5f63f01494f79f3585eea3b307c3e8133b17b1007c4b36915f7254e516ae7a62268be8f3e4b250dcec7a9a083b5a66582887d
 EBUILD unf_ext-0.0.7.5.ebuild 994 BLAKE2B b658df9d3ec2768561b36cee351c6b95a5e3d517d42d0ff602710b92eb47020bfcfa07523e2da3554deb98a258955f9ef9f246730446fc229b58243968357173 SHA512 cb4bbae8d085346b975f23924d91ca5f09c644234db1a30ccb34e06dd76dc9dc03d2827ea73663a5d8150eadf701a63986b95bd7fd9262c0a4f2cd81b7d14be3
 EBUILD unf_ext-0.0.7.6.ebuild 999 BLAKE2B 835e36429a40f5e131ed360a132f806803af67c2d5adb9e129b5f4b58fbc0ebae19c160c7be8a48c1b9b8205bf4d2d273464b0cfc2b50464e8d4e828b487820c SHA512 1495e04859d8397aed54c2d850554064dc8df694da4991965beabaca980fbaae60232bed7227b241e6aca1b2db7295bd68433d408bca9534329845ebfca5d1c6
+EBUILD unf_ext-0.0.7.7-r1.ebuild 809 BLAKE2B bb21b550a306ae8a195be8b6e7d100140ff0925dbb8e87534dc2aabfbd39a8dc4b71eba5458148d17882d853d76c629d2249c1f84470f76bd4a8b64b5832c3b9 SHA512 3dd6775f3acbbdfdb5aa7ae926f094d7c72b6656c644ec87e09d5b9711b105ae035d3d56661e9ec9b0010b26d7132f8b76985ddf68d513152f5ed3c4c87e8713
 EBUILD unf_ext-0.0.7.7.ebuild 968 BLAKE2B 15367ac6659abe67a95ef1c3389f85b94efabbc158a6aadf10635499bd3cf8377c152051bb97ae9ff226016e657d77dcff19a5f1c8edae3cb6852cd9e8a70c7e SHA512 a040a56b4e13c991052974381ab016ed0df071304f0888b1ae2fb3a3ccdd86d26dc4193b646d89327a2183a95da011c02cc98ec8f7a72e9fb9ef73bf305ae42a
 MISC metadata.xml 383 BLAKE2B 96615ab1e6b21672cd9b121a3d70bb20630897823e9cf901575c9d646d01d98826c7813fd5d468874574596a4b56479b37e8331f98c51aab496765da2a4213e5 SHA512 c37dfb0021af1d08192825188761b1c1266a8fe85b0d81700fb769d49ec75b01dc0160a6498fa9e2a0cc392d910a86613f7585af7f143c2dc5ba020580c42399
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
new file mode 100644
index 000000000000..75f86896daed
--- /dev/null
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/unf_ext/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Unicode Normalization Form support library for CRuby"
+HOMEPAGE="https://github.com/knu/ruby-unf_ext"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.1-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 test/test_*.rb
+}
diff --git a/dev-ruby/uuidtools/Manifest b/dev-ruby/uuidtools/Manifest
index ce10fd020b98..ae5beb683d16 100644
--- a/dev-ruby/uuidtools/Manifest
+++ b/dev-ruby/uuidtools/Manifest
@@ -1,5 +1,5 @@
 DIST uuidtools-2.1.5.gem 25600 BLAKE2B 8219d559d92d86e7a87b97d4eda9454b6c203f89beb4a74ff619f51470d339c4063b1982ffb6f8acd5b9c206ac7d0dc537e968b1744a030a4f6cd629a358fc7a SHA512 c56e6329e48638bd5049d348beedec7fadb9ee7a133a5013ddd41ae98baa8213d8944903059729c9ca4f38b24d9b565b5653332685982337a4233f11d4865ac0
 DIST uuidtools-2.2.0.gem 27136 BLAKE2B 1760c3fcb193901a552b8d32acddd67a0737b95a79bde47854c11a3a6378b008b0e17339ac2e95157329314f35612adc9355068eaef90f93f4d1976fdd430182 SHA512 17f15e8816fd17d31e1296522d9c68b8da71211556c3284770197b06a6fe01f9038c1e6c6e5e8272b4290cfb23b48914a27717c4705fba17e5d9848257664360
 EBUILD uuidtools-2.1.5-r1.ebuild 1061 BLAKE2B 2169d594b43626c5fc18a00930861c6d4b6789cfb38c15f5fa6016c9dd23ca0cff76909433d908cf11bccc14f4e6b9e3aef81ce29d9407923b2306f2ed0545bf SHA512 191cd5cc2360b101cb0a4bacb043ebc555f905c8ff0598402db2f5e3814b291949037b0f7f4f8276c1856ad5a4a9af1126fbf887e9c1162cd0e6d89e67295fea
-EBUILD uuidtools-2.2.0.ebuild 1056 BLAKE2B 9e4f755c05730774bc12fd6610645117bb2fc413b58f94ca135194ba899a31a3e532dc6fc8cb799491cec8ece3cfc0cfc068c596c3f922f1ec4ecd8d0f8fbce5 SHA512 5d2afa71f2d50a25e22243c0c0050665eaddf5350f760d80aaa74d29551060e9ce6743af87c4db9cb0ecea4170476d7ff54ed15019a6f30ba9bf00528217075d
+EBUILD uuidtools-2.2.0.ebuild 1063 BLAKE2B 0626a31163eea598835efb35f860454e4c5e1007b8827d1c56a530b48b09161efdeaee99cd3c6f83a269d49f1e6861d852589861d64c43effc58606c405e6432 SHA512 012b86eeae4d28a34b61f56e91276c14e94add45902811bece4993371f399f6c690b0a819aa033b36b210f9c5a8615f27ecedf6ae5b5a5173c192eba89ee9109
 MISC metadata.xml 539 BLAKE2B 5a99e5c959879b57b6b604bd90b1e7c91fbee2608653e4a6b6cb135012f5c964a1b07ff90f9f8702c99a639df9a143c308722df4c0bcd1e8beea2259d3e9fc39 SHA512 6f697164bc069b62ade929d31fda162c1d25e33fedc1135985cad7bdc80d256db169aa8ee3f2293a9dc56667a1e1d4f75834ca1d4b3c3310e3b26ed85079f09e
diff --git a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild b/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
index e8c48b65a05d..ea503d423b9d 100644
--- a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/wisper/Manifest b/dev-ruby/wisper/Manifest
index d10c8254d5fc..473634a08a01 100644
--- a/dev-ruby/wisper/Manifest
+++ b/dev-ruby/wisper/Manifest
@@ -1,3 +1,3 @@
 DIST wisper-2.0.1.gem 26112 BLAKE2B 3dc78cecb80e052ec8bc308d02e5093ca55fc7d26a1dd98614907707d62d15e0cea1a20c7843ca7e6ee175800d320c3ef5854396505aaf0648161153b0e61368 SHA512 3518c218c0cb4ceb5d96260f7ac8845fb2f35d4a77c478cb56f1251fc29910a655ce070ebf3c17eaffd7d144ac54b436420bd2b2c4f72a8743f68dfdd72a514c
-EBUILD wisper-2.0.1.ebuild 533 BLAKE2B ca2e104296eac16e7458ca569085c2f5faac5a31c364e7a32b0942f47d0e43689d4a6d4e80bdab4b5027fdddb5232bd58fda4c89bf3f44b1c92659d68bb6a28a SHA512 682382fd98dc1b4c99378a8fc143bb6d6e1898df3e8f574cb4eb9812f2aee32802392d1eadcf17f7dfc55083330b565479413a8ac97790cbaf3ef6cf63128133
+EBUILD wisper-2.0.1.ebuild 533 BLAKE2B 3334ef2bf03829a5d818399e252857e475264b5207ad6236728ab6dee0e5819ead380255b905786043ef4a8954521aa71dd468e045f85ee6790a8a152d925ba8 SHA512 7251ff0dbdf415d407b3a5b4f9404598c88d1f2dd5c3491c7729a84effc6bf781bfc8ecfd64a51b9e465dfa5dee31e765c302feaadaa147b0bf49c7360d0ceca
 MISC metadata.xml 332 BLAKE2B 4bcf48a0a3dd7a92b54195584e9fadc814a3d011956d08f51090bc7d32ab14baadeb61ce4d1549e77f6a52042542bfa0130683df08cf05f06c36107b5a300a09 SHA512 a996d5e847d5f13dc33afcc1db43aa46699ef56ac194d6ce4b572d9aa11936bd62cdeb46e8632b94d3dadcd4553ca692156a092084e7fc2e812bafc65b964503
diff --git a/dev-ruby/wisper/wisper-2.0.1.ebuild b/dev-ruby/wisper/wisper-2.0.1.ebuild
index fbe9a40b4ed6..d3ca01b8df71 100644
--- a/dev-ruby/wisper/wisper-2.0.1.ebuild
+++ b/dev-ruby/wisper/wisper-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 2afa4d26f1e6..83d3cd38c499 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,7 +1,7 @@
 DIST xmlrpc-0.3.0.tar.gz 34157 BLAKE2B 862bff09fdd7febfd85ef4fde77a913b77f20024692b1475994b93b394d587f1b2139c82ed7159cc756bd1757ee2fee55f103866c52d4297d8a38be70c066c22 SHA512 370b2fe2ed9ca37fbbc2e85d08328450671019a2dc0c2a31ecf8fc8af95105ccf1b8f728307a5d9cf5f4dbcd93ccfb2f66244b441c0aea1cd1aaca2e820dfe31
 DIST xmlrpc-0.3.1.tar.gz 34720 BLAKE2B 452640d82bd93568a3d36235a1f86f4d2be85b47022d269131daac4e12e759bf1129fc46293f3f4408cefeacad87214d1e34da1b3e3421638e5609659afb7586 SHA512 df47968288592aba4093b8c4d19ea86d6171c1f2cb10ab7b9a03fccc8ed65a9aec35908d831a281970e75becc7feff7242f9fc3ca5b64a54ffb56a717bccbdf3
 DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
-EBUILD xmlrpc-0.3.0.ebuild 951 BLAKE2B 3fafe401c49335d0a96dc806a297a0db5d64f7f9efdba8430b50b4ebb1fd52471bbd66ef0cd43934540fab343be0dae06f6b8ed30d7828956d2fad8fe6284581 SHA512 3b4c4d8700c52b0cbf46bc3d099c76eca9cc9bf85bcf2a41f1f73fadfcbed0e63ff10a14f96d89d12521548885261f6aeb049163b86dbdd481d174561116a08c
+EBUILD xmlrpc-0.3.0.ebuild 952 BLAKE2B dcb23f5f7cc72761644256e00b4f1ceedf6bbf28574fb82a3839dc602554ab448da49771485681bbb913def3c571e8cdf4757db3a84c2ac608de59f3f7ffee59 SHA512 394593ec1e7fa9e503565de9ea64289d0d6b96bbc2fd8264e941642fb698a7388d53b5466d4697b0f7a5aa5daa57535b9b73579ad13251f547cdf864bea8fa1d
 EBUILD xmlrpc-0.3.1.ebuild 922 BLAKE2B b902641c965a750d20770924be81f08e415d23b41ab41bb01318538898f083f6af692a3bc7fcf1d6c3e26ecf35eafd3803192caa5d307b09e0f184ec7008e8a4 SHA512 356462d336d8994a1e7ea6139da9631d054a6a619b73608fe6c2ba6e2ac8259d0c9fe10791c786dca8316e7fd43611223637c6295da4edd4f113598385de8f11
 EBUILD xmlrpc-0.3.2.ebuild 929 BLAKE2B 09836e4c83ae4c7fe5131e3607990b1e4a94f3c9d04f6df361b6dab726d264e733a4f91fe85b80e3ad57c28c69ffb560fdf746917bc1624157bb53ff2e90f5dc SHA512 a56fbca5004ded2be730406d814ece148b975e397b3f42ebf2018ffa34a09f5b8a02aaf860508d964dd93653eae4f0ba35fe4f4f15e4fb890750d2788da2962e
 MISC metadata.xml 337 BLAKE2B e45e1b70e063e5f33759c32c987c2afee3283a31fddf4eec4a44c317f65a68926a84af12c5ab9a72e5315033593105dc95d1919fce3de684593755078246ef71 SHA512 94f995e14666100fd2f0e569f01bfcc86cfa319c213f0fb99e7fe104bc9b731dbd06e4e35cb76d94b126b296e1a5b916b4940c59f251a899781357f587f9be14
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
index a0ed76280cb2..744ddc5820d5 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 4a5553af1c50..43ecdc8f855a 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 1223 BLAKE2B ff15fd1b7c564ac028d59c385d7426278362d09914ec8b6a8a43923c3ceb7810cdc5c812c0da823e96fdc589eedc44b473f1ffbafaa080312fbed4ea8430156b SHA512 335b2c295c35dfe6d92914ad71cd0c731f7bb38fc37c6c2f574cd7dd16c95832584c90af846470f49c2bd89dee960635008ad7ef9584d729816b7fbad88020d0
+EBUILD yajl-ruby-1.4.1.ebuild 1224 BLAKE2B b2d0ea92e78e2064a35088b69dabce151e92afbacda771b888820df8c7a6477760c63c9bff3b41f9bf76c5a51d64c70c1d0f9e1cbb608c1864583d36150798de SHA512 9e5bc66bf68533037c0371775d22a70e9d4f5618d2cd02f2052d03d00d1be9e52573781375e72c420eb01726745a65e44d6b03bb6203a3f0d05599032ea45ea8
 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 55bd34c534a1..740fb58ca514 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~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 63330fdb1d1d..b2fd9c9e873a 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -3,5 +3,5 @@ DIST yard-0.9.25-git.tgz 930253 BLAKE2B 35531a7e90ab99bad8d236ea4774a8aebc50eff5
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
 EBUILD yard-0.9.20.ebuild 1766 BLAKE2B c8b561e62e689e9dd828cbbd4674a317ce50dddbfd63a82766eabd315ed4a1c8c7ab80f6a84ef77dd2181c164c9419d62ec491a94dedb7eaa6a4a66bc0a25e8b SHA512 9554cd54d05877dd5e3197127e463c01dd01f578a5d92249d2adaf27bba34a8627075a7ed3af229ab28c473b5144959b519d2006dfc034318d00d2e28e73b37e
 EBUILD yard-0.9.25.ebuild 2058 BLAKE2B 7eb00d3fd28282d032dc9ce57b2fe9e27d0ddafb348a6a0d8e1d42e68187aac69943c4e1a4a8892e7a47cff0ac7a10bf3d71ad71d1cbb8ccfa0a009f4d44c6a9 SHA512 a8f2500b60dcbca8af237e84c29f230cbaeaf59a60d47b0a342a35a595618cab64c8656db7fe5ec7b9bfc9225b97dd8d8ba6bb23af83383a0111b241766749f4
-EBUILD yard-0.9.26.ebuild 2051 BLAKE2B f8bc46d22cd14f1aa406a3f2ace04b819e986636789ccfe2a81bc6440c0e54f2a9e2540ea7b15b70ebdfbf6cd3078f5812cc189f24710fc752a5f226b31210ad SHA512 fe6bb65010f6f7ddb0444dbcee36dd4df65b1dbc262680dd5b1923fa6122ffa15c6a87d2a25a3dbaff72ba2c2ba200cbc74b662c5afcab5b7c477d7905a7cc09
+EBUILD yard-0.9.26.ebuild 2058 BLAKE2B cc8c241a51a252e4fedaee56714e514a8148418774b529078a9102082c2e61a1d27d292d1456c657a5de51c5fab2f094bc011196ccf486ee81ecf576c7a6afb3 SHA512 bf4ddab410103a31df845c3e00b3f1c25d3ffa221e77d19bd13230f209e3696b381bb7c2b4a722ae99e0e37a091e97d18607fc71e2c0f0f8a8aee0b879049277
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.26.ebuild b/dev-ruby/yard/yard-0.9.26.ebuild
index 576c13ef1b92..82a76216fbd3 100644
--- a/dev-ruby/yard/yard-0.9.26.ebuild
+++ b/dev-ruby/yard/yard-0.9.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index c90e081679b6..ebecfc63cc86 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -5,5 +5,5 @@ DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aaf
 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
-EBUILD zeitwerk-2.4.2.ebuild 888 BLAKE2B b6aa39db8682e158fec51187d7ac5aabb321c9d02a6b271ce6a7da9359fb3b035906f46ed5f46cebfe74ef2e9fc271adcca1f7e2ce73fde1c2c27b1d9eb136cf SHA512 047db4053daf22021c1283291575cc8d6dde82a9cedcda88af9298c11d07aec9c7b85b23ab9818d2c8e75a366b6155b8fb0e8eb767f5ef6f8e918c3665cbf7b3
+EBUILD zeitwerk-2.4.2.ebuild 895 BLAKE2B 912a72506db761ceafbcb4187f5a0ea00dd85b2bc33fbaf45822b8dcfc9ab056cb453f99507f6e3bb6655081e28ec22a719dbc5a5d98045bf5bae5a50cb221cc SHA512 5ccc30756b684d6467a74d40c836ea49512b687a74ac02420d5a63dcf1d0feb44860ab652cb34445ccd4512b4b5e9722e0450308c14ae75f6243a36e9d99ea29
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
index 195751178c4e..30e287157919 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-ruby
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)