gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-ruby
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
181 files changed, 2693 insertions, 891 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 8ddfef62635f..39550cc40503 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index b2d35a58a222..1a030ece5802 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD actioncable-5.2.4.2.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
+EBUILD actioncable-5.2.4.3.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
 EBUILD actioncable-6.0.2.2.ebuild 916 BLAKE2B 663bc3f0bfd1ece2bfba40015fd83b0bbdd11f9e87d345dc96d8182f92724408c3990d3f75a87cf5a2a48c2a282cad5956a3bb1703be2f8e1b1080aaca91885a SHA512 a7f3b47cbf19ec42057887bdc74cba6111ba3693fe16123f9a4ea8b2c1630cbe70aa86b91f7351539c164c173c8b737b160d66a810e3aaa3f79eafdb6a6bc0e2
+EBUILD actioncable-6.0.3.1.ebuild 916 BLAKE2B 663bc3f0bfd1ece2bfba40015fd83b0bbdd11f9e87d345dc96d8182f92724408c3990d3f75a87cf5a2a48c2a282cad5956a3bb1703be2f8e1b1080aaca91885a SHA512 a7f3b47cbf19ec42057887bdc74cba6111ba3693fe16123f9a4ea8b2c1630cbe70aa86b91f7351539c164c173c8b737b160d66a810e3aaa3f79eafdb6a6bc0e2
 EBUILD actioncable-6.0.3.ebuild 916 BLAKE2B 663bc3f0bfd1ece2bfba40015fd83b0bbdd11f9e87d345dc96d8182f92724408c3990d3f75a87cf5a2a48c2a282cad5956a3bb1703be2f8e1b1080aaca91885a SHA512 a7f3b47cbf19ec42057887bdc74cba6111ba3693fe16123f9a4ea8b2c1630cbe70aa86b91f7351539c164c173c8b737b160d66a810e3aaa3f79eafdb6a6bc0e2
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-5.2.4.3.ebuild b/dev-ruby/actioncable/actioncable-5.2.4.3.ebuild
new file mode 100644
index 000000000000..a6339fadbd1c
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-5.2.4.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_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 eapi7-ver
+
+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:0
+"
+
+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/actioncable/actioncable-6.0.3.1.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.1.ebuild
new file mode 100644
index 000000000000..e52e0ab9a501
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.0.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 4e8d4daf0f17..32163818b61f 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,5 +1,7 @@
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD actionmailbox-6.0.2.2.ebuild 1660 BLAKE2B 481fcbe9c4d1819b18c5e27907839cc9e0f9d14010cd8bb11613e6f3acc4953703995e4786f58370349386810993d726d1b5f53c6ffcd8c703220759e3dc4b7f SHA512 3b6f884f4f7caf6fb8246bad4503bffe732ac4d1695cad7ceae978347a68b73df19a07bac0d745ea6ed015ac65c703c7f94dfcddcff99dac73991ba31fc11c43
+EBUILD actionmailbox-6.0.3.1.ebuild 1660 BLAKE2B 481fcbe9c4d1819b18c5e27907839cc9e0f9d14010cd8bb11613e6f3acc4953703995e4786f58370349386810993d726d1b5f53c6ffcd8c703220759e3dc4b7f SHA512 3b6f884f4f7caf6fb8246bad4503bffe732ac4d1695cad7ceae978347a68b73df19a07bac0d745ea6ed015ac65c703c7f94dfcddcff99dac73991ba31fc11c43
 EBUILD actionmailbox-6.0.3.ebuild 1660 BLAKE2B 481fcbe9c4d1819b18c5e27907839cc9e0f9d14010cd8bb11613e6f3acc4953703995e4786f58370349386810993d726d1b5f53c6ffcd8c703220759e3dc4b7f SHA512 3b6f884f4f7caf6fb8246bad4503bffe732ac4d1695cad7ceae978347a68b73df19a07bac0d745ea6ed015ac65c703c7f94dfcddcff99dac73991ba31fc11c43
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.1.ebuild
new file mode 100644
index 000000000000..bbdab69175ce
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 963e41ba4cf2..6d9adfebde9f 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD actionmailer-5.2.4.2.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
+EBUILD actionmailer-5.2.4.3.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
 EBUILD actionmailer-6.0.2.2.ebuild 1249 BLAKE2B a494099c8b1dfdb56936daf22ae96348c82e403cdee4d3e754ef6980f22c39b71b60083d847b9ae815e4e93511ca2118a108cd7bbc0d64ea71a8464f24a3544e SHA512 6977bd20b5097410aa6d46258e75022ba5fc3095a796029bc3a6d0942d509b9009b38e2d6a0e41f477049365cd26d9472445ff864b51d85b516ac7f3eb2a4ffd
+EBUILD actionmailer-6.0.3.1.ebuild 1249 BLAKE2B a494099c8b1dfdb56936daf22ae96348c82e403cdee4d3e754ef6980f22c39b71b60083d847b9ae815e4e93511ca2118a108cd7bbc0d64ea71a8464f24a3544e SHA512 6977bd20b5097410aa6d46258e75022ba5fc3095a796029bc3a6d0942d509b9009b38e2d6a0e41f477049365cd26d9472445ff864b51d85b516ac7f3eb2a4ffd
 EBUILD actionmailer-6.0.3.ebuild 1249 BLAKE2B a494099c8b1dfdb56936daf22ae96348c82e403cdee4d3e754ef6980f22c39b71b60083d847b9ae815e4e93511ca2118a108cd7bbc0d64ea71a8464f24a3544e SHA512 6977bd20b5097410aa6d46258e75022ba5fc3095a796029bc3a6d0942d509b9009b38e2d6a0e41f477049365cd26d9472445ff864b51d85b516ac7f3eb2a4ffd
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.4.3.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.4.3.ebuild
new file mode 100644
index 000000000000..24a51c252868
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-5.2.4.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+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 -e '/\/load_paths/d' \
+		-e '1igem "railties", "~> 5.2.0"' \
+		-e '1igem "actionpack", "~> 5.2.0"' \
+		-e '1igem "activejob", "~> 5.2.0"' \
+		-i 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/actionmailer/actionmailer-6.0.3.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.1.ebuild
new file mode 100644
index 000000000000..9de7bbb7b27e
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.0.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 6048249e6f4f..22833923c52b 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD actionpack-5.2.4.2.ebuild 1979 BLAKE2B d071cefe31d62e38e5aa1f672f85c00c4fbc8bf6205b392739a95aeb4d8c8a928b30aac8dca728fe58707cdd30e6aa2b3bf48a9906483d1765f9d9615015fb64 SHA512 4d5ba86d14a579d88b972dbdce6e1eb5140aaad848f49ae1b492422ecca69e7bd53cd527d95b1fdda0d340ed7b2588d8e3cb1ad96df666293ecf017bb935f1b3
+EBUILD actionpack-5.2.4.3.ebuild 2226 BLAKE2B 80a8f1ad853caaebc2c7de4e3cf6baeb2ce0382c389124a9450ec1899663f56e58f3db22aec31d58712a546cce40f6405dbd74c19bf9e03180265981422c8a58 SHA512 ea8eab1400732fa614486e33306d49d7c3db3c87ea4b5ae32d6fabe6531bc4dcda6e3f5fbfcb0e486f9baf9796f3dd0ffdebe3c24de63fc2747a03fbf1a0b8e9
 EBUILD actionpack-6.0.2.2.ebuild 1797 BLAKE2B 50ab2ddfe0dc8967b3c931ae1f5874ab838e6afc91f67c35f523c70e108b011861531ee1768c19c3d7aa8a08b5fb81f654acb302fef5d749366c7ea09de5a0a0 SHA512 be57b1597b60f2d9a77ae212ac2f802909822435451c8b7d5643068bb5881ffd683fe965ad4b40d8f29459313e3853651484aa8b24eb49651d4b047cb5d1f50f
+EBUILD actionpack-6.0.3.1.ebuild 1804 BLAKE2B 1860908e58163e92617fdd7a1ef3276ded9783978c8a5ff272c7fa5c802ffdfe8018ef0902db4bf6fc34b33803ad38cd0dd56239a8d991b03ebc9595e1619800 SHA512 8310464db1b657e51556aee7022afbae1a3b92bdd8104f1cd3199e7ec7b8134803af88eb514a2e7ec2425ac160779cc277930cd6fbf8b969a7fb5b7f4c25e709
 EBUILD actionpack-6.0.3.ebuild 1804 BLAKE2B 1860908e58163e92617fdd7a1ef3276ded9783978c8a5ff272c7fa5c802ffdfe8018ef0902db4bf6fc34b33803ad38cd0dd56239a8d991b03ebc9595e1619800 SHA512 8310464db1b657e51556aee7022afbae1a3b92bdd8104f1cd3199e7ec7b8134803af88eb514a2e7ec2425ac160779cc277930cd6fbf8b969a7fb5b7f4c25e709
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.3.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.3.ebuild
new file mode 100644
index 000000000000..8f4e2160dd01
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-5.2.4.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	>=dev-ruby/rack-2.0.8:2.0
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.0.2: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/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
+
+	sed -e '1i gem "activemodel", "~> 5.2.0"' \
+		-e '1i gem "actionview", "~> 5.2.0"' \
+		-e '1i gem "railties", "~> 5.2.0"' \
+		-i test/abstract_unit.rb || 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 broken tests already fixed upstream
+	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
+	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild
new file mode 100644
index 000000000000..3ae431f685a6
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.0
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.15
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 9f8338952f95..c764865f3cb1 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,5 +1,7 @@
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD actiontext-6.0.2.2.ebuild 1632 BLAKE2B 44123592c0926e9d0b5d55bf9219c7770eeb4f4261a62b5ae138b21f351694204ee46e53c4875342475d45edba1d2a5561308b94df3175cf31b3f1433ee593ec SHA512 3488b55a41431d365ccfc6aeb2715effc81ddf0981cdb5d8989f22e2dd8ccbe6c21bb8fb15624e56a8d452bbc82b37f143184e2cd1cfd2d7090b59c838ad6cf4
+EBUILD actiontext-6.0.3.1.ebuild 1632 BLAKE2B 44123592c0926e9d0b5d55bf9219c7770eeb4f4261a62b5ae138b21f351694204ee46e53c4875342475d45edba1d2a5561308b94df3175cf31b3f1433ee593ec SHA512 3488b55a41431d365ccfc6aeb2715effc81ddf0981cdb5d8989f22e2dd8ccbe6c21bb8fb15624e56a8d452bbc82b37f143184e2cd1cfd2d7090b59c838ad6cf4
 EBUILD actiontext-6.0.3.ebuild 1632 BLAKE2B 44123592c0926e9d0b5d55bf9219c7770eeb4f4261a62b5ae138b21f351694204ee46e53c4875342475d45edba1d2a5561308b94df3175cf31b3f1433ee593ec SHA512 3488b55a41431d365ccfc6aeb2715effc81ddf0981cdb5d8989f22e2dd8ccbe6c21bb8fb15624e56a8d452bbc82b37f143184e2cd1cfd2d7090b59c838ad6cf4
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.1.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.1.ebuild
new file mode 100644
index 000000000000..81ba03261fc8
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.0.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 409cc9244d3a..3d3e785b6220 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD actionview-5.2.4.2.ebuild 1895 BLAKE2B 411ae4e3059ee9cd7634be51eda0fe3de03609fc2e02c9757de3bb0bc209b1167555e62590216050a9143b2fe9a5b98adfdb866b2b172594eb0884bbb050b314 SHA512 ef2e2dd6eb2b442bc7ab850219fb35c4a33782904c0af25535745d540edfaae1b1196455a950fbbb239e9cd667d0c31524248156f85204a71bd121c8b4f68c88
+EBUILD actionview-5.2.4.3.ebuild 1896 BLAKE2B 16e880e2c8c53762a3e9cb3c2fefd47f155d6796a30b929482e66898728019ae7c49bb89d8c6dfb6a9f2ec94552be67aa919e4f13fe61de407f63e0d70e78f76 SHA512 c8bc732c9fedb30ab61b48ca60153d476dd64750402ab310f72f4954c569897fabb3571c4f0dc6168ed4be78cde52abef63c4a640e5e2b40a59529078523d882
 EBUILD actionview-6.0.2.2.ebuild 1716 BLAKE2B def5b4aff4c34cc23077f578502c1be5302ae61e47da05a80f31424466d98aab251899bebb9113d5874b4b165f7c262543d51e76036e9b8628e8838bddcb8479 SHA512 cc55750d80c42f34946a9991c2e8871d6dbb6da46db03a49fa63d4a9d49cca8304af3d28749908480c46918901b299c4573fa0e7b4b735594fdeec03b8ca05c3
+EBUILD actionview-6.0.3.1.ebuild 2041 BLAKE2B 65ce0091086d912239b2a0f16e13e7c169c292e1878c49687f309a886fc25109574b99f5141dc43e40f806e0eec7de15cbf482b923513debdb4bfb526b51a19f SHA512 3b123d5ac94d05d6020d85e7175d27978ec6b21a5c0b710fe85311f000c620fbda2a6015530108edd60f14a000574869eb3ea2918a9355fb697eab5d187bee4e
 EBUILD actionview-6.0.3.ebuild 2041 BLAKE2B 65ce0091086d912239b2a0f16e13e7c169c292e1878c49687f309a886fc25109574b99f5141dc43e40f806e0eec7de15cbf482b923513debdb4bfb526b51a19f SHA512 3b123d5ac94d05d6020d85e7175d27978ec6b21a5c0b710fe85311f000c620fbda2a6015530108edd60f14a000574869eb3ea2918a9355fb697eab5d187bee4e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.2.4.3.ebuild b/dev-ruby/actionview/actionview-5.2.4.3.ebuild
new file mode 100644
index 000000000000..26bfedbb630c
--- /dev/null
+++ b/dev-ruby/actionview/actionview-5.2.4.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+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.0.3:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+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 activerecord integration tests because they are very sensitive to the specifics
+	# of the environment.
+	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
+
+	sed -e '2igem "actionpack", "~> 5.2.0"' \
+		-e '2igem "activemodel", "~> 5.2.0"' \
+		-e '2igem "railties", "~> 5.2.0"' \
+		-e '/active_record/ s:^:#:' \
+		-i test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-6.0.3.1.ebuild b/dev-ruby/actionview/actionview-6.0.3.1.ebuild
new file mode 100644
index 000000000000..0b4fd032262f
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.3.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index b4a63503332a..b017180609c3 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD activejob-5.2.4.2.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
-EBUILD activejob-6.0.2.2.ebuild 1117 BLAKE2B 72dbad34d9ddf04e84025fa27c2b146ad1736d6ed1b0c81486792421679496798d469faeb0b8e101b4d3d9bc6f506b251fcf7c7121042b846354e77228df0d47 SHA512 5baab0c06eaee54458c5f7fd7fb152b07d23bd0b713bd679261f7b896defc2c344e06c222dd0006dd87aac9dd57304b95f2425d569cb4a45aa7233b9a90dcedc
-EBUILD activejob-6.0.3.ebuild 1117 BLAKE2B 72dbad34d9ddf04e84025fa27c2b146ad1736d6ed1b0c81486792421679496798d469faeb0b8e101b4d3d9bc6f506b251fcf7c7121042b846354e77228df0d47 SHA512 5baab0c06eaee54458c5f7fd7fb152b07d23bd0b713bd679261f7b896defc2c344e06c222dd0006dd87aac9dd57304b95f2425d569cb4a45aa7233b9a90dcedc
+EBUILD activejob-5.2.4.3.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
+EBUILD activejob-6.0.2.2.ebuild 1124 BLAKE2B a259a0961f2964b2569cf0236b56316ce0e9cd0bce0fc2c40c38540acb71facb78e7c733b93fe864e32cd2bb2efad80dad3b78333e7c4e1b5e60c81d889dd4de SHA512 b0fae9296a278b2a3086ed85a967e9f0c5e34b70aeb28f1de2a948d89cb89f3982075bbb587c7e73554c976555e531aaa30eb70e8eabec0f157cfc2c30b2b25c
+EBUILD activejob-6.0.3.1.ebuild 1124 BLAKE2B a259a0961f2964b2569cf0236b56316ce0e9cd0bce0fc2c40c38540acb71facb78e7c733b93fe864e32cd2bb2efad80dad3b78333e7c4e1b5e60c81d889dd4de SHA512 b0fae9296a278b2a3086ed85a967e9f0c5e34b70aeb28f1de2a948d89cb89f3982075bbb587c7e73554c976555e531aaa30eb70e8eabec0f157cfc2c30b2b25c
+EBUILD activejob-6.0.3.ebuild 1124 BLAKE2B a259a0961f2964b2569cf0236b56316ce0e9cd0bce0fc2c40c38540acb71facb78e7c733b93fe864e32cd2bb2efad80dad3b78333e7c4e1b5e60c81d889dd4de SHA512 b0fae9296a278b2a3086ed85a967e9f0c5e34b70aeb28f1de2a948d89cb89f3982075bbb587c7e73554c976555e531aaa30eb70e8eabec0f157cfc2c30b2b25c
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.2.4.3.ebuild b/dev-ruby/activejob/activejob-5.2.4.3.ebuild
new file mode 100644
index 000000000000..7e36b898f263
--- /dev/null
+++ b/dev-ruby/activejob/activejob-5.2.4.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+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
+}
diff --git a/dev-ruby/activejob/activejob-6.0.2.2.ebuild b/dev-ruby/activejob/activejob-6.0.2.2.ebuild
index b6081286eb11..e34fafaa96cd 100644
--- a/dev-ruby/activejob/activejob-6.0.2.2.ebuild
+++ b/dev-ruby/activejob/activejob-6.0.2.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/activejob-6.0.3.1.ebuild b/dev-ruby/activejob/activejob-6.0.3.1.ebuild
new file mode 100644
index 000000000000..e34fafaa96cd
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.0.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activejob/activejob-6.0.3.ebuild b/dev-ruby/activejob/activejob-6.0.3.ebuild
index b6081286eb11..e34fafaa96cd 100644
--- a/dev-ruby/activejob/activejob-6.0.3.ebuild
+++ b/dev-ruby/activejob/activejob-6.0.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index 52120c31676d..a9f89df98b67 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -1,7 +1,9 @@
 DIST activeldap-5.2.4.gem 226304 BLAKE2B f13b5a1cf423b44087d55d3a4957be1444d598ab1d1bd7d83ee545a2806b77b47124edcb326fc567eb06e866c62a2ad0c3dafd903232588f824bc2978c197d60 SHA512 da37cfa20c8be7151669ba3b409994c668b037a2f318b1b034f6fa9c0e56a9a778b03a26415cbd98c8ba3fa1d487d42343bc0532665c1037880e75474a1c708f
 DIST activeldap-6.0.0.gem 226304 BLAKE2B ea200a672e1d77cb2eeca343479d39652441403737db9e1fbed14e594749cf33e00e8ca98ffaaa5f473e683faacc2f8d0b046b1ecb3dedf04efa7a23379f7439 SHA512 8b3ce2356612be4093210391102fb5fea51ba9e33ed9ee8281445d8bd13574af88cffbd35122b8cca69ea6799dd31be8fb2f2086f6ed773078b877a4c2ac163d
 DIST activeldap-6.0.1.gem 226304 BLAKE2B e61ab86d1a39313f3f34debfde47e4499579273b666ceafc51e3a62cb73293d31a124dbf821428ac33437ca8e604bb4f4c1e1e43b8be58b9a67a73872b6634b8 SHA512 baf3ae0975348f94b00186a6c8569aa9371ae28f5a53654f18da9e6eb8eb50750730c1813c45318148eefa0a37fdb06d27efe13293ab4386637e0fbc1906334a
+DIST activeldap-6.0.2.gem 226304 BLAKE2B 513ee26d37292ede2142561d36039747df7d50211151776c14d140fe565adcb3a6005c0923ca3a6d65befa72f91a7e9eff19fa1e1cf35c95111285f5d37de264 SHA512 817a394f3715c53b3ad67fa063c96d0974855be3547daf378064559fc690a0471322a8869fa7d6110661813da50a150c54f8a3b69d3a64d00e64d48ad7125788
 EBUILD activeldap-5.2.4.ebuild 840 BLAKE2B d51d1ab0a92be710711fe64920b1eb8fa02f7a984d0180199fbf977560a90eb542d2d5be5439e2204eef3d8928aead03686b3c774e11f7032f11d41473781fef SHA512 8c1283dc9484998ba2dbdab269849c63450bf324c421e9488c57464ce49504cd0f7685f9f5d458880e108274e36a5390eacd1aa5f8a2ddfbd7b0c7734dab43ba
 EBUILD activeldap-6.0.0.ebuild 836 BLAKE2B 061120646c38ffffc666a240e8d3743b94b0c7ad8a07f8fa98dd1a9619e5f09ff97b38f0d36a8511d935ed32c32f4d9be93920c06a447b501fbea7c1ff193d31 SHA512 adcdaa65b6b8ee0b3e8e040f5698a300634c3feba765c778afd1290784ec05934bf7586d449a68c6e1174996e02ee80de827a19d8dc95845e9e5eed95a9a0554
 EBUILD activeldap-6.0.1.ebuild 836 BLAKE2B 061120646c38ffffc666a240e8d3743b94b0c7ad8a07f8fa98dd1a9619e5f09ff97b38f0d36a8511d935ed32c32f4d9be93920c06a447b501fbea7c1ff193d31 SHA512 adcdaa65b6b8ee0b3e8e040f5698a300634c3feba765c778afd1290784ec05934bf7586d449a68c6e1174996e02ee80de827a19d8dc95845e9e5eed95a9a0554
+EBUILD activeldap-6.0.2.ebuild 837 BLAKE2B 273997529dd4431e4a3dbdff828dd7cd514e0742ffada2154179f91b6e6dd1a03a32e4aa0522961c191d2103d12c257090dd28d7e32f3873824f530eb8b507e0 SHA512 abbd47353d894556b0eb49a69dc15125e748901cc0cd6466a8b5d927a28021c82de13c17915c2f90381e748a6b08941bb74709ca2f4b62afe8fab5185b62ae7c
 MISC metadata.xml 347 BLAKE2B 14d83abbee66dd0fac29431f2e219444dc61b0a27861dfb3eae63a245fec285627ec788f4da897dadf81f3cf2d94406121c565a3c29121400498d1f96ba7fe17 SHA512 642b21533d2c7665de55d54190762be8b6c295060ad0d20ce2a65b81d86cdd3156571470189acdc142b4f54d7b7eb60e4e7e2be8d3534f220c299f8cf3c1f555
diff --git a/dev-ruby/activeldap/activeldap-6.0.2.ebuild b/dev-ruby/activeldap/activeldap-6.0.2.ebuild
new file mode 100644
index 000000000000..e7d248c7d519
--- /dev/null
+++ b/dev-ruby/activeldap/activeldap-6.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
+RUBY_FAKEGEM_EXTRAINSTALL="po"
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
+HOMEPAGE="https://github.com/activeldap/activeldap"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Most tests require a live LDAP server to run.
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activemodel-5.2.0:*
+	dev-ruby/builder
+	dev-ruby/locale
+	dev-ruby/ruby-gettext
+	dev-ruby/gettext_i18n_rails
+	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc doc/text/*
+	dodoc -r examples
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 74e812922437..4942b6735dfa 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD activemodel-5.2.4.2.ebuild 1040 BLAKE2B 8c464ea18bbb1ec9297fa0e95812a5857bbb1094115b5f556d2e010783d960518e1f7baeb905ff294e647117fd54bbdc402def3ed3e88cfd4420bde1854db72d SHA512 fe53836eac85fa0d2e567c597f60df351b1efe879936978fcee1c6437e290f1386a5b9ac424f0871e42520e5e0dbb65329f7e8298d841e58d68bdce15cc71fac
+EBUILD activemodel-5.2.4.3.ebuild 1041 BLAKE2B 26d3f88520da84b755805ef126ef7ee0828063631d8a3b92339289ba20c33832462f04bb7bd0a8d80fd7856bb22f708d9b2b4655ade2297c3afecba59c86a338 SHA512 9ce66f6763eaa829df1f9b6c2a59b3d2803b2a5d431cc71d3dd34284663be82e7b25d29d07105b870e21c9604fbeaa998f9b88fcc99b366c84ccc29b7ff3ea04
 EBUILD activemodel-6.0.2.2.ebuild 951 BLAKE2B 47b57f9a3f1a935b29c0b07414e8a6fc19056bf85d4447f28c06d4a5897a3f057a1a65791566c49f724a49b9602f809a39cc9a25c80bd7f71429421df608d860 SHA512 60e56f0cb90614f7644bc95124a416c6b7b220f856e4d3ff7b30e9aec89fc85a4592b7f8992be272ae0a685bb6d03d1fc508562d918a73e3d2feadd2e60af5ca
+EBUILD activemodel-6.0.3.1.ebuild 958 BLAKE2B e82f8f658447c3a704fd3987182fc70432b80144bb85fca2221631b1bf752446817ed765bfd03d6e0dbabeb66c11bdb4d66e79bef6522100c31abe88b77ca09a SHA512 2c2d494285e1c9678ffca4dd3f160bfa8c56714743b4cc96bf83e1445814c32ce93894d2c4beeb9900742afba931aa97e4c1d49d385123f96fb45b4dce546fba
 EBUILD activemodel-6.0.3.ebuild 958 BLAKE2B e82f8f658447c3a704fd3987182fc70432b80144bb85fca2221631b1bf752446817ed765bfd03d6e0dbabeb66c11bdb4d66e79bef6522100c31abe88b77ca09a SHA512 2c2d494285e1c9678ffca4dd3f160bfa8c56714743b4cc96bf83e1445814c32ce93894d2c4beeb9900742afba931aa97e4c1d49d385123f96fb45b4dce546fba
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.2.4.3.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.3.ebuild
new file mode 100644
index 000000000000..2f56044a1591
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-5.2.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~x86 ~amd64-linux"
+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/activemodel/activemodel-6.0.3.1.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.1.ebuild
new file mode 100644
index 000000000000..1494c493a78d
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 9b4033efd0f7..e4137856adf8 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD activerecord-5.2.4.2.ebuild 2980 BLAKE2B c4942f74b7d161c71e42ca4bcc9704c9bcb6893f7e85c95fddee345d15026796de48da0f5a169f6b29d0fbb38c2c99a6463d3012fa0040260257617c53e6bb53 SHA512 72cf8132feabee80fa1819d0dd8ad0d8676a6743611a9171b4ae919a274143329feb2e2a3bec80cc23cef1f55f102507235cd0cd7d07525848760fd0641a8a3d
+EBUILD activerecord-5.2.4.3.ebuild 2980 BLAKE2B c4942f74b7d161c71e42ca4bcc9704c9bcb6893f7e85c95fddee345d15026796de48da0f5a169f6b29d0fbb38c2c99a6463d3012fa0040260257617c53e6bb53 SHA512 72cf8132feabee80fa1819d0dd8ad0d8676a6743611a9171b4ae919a274143329feb2e2a3bec80cc23cef1f55f102507235cd0cd7d07525848760fd0641a8a3d
 EBUILD activerecord-6.0.2.2.ebuild 2907 BLAKE2B 31a699892d77f34149c7257c66f07f16d42df7f638e133e411b7a667f93fd85e4afb22d0f975d4a20d6e648b2dd55299f18479df1dc8b97c6539ab8e5c9f65a8 SHA512 d38849c3ed1ac04bb6ffdafceb53927ef7d760cefd546610205fd8ec8f26f1e146b61746fcf38529a21f141e4b499b777752666b1d9abaaa6e4073b54a770b64
+EBUILD activerecord-6.0.3.1.ebuild 3097 BLAKE2B 1acbfcf414f8bb99beac8eeb2341332cc6fbf1ebf489813c98be5fe580223e007df35287de15f2e7f633b5bb0f7faab82160c1bff658f142d7a49eb251e01a6d SHA512 00dd3caa9543df95629c80a9d30ab84b3843ab4d7fa9952b5e0f3af69660663f396d176995e5a439f8ff0c74d2262452068438a2f5f4c75006ec5e6c75e8361c
 EBUILD activerecord-6.0.3.ebuild 3097 BLAKE2B 1acbfcf414f8bb99beac8eeb2341332cc6fbf1ebf489813c98be5fe580223e007df35287de15f2e7f633b5bb0f7faab82160c1bff658f142d7a49eb251e01a6d SHA512 00dd3caa9543df95629c80a9d30ab84b3843ab4d7fa9952b5e0f3af69660663f396d176995e5a439f8ff0c74d2262452068438a2f5f4c75006ec5e6c75e8361c
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild b/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild
new file mode 100644
index 000000000000..ade4146d39dc
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~x86 ~amd64-linux"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	dev-ruby/arel:9.0
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( || ( dev-ruby/mysql2:0.5 dev-ruby/mysql2:0.4 ) )
+	postgres? ( >=dev-ruby/pg-0.18.0:* )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' \
+		../Gemfile || die
+
+	sed -e '3i gem "activesupport", "~> 5.2.0"' \
+		-e '3i gem "activerecord", "~> 5.2.0"' \
+		-e '3i gem "activemodel", "~> 5.2.0"' \
+		-i test/cases/helper.rb || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_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
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.1.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.1.ebuild
new file mode 100644
index 000000000000..952512d4e312
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
+	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test failing related to rubygems
+	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index ae6fb3297888..91e4b89181a7 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD activestorage-5.2.4.2.ebuild 1863 BLAKE2B aa9181b67d535ef5dc99daddb96b9ee9b98d283f16731210fe224d4c213536102896c664e729630f21d4d146e7e15df37a3052faee2c88ac4457f228170ab3bb SHA512 f17c08e9ff4f8a1b48ac28b5e942b3ca25a6dd66b88b3c36821749a629d397a31bb14fa935e4e640ec3d48d0c530ac581d1d6ee8f65d7badee79c2ef71655783
+EBUILD activestorage-5.2.4.3.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
 EBUILD activestorage-6.0.2.2.ebuild 1907 BLAKE2B d5439e81621f2bff31474b255dc8f7ad58cafad19aae242b9ef3079b72a0707b21ee660c86a51aae8076650787be242c302698560eafca4d81641964b9270f8a SHA512 6ac06c5bc8e3b93c3c5c691aea251acc2290db7e50a366ff987fd1e955ad6149428a2d564b598b6951d477f8f41e387f4409db948bfbb1c7db6497850453376d
+EBUILD activestorage-6.0.3.1.ebuild 1907 BLAKE2B d5439e81621f2bff31474b255dc8f7ad58cafad19aae242b9ef3079b72a0707b21ee660c86a51aae8076650787be242c302698560eafca4d81641964b9270f8a SHA512 6ac06c5bc8e3b93c3c5c691aea251acc2290db7e50a366ff987fd1e955ad6149428a2d564b598b6951d477f8f41e387f4409db948bfbb1c7db6497850453376d
 EBUILD activestorage-6.0.3.ebuild 1907 BLAKE2B d5439e81621f2bff31474b255dc8f7ad58cafad19aae242b9ef3079b72a0707b21ee660c86a51aae8076650787be242c302698560eafca4d81641964b9270f8a SHA512 6ac06c5bc8e3b93c3c5c691aea251acc2290db7e50a366ff987fd1e955ad6149428a2d564b598b6951d477f8f41e387f4409db948bfbb1c7db6497850453376d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild
new file mode 100644
index 000000000000..9ee08a50fdf3
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_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 eapi7-ver
+
+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 ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	   # Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/:job/,/end/ s:^:#:' \
+			-e '/:test/,/^end/ s:^:#:' \
+			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		rm ../Gemfile.lock || die
+
+		# Fix spec broken with ruby24
+		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
+}
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.1.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.1.ebuild
new file mode 100644
index 000000000000..a866c2b3677f
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.0.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	   # Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/:job/,/end/ s:^:#:' \
+			-e '/:test/,/^end/ s:^:#:' \
+			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 7f0f48b95b37..12e3bba083e7 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD activesupport-5.2.4.2.ebuild 2523 BLAKE2B 7cef7564cbc0c057d76cf74f4dd5382a738ea204f1dadf0367fa70e30f6e8f002e252c446bbd342352e476f98623b534db00734dc4658c68145c51ad1d30b945 SHA512 158df77044882eb0fdbfdf7fb0349d74812187cc668fff6af4f44f7ee2ffbb31e1076569f19125048baec407ef6797b35ac21cdce52325a92d1feff3b0bc7922
+EBUILD activesupport-5.2.4.3.ebuild 2524 BLAKE2B 6fdcde9119c8a295d58899692434e4e6295cbfd2949fce81733d18e3df4bcb87b515d5586f5ad9f971099312910a7ac05af8262db73cfdc437f9ba90221534a8 SHA512 cf34055a10c5c3f1985042fd382def3a965614f3067c234f6c72866bda935e9d1639fb7527bf0a65ede6f8bc25aa035ac180be16807f72e4e13597cafd30ee59
 EBUILD activesupport-6.0.2.2.ebuild 2402 BLAKE2B 8176f2d7e911e93fd8d813dd35d5731795dca4d32d57dbacb7d5677699a339a16821d73902f476552c73659f4049169ed4472f6e5de9591f60cc1ff226116449 SHA512 cfcc9789d8e70cf5f567fa3d3ed47fd924c38e5e1af24bf0f6f299b392d545e25ba03e27f366e01678899d6c12088e18f6ba5ca06953f39ec71092ccfea892ae
+EBUILD activesupport-6.0.3.1.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
 EBUILD activesupport-6.0.3.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
new file mode 100644
index 000000000000..d7716eddc9c5
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.1.ebuild
new file mode 100644
index 000000000000..bf4536107f91
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.3.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/zeitwerk-2.1.8:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index b16a585c2712..2a0385887a41 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -3,9 +3,11 @@ DIST backports-3.16.0.gem 154624 BLAKE2B a35adb965c3f9f42fab5fe80fa1ca20a59511e9
 DIST backports-3.16.1{P}.tar.gz 156181 BLAKE2B c7cc842fb9bf8fcc7b55c8a572cc7a01a63008ad20f63142f339d24d7bf04202f4def2f03261d23d6c41c8c3bd0af8fce76a323e25585b6874c1428eb2a9ef90 SHA512 d907d729dd37ebfb175f8274078664fc4eee51de773cd0871b8bec9a8808052fbdea8571f0a402b1a6ca88ca7cd7b6b9984f66799abf92f300f1f8bc7b8f3f9b
 DIST backports-3.17.0{P}.tar.gz 158065 BLAKE2B 33df81f32aa36b8039e021dbbf9ebd265a73cc5f74069472773ccf8f71d9378820671055c8130282a95ee8a5b32d3fe13a04394fb8f9b4c01c38f13582447063 SHA512 4acea191916bb067856c42665c10fad52a275193fc5cd04cb73bc5ce7967033d055acbf682f5e7abc8058fafd5150fb8154495a964d09664bf1ffcf91dd154c8
 DIST backports-3.17.1{P}.tar.gz 158209 BLAKE2B caecc782c7949d2b6408a31c3d5f7e1599c49a0593761c2e75fc8181b28db42797fc10ea8149e6f6d3d60c6561bedea536b80b271ba4243c9cf933414e8aca71 SHA512 87cd790099c5265bbb3d6f91fd40429f65b97c4dcdd5126c2a8c4376efac047883271e447ecc3512999c2470b291258b1d45600fe55ad687d4eab8ab12cca37a
+DIST backports-3.17.2{P}.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
 EBUILD backports-3.15.0.ebuild 666 BLAKE2B 582f77e0126ad733ec009687eef69942ec75f90bdae8be08cc460af4e28ef5f4e36d9ac16ab2edff4c1d632488a87e81645642b5c9c74405bebb9c0ca2fd688a SHA512 b61462d7b91475e48927a0c816c02c51d66876400225703ead490e73bfe5d4915da2a9b381f6947dbfb0931f3012c03df9b03f0dcae41ef64649a59b3a44dab9
 EBUILD backports-3.16.0.ebuild 623 BLAKE2B eae1b090445de4aa9d97da1975cf789739c9d8753549a3726c175caf1cf90f6012375e2ff4edf877fe924e0529b24c3f1f41438530dbbf121db72e4d45b203ab SHA512 81f78b10bf6d43d466c10a386e0e4291d84b384116bf67913347b12ab44026784ade8941f9584127883e6a93664fa152241fadbdaba3376a5bcb212cf4378811
 EBUILD backports-3.16.1.ebuild 752 BLAKE2B 5d8c699e1d0e589c3d7bea246a9b64fa2212a1c614a1c078d9c9f1efa7af79f584ea6ff3c20e1555991c4ada640f15bae70c0818fee54eb5c3b9b284f8bf8f08 SHA512 00c4e1cbccd845f5312581cde1bd443070fa579aa8966e7f36d743df610432e5a70f85d147be51aa03e1b418edef4f513c3651ceabffb11dac2120254265643f
 EBUILD backports-3.17.0.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
 EBUILD backports-3.17.1.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
+EBUILD backports-3.17.2.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.17.2.ebuild b/dev-ruby/backports/backports-3.17.2.ebuild
new file mode 100644
index 000000000000..10f3947595ba
--- /dev/null
+++ b/dev-ruby/backports/backports-3.17.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid activesupport test that no longer works in Rails 5. This also avoids
+	# a dependency on activesupport
+	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
+
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
new file mode 100644
index 000000000000..0d93a02db848
--- /dev/null
+++ b/dev-ruby/brotli/Manifest
@@ -0,0 +1,3 @@
+DIST brotli-0.2.3.tar.gz 63304 BLAKE2B 96321a480e855ae7e77b93c06fd09153611a8a273ba66a8952093f844f6ccfa908d4bcabfd4dde084813f7f3961e8843208ed71f78e91f924bfe7e2ddece3628 SHA512 7d057d0055836c79744b802bb2401630375cc924035e9a45069c54e5df32711b9aa25234f4743aea729526028b804c518f36112ab721a6761b55311d07a8b79e
+EBUILD brotli-0.2.3.ebuild 833 BLAKE2B af0232e55e0203968733a648a62909e2b6bb6686805de735038c5a97dc38e45513fa26eeda0c6ef4f7a6194c29cd664fb8e1e0e8888f892c266e5e939a32dbb8 SHA512 d5665f2ef516b5c17b001ac4a0828f389f6eabc7212f6683ee5ad1607a84b16eb8bc37a71f1c89f70858c89fd7cfa9734ba16084b906e5329d7c9443cff43ddc
+MISC metadata.xml 339 BLAKE2B 01598fc9d63528fa9989ec5587aec7d66ef0ba8a238519a22f2a24eb1b1dad681286be1331578fbaebcabcbb4caf8e7e35fe9e25fa73c94c1a0f847c59e26e6c SHA512 4afa68712c313b7a1904fe2b62e57452e7a677ed79ceb2c5bfc0804af54733263330a1a799b89110641eed489d127bc0fcfb82c4005765fc39144e3ff55e7719
diff --git a/dev-ruby/brotli/brotli-0.2.3.ebuild b/dev-ruby/brotli/brotli-0.2.3.ebuild
new file mode 100644
index 000000000000..fab2f12fe16f
--- /dev/null
+++ b/dev-ruby/brotli/brotli-0.2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Brotli compressor/decompressor"
+HOMEPAGE="https://github.com/miyucy/brotli"
+SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" >=app-arch/brotli-1.0.7"
+DEPEND+=" >=app-arch/brotli-1.0.7"
+
+# Depends on the test data in app-arch/brotli
+RESTRICT="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext/brotli extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/brotli
+	mv ext/brotli/brotli.so lib/brotli/ || die
+}
diff --git a/dev-ruby/libxml/metadata.xml b/dev-ruby/brotli/metadata.xml
index 53271e9caf26..eb5be24aa567 100644
--- a/dev-ruby/libxml/metadata.xml
+++ b/dev-ruby/brotli/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">xml4r/libxml-ruby</remote-id>
+    <remote-id type="github">miyucy/brotli</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 149ee11e5562..3a3cd1d7328b 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -3,9 +3,11 @@ DIST capybara-3.30.0.gem 360448 BLAKE2B c20173448903f96facdba007b81b43d74500a0e8
 DIST capybara-3.31.0.gem 363520 BLAKE2B 246a199d89f5120bd1be7b36b5aee5bd4143ee5d1c8953cc2e65e805c234d902c5d898f873c562b8457c6e09af507cf81ddc178bcb617f2730b5db1f9ddd97c8 SHA512 920dbd331eff5300cfa575689f7c62f502cea5782ad58eff168ffc274f2622a95869a7ab90e53fc010bc7f5c0847caa5dcf69cb74eecc2a82f0f449c11be3edb
 DIST capybara-3.32.0.gem 365056 BLAKE2B 13fa531ffef6be5711b3f88f7b40dc409c9e404a3815ced121e1b87d2a7aee7b1ac22b7c44673c2d14a79a0eae18a45e5f20b022625594c24ce8a30a4779b061 SHA512 930149822605a744ad3b802d27f9419542683b4d11322f4c71f25613b8c1a3653adf5b598710e2961a82a1d0181ae6c182473d19044456991af378601e4ae89b
 DIST capybara-3.32.1.gem 365056 BLAKE2B f866c90cfbaaf57387286436e877dfdd2c6b1cf4a581931c416656c6b687ab69c1a4cc1f70eb43faf306950bc1f4fd9e5b6e4741118bf7eb239a477f08851851 SHA512 20486897ccd282e1a73f26b94dbc89837527b253976b317df55b319174aa9eeaa499f1ff153aee1b463b93edca5f7f2886d01edabb7358262e57736111d758e6
+DIST capybara-3.32.2.gem 365056 BLAKE2B c193f188aec6089aabafb5d09cb540f914d8c257d3faafa0d59f674069a39c29a3750c80bb269bf2d010cc7608aec1699c7d75d96c7c85c201aaa0f99adddf83 SHA512 b1b21615b5f87012a71a7901a4f9bb9cda61f1a455299d4ad05b05e0281985a6c158a1549864e551c2ca4b97e921139b35843a1d23efc45557647328c0d1c2a3
 EBUILD capybara-2.18.0.ebuild 1529 BLAKE2B 2c82eac2f07da03522e3d5cf719171ca3b81dc08b516ee37a9dcde586d5257fce47e8ca2c0a82de966ee79c19ce84772035e89efc1e28f97f240e54e64e75e50 SHA512 8c02414c863ea3a380821c127c3b8175f1a38ccf7a19abfdb493d702acce171e915bc76cac2ea94acaf1649647386bd78af1c80272fb6294246462c3c42a5d5d
 EBUILD capybara-3.30.0.ebuild 1782 BLAKE2B 98d775d959579d73277b3b53d72128b0d866af84a16da3b48e1c1e7aa512191dae70a1b1d6a205136a9f7502d79afc02655cdae858135cedb76816b21ecd3a72 SHA512 c50c6ec8d2a9d48107940084e266bd6f599c3fe1f8c41f4305fe218ec68940e5c4e430572434ee7ebb35325e2b3c51b507b37fb62dbcdebe242f1841735b4762
 EBUILD capybara-3.31.0.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.32.0.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
 EBUILD capybara-3.32.1.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
+EBUILD capybara-3.32.2.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.32.2.ebuild b/dev-ruby/capybara/capybara-3.32.2.ebuild
new file mode 100644
index 000000000000..b68f23f73e1f
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.32.2.ebuild
@@ -0,0 +1,60 @@
+# 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="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/regexp_parser-1.5:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently accross ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec
+}
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 83a66e7612a9..51c516d8f7e9 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,7 +1,5 @@
-DIST diva-1.0.0.tar.gz 13654 BLAKE2B 3743a2a0cacf6390a2bb2149e1213c9057c7c348fdb514d622b1edeeaad52a8a255defa0ea556a6bc5f89889d36f9f096b63d48eb03d868797f37ba2a5ba6a03 SHA512 d29375840893f61f022e3afb041855486ff13266a9635c8d944177df0642f1e53c0038b5bd6fecfa2d02296558f6f0f0e4f86089434f6c5f04a440044c9b75ca
-DIST diva-1.0.1.tar.gz 13643 BLAKE2B a5fb279003c05a795e40125fd99023f458efe8d22a6ef6236275da2a276e481ef40547cb99ae6dbbaae50685627848c0bc0f1af010c75ed5ccb9d896e7fab7d7 SHA512 cac830f78ba02c41289f44b6ef4bc9853d94a742f9c720190ab8944df14630b0882110d683a4a52971281f1f94c5a857927939236577da1790b577a8cb1a6f3e
 DIST diva-1.0.2.gem 13824 BLAKE2B c292e11d9975691d85cb0500ec42b10422665abb9b236d44629d0a9518e318cf91891d4ad265aab81d13762d121910a8be92c602225d44bfa66e31e77082fa95 SHA512 b5d2df59e4144930ee18c7b738e8b93646057935364c2710d349761e68053f1c342b382de76dc1669076db7394ff906384a8952e1e7c44c71f208dc3604d67f4
-EBUILD diva-1.0.0.ebuild 544 BLAKE2B e2a7c239813917ddd0d04593ef365a02483719fec363b3fb60c890d690f5ae71b6cbdec7237c50ecddd57d4a918937234a349c23ef684aaf31f0af3b04989853 SHA512 71ef8ccc0697bc519d5e654fa9a93a13601af2ecd829cd11881596812d76bf11884755bf2591606a4291df5a34bea5cca10f2d61e8319c294cd56e031db71c2b
-EBUILD diva-1.0.1.ebuild 681 BLAKE2B 9d25cbc7b519b31772ef4aa8341d821c02526fe33ce39197ec6dee350053891f836a702440b778f771e31d531f11f233d8cb3ccfc51130c91cb6f9cc7d511440 SHA512 8dbc561d248d70bf869f92bb269f7178058d99b9d1d4041e58b27a4e436a95dad95320455889454bbcd688c6c8382d27003c987ec4ecca10bf2aef3aa83d8e9b
+DIST diva-1.0.2.tar.gz 13638 BLAKE2B 461e8487e06749d0482b86fd30945dc83d53daea06750628839c899b6f8d419599c9cc322b62f58d3eb956a2a99a3674dd591c4bb2fc5483bd1853bc40154634 SHA512 b60d80ca55c98a2f6fcf269aa4a2188f2239b871b0e77f328490d5924a6d0e6801c67d0eef4de28b584303f38bed3752a3ceb2c1e4f2c7d17be13dad03c643b5
+EBUILD diva-1.0.2-r1.ebuild 734 BLAKE2B 2248bf4396bc284852f7cb900d87923d62f3ebc92b304d18499fa2c0152a9dce50884dc33ffd10ce7752b598d7b70dc7bd4eb3c96545d9bc36433aedcd8e9881 SHA512 a1d0a1bb5ccce158b9429c747763993cbc9a8f57c223d588254bb11989df6f31584e1a54f1ec5bbe65211331407b0a909af9d7887f71eb44903723b0e7082dc3
 EBUILD diva-1.0.2.ebuild 610 BLAKE2B 6bdb64d5897c04ba9010fe82d539cdce989c1adceccac317fcb340f3bd31db25fece406a3912a7fd13417f8771bbbe297473bfe572d8609c4004f33404e6df4c SHA512 951075f3cb56a0d98924f5b0cf2cf71bc398693a3a216522ae10de0e5e90539c8e56733122146a95ffe46e26eedec228ed8e2429d9101fa003709b796671281f
 MISC metadata.xml 399 BLAKE2B 26a2baccac7448af4f7e749c1e8a69821a25864ca8f3672f137e73ae7a257ec87398239cd94479a06691ee3ddcfc0e4ead1b71f58ba2fe5541577099592466f2 SHA512 a95f31401006f69283159dbc1524b53e79454609c6bda896af06f472c84ff828162fea80594028fd8c02110cd190beacdfdee47dc27d69d5b01b10e29a4ce0b2
diff --git a/dev-ruby/diva/diva-1.0.0.ebuild b/dev-ruby/diva/diva-1.0.0.ebuild
deleted file mode 100644
index 2023272a0fae..000000000000
--- a/dev-ruby/diva/diva-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things."
-HOMEPAGE="https://github.com/toshia/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.7"
diff --git a/dev-ruby/diva/diva-1.0.1.ebuild b/dev-ruby/diva/diva-1.0.2-r1.ebuild
index 08ec4d43682c..cd07c32b70cd 100644
--- a/dev-ruby/diva/diva-1.0.1.ebuild
+++ b/dev-ruby/diva/diva-1.0.2-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_BINWRAP=""
@@ -15,7 +14,7 @@ RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Implementation of expression for handling things."
-HOMEPAGE="https://github.com/toshia/diva"
+HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
 SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -26,5 +25,6 @@ IUSE=""
 ruby_add_rdepend "<dev-ruby/addressable-2.8"
 
 all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 7a471b832731..a6323beb4e72 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,5 +1,7 @@
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
+DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
 EBUILD elasticsearch-api-6.8.0.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
 EBUILD elasticsearch-api-6.8.1.ebuild 1462 BLAKE2B 625c06f2e263292c4907b06f908829047460bccfd7ab4b1e7639c49c2cb821c893fde21c32ac8699ce3672486c2c9b245de5428704bbccb80832f0ec1f90bcbd SHA512 71850eafc5466f9f13a903b89e129f3d395a1b25355086abc1eb5c8a57f65ecafd5020c53c57ba287318f7a03cc2567f5ff4cb17ce766aa31136e51c75f14ac4
+EBUILD elasticsearch-api-6.8.2.ebuild 1504 BLAKE2B 4c1f50b07a78efb3384503dc975e6d0b604e76b7ad2385a402a6c8c794ca7d7e84b444acfb4e061b9c3f8860515a78d209deabd2608b5fdd11ca46d4273a6294 SHA512 9f1949109070edfe3fc6d0ed96d8a359040057083f5a8a3913d73184edf2c1572bba1a7020ee25aff8d24756a5505c462a978872f5c34c6e99b33593aed16976
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild
new file mode 100644
index 000000000000..8b9a274812c2
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild
@@ -0,0 +1,58 @@
+# 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_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 24f62de10e04..5366b0fb14f4 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,5 +1,7 @@
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-EBUILD elasticsearch-transport-6.8.0.ebuild 1284 BLAKE2B 3288fafe5b6a4cb14dae4055aac032768baa0b344e73aacc266b2f73e4882fe48b38812d3e870bebfdc6fe4644dcf1decafcd9b45ef91776322c06ee4c6203b1 SHA512 3236272c505ada8a99b2ce70ad5fc1609e83e127f5dcf0393565a0443ec0f335e9be2f7dd6456430e434af517253c6d75ce195570a3f384e04ab290c3ac41a84
+DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
+EBUILD elasticsearch-transport-6.8.0.ebuild 1286 BLAKE2B 74253518166d3899889640fd67d32b3a9851b85d04e8bfbda7cbe5219bd623f0d33b43497843dd487edcc47228df4ead1e05e192d8719f170eff5afd5bd5f03a SHA512 e897ff95b6406ae36bbea0b2d092c9de8990310aaecec94a97fad17cea20b9e953b294ef1f46ab237461f4789fc9b32f2ff0eca29a9a338d8db4e085317a5a41
 EBUILD elasticsearch-transport-6.8.1.ebuild 1245 BLAKE2B de79ad2d371cdc49172d4aa835048c11b462c5f7faec0e3512890b6ea36865b15289e46a5b0bff61ab9bf0fb1080d6333ff3c58f15558940112898903bebe4ea SHA512 72c619d7be6141257c7e91f6c436cdd349e0abdced71e93a05a143246ad56f0003a0ed876e53aaceba5b8b3c049cb82c4daf80261b867cd6cb44822f9d3e620b
+EBUILD elasticsearch-transport-6.8.2.ebuild 1266 BLAKE2B cd158092fb761a3a7e02917c62a9e75ae207142d04cb40d3377b48a28cdbf3e96fe05c9a46884bb4d52502b77e7c6dfecef1f68ed1261ea2ddbbcaf35feb4ef0 SHA512 ad6021417629213db68bcfdfcbf7773de1ddf07e49fcbae26ffa8df46a0505c335964f8da53ffeee8e5bde8d78c79821f31272df4b393dc1b66813646d52061e
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
index 62da4c569e55..792e50aa53ea 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
-	dev-ruby/faraday
+	dev-ruby/faraday:*
 	dev-ruby/multi_json
 "
 ruby_add_bdepend "
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
new file mode 100644
index 000000000000..1d13774e21d5
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
@@ -0,0 +1,54 @@
+# 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_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 055dfd78696f..91f476118ce4 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,5 +1,7 @@
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
+DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
 EBUILD elasticsearch-6.8.0.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
 EBUILD elasticsearch-6.8.1.ebuild 1199 BLAKE2B db6f862c79624d37bcd5e1287aa55b5c631c102619722073200790f72aa9a7688f24786fcd191286f0976b6e6c5a7979ba7f2c236e5347c09e1ae26ffe3f9efd SHA512 c1eb39f656292888e241e9b4abf406edc88f5d4a3a9ea24ea180c5b11f3bc97bc8689482bb39ea5f0695f3301073817ebb9fc84f27b0feb428353e409b58879d
+EBUILD elasticsearch-6.8.2.ebuild 1199 BLAKE2B db6f862c79624d37bcd5e1287aa55b5c631c102619722073200790f72aa9a7688f24786fcd191286f0976b6e6c5a7979ba7f2c236e5347c09e1ae26ffe3f9efd SHA512 c1eb39f656292888e241e9b4abf406edc88f5d4a3a9ea24ea180c5b11f3bc97bc8689482bb39ea5f0695f3301073817ebb9fc84f27b0feb428353e409b58879d
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild
new file mode 100644
index 000000000000..be432279d0dc
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index adceef5028a9..1c04009b20a7 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,3 +1,3 @@
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
-EBUILD eventmachine-1.2.7.ebuild 2741 BLAKE2B 59308a430cab2f52cc8e70a30f31f61512dd8093308143a6e293ba654fc927faee43525ca3c2441d36a592b529743ca11e57b135c41f0c9adab65745932639d6 SHA512 999df0bb8898f7ec9cd41e65680f1b539ca5560220fa237864edb1a5ffe087684cd5c0ed3d292de3ae106f5d5b4e446b84be1d48c85b47bf86484cdedb3b8a96
+EBUILD eventmachine-1.2.7.ebuild 2758 BLAKE2B bd55b688608948b7edc90abb5f11c5cb6fc0bd30df79e3b541fc85bcf4e4327ed551009e9d41d9b8bf07860b6e1d8b89515e4e4c55e4372b8859fe7047f0de4a SHA512 3bd5601cba3b370a5b4bb10ea9227f798f2a0df93b7bb92225b89d10a85de69558772c6de70e03fb135461d2bbc648b31c1f02eb8f61be28556ae3afb7a74ac6
 MISC metadata.xml 523 BLAKE2B c8c4dc99c1560b2dc7233a194f0892bf86397594daf3896408d080632dda52cae3fef16654e2a35340bc0746befab669071ff9de7707fcbd92583472aa52f73d SHA512 622ac8cdd832ad49db828fefc3c9ab089e1d7e3795e369778591b4f572a647a99d4625fb9a3624189d0521a8daa9d2360bfe01fd905e8d106b83e244d900e509
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
index eef8004a177e..2a49e0f72980 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="http://rubyeventmachine.com"
+HOMEPAGE="https://github.com/eventmachine/eventmachine"
 SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby )"
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 84383c58d433..c175b2276328 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,11 +1,5 @@
 DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a00fd4ae0a2a28dca91c5981290c8540602d89d406e91d98a0f5dbc6fc4a54ab6d7d2b716a4d4957ab32254dc SHA512 1ea0c4194603b5eaec0f4abc2460fb39cb9de97179d7699c3cb37673731ebf8bf03d20fb422911d4725d4308691d4c92a82f5a661e034381cc04066ddcc955bc
-DIST faker-2.10.0.tar.gz 1026104 BLAKE2B 4e669233bc6def8c15d9b042607fed37c6a267494551af71000b7c774f84a90d5dfbc6a168024fa8cf2a16b03d5041c90a94924fd55a96c7c5d091d6907310c9 SHA512 de7abb03be6c0a2a6a367dcf0611b5416c5d2128ddb33252758f1a0ac9a663fdad034e0f7dd3ca8cf060fe5bca011e3a078b2a9b36bab5daec9d7a406d9df7ba
-DIST faker-2.10.2.tar.gz 1028811 BLAKE2B 27976e94f2910c37943318d4e4330d557dec3d7aed9ff291bfa7ac108298787352cb7c93f15fda80d17d2c639615b215e147d8f97c707c8ab66033acab1c7f9e SHA512 3a6326778a190a26ff0842e9d21c43d27106b8fff5a7057eb4ce3d7f64ae378604f56e93ab1baee84634c256633044f3aaef93b49e06b70905d959f09fa1d70a
 DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da5c407e030d9722ed8ccc4ed1a0a8b2d5534c96b50fbe79e84fe71e4268f3228c223dc61fe4c74cda0de18a790 SHA512 9adc03cdef0714656738d354d787a99cb9fcc85718847db7b183b02f38d550ff86d65c8e6ed13be3c839cc64f36f3e95ff25dd5d2f8f45c7207dbe5735238e0a
-DIST faker-2.8.1.tar.gz 1019881 BLAKE2B 06336ba84a512058150ac50535e4d6a466628d127999a47f954076250c5fbb01ca901b80e1933286a88ae0770a1fef874ac24299f5d28a327f06f901007c729d SHA512 8cee9dc1ea8c1aea65f117dcfdda0b9cf17c297ead58ed8ee97626f0c448f91e4f87fe4c27a09c5da844af7476ea442ae32e23d829f50d6686b44283569a0902
 EBUILD faker-1.9.6-r1.ebuild 720 BLAKE2B 19d8387ce2fe15cf1fff88f00219e630526321f37645f5011920c68056646c55c5f983f9f3bb8c291a4a90ee6503e118d4c6758a93f39cc78c881c46f4e0ae67 SHA512 50c6bffef40a9ff278234abc58cf4ab71e187dbbc9b48631f547ad6d40637150ca2dc040f5d3208126e1aba09fff97cc8a499437777b7113ba5be934510fcb10
-EBUILD faker-2.10.0.ebuild 732 BLAKE2B 9e2d2b40870cd1e6426224da8a23a0a5ee7b33a53b02143d51bfe34300f874c160ba5ca06f4c4edd97db1bb2ab409b4113f088c784728269bb887c2beea0cf00 SHA512 78208acb8d8259ccdff08ab2cd30705b70af6780278a2cfb656469155f31e0a147db919be1b6f75489cfb84d7bf15f9c02de213c49934cfe50e61cf88e54c9d6
-EBUILD faker-2.10.2.ebuild 786 BLAKE2B 00aaac9732072e62bdcb8c29bc493e03a806b79eeab627c0cf8940cded282f023b279524056becb5e8c40adcb385a2c473cbb07ff4cba7c66795405b1e5b2107 SHA512 736f99a6c366740e23f65e79814ee4e0548c2fb4eb9dc068c625105a3fe884c383615d9613e057995f411059ea02277b4a0ca8612f2ae3fc1155b84da532a8e9
-EBUILD faker-2.11.0.ebuild 786 BLAKE2B 00aaac9732072e62bdcb8c29bc493e03a806b79eeab627c0cf8940cded282f023b279524056becb5e8c40adcb385a2c473cbb07ff4cba7c66795405b1e5b2107 SHA512 736f99a6c366740e23f65e79814ee4e0548c2fb4eb9dc068c625105a3fe884c383615d9613e057995f411059ea02277b4a0ca8612f2ae3fc1155b84da532a8e9
-EBUILD faker-2.8.1.ebuild 732 BLAKE2B a6930679c5c508eb6756824b39a5b2849d9a20699398c1511b8082205dad51c0a2874f4c72131641667a0c877805f75c4503216feca41cfd698a801ba4622a6d SHA512 b1ae2d50004d3b73d5192412db034ef8151cab8505bff95be5e3900236bb96e2dce24d6a53c71c626ed920d1734bf875cb1ca96e57b49f67bf1509554900046e
+EBUILD faker-2.11.0.ebuild 799 BLAKE2B 3cb0a41f26666e42f9afcbb64b533cbb80c5624d5b04447f6c8136500f65968097c2476f6da5a13e1579dd463c4ee387f8482dc62c9a76fa67616cc0377a91a5 SHA512 cb773add5e5a637eb2a27e98b5229bdf4380f8c9ff2ac9d6061b1cbcc896331b458aa11c17c925749b5a4bad9aaec5b291f9dc121d9a68cfa3ccc6150d9b944b
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.10.0.ebuild b/dev-ruby/faker/faker-2.10.0.ebuild
deleted file mode 100644
index cae4b1e72530..000000000000
--- a/dev-ruby/faker/faker-2.10.0.ebuild
+++ /dev/null
@@ -1,29 +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_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 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.10.2.ebuild b/dev-ruby/faker/faker-2.10.2.ebuild
deleted file mode 100644
index 175a91f89e20..000000000000
--- a/dev-ruby/faker/faker-2.10.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_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 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.11.0.ebuild b/dev-ruby/faker/faker-2.11.0.ebuild
index 175a91f89e20..e632ed504de9 100644
--- a/dev-ruby/faker/faker-2.11.0.ebuild
+++ b/dev-ruby/faker/faker-2.11.0.ebuild
@@ -25,6 +25,6 @@ ruby_add_rdepend ">=dev-ruby/i18n-1.6 !!<dev-ruby/faker-1.9.6-r1"
 ruby_add_bdepend "test? ( dev-ruby/timecop )"
 
 all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+	sed -i -e '/\(bundler\|rubocop\)/I s:^:#:' Rakefile || die
 	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/faker/faker-2.8.1.ebuild b/dev-ruby/faker/faker-2.8.1.ebuild
deleted file mode 100644
index 4128467758c3..000000000000
--- a/dev-ruby/faker/faker-2.8.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-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 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index 4888390c6ab8..209521c14d09 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -1,3 +1,3 @@
 DIST fakeweb-1.3.0.20170806.tar.gz 61449 BLAKE2B f015f95897383e0b65ada5a7833f7bd3fd61ae77f4ab38bf6bb47f2eecef0c778928090302e46157ae4e2fc6c3df4559e9f5c8004a6474ad8852d157aa3af6da SHA512 1871b7c9f2e4f12cd1c434ef4f760828187078a951517fe3f7a6ca5c5d6f08e3056cae2bb012eca1ba556c2f4d369cb2716c637fefee67eb723428195c482edf
-EBUILD fakeweb-1.3.0.20170806.ebuild 1313 BLAKE2B 88be75bb23631feaa84163478fba0034020303531fa55ed0b2905e8497644f98e64535fe405dd0ba114ae144c9871f87c3ab6b8b014f0eed864af01b67e21f3c SHA512 a0ce15ed3c25d0eaef49bf3c7df13b1d8327d95e46a5f3c576938d38d0f8c8be654d0afd1991b5839fdfd72e41380f186b38ef191dd2960a371f46cc9ea21fa1
+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
index 94a8307834a1..99dd3e6ce4b7 100644
--- a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # ruby26: not compatible
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
@@ -46,4 +46,7 @@ all_ruby_prepare() {
 	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/faraday/Manifest b/dev-ruby/faraday/Manifest
index f049e11baf2e..9287da2b4f92 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,7 +1,5 @@
-DIST faraday-0.15.4.tar.gz 67196 BLAKE2B 4e64e834639a6e59c028ee19d72f51ea72fd6b3be5fc63b6fbbec25716dbd735e97d8a05a210dd1a57b740a1dcd76d30a39b59c7034cab8a531f8856dc132b14 SHA512 6d1a8c66bd6e2ce417ce504bf20ea89cf24c46c2b48491aba110d04f273448e0e8f0cf94a0dd5356a13876aa030d41bbfb80b95365ea4b212fd79d8db624128f
-DIST faraday-0.17.1.tar.gz 75748 BLAKE2B 203f8603ef24846732b7a41f7a8ad4583539b45958773495c8f1b7f96461c4b661fa13ade0ce5d407b8f6efc17c997a4628cdcb77316ccd7baa2f3a8d6915a85 SHA512 b91079cce459d714e518cd2d45e355e0faf4e79b94a91eff6b9aa67e1a534ff52ee8daea6c21c171804a14a0ae8b18eaf79fd1a8d6ea7b733cc537bceb183970
 DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
-EBUILD faraday-0.15.4.ebuild 2054 BLAKE2B b509990a3701d90398eb219bcc9cbaca9faf8bf0d46e8cac2ea6cd3aaf2a0702eb3dbda5a3cc7b058c9a4e12e2d2538a98a32c590871aa87f263c00506938213 SHA512 c1ec1d891f6a9897d2a2319841c96a45678d03b75a2fbeb054c5a420cf29a97cc29e10cf9d0159011cf61478a5853eb898b9736df958130465cd274b1fe9cc70
-EBUILD faraday-0.17.1.ebuild 1632 BLAKE2B c4a7aff7df6abc6c3c49bb81461426c58e33d79c5a3c124af875c432ec33cb9fc7b6ef3683cbc6f2f48e35f9ee8d08b593a4a68f268d721281eb47d5b5557318 SHA512 a83c7d5a28d5b6e6a4433441dd9d9d8570d503a8b7be9b0fc8a800ee4d8c9352761eefae3fb668edc3da59390f990fdbe2f61b8825314ff4dca53820456465f7
+DIST faraday-1.0.1.tar.gz 835557 BLAKE2B ea5c32f0a93bcc4c4a0a7c55d61578b4e9f0173caed484c0c6424201884b8e81304c0fe07e1c1d6ffdbff41be85bdb494904c2a3b3e19b6c89b58995d9fdbfe7 SHA512 6a2dfd751d013ddc7cb005e262b48120f9a6ae2bb50564082ed5c5e47cfe2b07ee91d7d1b6967813d39b9874c7d5c7daf65ac773dd7afdcae65ed38698b1f496
 EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
+EBUILD faraday-1.0.1.ebuild 2267 BLAKE2B a6b9cfc425fed9da8cb884224649b049e11e71369fbc5dba0b2ae60cbf72aa10befc8a47add92c34555074c505d02ba403c5fe63a52a9a81d8f097c2de024550 SHA512 0fdd69e80e570c2f0b77888608d389c56889164e40d2d4a245cdf544e5cbccb076380a4b2a2bd1ea4e9b1995549f0545f5c90ad920ed465c16099f226822363b
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.15.4.ebuild b/dev-ruby/faraday/faraday-0.15.4.ebuild
deleted file mode 100644
index a0fa609575de..000000000000
--- a/dev-ruby/faraday/faraday-0.15.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent >=dev-ruby/connection_pool-2.2.2
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# Remove tests against live services
-	sed -i -e '/test_dynamic_no_proxy/askip "live network test"' test/connection_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.17.1.ebuild b/dev-ruby/faraday/faraday-1.0.1.ebuild
index 545dbb4d61df..3c85417b7a8f 100644
--- a/dev-ruby/faraday/faraday-0.17.1.ebuild
+++ b/dev-ruby/faraday/faraday-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/lostisland/faraday"
 SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
@@ -28,11 +28,8 @@ DEPEND+=" test? ( sys-process/lsof )"
 ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent >=dev-ruby/connection_pool-2.2.2
-		dev-ruby/patron
+		>=dev-ruby/connection_pool-2.2.2
+		|| ( dev-ruby/rack:2.0 dev-ruby/rack:1.6 )
 	)"
 
 all_ruby_prepare() {
@@ -40,12 +37,31 @@ all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
 	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-	sed -i -e '/[Cc]overall/ s:^:#:' spec/spec_helper.rb || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '3igem "rack", "<2.1"' \
+		-i spec/spec_helper.rb || die
 
 	# The proxy server is already killed, may be OS X vs Linux issue.
 	#sed -i -e '138 s/^/#/' script/test || die
 
 	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
 }
 
 each_ruby_prepare() {
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 8143a3acf5d4..0c609600481f 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 894 BLAKE2B a7fb7669e784e511574a7254af0946f26fc4ab4c4675c830a718eb95f49fcced0659e126b53c4e2f048c2cadaf13090ef960f0efba598640959a901e2e50c29f SHA512 a12c5235123571ca7e39bf31ce25c6646e384d73a40226adbd82631eb9dc7cbb9f70a53f6d546c52fe820c4cb287ac14ea08c609265847590621a1931e2a811b
+EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 896 BLAKE2B ba2383753ad41ce636aacbe8e184af0cae85bbb0f631d41fb83b6ec670c2d0f8098a122bbeaec450c9957787a26fde0b9e9d0375eb5c2e955875d9cca9851a52 SHA512 9890daa324a7e39bfc6f3b629c759e8ff253ec9850b0ccaaaf16c2927991c4f33694ecd7e8b7187524798f0563272b4358acb6a52e286b8df02018d437fb296c
 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 59ba7f20bdc1..cc3b566db30d 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
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
-	dev-ruby/faraday_middleware
+	dev-ruby/faraday_middleware:*
 	dev-ruby/multi_json"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index bb3035dd1578..99d7a68dd8e8 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,5 +1,5 @@
-DIST faraday_middleware-0.13.1.tar.gz 25728 BLAKE2B 7899d9115ad4e93ab1dedecfe5147fc425c5f884f66e473870542662b93e616e48392d7c564079fc55dfc7ffc09f5983d8a481894f295b88178d15ac05e2b312 SHA512 ea58c14e4e45cf1118281f42861df2e54c97ed92ab25d1de68a9d9da73b1ace378d464140ac8c0e42c5b36d5b0cd5f760092727c49da26c10b4e2566af9ab768
 DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
-EBUILD faraday_middleware-0.13.1.ebuild 1804 BLAKE2B 13bcbf5084c41f964f5fea25a7993a7955c6707f56efe0eb42d6438e66f53af60d9d0bd035f1fdb26c156b355ae7e9010cbcbff950202248e7eb7c3953d4ea74 SHA512 650a516e9034f054beabf70ba781deb8ea601926bdf47dde9926d3f5363ca6f2a0447a4a6fd9a505f0aea13fc1a6220c7979868811e6a04893feb6fbf10c65e2
+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
-MISC metadata.xml 823 BLAKE2B 3329517a3334e1d682430843b838b09e5deab6f87a485ce05245beccfdfb32c66ccc23cec648074f060162ff107a276007a343950b246140dfc9b1675d63f8ee SHA512 68204a852a7a6eb422d389fdbd15abf5aa2424707329b42d48c0c9aec407a30b9ed0567ae87deffdf1cdccc582c31f9b1fb83bf45569915ff72e351940ffe92f
+EBUILD faraday_middleware-1.0.0.ebuild 1614 BLAKE2B 71dcff66584bdbc21c46687f0c6d236f996e322a7747c3a333216937f0d4166a99d34b3be857560ca65715caeb5dc50fad3b2613acb3c22b600d76a9a3c14b7e SHA512 aea52927254a7c3c25a2b9cdb53f3c9300c53a6cfc5c5ba5d7ce1b46d652ec6b57973af73c712c05d3e1cd713e26f404b69354f0c133ec225fa0e4072924b689
+MISC metadata.xml 729 BLAKE2B 684a1b5173fc890eeb563bafd76307f16fd74207ad0d16b08ea57eeac54e9975dc080dc19341c4cb9afef747d659a41d42cda8a43fa0a5a4f87f835e8cf08c7f SHA512 29fccc8e1b7554d73c75985809b7e9fece60e481f1926f4f8188fec19e32b3c4c02dca2a1fbe30ff2d6264e60a4f88436e3143d5a0137312e396a19dbfe79875
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
index d82d4eed3f29..bb5ad693199c 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -19,12 +18,12 @@ HOMEPAGE="https://github.com/lostisland/faraday_middleware"
 SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
 IUSE="+parsexml +oauth +mashify +rashify"
 
 ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
+	dev-ruby/faraday:1
 	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
 	oauth? ( >=dev-ruby/simple_oauth-0.1 )
 	mashify? ( >=dev-ruby/hashie-1.2:* )
@@ -35,7 +34,7 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	dev-ruby/addressable
-	dev-ruby/rake
+	>=dev-ruby/rake-12.3.3
 	dev-ruby/webmock:3
 	dev-ruby/json
 	>=dev-ruby/multi_xml-0.5.3
@@ -45,20 +44,16 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/rash_alt-0.4.3 )"
 
 all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\|brotli\)/ s:^:#:' \
+	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
 		-e '/rspec/ s/>=/~>/' \
 		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rake/ s/, '< 11'//" \
+		-e "/rack/ s/< 2/< 2.1/" \
 		-e "/rack-cache/ s/, '< 1.3'//" \
 		-e "/simple_oauth/ s/, '< 0.3'//" \
 		-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
 
 	# Avoid unneeded dependency on git
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unpackaged brotli dependency
-	sed -i -e 's/jruby?/true/' \
-		-e 's/gzip,deflate,br/gzip,deflate/' spec/unit/gzip_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/faraday_middleware/metadata.xml b/dev-ruby/faraday_middleware/metadata.xml
index 308ea2abc418..38d121a1191a 100644
--- a/dev-ruby/faraday_middleware/metadata.xml
+++ b/dev-ruby/faraday_middleware/metadata.xml
@@ -9,9 +9,6 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		A collection of useful Faraday middleware.
-	</longdescription>
 	<use>
 		<flag name="parsexml">Include FaradayMiddleware::ParseXml</flag>
 		<flag name="oauth">Include FaradayMiddleware::OAuth</flag>
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 05e54e67713c..fb8dc27b2070 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -3,9 +3,11 @@ DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1
 DIST fast_gettext-2.0.0.tar.gz 91904 BLAKE2B fc0f752cad55512f502332a8721aa64fe1b3103ecedceac08b82f293575e974e0565b2936ae740e61ef3413919406959c6a78709ddc737b3e7decd710eafbd46 SHA512 f997a63ecccc3a8836e191b8cdcb5ba0e260bedef4cc55efeecb12c1fb3a469cc98e9e565ac773392a2bdf266618a76c8d34b0522d5447967fb85f4dfeea3c10
 DIST fast_gettext-2.0.1.tar.gz 92037 BLAKE2B 109470cb8ede188a7603dca9b79d17066b6fbbcfa13e2cb6b9a5a6f329d1285a042e152b5afaba206ac447fdbdbdb59f79b74ee2ac70ea39a99691a00fc82155 SHA512 edf98e22a39266c55e7d77547fb1b8cb3a07dcb7bd742e2eb93b636072902f065dede0d980bd3a67373f5afeacc39689cbcee33dd62ad10e1e94f6d84bcbc70c
 DIST fast_gettext-2.0.2.tar.gz 92030 BLAKE2B 762f5e5375f29abb6477579aae25c023e7b5db27a41b857523baa3412f8f80f26fc9334ce0937de20cefcf9d845846a362e34540bc5817e9e8ad00c6a7abea8e SHA512 027b35c5d8f93719fbc14cbcd0843f2a0948b49c9cf2fb65e723ba410e6c0c14ce3e42c5ce7abe657946a7da2d20665559b71df1b9855c9a04978946a50beb51
+DIST fast_gettext-2.0.3.tar.gz 92262 BLAKE2B ebcbb081e8197e3443c2adc0ec6d1b4c3ebc7ccc8623a857705d893aa5e17af4be367802b5feb313256e337c1f751b74b45fd71f6aa5cb2188d6b71fe52718bb SHA512 b9a51c32a8cec8700cc4dea85862b48196aa87a567c813bfa45ecddcb841afbeeac8b061ef7f95a5f6573d78311bf5504e10adee44547b78ae412080bfb258d1
 EBUILD fast_gettext-1.6.0.ebuild 1999 BLAKE2B d56cb283287f37612c2b166b76d31acfd8774968664ab1f107c76e3e32310c6f15119d1357e58a562cd8d3c893e30abb564f97ee2ea846d8a7aedf464fe604d2 SHA512 d760902688d8dfc33a4c26a94e889c3135d17049291fdd1dbf660b5ec8d88f5396a3b7459317d0b9c7dfff7292e714ca95d41856e55cf8202ddd0c85e6700842
 EBUILD fast_gettext-1.8.0.ebuild 2005 BLAKE2B 89fb54859c6176ffcddbf9d8290749135ad4b31898c4d6f94e56f52fb81f09f24cf47e9b6693e0c0b2aeec14865aecf99bee56e2d597be856bb0bbc51b797c4c SHA512 4c08a7139c63d3af6066e21abd4f4fc44cd114a672f5a84280aa552009e5f540e1507edc2d6425790ab3c6f92363328a9d49a33a8012d352700756323c74a0ef
 EBUILD fast_gettext-2.0.0.ebuild 2114 BLAKE2B 7b5e88f4fcd6f47edbde7c4aa0fa3436ef37d49d0e87cdd5d71429781039a256c549e7652d7a050b1241ce29058adaeee8f4bbe08519b38dc51d4a76107f746c SHA512 f214fd19fc7dda73e617441ec89386b4bf7c5866b39e4e38019c540d1b99d89b137565a214ed8f385129acc6c4e4e49edaa067eaa6cc85c94e3541f7fe1d2bfa
 EBUILD fast_gettext-2.0.1.ebuild 2114 BLAKE2B fc19886b70042de69e7e781c8983f619c1b193313165b190aadbe81a15a99e61aa20d4aa6a1df34b192b5f085bc004edff3efb30cac57374d67d7bb6b362ed07 SHA512 2890a30b895d0ba0a728d024dbadaa374e4514476f8c437bc6503257b273dc004264f6cf1f7b82d1a02c371fe1e778da501151e758cdc736ab848b926a361690
 EBUILD fast_gettext-2.0.2.ebuild 2202 BLAKE2B 113b8ec7d97a2a55ce9f8da0a8315f9d227f2e804e3419ea271a59ed1e9286b52274afe79b91da394b686afce66e97a6ff9631f3f267e55bbd114a5f3205e537 SHA512 b4841e80d4bd22400979ca2b0b148e2374262a5e7c6d34825a24aafce6e0092fed285bfb8e71699601f39784b13dd9054628d9b7e4808654eea2518ea8c989d7
+EBUILD fast_gettext-2.0.3.ebuild 2202 BLAKE2B 113b8ec7d97a2a55ce9f8da0a8315f9d227f2e804e3419ea271a59ed1e9286b52274afe79b91da394b686afce66e97a6ff9631f3f267e55bbd114a5f3205e537 SHA512 b4841e80d4bd22400979ca2b0b148e2374262a5e7c6d34825a24aafce6e0092fed285bfb8e71699601f39784b13dd9054628d9b7e4808654eea2518ea8c989d7
 MISC metadata.xml 346 BLAKE2B 93a39aacb63cc0db79f126c108547c24dd182711584ef61c481b762a35f96cbee330ee29baea8d063e6f2ea2fc0491e572b860156f14be164ab29131a8f047a2 SHA512 1b57982213ae99ae1dc5ea06240bf81f7719f3cc576926de6a0d308f26895236eaa9b3312157eb5af3e47893787c9260e4386988a6f156c9a8b660aae85007ce
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.0.3.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.0.3.ebuild
new file mode 100644
index 000000000000..193ba2972e99
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-2.0.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	# Remove jeweler and bump from Gemfile since they are not needed for tests.
+	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
+	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
+		-e 's:require_relative ":require "./:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	rm -f spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+
+	# Don't run a test that requires safe mode which we can't provide
+	# due to insecure directory settings for the portage dir. This spec
+	# also calls out to ruby which won't work with different ruby
+	# implementations.
+	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/file-tail/Manifest b/dev-ruby/file-tail/Manifest
index 039012dc5042..8553d4214b06 100644
--- a/dev-ruby/file-tail/Manifest
+++ b/dev-ruby/file-tail/Manifest
@@ -1,3 +1,3 @@
 DIST file-tail-1.2.0.gem 19968 BLAKE2B 8a9ef8b73d2e7c8c21ec04e817991ebe40ba62800e565b607dbae9732b0192074cff4b3fc9dc7a495be9a2315eab63b48126e524091d72b37f7e8261cb1333f1 SHA512 ac20e5e855144f7462ef0471be08ab56e521a7b22117f1653e06624e1d81ac11d047a21a6979476bc8547dd88d90f25e51052950148acbe3ea64bdd3c35e1da3
-EBUILD file-tail-1.2.0.ebuild 713 BLAKE2B 3a30249285fec89a7e708ab67c0a13a80e6136eb9c12d0633a489c4ff107f500fedebde6224437e5d8e2778ffcbae06de2403d5fa01430858bb173a737d0c251 SHA512 3e6278a1f8e7bcbf82d8bb1691e18558f2f7d7d8230715188e2c2faf4c393748cdfbf3efca43dc322c8c2a5ee1a42b929ce25ff7b695fd1d9e2f458fef7c0d4a
+EBUILD file-tail-1.2.0.ebuild 827 BLAKE2B 1e38bc7755deda42e25c42a28a4ff72de0976743d0f48dbab54b7113315cbf7f27bb22bd5824c5907fb85e424aad6216b70864081ac6ff94af0483902a07356e SHA512 8c3d48075a4679894f087c6708b1c868b804a222cc053145f35e89abe359df59ab49440c1b222bae65f9d98360f3b016b2ad9de989b857a630cf27846c0a2e6a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/file-tail/file-tail-1.2.0.ebuild b/dev-ruby/file-tail/file-tail-1.2.0.ebuild
index b04bfd77744d..4d1d4ec10c74 100644
--- a/dev-ruby/file-tail/file-tail-1.2.0.ebuild
+++ b/dev-ruby/file-tail/file-tail-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -27,6 +27,10 @@ IUSE=""
 ruby_add_rdepend "=dev-ruby/tins-1*"
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
 
+all_ruby_prepare() {
+	sed -i -e '/test_tail_change2/aomit "has race condition"' tests/file_tail_test.rb || die
+}
+
 each_ruby_test() {
 	ruby-ng_testrb-2 -Ilib tests/*_test.rb
 
diff --git a/dev-ruby/gettext-setup/Manifest b/dev-ruby/gettext-setup/Manifest
index ee05b3fec91c..0dbf5eb45453 100644
--- a/dev-ruby/gettext-setup/Manifest
+++ b/dev-ruby/gettext-setup/Manifest
@@ -3,5 +3,6 @@ DIST gettext-setup-0.31.tar.gz 16043 BLAKE2B 762d40295644acaaae27045a8a03ddb6a9e
 DIST gettext-setup-0.34.tar.gz 16010 BLAKE2B 3da3810bba89205a0a2856760b7fbe7a415207ccc45a3cd2e8aad658131dc751b1ad44178beaee2d0c67164a5e3e7b1ee0aba1c4e1b099f77643d72aec753de3 SHA512 479e2a79768923796960b45f1e3b3963939a4166c636ad4c3af60840a5c8449fa7fff81271b4c938e5a441146b25fcdd9fd8bb60e1df7ef31bb39efc56577572
 EBUILD gettext-setup-0.30.ebuild 1083 BLAKE2B d2131b49d40885b97ad9037169834cee5a344f7cd1bcdd5977d8dab5d3c1034b7a3cbdf8fd4ab65d50bbe24c009a4fac2ec8d702a84fe89ea430d8921d957bd4 SHA512 e9a2863774b8c36f6e2327f7f04752150440d13b51b2e2f0b755111330566b7cef7a58869135dfebb5b9afa3f170c62fdd6e315bcab97d357e3559aa1bb362fe
 EBUILD gettext-setup-0.31.ebuild 1047 BLAKE2B 812825978046a5347fd02c5d7c8051f175e137b1017e85e490b2a488665c2f513f0e71c3cff68ae5d55b7289dafb69e82d07f67f95e4a87e2a068b43e6e56fea SHA512 f4465f5abe1f56efc4b41dc952437b6ebc4a6fe92a1edc25013e3dba3c072b92373eb6d5c59b3e9bac571651d209acfc6d34dc563d5c9a2175642de5db0b4c01
+EBUILD gettext-setup-0.34-r1.ebuild 1112 BLAKE2B d2d6c01eaf59e6158b00ff5532f78c5a465b5ddd9cf215a43050a6ac891b70125892bd49524c1fbe65c4310798eceaf6b96be2ab873e23a58a549fc7a1a65a8e SHA512 55a0c0db38ca6a15e6f6fe23ef5d3ff8f329115f653f6d475f410c451a329507dea9cd2d1b086e00cfd556f97f33ad7b78fb20d64e5a7d55797599052ada905c
 EBUILD gettext-setup-0.34.ebuild 1054 BLAKE2B ca24c406b7dcfc85ceb7ba8e990f22547d02e8f2c254b998ed6463b59d66cf22a63e8d1370773353f7d501790982fb41255c19e6926028226ae1c5c315e983da SHA512 bc691cc1d4d7585b83ced60fb8e5aac2ae16ac99c04a513960d39537041ff3a448be913cea94fec35884b1db2ccde5eb9c94834b9c14c0fa6333c1bb657db722
 MISC metadata.xml 344 BLAKE2B 14075c722372613eeff2cb810420e1e0ff7cdcf4ee1ba748a0b615222b88b13a0ecc01c9d0ca1aab71c0bb28359c18682b7402444caa01100c3d8381b9b13e08 SHA512 f7f8c8e7f745313b74340ffe738cab426f793f452106e0ae70f5e73a3a745f1b9ae7b1b70b5951f1d5eb81d4e61851845fa53bd2aa3dab8362f330e6f8d79e9c
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.34-r1.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.34-r1.ebuild
new file mode 100644
index 000000000000..e56f46d82428
--- /dev/null
+++ b/dev-ruby/gettext-setup/gettext-setup-0.34-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem to ease i18n"
+HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
+SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-gem-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-vcs/git"
+DEPEND+=" test? ( dev-vcs/git )"
+
+ruby_add_rdepend "
+	>=dev-ruby/fast_gettext-1.1.0:0
+	>=dev-ruby/ruby-gettext-3.0.2
+	dev-ruby/locale
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/1.1.0/1.1/' \
+		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
+
+	# Avoid spec with specific locale requirements
+	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
+}
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 06e011165637..6c4bbf353958 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,5 +1,5 @@
-DIST gh-0.15.1.tar.gz 64076 BLAKE2B 3611d83d9414349284bbaa7618aee2c9b5cb4c6db98e506891f70cf0f21dd7f25ae87e9f8094a90ec4ed4f62ba1e05bd598722a743e32abe54e7eb2a002d9d72 SHA512 6b8a43360253275408ff3d0f6e8cabe3afe399b4ed362f9b4ded72a9d650d18483cf5e3d10877a97c9112b7ccd5add5f2c9999ab1cd5f8102af3a9e49ef39037
 DIST gh-0.16.0.tar.gz 129499 BLAKE2B 6dea86bcaa8191b2eb19daed487d80e5b55adadccb1c063320b44e742895cad1956e06a917ff35659834b4cf541892d3cd0b432f03783b4b860cf4c7136c7c49 SHA512 141a432b8d5f43feea6cc86be504e35b5133590466f1a28c5ba60a208cde9d3cc1a6f19702757e132e4255220e1161f6dc9621ec18a789d963738b9801e52da1
-EBUILD gh-0.15.1-r2.ebuild 908 BLAKE2B 90bec46a308dea780e6fe0e8052dcfbc47702549b1da7e6f6ce7c9d74e8e07458879c22a4c10907bc34a63ac0c63593431d5818f39b3d6790907f69b5bba28a5 SHA512 92550711dfa167eaec96493b4953e1b6c7c8aaab0328713a581d777a96b06ee86e651cf8ab04dd53a0144889673f4471be0998c3036971eda45c3241b47b18f0
-EBUILD gh-0.16.0.ebuild 916 BLAKE2B 41b978b733212b8e2584d05f02f8ce93d0deae4af7525ea58765680edb632bdefacbb8d25fadddc9e97bf7fcfd7359a178ac920fa6f71a9f039dacbffe82755d SHA512 0007c0203a5b439e20e78d6b98e778f57d1f44e884a20c453ffe635e602c7f86daf82f193ebf61ef0f7a92bc9268d4d9b82ce130eb1634dae2168042c16941f5
+DIST gh-0.17.0.tar.gz 129494 BLAKE2B c7c777fb1f0f417c62c9ec0598716302c2cb0a6870ff9534cabf03baea33e73581cac9bbe1f803d23adeb16b15e5af06e4dcc61ab2300846b6c5c227ddf7aaea SHA512 b655552180dd48a9de05d925d9795278ba8f293d03e07fc0675aae9bcef264f45a840b37cc855718c1118c31964625775b1156facf52781e99255bb16e7895a1
+EBUILD gh-0.16.0.ebuild 918 BLAKE2B 86306322fd2d9bd7df7c1eb2b01f06c140a235abbc01cc0075102e715e861b03822469e68cf120199617046ddfe3150dd5c346780be7d79b7f170f6f3d1f3d96 SHA512 41818e1f35626458e009b2728930e8c8cf12b380e5ceef46213b387b2f5831d25a3527c02e43b2e74005bcf6f2a15aa7ba7d503400bbb04eb8284185e6d8c9fd
+EBUILD gh-0.17.0.ebuild 912 BLAKE2B c6281e196cecedd284e61033de159a5b290bc97c6545dbd7a62dbf3202e8018e8d64604e07e360c42030fbac2dd59d14af275f7107e2bd4ef842a358a35144c6 SHA512 160debae74829ae66e9078b38fc256d50a8443f67fe30ee963fcc0b50c2b1cc8bb00e57f57352d9929007655c9253640a712749276bf6697289a0b8a5266d0d9
 MISC metadata.xml 328 BLAKE2B ffcac2532a59009124144d5a974ab68f58c35954d76523766184eadaa5ba9602d891c433f40e830cac3d5acc8ea80fe516b5ce69df6e2240454e5ec1d9f198a2 SHA512 827f41487bb4442546ace9b648b2153e910f4e38a9d3edb1d2c231add2ea537c6318da7c5f0b4ee48f016c7c0bc62fba36cf4745fb96f9ad90890b97049d9d29
diff --git a/dev-ruby/gh/gh-0.16.0.ebuild b/dev-ruby/gh/gh-0.16.0.ebuild
index 21bd4bf82044..8114569ae0ee 100644
--- a/dev-ruby/gh/gh-0.16.0.ebuild
+++ b/dev-ruby/gh/gh-0.16.0.ebuild
@@ -26,7 +26,7 @@ ruby_add_bdepend "
 ruby_add_rdepend "
 	dev-ruby/activesupport:5.2
 	>=dev-ruby/addressable-2.4.0:0
-	>dev-ruby/faraday-0.8
+	>dev-ruby/faraday-0.8:*
 	>=dev-ruby/faraday_middleware-0.14:0
 	>dev-ruby/multi_json-1.0
 	dev-ruby/net-http-pipeline
diff --git a/dev-ruby/gh/gh-0.15.1-r2.ebuild b/dev-ruby/gh/gh-0.17.0.ebuild
index 3c2c8450ab39..e119d3055028 100644
--- a/dev-ruby/gh/gh-0.15.1-r2.ebuild
+++ b/dev-ruby/gh/gh-0.17.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_GEMSPEC="gh.gemspec"
@@ -25,12 +24,13 @@ ruby_add_bdepend "
 "
 
 ruby_add_rdepend "
+	dev-ruby/activesupport:5.2
 	>=dev-ruby/addressable-2.4.0:0
-	dev-ruby/backports
-	>dev-ruby/faraday-0.8
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
 	>dev-ruby/multi_json-1.0
 	dev-ruby/net-http-pipeline
-	dev-ruby/net-http-persistent:*
+	>=dev-ruby/net-http-persistent-2.9:*
 "
 
 all_ruby_prepare() {
diff --git a/dev-ruby/gist/Manifest b/dev-ruby/gist/Manifest
index 3ff83a91f3f9..f32e26b7b31f 100644
--- a/dev-ruby/gist/Manifest
+++ b/dev-ruby/gist/Manifest
@@ -1,3 +1,3 @@
 DIST gist-5.1.0.gem 45568 BLAKE2B 829a307fb2f03afaa4b4ef8308e8afc03a1218d91f7ad1d104c5988e928d684a9fe8a54572b83d05ccc9aae5186ece7ab7ac5f8b43b0b0ebaa50f8706f22a90c SHA512 4684885142065929fce87a335749d5d5eac0486a3f340005409d178831b5ea616f8e8f34b2e43f1afd6e392cf91883bcfc4b2ca26183aea711420563b22aeccd
-EBUILD gist-5.1.0.ebuild 475 BLAKE2B a8910684875ccf1d32f912cb4a96b37875541a401c718be6977f2ba06910dc1dc9862ee43457a73cea43db221ce5de531335bddb54a7cad4782f8c3e0b012a66 SHA512 721c3a3516b2d89dd94c84d04e8cee0afb98806d5753be4def70ec681a639cb3ac7ca83fc5c76100befa0e8d2c6f7f670ec9353412f5c92a58eea8da9af5f919
+EBUILD gist-5.1.0.ebuild 515 BLAKE2B 01d02f522856051b926c43d913492ec2539b3a95b48677c8b22b9fe328a684a6f732d81effd6ed46c8c7bead23dd50b6ac29d256d256d4cf77130804fcdf1251 SHA512 13c788ac3aeab8c44ce253d8c6cdf13b91ec5cbf6ffa4682266a14fdc8795733892be4eefa43e23055a2871fc2d8427308b6d3c0ffadf21e8bfa2a459b276af4
 MISC metadata.xml 559 BLAKE2B f9fb5838cd7e74c215e4707f230795b00dbd8889599b98b8b45b917e6150f34c9b5c620877bc756270718c42319e43db823d3a4c1b63eb6f3d3da4a24b9e0b1d SHA512 2fbd3a05be934871e9e60078e7c72de9aea028c379c9d1ed33e3f9520e03eba40b830a9b35ebbcdf3ddf99163688b6b1db6f50fc60cda6d7f85bb3291a8dfa7d
diff --git a/dev-ruby/gist/gist-5.1.0.ebuild b/dev-ruby/gist/gist-5.1.0.ebuild
index f5655faac28f..281d969d8c4d 100644
--- a/dev-ruby/gist/gist-5.1.0.ebuild
+++ b/dev-ruby/gist/gist-5.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -20,3 +20,5 @@ IUSE=""
 
 # dev-python/txgithub also installs a 'gist' binary.
 RDEPEND="!dev-python/txgithub"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index a4efb91887e9..67d7139e5899 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,3 +1,5 @@
 DIST git-1.5.0.tar.gz 128607 BLAKE2B e2bf19af6c0dd95917b7f599ce2e9b0b4237da78020a86cab5c5985b6944f0921a8f245ef860b9e1faf31761296c4cb6a685ca8d6033e3a8ca7086eef8a9e75b SHA512 001b2e93c1a1f5010026e4b6ea280cc6d7649903cc6faec277b2389bd74fd274c6b2daa465bb66ad7e15f7bdc4b09e20e8c1cc1a55ccfd4ab80ec12bf8562af2
+DIST git-1.7.0.tar.gz 142017 BLAKE2B cb05ef711582b98b420c143dce8fcc3d932c7509ab8c5577a46d70f180ee37d865d7268f56c133d3327ed27058a4c5cd7b03a6c602c665d2f574bdec476c6eec SHA512 c90cd3fe46767a4db5391eb85534e3801f1bd2f345a324ee89d3c04c4348aef09a5424760c59a079d51f3fa003c3b31d30907bfcff4b854adf3b96339d25a8a0
 EBUILD git-1.5.0.ebuild 848 BLAKE2B eaa40f4cdc6a76b8852427ec87a8031d4cf87db7587ef90994a2efec6495efd7c451a0d3668644d63bc16643d8b252da7896190bcbe681e1d4828214225650d4 SHA512 00fbc7c2cd55bc4069e67cd394713c2c55b211e494ab1e8316b146a006627c982fee61fd12b5be10fdbf2130b73eb68201fcad27bb332426949551c04e5ee2d4
+EBUILD git-1.7.0.ebuild 863 BLAKE2B 292e8cbccff16cdffc102e1cab4d0bd6684586f5c2d89b8afa6e40713e28f72a66f6fc3ec110693d4139116f91b04941d899d22c66533e847ee4e13d0d6511d6 SHA512 b50d390a63f592a66dac078669f5d33f7776911aa2d048bba51d04162fba37ef7d07efda655a990bcd8476379f76cd59a963882eaa310c31e8fed5334d615b26
 MISC metadata.xml 342 BLAKE2B 1aa7d32650b393da1bfad419c6f65c3d9956db2499d892644612e493a0a992965bdad905f84aee02344bdf563c2013caece8ef34004a0e2dee5d71f8ef3d0739 SHA512 0c99c243d5fe5177581b406fbaf9414b2a96647379dcf81c1ccf89762c300e6b5090ac7ed25e214e5a2ebbae84abdc369a19a37a67d0075aa54228dc71748eca
diff --git a/dev-ruby/git/git-1.7.0.ebuild b/dev-ruby/git/git-1.7.0.ebuild
new file mode 100644
index 000000000000..67c338468bc6
--- /dev/null
+++ b/dev-ruby/git/git-1.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/schacon/ruby-git"
+SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+RDEPEND+=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend ">=dev-ruby/rchardet-1.8:1"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+}
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 14f17746d3c1..88bb76b44ffb 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,3 +1,3 @@
 DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
-EBUILD globalid-0.4.2.ebuild 767 BLAKE2B 80997852c908451f89d018743e88d4c424f45dca4c9af86325e839470f059ab4a29a6765e1edc28a735b0ba8fcac14a699492f6a83a4a9ce87e0a0276799a730 SHA512 bd9729f118268ca79eeee081c9bc53192c86f9f71cf19cabf60b51d39e6a121fb1507fd51f2f131fc2fedf50c5c6c59f5ab553d088ee8f8fd5bbc0263028b396
+EBUILD globalid-0.4.2.ebuild 774 BLAKE2B 7141669a7747eaa4b73074a8a6bba1154ed997c8691bae1dcc33dbd6fcebad74baf98861884abd9d76a6819e806fe5907e245eeb0d6d89cc6ad5aa4d520b0827 SHA512 87db6271ebb3ff86096dca8a0b650c981261d05cd0c79fb4f06c74f509ce82f3c53d13b836877575361a79074d51bd81de81ee483aadf8692b186f72240ac582
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.4.2.ebuild b/dev-ruby/globalid/globalid-0.4.2.ebuild
index 1d8455b2ab54..72e08acc7fb9 100644
--- a/dev-ruby/globalid/globalid-0.4.2.ebuild
+++ b/dev-ruby/globalid/globalid-0.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index dfb194552a49..57a46421e4a9 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,5 +1,5 @@
 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.7.0-r2.ebuild 1459 BLAKE2B 15d39112ef127c9f0c135dab0f000fad1ea6cb13fb4a25a117814c08e6000f1434a263dda50ad88b61794e82f5e58d80ba6066c19aab91036e2f9704305685d0 SHA512 3ab43cce5ac564c275b75dd3109ae1538dd505ae634e93d1a1b23daadcde4c41268f73716ee09a1671ae9c3913f5c2e9c69abca210279054c44bd2cceb657a4b
-EBUILD gruff-0.8.0.ebuild 1420 BLAKE2B 4a4a612b32c9013776a95564f444a1f4a911541c68da286622bbff9c03c19956d87d8faf901d88f865c32715364ac09a6c543109de755bc107a3cc4681d58eb1 SHA512 d56b0cbb70860a726594c316cb1e5a3215ddadbb9874fe18d5eb685599a2b86c585aec8532da41e9b8103350b13e7664d26ad92a5e4d2a644f4eff466648df1f
+EBUILD gruff-0.8.0.ebuild 1427 BLAKE2B df65f08ae1216a5eb831a5a9595042683428aa1e7b6d8fd1965cacf9ca99ae645eff1eacee88102b0b77a5ebe72385d7cd44408ac8430682e5c69a56802f7170 SHA512 34e18876511182db433f954f97d53516aecd2de829070e7fde2b50845c9af36f67ecc0835aa2e3cf514be553665752b80911ecffaf0374a8902fe2dfae81da6c
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.8.0.ebuild b/dev-ruby/gruff/gruff-0.8.0.ebuild
index 3c1522ffb1c6..a65092a0b85c 100644
--- a/dev-ruby/gruff/gruff-0.8.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 9dc9393a7aba..a110ac669728 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,3 +1,3 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
-EBUILD haml-5.1.2.ebuild 1606 BLAKE2B 67e7de0cd516c7803aa608731e3ed312c46cbf5287eff40f2275b17877c44032c855df042c6c947bc5c071f4ecd84ace679d4f3013f6fe1721eb5ba3b75bc4a0 SHA512 0ad164beb64b0e0cf32d02757382350ce7016b5c253972c034870ce87c7b49967a671185f04a5433c4b8d052aef0556bdc0c75a36a8b24de6370ac72dc7f063b
+EBUILD haml-5.1.2.ebuild 1677 BLAKE2B 1c26084fa20a65e01e3326a91b546b90c10a996896968b2d67a120274d8c127ab44f44ea535cf93451f5d9d3ed11e8e7118259881c76530008e13d2a21cd19de SHA512 5288a67f335885bc39b07c9415dba64741770bb955c58341f65ee09404f534c63767ef29ed5bb0da4e2eed0cb2417d9a1c16ecf521e290cdda335265f65ad74e
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.1.2.ebuild b/dev-ruby/haml/haml-5.1.2.ebuild
index 8ae391d3b3dc..077a1d33f39b 100644
--- a/dev-ruby/haml/haml-5.1.2.ebuild
+++ b/dev-ruby/haml/haml-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,7 @@ ruby_add_bdepend "
 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", "~>5.2"'\
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index ee6aa5cd4911..790b9cf03cbc 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -5,5 +5,6 @@ DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b265
 EBUILD hashie-2.1.2-r1.ebuild 736 BLAKE2B d54f1f1d5cf059d17af6bbd20c229cb8cf28cc2cd2a62a4ee6e42200f76c16393e0b1f2927fec47c485a5e144211dd8ed9ee790c73dee30fa93ab865b79bb084 SHA512 650393587f133232d8bc304fd1783d19c8eb6f9baab5e5efb3b3619b957f69dab9b46c90d8c7622519a2b3ba3e06c4496c2074079dedad14a768a36789acc1fb
 EBUILD hashie-3.6.0.ebuild 1286 BLAKE2B a7c43fbdad7d52bf2ab56e1f4eccac9c894eb3da2b932ec6e3f6af0c75ed9338e473c05a242acb32a32fd607057ea7aaf99b2b8f696cb795e3224bdca231aeb4 SHA512 96c3c718ebf37a8b99178e052936ad6c78fd7f3fb7581c35f6653ae36d8d8be0f122da3ea509e2f17289827909203fc52376d26a80297b397d07b432a4e72bd5
 EBUILD hashie-4.0.0.ebuild 1411 BLAKE2B c6b1723aaae76f7265e3e18ae5ebc3e5e00be1ce8e2378c881092d415aa64a6f75c6cde0daa3c3051210b5f1813014e99310ecfc77ac9f47237705817820340b SHA512 e12e0593a6ea70686708687323966a8f536bea783c7262c6696af67ce12e1e242a9e7825c44e23921f8995a3c1cfd53a92cefb3fcf470353c2ef66617d0b3860
+EBUILD hashie-4.1.0-r1.ebuild 1422 BLAKE2B 01cdfd2a931ba534fd537f89b87ee8f5a1b2a468da9ef5830c00194e2085f51b23b2bd4b75b296ac91c2066d819e1824a13cb45c1a4634cea4deb2a5152b2422 SHA512 67a15340eabe572e981aa50b49b864abb243c150dae09327c58018316ccfb346cec75a37602c7ba21e92e56b8e71f8c4f46e340bb5a2eff237965924001ad309
 EBUILD hashie-4.1.0.ebuild 1427 BLAKE2B a24c92707fcca20b13cd200dc262ad5898fb220d85a7104400849b47408978ef7335dfe0eb87d593ef30b7866930c0f4f9987b7946812b515ec05c90c4eeaa2d SHA512 773bb1d904af1ef1b1df27d59871c006320587f34639ffc606f15c705c0e537dcf7731a4edfbdfb5090e1e07ad4819440f9aad5f0b1b79743ecd565d400d22e7
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..9f66fbf88a1c
--- /dev/null
+++ b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="hashie.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
+HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
+SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	# Remove bundler and fix one spec that depends on its requires
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -e '/pry/ s:^:#:' \
+		-e '1irequire "pathname"; require "tempfile"; require "json"' -i spec/spec_helper.rb || die
+
+	# Avoid dependency on rspec-pending_for and its dependencies
+	sed -i -e '/pending_for/ s:^:#:' \
+		spec/spec_helper.rb \
+		spec/hashie/mash_spec.rb \
+		spec/hashie/extensions/strict_key_access_spec.rb || die
+
+	# Avoid integration specs to avoid complicated dependencies
+	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
+}
diff --git a/dev-ruby/hocon/Manifest b/dev-ruby/hocon/Manifest
index 21cecac8a7bf..4fe0eb4f5bcc 100644
--- a/dev-ruby/hocon/Manifest
+++ b/dev-ruby/hocon/Manifest
@@ -1,7 +1,9 @@
 DIST hocon-1.2.5.gem 147968 BLAKE2B 9fe004d59cc3e66d770c7c8069ff2934a17befa120ccfb2e382f36f632a186095c3a94eb25e77ba3fff422394444ae85cf3adde2ed045d50f0ac99871c6dd909 SHA512 7d2d86c28edd6ed6dd99358558093cd224b9922bcbcdd2e95e23134ef0e9a2bae6129e7273435032850b672094e77f8f5b6d8cfeec03762b39ed6b63fc5fb5dd
 DIST hocon-1.2.6.tar.gz 145888 BLAKE2B 743b58d156e046e8226aec7d616bc4a8f6a044687270d50c7e618dde890927293bf750e6d4cbc0f394d1bd9b089c751f30aa08685026dab658efad1313b54d1c SHA512 dbc48fc1c895ee3278431e4dd6bb6b8a84f50bb630a768cc1fa295440d7d057c0eb72ab54d9ed35d397bbeb0febf110586a7d641d91b6898100ab7bf7b2a9001
 DIST hocon-1.3.0.tar.gz 146291 BLAKE2B c7104cd7fa2621ef5e39148de6e67c1b272153ae1b39dc5558b38202b5315f600f2933c19b6e075a5344bb215ba7ddaf95a73e0980cd3ff006dc67437b10823d SHA512 67a69b516197b4a0e64c275fe4b930a3b1128ef1949c47263ba9a20bd8397152a2a5dce0c64ce54dbcf7bd3c81d77aa2fb450e12f5aa7bacb0c85e61083904f6
+DIST hocon-1.3.1.tar.gz 146330 BLAKE2B 4eaa791f148347cf30cea04c79ed63fbc804a0ef7f4bdf1640da706f857a46a99342d338a8444b2df316ef972e11d5a3e10aae8d82f464b2964aa30c2086274c SHA512 c73cfd8d6c77751d1d2a35d85cad2f2eef700a01e8b8de9449c0c9dfefe8d4a80c4a79dd3db8ee4a6d2c3649f26d6780cbe05fe9b067de05ee3711b00faf4255
 EBUILD hocon-1.2.5.ebuild 539 BLAKE2B 242287c7614b6897ac0115d10f9ec29c4337e76f0b92cb539ba201ef8cb76daa978c62586477f3a4badfed659bbe106bb06aa83eede80980764c3015c00ae4ba SHA512 698340fa9cedb40faf187c1fd89b46e14f889024ea8dd2c0c1447f312a46e60d4d804ba8ca92bddc92eaae982a6ad8b5883b6c3c70b7c709c2db0e374e0fdf97
 EBUILD hocon-1.2.6.ebuild 630 BLAKE2B 0c89d6137187dbb05fba73e35cbefc660ccc99cb43af8400db13dc008487eefa8f19136757de9929025b950a69347bed653a59c85052ea22f70acb1cb64f59d9 SHA512 0719c2149983e006e9daeb061d27a7e9ef77358eb1f1ec554cd124e333b5d80875d3df2429cdb543da4ae348f89c8e93569c571868113e9bbd850561428253fc
 EBUILD hocon-1.3.0.ebuild 637 BLAKE2B 6ae58a847eb253fcf1547e6e48f151545560815bbefa12c5f9a73b7eac15e15c04f287faa5998e73b9e827836c888a1645fb540da11fea7550b076084eea7877 SHA512 16a5f551e8491775ff0581a5bae4c57713b2266443b59d6cea90c85db16ffd9078154c4c3ff8912e13b3d2902f4e3bc4009da5ea8809fcf247a965165f53beb7
+EBUILD hocon-1.3.1.ebuild 637 BLAKE2B 6ae58a847eb253fcf1547e6e48f151545560815bbefa12c5f9a73b7eac15e15c04f287faa5998e73b9e827836c888a1645fb540da11fea7550b076084eea7877 SHA512 16a5f551e8491775ff0581a5bae4c57713b2266443b59d6cea90c85db16ffd9078154c4c3ff8912e13b3d2902f4e3bc4009da5ea8809fcf247a965165f53beb7
 MISC metadata.xml 514 BLAKE2B 41c8fb2854ca091452e2530a98518581287253088bc3709b9945a47ca1ad06ffeb4ef40a1da8e2843322fde51e805e381a768a8cf3fd14b5d62d660fe975a59e SHA512 cfd1c8e9f9eaf4f3cf797e9fb40bdeee6004a38e1d3dac66469dc43944204722720c63798671d3032034dd826f44075257db43021910d31af3333df423064ba3
diff --git a/dev-ruby/hocon/hocon-1.3.1.ebuild b/dev-ruby/hocon/hocon-1.3.1.ebuild
new file mode 100644
index 000000000000..ce808c13ff26
--- /dev/null
+++ b/dev-ruby/hocon/hocon-1.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="hocon"
+
+RUBY_FAKEGEM_GEMSPEC="hocon.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This is a port of the Typesafe Config library to Ruby."
+HOMEPAGE="https://github.com/puppetlabs/ruby-hocon"
+SRC_URI="https://github.com/puppetlabs/ruby-hocon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-hocon-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
index 69d62c483d64..2793a5f19aa6 100644
--- a/dev-ruby/http-accept/Manifest
+++ b/dev-ruby/http-accept/Manifest
@@ -1,7 +1,7 @@
 DIST http-accept-1.7.0.tar.gz 12289 BLAKE2B 5eda9bd29e2dd2b52c8f2589adf57872a80aaf93c37d28b1668dc24fc1e2fa81d00ec12766dd558691dbf3e6560bba013f456a659ead47fffd77b1565c186a7f SHA512 3502bfbd07f6bb0164843c728cd5ef27adfd675317fd60372539180de212d02d6d446cff8eb081d1cbe5a19b30d5759a55b22bc63736cea83254595bd691522f
 DIST http-accept-2.1.0.tar.gz 12473 BLAKE2B afb5513207c0491fbac6e28e14f7637de805f3da60f0f00b6efa54a21686444f3a669a0f47895f21b335031856a1bee1e60b1f11e22b8a7caac23168bc6f7892 SHA512 c8eff607b697ff1691644e4e2e0447a64f238dbbc13413afc7bc3042cbb49d2d825bc9b698845dce4be2ebb3ecd9b31f3d5910a371982e74927085c9121c4dd6
 DIST http-accept-2.1.1.tar.gz 12488 BLAKE2B b909736c0fda14b32f30c38f12f4c4c2b2bf1a36ddf753069484b6b7151d518b80a6ae8dba929e27f8f758c0c0ae0c52c24802f02b1bfd4674ca33b50d7a0de0 SHA512 e0231cae90ce9180006714485df2cf205bf1f114887dc581ea50fb558c1c7e434838d10d0c9f69c1d747249b8d0c73e628a6ea7b1ffa1ffa7059ba2447307df2
-EBUILD http-accept-1.7.0.ebuild 484 BLAKE2B 4ceb90a8fb58481444b031939f12b048b705001d0b360178f1fdfcf330301d7861af31fa2b4af85d9332153c518e73ab3d87ac7fb4e9891dae07a3e54f1a4fc5 SHA512 d7bda461fdedbeaf919692c74e31279c8b98efaf7716c78c55620afdb68632db1922611bab776a9566408a00e8293a136d8a7e5245671169e0d21f8c14d0f981
+EBUILD http-accept-1.7.0.ebuild 491 BLAKE2B 9208b766abd74a8af829261e289409beef797d91e442a1a24ccea6e47aabbe803ef848d336ebcdab9a2ad26d78a1de9b5ebbcfa3822b8868ba6e3fa1d2718ec2 SHA512 fac2c88a82cf813e2131af55a02da2fa6d07adc49a471323ee14c56584e70d76b6c84e427e56aee1a709e75574045fab1118159c0d50bac62376783ef4c4716b
 EBUILD http-accept-2.1.0.ebuild 566 BLAKE2B 56ad3751ede4c737d8a2988ba9b393098e67e8a83eba8d7352a2c130bd05b8820c96a9ccd3d04616fbd5e8aed550f962feaf2c47f66092335babf47ed7d6d109 SHA512 12c1a461ea6c922df8679590774618174b33dfec638c55cb67a187b79c53e85fcb98d9ff682c5a97f6bcfff1b965ea1b7556fc56acd3725976ee7581865b5da9
 EBUILD http-accept-2.1.1.ebuild 573 BLAKE2B c20dc015ffcf0bba2befbd24baf07c7f743704700d705f3c022e85b2065284896265b68aca7c458e83e723ac74d9c57961c4cd5bd0dbfa1b2d41327ef7158fb8 SHA512 b7445cf86adbf4f0c16ebcd86804d564ac3a67f45f5746e779b657c0a97506f1496637f4dab0cb577df0432bea11bd591818ea6183dd2749856cddf4d855a7ba
 MISC metadata.xml 346 BLAKE2B c33b0144f0c036776dc5c8693eec52606af791efe1a90ea9c1f6dd6792fe858a50f0c60f05fa2acad93a0922abdc0747a8edd45e5cd13cde04375ef34c41dcc3 SHA512 1d219740872630fd0cfbe5e93ab11f445c13c9d57089ff1adabf3745caba7cf4eeb57fea8cdbc4c5a132be18ae556ceb82ebef438bbe4d0fad665c34bf1fada2
diff --git a/dev-ruby/http-accept/http-accept-1.7.0.ebuild b/dev-ruby/http-accept/http-accept-1.7.0.ebuild
index 391f22753ff1..fe574509a5c3 100644
--- a/dev-ruby/http-accept/http-accept-1.7.0.ebuild
+++ b/dev-ruby/http-accept/http-accept-1.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"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/http-form_data/Manifest b/dev-ruby/http-form_data/Manifest
index 265e6a0ac880..f09329b6412d 100644
--- a/dev-ruby/http-form_data/Manifest
+++ b/dev-ruby/http-form_data/Manifest
@@ -2,8 +2,8 @@ DIST http-form_data-1.0.3.gem 14336 BLAKE2B f58410dfa309fbec55e97f5bd10e56a7be0d
 DIST http-form_data-2.1.1.gem 16896 BLAKE2B b19507dddf5c072b5a190bff98c61b94209652445ba995c3834bdf47faa515cc3877afcb46ef4946b4b6ad265d917cfc0fcdba2ee98c440c134343883740917e SHA512 43e1d9a522a748ab5d1633392225d87b5b178f6ae46a9bc4296b2a71b95b54d0a0c5fa1c3d8a8f48134df7c8c5893bfd7a5db060da275f49a147385cb4d04627
 DIST http-form_data-2.2.0.gem 17408 BLAKE2B 35669a42e366297eb54cb3b291b0cedcd70387f3e903056ff3dbbab52a6efaa9d536111f00dd9cd360268e75dffcd8cc91ad0ed898236f0e7af89f14979d3240 SHA512 dbcc2453388ba586556b86d4cff9cf12fcde4ee5f5a913e8c5f24857b10010e920fba447c1d34bed78a1e636c2ef2649ea4dd1b428c29842b3c45eeaa1281e74
 DIST http-form_data-2.3.0.gem 17408 BLAKE2B faa29c86d57fac1554680bb10e1a71e591ec873a04c63c0d0fa2c993c03df03dd35f3b762a290d188285efc0cf63d5040b262d386cdf7a4abc4b7477a6a1e00f SHA512 c070126d18a66bd505005d7dae4ece6c751e52593806daf618bbb437b7f9296a5f18aac2e317b3526c9b34adc2f4d9fc7b7bab8cf2a8c8ca67fdc5940969ff21
-EBUILD http-form_data-1.0.3.ebuild 591 BLAKE2B be58fad970c8875333de0e2e9e97e1eed0cfe8c0049a571cd54c0691b72ee7eaf852b96fa20df883f4fad6177b5e75a765033cdf3d76616d8762083dc466b122 SHA512 48deb64ba6ff6e8d4dada9841b2e812a2e61ce87f9365d25186cf1cffd49256fcada51f50f280bfeaf53c2f8738ba35eca272afd7a56625587554929f2d208f2
+EBUILD http-form_data-1.0.3.ebuild 577 BLAKE2B 76e649e40e56dc062b42a91e5814786f9fa267329b061a871129ede15b0195804ab856f718ef7c9d52bb422cb698db798facc18a5b5765dfacbd24df0c466b14 SHA512 34d2ccab203565fcb5e9df9d3aba724b41447ed7055a54d4da76ff1a3e3c23fd68ae11bbe65fe9f7075186a87eadfef3438a0e13e3eae8ff7f6da5729f6d24eb
 EBUILD http-form_data-2.1.1.ebuild 608 BLAKE2B 3be09f1d31a78791a3677f5a5a0de24a87540a310bbeff4e85de83ecce0688c16511324d4335a59dd48ffa70ec332dc1c09f6434001e7fa44a98b703227fe7aa SHA512 6e8b021238874e979bf0d87505d78fe05a3d7f49cfa4ff6153874fd526989b078dc0f987a8d34819b5d1bdc500c59a58970150361984a2fd7abc1faa8c38ecfb
-EBUILD http-form_data-2.2.0.ebuild 578 BLAKE2B 43cca3269496793d3bbe63a24ec1236f60d21a068fd113f66a005a2059b4cc78c4bb40742fcb9ac8cebf657cffbca6e05d321896a6c64f894e7763f02dc00c58 SHA512 86dec5c26024efda3b7327c9a8fc94162615084fa5a145bfc70047edc6ccb3fdbe4ed6873f4fbd0e0370284f4f0affc8347d1cd7d70254ad81d0532b4aceb6f3
+EBUILD http-form_data-2.2.0.ebuild 577 BLAKE2B 097f3c2df484ddc3ff90ad7607f6a7f9c5504e7f5551bc6563492f242acbb1c6c238ca545890acf90040986fbdb281a182a88c5f4fa3c05a2a5bf58bf5e258ac SHA512 7004f6bd7830eb20ab50a406572fb7a88be6765163d1503752f88284032872ebffa170639d6a869c41bf5f35167e0ff22aa7c64ca1184992c0cba6af3b5b6c94
 EBUILD http-form_data-2.3.0.ebuild 578 BLAKE2B 43cca3269496793d3bbe63a24ec1236f60d21a068fd113f66a005a2059b4cc78c4bb40742fcb9ac8cebf657cffbca6e05d321896a6c64f894e7763f02dc00c58 SHA512 86dec5c26024efda3b7327c9a8fc94162615084fa5a145bfc70047edc6ccb3fdbe4ed6873f4fbd0e0370284f4f0affc8347d1cd7d70254ad81d0532b4aceb6f3
 MISC metadata.xml 345 BLAKE2B 6301add67db13bd0df4d236cfa4042737f0216c1255a92b10ee272a3b4bfeeaeb0d9541013a460a3be689058ba31683854b3f0308232cfeae7f4d560d207c10f SHA512 6d157ee3fe1a775733ea0a808a81d68c0061319b30c6062e181cc4a19d1a5142027ddb2145fcb78c44feddd4e36682ce39306f0ade0fb5c13436cd9351e45bd8
diff --git a/dev-ruby/http-form_data/http-form_data-1.0.3.ebuild b/dev-ruby/http-form_data/http-form_data-1.0.3.ebuild
index 03de1ac551a6..5e6c7f35800c 100644
--- a/dev-ruby/http-form_data/http-form_data-1.0.3.ebuild
+++ b/dev-ruby/http-form_data/http-form_data-1.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild b/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
index 19cc657ae534..2d3968c6b5b3 100644
--- a/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
+++ b/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/httprb/form_data.rb"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
index 2abf92c4099e..e112e0c51a65 100644
--- a/dev-ruby/image_processing/Manifest
+++ b/dev-ruby/image_processing/Manifest
@@ -1,7 +1,9 @@
 DIST image_processing-1.10.0.tar.gz 984866 BLAKE2B 3afcdff652eec40ea652c68a99d6f18970596a8221883ec627b678b8af0013127471490a093ff190134d12e2b6eb4f8a42252d49b4fc61cfff8858b49d1f124e SHA512 47a465ce4e450647a67bda376bfdb5da5a0ceacfc01be5e15dfc819232b76509fdc2c6a8196042dd8508c69e0d19c8f08a54b939dd3e808f9a2ff31efd891c9a
 DIST image_processing-1.10.3.tar.gz 985090 BLAKE2B 9626dd41ae97cd0c68b857ccce2dd2b5eebbc04a5a3fc145cfde681b8ba9cc78806ddf1e7542afa2799ad707ced592149304216875297fc1bac112501dfcdbbb SHA512 7883199b2ccd693ae91a5d028a7c7bf5834cb36c7a48b4d02d1d92d7681e382a4e6605ca80cb0ca2f9949bfa95d8dafac3057e2508bb2932c5c3c0c3dee99b12
+DIST image_processing-1.11.0.tar.gz 985565 BLAKE2B 2ab1cfcdb0637dfbba50558cdb0b778cbb2f7bccf2a12aff5515171e252b0f41624d1867a2cb825d7200b5c09eb57d4f002cd086fdb987a9513a2ef3401a2db3 SHA512 2978ab351f6afaa9bb4ff08be6f89a27a634ac49a239a88c59cd40c877ffe4da57bdfe0d02af31577be113f04d7dc736e891b1edebc09fd4829bbe89085c4282
 DIST image_processing-1.9.3.tar.gz 984561 BLAKE2B 71c729c36e7048ceee3bd452d0429b24303f6898658337211cda4c697823e275f84c8b5ccbce857caa8f63a80e620f11822d3c0024f05343c3d72f9c8aedbdb9 SHA512 117e45146b646632bb2990f1651a494887ec8b75d8dcfcbea241b75d4691329597b7c8979fd13d4e51bacd5065b51594d6de9357e63c8b9b959b78fe075d0a76
 EBUILD image_processing-1.10.0.ebuild 1170 BLAKE2B fb4c9e60dabb342f96f39cc436791478e6fbf53aa6f6b1cfe4e4101e2d2d609df58991952a5f3826a34f33d94b9c208299ed2f6a62050d4c88ab10059f2de7c8 SHA512 72a9ddb4a6d74c60ab00efe8a5ca11698b86ff6b5a53b0f05b1aeb4e7863228802deb78fb6c9dd1cb4855288f19040af72e156149c8772e304e46e25897addfd
-EBUILD image_processing-1.10.3.ebuild 1193 BLAKE2B 9121bcfa424f6845777c6a6f79726ab2f698fe3fe9711aba149e98682862994307a2497e295a5faec415b0ad35fa1b953a67afdaf5430679babe9ae7ea6a4a73 SHA512 057f3e772b500106eaa8394adae357cfa87b6d61653e956577185a90d0386e6e234743451c8b9bd9ba593db43afd799a558f4ad0d6f8f18052104fddd9788c0d
+EBUILD image_processing-1.10.3.ebuild 1248 BLAKE2B 77bf5e00d8baad980d3b54411edb0298e2e9d848739437248737f5d5be3d7e5354ba98662c9562be48ee5e44ffb050564c534f6cf0f05152b67e2c657b8252d5 SHA512 d6727f0afb4321ba18da3fec34715237c86c025140ae67a090580aa3d4a373a039be5811d01274b229fe8893a4b09c17c693201ddeac9d47af36e2b903f64160
+EBUILD image_processing-1.11.0.ebuild 1248 BLAKE2B 77bf5e00d8baad980d3b54411edb0298e2e9d848739437248737f5d5be3d7e5354ba98662c9562be48ee5e44ffb050564c534f6cf0f05152b67e2c657b8252d5 SHA512 d6727f0afb4321ba18da3fec34715237c86c025140ae67a090580aa3d4a373a039be5811d01274b229fe8893a4b09c17c693201ddeac9d47af36e2b903f64160
 EBUILD image_processing-1.9.3.ebuild 1170 BLAKE2B fb4c9e60dabb342f96f39cc436791478e6fbf53aa6f6b1cfe4e4101e2d2d609df58991952a5f3826a34f33d94b9c208299ed2f6a62050d4c88ab10059f2de7c8 SHA512 72a9ddb4a6d74c60ab00efe8a5ca11698b86ff6b5a53b0f05b1aeb4e7863228802deb78fb6c9dd1cb4855288f19040af72e156149c8772e304e46e25897addfd
 MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.10.3.ebuild b/dev-ruby/image_processing/image_processing-1.10.3.ebuild
index 5f597dbccf09..80e6c6be3000 100644
--- a/dev-ruby/image_processing/image_processing-1.10.3.ebuild
+++ b/dev-ruby/image_processing/image_processing-1.10.3.ebuild
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+DEPEND+=" test? ( media-gfx/imagemagick[jpeg,tiff] )"
+
 ruby_add_rdepend "
 	>=dev-ruby/mini_magick-4.9.5:0
 "
diff --git a/dev-ruby/image_processing/image_processing-1.11.0.ebuild b/dev-ruby/image_processing/image_processing-1.11.0.ebuild
new file mode 100644
index 000000000000..80e6c6be3000
--- /dev/null
+++ b/dev-ruby/image_processing/image_processing-1.11.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="image_processing.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="High-level image processing helper methods with libvips and ImageMagick"
+HOMEPAGE="https://github.com/janko/image_processing"
+SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" test? ( media-gfx/imagemagick[jpeg,tiff] )"
+
+ruby_add_rdepend "
+	>=dev-ruby/mini_magick-4.9.5:0
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/minitest-5.8:5
+	>=dev-ruby/minitest-hooks-1.4.2
+	dev-ruby/minispec-metadata
+)"
+
+all_ruby_prepare() {
+	# Only support imagemagick for now since vips is not packaged
+	sed -i -e '/ruby-vips/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	rm -f test/{pipeline,vips}_test.rb || die
+	sed -i -e '/assert_dimensions/ s:^:#:' test/*_test.rb || die
+
+	# phash is not packaged
+	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
+
+	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index 481a3eff731a..d5efe7bbfc05 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,5 +1,3 @@
 DIST jbuilder-2.10.0.gem 28160 BLAKE2B c277a59d53f30132ebe88d6afda5c221d74a399b01cedf6a4863f29e94d329137669942957a21ae9c5c192177dc9e78b6d66d9b5a29c7d4667a0432556c6b28c SHA512 a429422d65ed3eec55f46597f73a97b267fe7d6c7554ec6a6d60e1e1c0a9306b81f7283524602a30af11a141f7cd466a0f7b0a804172bd4008787462f0fa4ffc
-DIST jbuilder-2.9.1.gem 28160 BLAKE2B 52e8a6ed2e6be19d73c22eddc6bcf3817e89f390da3b5eb4bc3308fa0c588f910608cbc6586cab858a5fb9ae6eb22fbade3fb32a426bed665cae18c067d85116 SHA512 aa8607696f5f14f22d163438d876b2a3017af791fdf4d6afd0df6c736ef86294db71f21a719029a2c052c24623d86f05c7aa5315e6f5066c74bc6886c50873fb
-EBUILD jbuilder-2.10.0.ebuild 557 BLAKE2B 2c5bd617e85d0b2767a935d831d833185002220d7533ad4af88d78cb5c5d002a69134f2364df7feee04da8ba1f8bbf87a1f34b71e13f5e62cbc1e01607454523 SHA512 d1f3d27f0755145f600d4f585b00c50caa315ab33726466859591dea17e55725d6c2e2f812293865f791eb6c54a0d3bd9ae4bc09c4ba2109ea303e5d69ee7d28
-EBUILD jbuilder-2.9.1.ebuild 588 BLAKE2B a26d9befeffe98f74f06201505621e6bb2f0e5ab9fb269499b281fd53672637d3461e61615b66244b976e3f9aaf926bb1a847ad2760b8ead97efec452461ad38 SHA512 9e1cf9d0272fe96ae84b0285062609bf6b93b5ef9b87e5f80b7bec30d85a9608aa41ba88727692f6fcd19d8fe946fd0a7875c721cbd3c0298c570c3b9767e3c2
+EBUILD jbuilder-2.10.0.ebuild 614 BLAKE2B 5902a5124d6fd31b4e52e5510e52faf9c026502d2d07dfbaa6f02e34a52a3921e595b5bf06905462bb04b0a1100a9c97449dfc0836f2dc564b3fdb9fcf942c4b SHA512 c69e55cb1c394367f38c209954eb6ca5f2aa698fb4456ba982946cce281726b4afa6b5e32aee320c543b2e1890ee08ff7cee7ed7d5fc78a8b8fb8912e63c3bf8
 MISC metadata.xml 326 BLAKE2B 205ea196c26e50f19fae65cb1b0cbb295b08406f3fcd6bb51162f52c48aef883b05aeea5092100e53f00ce2dc5f8c5f5a0c32c810af822b6b4ea0d95730e1ad3 SHA512 935898503cbfde9f698968794d20797e973227e1441489359520aa0ec2966c7cfb8df8c9b64ae4738cb55393ae4d001f38eef28cf379fb9e7ba29feaa18cd37d
diff --git a/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild b/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild
index 765909fd06b0..8842f2f99a14 100644
--- a/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild
+++ b/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild
@@ -20,6 +20,10 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
 
+ruby_add_bdepend "test? (
+	>=dev-ruby/railties-5.0.0
+)"
+
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
 }
diff --git a/dev-ruby/jbuilder/jbuilder-2.9.1.ebuild b/dev-ruby/jbuilder/jbuilder-2.9.1.ebuild
deleted file mode 100644
index f71f5a9a2601..000000000000
--- a/dev-ruby/jbuilder/jbuilder-2.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="TRAVIS=true test"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Create JSON structures via a Builder-style DSL"
-HOMEPAGE="https://github.com/rails/jbuilder"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/Manifest b/dev-ruby/json_schema/Manifest
index 7b23a1c747bc..8c7633898555 100644
--- a/dev-ruby/json_schema/Manifest
+++ b/dev-ruby/json_schema/Manifest
@@ -1,7 +1,3 @@
-DIST json_schema-0.20.6.tar.gz 36231 BLAKE2B 79874e4e7af3c856783ad5eb4c3085ea087195d46ebcf41e12302025dd899e70c81808889ad8e417d3aba1384444beafbd747cddaa4740fd6be9fdd7a4aa2907 SHA512 09fc6f5574da27e69cc13e5b081e27a78425c41606d89e794d77b15f56a17f709ee6a0267b247535da1ee9e71f2b4da9e2e278052a5d53c7d6f9ebbe3e314936
-DIST json_schema-0.20.7.tar.gz 36421 BLAKE2B 4110d9781da9a95d0480fa88dfc8d94868574dec0e0a36ad11efedf3c50c98557dc8f561d1df8189ec4bd4453e86acbe5f76a8e2274fadcfae659d0fcc85943e SHA512 e35d3d580078051f3484eddd910744d1be5d1dc77a63b20db418a075a75e71961bd1d7459759ee8b40b1784640e69c626f76c73de02b3a07e37b4233ddb4e661
 DIST json_schema-0.20.8.tar.gz 36456 BLAKE2B 4159b8a293ab41d0d5f6c3877de98fe3ba0f1f9f151e938ebf03cdbd563fc06e80603b49ca0132877d0369901b8724229ee618bd2133a159fc34201de7d9541a SHA512 f3e2314d66fdd4fd0968a1e98f363e5f008fa91c46c068c198b89f54cd856d4d87bcab02eb23b46fbce34749885579178955a84d22aad2ae131928ceaaf80065
-EBUILD json_schema-0.20.6.ebuild 629 BLAKE2B 6ccda166cfc98bdf79c5b6d28c42bb122178c6afe57f649ddd90b75f724927b1fce3eca8147ad3bd65ace4a3ed1e77c25629b8822425794a33599c2c42aec21a SHA512 d3966ecb60bfe668330b452a8c828e95dca6e7ec3ee0afe4d34e4e29b558e4ef863a9eb7e268dbd22d88bb909f20faa9eb8f309b40290930e4234fd181589685
-EBUILD json_schema-0.20.7.ebuild 629 BLAKE2B 6ccda166cfc98bdf79c5b6d28c42bb122178c6afe57f649ddd90b75f724927b1fce3eca8147ad3bd65ace4a3ed1e77c25629b8822425794a33599c2c42aec21a SHA512 d3966ecb60bfe668330b452a8c828e95dca6e7ec3ee0afe4d34e4e29b558e4ef863a9eb7e268dbd22d88bb909f20faa9eb8f309b40290930e4234fd181589685
-EBUILD json_schema-0.20.8.ebuild 706 BLAKE2B 07bad12fa96f6292fda18f0c09cbc110c0ee1a2b0983e5c525b8d549cfdb36f3a4bee7fa0afc1cdd0d807cb5eaa8e992379178e587e1d2f304967c24a76a75ae SHA512 89b6ae937ba22d101facca1e9125948c6e26aa1cfe821bc779dce4a05a6fe25bd9ce3d8c941195258c47880371b0d0c2fb259c286cdc4703804bcc267330d850
+EBUILD json_schema-0.20.8.ebuild 753 BLAKE2B 17dcba97667e6895c9e76e6f770fbb32f43815025e76c698970a5f3164ac1f117c66e99a65489a62242c3bd92ec840f8c3aa8c3b013f04a2ff163db35d098b30 SHA512 b72551937918559dfb6177c6c80092aaea437e800a4a44c97b34f6a397bb8e4c386b08e74a6deee1d6ccfdd304d2b18000e6a69f057142a99d56b7625af90b88
 MISC metadata.xml 329 BLAKE2B 336543b59af2964b8644691469c9ebdb21eac3b524a7602e656ab8a2bb184341ba9de381ae8220cc24dd0dbc8fd7ac70e9e6206a1cfb1a143d5273d305411a05 SHA512 4908f24aa2bd471d2a8257b32e8a320b3040e4bb2e6a516666544184890d57c1151b029935dc1ba6df774a1d2bc963a5601749a569c270812374e744ff55617f
diff --git a/dev-ruby/json_schema/json_schema-0.20.6.ebuild b/dev-ruby/json_schema/json_schema-0.20.6.ebuild
deleted file mode 100644
index 735e6565181b..000000000000
--- a/dev-ruby/json_schema/json_schema-0.20.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="schemas"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
-HOMEPAGE="https://github.com/brandur/json_schema"
-SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/json_schema-0.20.7.ebuild b/dev-ruby/json_schema/json_schema-0.20.7.ebuild
deleted file mode 100644
index 735e6565181b..000000000000
--- a/dev-ruby/json_schema/json_schema-0.20.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="schemas"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
-HOMEPAGE="https://github.com/brandur/json_schema"
-SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/json_schema-0.20.8.ebuild b/dev-ruby/json_schema/json_schema-0.20.8.ebuild
index e032670207a9..548559b4ebb0 100644
--- a/dev-ruby/json_schema/json_schema-0.20.8.ebuild
+++ b/dev-ruby/json_schema/json_schema-0.20.8.ebuild
@@ -24,5 +24,6 @@ IUSE=""
 ruby_add_bdepend "test? ( dev-ruby/ecma-re-validator )"
 
 all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
 	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/letter_opener/Manifest b/dev-ruby/letter_opener/Manifest
index 54261a06c529..8690f42b07cf 100644
--- a/dev-ruby/letter_opener/Manifest
+++ b/dev-ruby/letter_opener/Manifest
@@ -1,3 +1,3 @@
 DIST letter_opener-1.7.0.tar.gz 10907 BLAKE2B 0ac93d28a1eb0198d5d5c34a40dd03ac6406093c40d978ef35640893ce6feab672799cd628d4a43520c14277b50201d181aebb18819c8e0e5a561d108b08d3dc SHA512 99a62e4720e1b18085546b5ce09c136da951921e0a6436a37b747d3d8ce6f83fd6e35be23f1da0d49e7859967f06a479530845663665ce4abbac3938d3a4eae0
-EBUILD letter_opener-1.7.0.ebuild 809 BLAKE2B 5135c03a1640c9c8e0729435e002cfed2e96f963d93e1f624b116747b362517f78c28ab2d4b3ff245ac34eb0dd163b3937297824d61913d07fde119f94a147c1 SHA512 7f68f54b92edbd4fa2c643746a3ac5592391b175ed2ac85fe1622892d67240d2bc5b09fe4268ac670f14dd3ce3078ad5a110e1b57f08fbcddb85384dd13d9942
+EBUILD letter_opener-1.7.0.ebuild 970 BLAKE2B 906ce0b6976e360622bd06a3ad68f35365a0c7e25d95ec2d7d12d76df36d39e075ef04657eb0261149cc9de78a36dfad2728ca5d318fa53a8bc32d14e6582eed SHA512 63a0169f58f21b61ca2fc30e4f3fa85fd5e1a09df480277a913bd3f840c5f365a1ed614146bbea2814cb0692f39d694d2876f086e2133aafd4bee26dfca556a3
 MISC metadata.xml 345 BLAKE2B 5dfdcdc697b47d77410c7e338965e29ef16568489a51eccd05963f29191643938d1e548bf5b642198fabde5cd9ad2431cdfffaabc3b15e73fc7f7ad9e719b432 SHA512 cc99ba697977c098aeb242fa953214e819861cb43c12dd6c1f6f781af49150c4e58828f893561d92c0a3f33d8d93b57fe80147b19af02de34d791a4b8a3126f0
diff --git a/dev-ruby/letter_opener/letter_opener-1.7.0.ebuild b/dev-ruby/letter_opener/letter_opener-1.7.0.ebuild
index c305ef3c816a..bb732fe8c164 100644
--- a/dev-ruby/letter_opener/letter_opener-1.7.0.ebuild
+++ b/dev-ruby/letter_opener/letter_opener-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,4 +27,7 @@ ruby_add_rdepend ">=dev-ruby/launchy-2.2:0"
 all_ruby_prepare() {
 	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
 	sed -i -e '4irequire "letter_opener"' spec/spec_helper.rb || die
+
+	# Avoid tests that require some kind of browser
+	sed -i -e '/opens email/askip "requires installed browser"' spec/letter_opener/delivery_method_spec.rb || die
 }
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
deleted file mode 100644
index 56118d4b1a0d..000000000000
--- a/dev-ruby/libxml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libxml-ruby-2.9.0.gem 262144 BLAKE2B fb601a0be0aab7fdfd00ac7ef245e52413dbc6e4de71eecb4f0618843ee0621f96ef438df5ec20483a56686ec0ba7ed13fce29b13b779a04313337caa385ae8c SHA512 06ad42ce68c16715fc92a41439c3c27b49fc25b4f8829fac0a27f860d6c3df9a4cb964f1b4677d7587d31c0e5542c4d1c1c25ae3bcfcec889015618d22f6ff3c
-EBUILD libxml-2.9.0.ebuild 1356 BLAKE2B e6adfc377380ab2b1a835d13ab17b3a95208e7e25a06f78ab90d5930d824087ee0ccb270cf43cc11c796420bf62a6d68b2acd9435404c5fda9fb76672b50e917 SHA512 a180022bfad3e0784b9f504a31d54e334e632882c9a10b63170d5d3a59a1da2ab72b872cccee4e7b002af924a33326cdfdd895c85c8e45ffc7d824ee1e48db14
-MISC metadata.xml 343 BLAKE2B ab9720276d88ebdd8463243faaad691ef7f782984291ece318f16da272dbc24bc79082f556ffa37be664feee98a189a7d71e1925884a7b40e834c878ed61fa45 SHA512 fd2936253ab0f8f0e35b3c8e3b6a145eda17d8bf82badeaf78e20e1622c0aca323240227e4159991d6436c7473f96bf9960ce39a97513ff9610c13d9f5fda13e
diff --git a/dev-ruby/libxml/libxml-2.9.0.ebuild b/dev-ruby/libxml/libxml-2.9.0.ebuild
deleted file mode 100644
index 14d0f1ef7171..000000000000
--- a/dev-ruby/libxml/libxml-2.9.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_NAME="libxml-ruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML"
-HOMEPAGE="https://github.com/xml4r/libxml-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/libxml2"
-DEPEND="${DEPEND} dev-libs/libxml2"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Remove grancher tasks only needed for publishing the website
-	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
-
-	# We don't have the hanna template available.
-	sed -i -e 's/hanna/rake/' Rakefile || die
-
-	# Remove rake-compiler bits since we don't use it
-	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
-
-	# Avoid test that fails intermittently
-	sed -i -e '/test_get_handler/,/^  end/ s:^:#:' test/tc_error.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/libxml extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/libxml V=1
-	cp ext/libxml/libxml_ruby.so lib/ || die
-}
diff --git a/dev-ruby/litc/Manifest b/dev-ruby/litc/Manifest
index 150800c86d41..3e228bed0fbf 100644
--- a/dev-ruby/litc/Manifest
+++ b/dev-ruby/litc/Manifest
@@ -1,3 +1,3 @@
 DIST litc-1.0.3.gem 9216 BLAKE2B b7ca4224e3a0fe0d5b109ed1b2dd07e93faacb13779ec245b1e6e2357cee54af137d5fee0685705efdb10c19131ff9eb8142fc8e9a77eedb7702ee441300035e SHA512 7fb36a051d0056a8ae2c7c48a404b8fc71b3e8f40d6487c7ba5c8d3896ff6c936604c47f8ccbe011c4ba7c1fc4ef863f9a551cdb06f40a93896692b1375b8b31
-EBUILD litc-1.0.3-r1.ebuild 786 BLAKE2B 5c0ae41a722be727663ecc631e1003e95bf30c1301f7d266cc9ce056750c56bf4a923e6f680d1984469ec0e448919e3fdd1f61e7a5b72eefe9c373fe4d798313 SHA512 3e7d05a7bead16238380b9e1ec27dcec743b37a01425fe9a1375677f2239f0fdcdcb448862a48b9c730fd06404e4d6fcf0dc0ea5492181a779c3f014204e7577
+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
index 11587aedd582..f38a0d9b8c67 100644
--- a/dev-ruby/litc/litc-1.0.3-r1.ebuild
+++ b/dev-ruby/litc/litc-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,12 +18,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/fakeweb dev-ruby/minitest:0 )"
+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", "~> 4.0"' test/helper.rb || die
+		-e '2agem "minitest", "~> 5.0"' test/helper.rb || die
 }
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index dc82e0353c3c..5eab41bbac3e 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,5 +1,5 @@
 DIST loofah-2.4.0.gem 68096 BLAKE2B 7bffd489c6234b3afeebafad5029802aa0370ded269de018517e914c4c2ec151936e899c633e157045f93dce3e0d829e9821a3ab42447f71ca679f1bd3965423 SHA512 95bea374c0cf9e49becd4533c141a6ebb388f4ae0a1c27263612d3a4089177fd97956e4fbe7a8c8a8b17d8d69387e4629cf7c004f17008fb592f6b71297ed22a
 DIST loofah-2.5.0.tar.gz 68497 BLAKE2B a4e13bb4b7e5b76b9cc753031617110c61db8b7f13c2dc7f0f9423a1ff106e45e79f62b80f595a3e1e2958de9ed717e718b5d58e57a32d4baaa2d8355713580e SHA512 77d84a26f93605bf231e893dd7b010013d97077ceed44ae16164210f029a044e36d5bcacebffbbefdd8fe371e7ab0aa322bc48565c2ccaed1e8a386385176301
 EBUILD loofah-2.4.0.ebuild 983 BLAKE2B a49a9f19dc1807454a880247684007e31f7339747c4b783685a44944d9acd6f804a9ce84a3da46b971710896c973a454bdab4f8ddb3271ab646018022ed26309 SHA512 0a696fdd8a3f2a465d00b17aa4b6f81cc4771db0582456231ed966d2baddc6a270a77b9ddd0aaadb45160d42829b9f800b96fef2ed283aa0606771689c7d64fe
-EBUILD loofah-2.5.0.ebuild 1069 BLAKE2B c50e4112e0ae8ebdaf53432c55bd5549616bdd20eecceb80083f52f9253b74fd8894189c396d7b63ab204c0e1293318ec6d831a5dd8c7ebae6337b7b06472c00 SHA512 5ef5f191d60b8b80e9a7794c431535667c240e4af6c88091ddf6936ab7ac892ef40570602e8a9abcba796255290cec10dd065dbcb26e977d95c2753db1dbf4f3
+EBUILD loofah-2.5.0-r2.ebuild 1209 BLAKE2B 5ea9866c4d1325c53d8dbec8150472ea0fdef9153ee9c5d00c5af1e9e84268315b9961af09e767e32d885bd6eecc13f3b6f3d5351866125f1d2763b635f7f3b3 SHA512 49a5e36fbf844f5cd95995f59ca4b40e9c0dca7402876f68f7371fd386572141e21acec71698d9c1caa875fe7a61285199e321cb74afb61681b80d85aa19f781
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.5.0.ebuild b/dev-ruby/loofah/loofah-2.5.0-r2.ebuild
index 1889f675b014..aa2eaf69d5c7 100644
--- a/dev-ruby/loofah/loofah-2.5.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.5.0-r2.ebuild
@@ -6,6 +6,8 @@ USE_RUBY="ruby24 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."
@@ -22,6 +24,9 @@ ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogir
 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
 
diff --git a/dev-ruby/maildir/Manifest b/dev-ruby/maildir/Manifest
index ebeddb42cb08..9da04547704e 100644
--- a/dev-ruby/maildir/Manifest
+++ b/dev-ruby/maildir/Manifest
@@ -1,5 +1,5 @@
 DIST maildir-2.2.1.gem 15360 BLAKE2B d3ea037ba38e83bc7b21bde9ccb2296fc922c3f657a73ad3637faf708cfa16ac75c2e6535714ba18b00aafc5a94265c56f6e086d25de5810c0a0112d6c876e1f SHA512 4c366333c802bbe0cbd19e6abaef1fa31ad84596518d24ddcc33aa3afe39890896d107bc864c68787c90c3a38115979f6a4fe8b442aecaead39306122d560f18
 DIST maildir-2.2.2.gem 15360 BLAKE2B 3e926057b4a625b95879a8ac91fbc5d0ae002ae7f4658c1a9b7a997a5071f30d05ff8e59df405139b0e3a0a060286c61112ca07671ae5e443b6eb2b2f0b33983 SHA512 90f4896cef297262d2bfafa9a2ec155d83f405114b80df8015cf0c6a5450e1b28807d073cf48b2ff03309bf2b7d50a77138cb524826cfb2c429b3c606e02c093
 EBUILD maildir-2.2.1-r1.ebuild 965 BLAKE2B ea320d6fcc95eb96158636d164bf2f51d9708057ccfc93bc1cd049b2095a5d4815d5b0a33760e6f767c45df35d5d4d2cd6ebfeb8e8c101ca363f106d768f5a75 SHA512 3a13e2d446a361cf86e28ab283c7c9ed651e0a3950cbc3d0ba8f9d23b45772380dee7d0679d39d0d1b870316da0eff8203e5ca8daa31ad8beaa7b34ddcdddfdf
-EBUILD maildir-2.2.2.ebuild 958 BLAKE2B 9d5e4271916a83b5f2e04722fab813b3aec9d1612766ce211eb62f5e6ae28b5b9b36fd04d9684eb613e09b61079e423d9fe1e4437ecd93819f44927092f9e08e SHA512 809747bd7713020493a24566f8f9ed0d28932929e02b96f885cae3abbd8580edf724e811834496425c43b858322ccca3cc80fdd9ed68309452bb6d42efd0c459
+EBUILD maildir-2.2.2.ebuild 1003 BLAKE2B bebc2c9aaff3b3c458654215a5ec565786bffcc69a7a65802953ea56f0da94b9a3fd25d2c8eae8caaf29098857a3564787c3ba74069b333d7972f9192992cc1b SHA512 17be1f9d41365dbec7c98de06b0ac0dd1b8c372a86968c527e295489d413485de8d8f5b9669497828e4f425cc141af7baabb3ac889074ba484638a987796068e
 MISC metadata.xml 341 BLAKE2B 6081100c628ae44a08e012674babbb174a563ffc3c9239bb4dc117e372af60d23a68f8666b4f79c2a17c0270a8df39efc0106a07bacf600b76b5d85dfe9facc3 SHA512 68ef596ba601b4886488bf164b786fc0deaca4a10441ac164bd6eef0502c12e380ca27215f6599660467fafcfc3b6183fb7ae0dd847888aa8919437896e6119b
diff --git a/dev-ruby/maildir/maildir-2.2.2.ebuild b/dev-ruby/maildir/maildir-2.2.2.ebuild
index 18fa6f98b157..e5614828fcab 100644
--- a/dev-ruby/maildir/maildir-2.2.2.ebuild
+++ b/dev-ruby/maildir/maildir-2.2.2.ebuild
@@ -20,6 +20,8 @@ KEYWORDS="~amd64"
 SLOT="2"
 IUSE="test"
 
+ruby_add_rdepend "dev-ruby/activesupport:*"
+
 ruby_add_bdepend "
 	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
 
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index f3e74fcacdaf..95db728fad50 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,3 +1,3 @@
 DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
-EBUILD marcel-0.3.3-r1.ebuild 970 BLAKE2B eda6e25c38faef7a3319fc025cb17e004235a819e4626071c8a42d3c0d36f73d76f9b15e86c8db87c55c3a87aa2ed12b7d7f1bf9d7729884919feaa51b30205f SHA512 94ea6437b5d61733a5df5e554652dd0ac7882526f8f1178ac3a288c28b60881f9e793e8adb97b669a77a84747eb38b023a08f598f50441bf8f09ad4f6ff6bd35
+EBUILD marcel-0.3.3-r1.ebuild 1017 BLAKE2B 63abac02196f77f5d8df3261fc1e59b777e858476a5f67cb357fd3289d12c42ae78ff47f3df50416d8014622d12f59d819ae0188b9073e7aa88e72559fadcbe6 SHA512 bc2831e022b2200839a4b970e91593230c92db21c1a24fb707743290aee27419c79774d1e955a9429d079e7e0e3d9983a799f528c0ee7b40c89acbe6eac3c103
 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 40fae2ec8e91..d92cbf438233 100644
--- a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
+++ b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -25,6 +25,8 @@ ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
 all_ruby_prepare() {
 	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
 
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
 	# Account for changes in shared-mime-info 1.10
 	mkdir test/fixtures/{magic,name}/font || die
 	mv test/fixtures/magic/application/x-font-ttf.ttf test/fixtures/magic/font/ttf.ttf || die
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 1aa58a653b64..8cd40fe02240 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.9.5.tar.gz 1192220 BLAKE2B 18867664682b82c689beadd190d203f9a460a229ee07271fdfd3b9ef7c7fb2a913107b2f318c33b7aa15aad88488a4da5548f371f9f9b38246aa8f2210e04d15 SHA512 06a82b3c5bf47ae1254fb669f4cb63a7a944977eaa790501ee715740c6a2fdfe81ea886235fe310d2c0ca07253f4167e72ddae6e29a551315ecafc595c2a3a53
-EBUILD mini_magick-4.10.1.ebuild 1895 BLAKE2B fd5e63a87c95d87b4f522a58c4c43b655ad5868e539fba34b0bc0201e4ce8666c72d4dab5dba33677669edf7890a9a8d500a1bdfa2d39e724a3568489f1616c6 SHA512 4efecfbfbbc954a76b797bb3c67cbf65404ae3261e8031dd69ebab15b83c55b997a08cb807b3ce15708a25716050fe722759d7285dde50b29176d336e127f83f
+EBUILD mini_magick-4.10.1.ebuild 1997 BLAKE2B e6ccc6f39fa802bf01b275e76692a06afa03a86995110a07a53396bc9f3742bf8124bfbd66786fe300e3dcf461f36acff68ba926ccb3fd9b99a8d19bb0dafa64 SHA512 c6fac624c0ae3fa0fc047ff940f7621d248ff1b0cfe89459a46e724cdf1a8ccd66e12140db152eae483b5528a2f72fcec1add7bbdc55ee2932466dae662badb7
 EBUILD mini_magick-4.9.5.ebuild 1895 BLAKE2B c77ec716b48f65c6f06c3962c2adab40ab9b452cfb87022c8b4ee26b51bb438cabe279965506d9a78344ccc570bb67ea749929de5affe5074eab2603655a99df SHA512 42e1d875de68bc5b47a8761f24c1afb6d6303e86a353f9a04362da7b026676249da8da5e1b0822f4eb715e6deab750757480c0392ca565f0cf9317ff8020011f
 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 c215478ddbec..155b9385df44 100644
--- a/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
@@ -46,6 +46,7 @@ all_ruby_prepare() {
 
 	# Avoid spec broken by recent imagemagick updates
 	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
+	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
 
 	# Avoid graphicsmagick tests because installing both in parallel for
 	# tests is hard.
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 5dc457380041..0faaea854b73 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -3,9 +3,11 @@ DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d
 DIST minitest-5.12.2.gem 82432 BLAKE2B fb8df3d5407a96b7be9611c19763a4480c20ac29aababc147f14f0684926806a76e2b38a75009a11cb2cb1e3ded371ef5b9275ddb87251496315f0ce023e4382 SHA512 7a14769e7eb1c4c950380da86a1e7ff8836f05bfb5b08216f4c0fe9e1709982e3f189fb579b1d74b307f6a17e3136d4ec3d7811562415942154a905364e1428e
 DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190a04ee77499d574531e95b8f8b6652cc51a5917e51920f58c0f95465c27c5d69bab7aba01e02502ccf72ae38 SHA512 bdd0d665cfd6f6e36dcb1f2f069f5154a468f68eb4c41f5c39e3a3397644141d5e05024023b20fafbceb983b019b00a0ec6da98432f505cc8fd1cebc11cc1fca
 DIST minitest-5.14.0.gem 84992 BLAKE2B 3bf733ae992e83af862773b6b76997b7a3262290c8239fe2871e9d55bfdd0a9c921a88965167a693794e064fcc2efdf9f6c111075f59921c55669fca1a8ada27 SHA512 4d65cbc96fe96bd79fd1dce36ce3b72d8e01efc12dcfeb6264075bb36430110f1c8fb519e0885e3449379fb5237cbdf7e24803ef49034e46ddf1d3a24c56b45f
+DIST minitest-5.14.1.gem 84992 BLAKE2B 1bc258ea21ff887381ce9d13ea08f07d6242bf1daa8e65063ac9bfa41c5a9363d0c7e25356d803e780814fcc62c54b9f62e76c7db8e0666f19dbb52bd94e171d SHA512 57a205ce8f71a494d9d8b0343cbc39f8d3ee22f33145b53b6b0bebebc0a2ed542eba3e1df91bf115be0910f0c2e65d5c24be6b595f13e6ccbbe417e06c54ffce
 EBUILD minitest-4.7.5-r2.ebuild 866 BLAKE2B d61d303233bfc0d24ee2a3b08cd0677f5a402eda683f85a654af5eea2300da8794a66eb7792636ad3a05debd460323907aa18b2c54bf1a8adb2c4a27c9dcb79a SHA512 af4c5d8b4f8a8a90c50391c70323a8f97d6c02fe95aeeb66d4e33c7af40ed9a1e3b15af78bd875ee924f903a0d71cf12c305ffc2bc4a1e098b85878e25a1e62c
 EBUILD minitest-5.11.3.ebuild 762 BLAKE2B e92e5a2875266c3fda5d729bade8a3c12b9dfd7f0789e66d103bef7e6a97bee26701f9d1593a9f1c7fbca382a782af788c08f9970bbf04a77d54e821949904a9 SHA512 c4eb8675e5b1d748dfc402ae67a29fa9f4eba3447b4b3b6023fd71e30f9902aa93bce874c48bb257e4f6b6c97007cba80ea7c0dbbd684ec81eecb65d9c63dcb9
 EBUILD minitest-5.12.2.ebuild 732 BLAKE2B ed24c7520c7590528e79dfe4b360ecdc1afb09223cefe4154883aef6ca2d221cf5740fe680e8c033acb4f4c2cdea657968e6ff83e0ef119b95531f8af1ab237f SHA512 9d1b66245cb42280fb3d5bb7d5564e26e7e69c8cf9d3a26e1b05350fd749a16b1e5b0e231a49f31c1f81c41f86a7c4ebb8c72fa7fa43f68241c891ba436e8fda
 EBUILD minitest-5.13.0.ebuild 739 BLAKE2B 1e9be46f61be5f5173fa9f4b02e6542a60d460f5885197ece20b727d4ac433ef6c989c96b93317aceb4b74aea50537646fbbd39a4ee36a45b8856f4ed4dd7efe SHA512 974b443f7f15637265f4f49fbbfef16305aae6fd9e9f7a249dff019e2184e26f7ae53c38a7da2d6f55c8f94a05069e044d0c85f80ee1b72d19175ba344610610
 EBUILD minitest-5.14.0.ebuild 739 BLAKE2B 1e9be46f61be5f5173fa9f4b02e6542a60d460f5885197ece20b727d4ac433ef6c989c96b93317aceb4b74aea50537646fbbd39a4ee36a45b8856f4ed4dd7efe SHA512 974b443f7f15637265f4f49fbbfef16305aae6fd9e9f7a249dff019e2184e26f7ae53c38a7da2d6f55c8f94a05069e044d0c85f80ee1b72d19175ba344610610
+EBUILD minitest-5.14.1.ebuild 739 BLAKE2B 1e9be46f61be5f5173fa9f4b02e6542a60d460f5885197ece20b727d4ac433ef6c989c96b93317aceb4b74aea50537646fbbd39a4ee36a45b8856f4ed4dd7efe SHA512 974b443f7f15637265f4f49fbbfef16305aae6fd9e9f7a249dff019e2184e26f7ae53c38a7da2d6f55c8f94a05069e044d0c85f80ee1b72d19175ba344610610
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.14.1.ebuild b/dev-ruby/minitest/minitest-5.14.1.ebuild
new file mode 100644
index 000000000000..59e6973c806c
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.14.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/net-ssh-gateway/Manifest b/dev-ruby/net-ssh-gateway/Manifest
index 81f15a78f02a..e7817b18d869 100644
--- a/dev-ruby/net-ssh-gateway/Manifest
+++ b/dev-ruby/net-ssh-gateway/Manifest
@@ -1,3 +1,3 @@
 DIST net-ssh-gateway-2.0.0.tar.gz 7825 BLAKE2B 05ade5aac288ee634aea37acfc68c9781e8178bf0ef92abafac13858a86ff952a2b30b6f92dc08f3856d9dd02a9795e0b93c15543b932070b9ec3f6a50c03e52 SHA512 6595c2a2a25ca9bffb942497be984773c10746f34e1dbba3d72503cef3c88e5bb50bdc8713c246aa6e38272540fb0ced66a3909bc02df96f511b0dc9fc50d735
-EBUILD net-ssh-gateway-2.0.0.ebuild 752 BLAKE2B 6c5c7269038ef08b2e66742bc408947e6e935e2122fa038bd8514fb1d3bd171033069e2b67d9909c11f2beea8990f2be81a1fadb65ce44b7029ee9a0879b3bc3 SHA512 b5ccc6a6145d14616ec6bbe62c27865d3ec62cd1da44848a0858bd786afb0e3452f5076b491c272740fa3f4d1f4326d5707d921f676adcac568337fe26275f15
+EBUILD net-ssh-gateway-2.0.0.ebuild 835 BLAKE2B 9bf73567f729f1191d42803e725043d98e36245cef8cf6577bd7cbc476d8db250ffecd978bdd2ee49d566d541a508998d145bcf0f9e28ba70d0404d2f8d83333 SHA512 6dd306a1f5d9e2caf1ad5c1fa3b62f1c1968091cd2fb5c0d1bdbc4144b3c1c44a43f7822cb4afb0f782bf88f0ad2ef2dd9ed454512689461ae189ba078dd5516
 MISC metadata.xml 331 BLAKE2B 1c926dbb5b9903bf35a96b839b8564de448a527cac952fa91c5df4c0df4f825eefc7a6bc1cac6c7da39a3127a2a0245b5e3b7d780009c3069bd72723f74c291e SHA512 a5ba1172a48f9aff250cb3cb9c6315a0ffd12595704a2bd5788ef59e73b9efc606d8d944ecc0f1346340a4a9e1caee2c6a1c30581d5d6a78bc26c751d4c6cf7e
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild
index 65120c82e5f9..075920a216e4 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -26,4 +26,5 @@ ruby_add_rdepend ">=dev-ruby/net-ssh-4.0.0:*"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile test/net/ssh/gateway_test.rb || die
+	sed -i -e 's:mocha/mini_test:mocha/minitest:' test/net/ssh/gateway_test.rb || die
 }
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index c7bf5f0e80f2..8f2c569133c6 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,11 +1,6 @@
-DIST octokit-4.14.0.tar.gz 3068165 BLAKE2B e50efa246273422daf5aed8e619465886962d361d129a310974c21bbc683c7444ee99e3dc01c184497683d07a48d852c006ab56c6cd4bea8660f16e7ec5eee98 SHA512 2aff18492c0207b8c7ced23adf0e76260d2976331563e22f7a130445b19b816a00281a86b4161d6709025d058c848ef3f7d1a5c64323954f8c03a59be6f6b132
-DIST octokit-4.15.0.tar.gz 3089749 BLAKE2B d10df675c067f0bfc86bd78aa05e48fb37bdf8d4d5f9317d7463838ec9e870380bc503eb621a02a332b6a26bc1780c5d77955b93c695e18674c792b01aa702c3 SHA512 8616dc97c2aee68ee5919045446ad34d3122bda71f0a9e48a7ef3c04ef2e706bb59f7bd344de9f21f912a927aedfdad11f73119e52f62729173d04f052a0c972
-DIST octokit-4.16.0.tar.gz 3090415 BLAKE2B e6f2addd8e85bc5de685fa644dca607a0f1b15fc007a6525c56605204b8423170918364892ac1c11fb200891aa489c563c52761ae622b847309a9cef3500cc31 SHA512 562b62714022d36d16b0e7f728f1b43ae76ed9f57bc7e74a8805519818f4c7203e0cba71e99202e5fabc8af150f26897f2fdc35e8bd2d09e3b1e578cae5d2bbe
 DIST octokit-4.17.0.tar.gz 3090364 BLAKE2B 42545bdaca8ecbbc3a3e78e70d535c634f20741651d41dfec254dd68254acbc82a992c93314b871d6bae7b4ca8321339b888fe7b5b7349fe9b48dbf6904f4524 SHA512 da6a90e77991d17697424da22c9481027f23f5ecb52e294748fe62c3a7c228412a276a01e6816b201e597b73f271b83e70c4d86ff9ea40c0204dae5c30df929a
 DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
-EBUILD octokit-4.14.0.ebuild 871 BLAKE2B 680ffc68ed44702d91aa03fa167b90ed724887e9e6115fa6623509c5ea7f166f08db2489ed12134f303a12efb965bdc293e2344dcaa648cd5f447311992d8a6d SHA512 4352d8e8421f01448fc585c039ea9973028ff3151e3949bb2ba628577d723f7f7b72e7629abc5156ec1eb9c04128c61e09c15ead8a9f435fe71701c71832d883
-EBUILD octokit-4.15.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
-EBUILD octokit-4.16.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
 EBUILD octokit-4.17.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
+EBUILD octokit-4.18.0-r1.ebuild 926 BLAKE2B 57d6d75d183e2a451b361f99096cce94f19d19526381bbf03b4310966af43510fc670c659e9826557eeda143922887c70b37bdafaf2c54b396b89f2e8c964e8c SHA512 13ea7f71fbad7a4aa1e1940c51562914ec2c37a82afadde9fe58ef86a2d09edf42f0ca0d316ac2d3ce29932c3861878c7b46b5db5ea40467913cd3d2c044976c
 EBUILD octokit-4.18.0.ebuild 916 BLAKE2B f31fe1ecb2508b059ade36e017a53e3d4e62f126a14a30fe69939160f49c93d54c4c15b30027f51132bbbc0cccf0d4814500c49a017faebcf4069c15a9b62a03 SHA512 e87ef4c75d0150b41f38e58ef979d229c0d68181c6c8352f16c69f99b8196f11219e1b74bcaeeb35e6599a238261038359ec5f346963e7ccd8d634176b9dd9a8
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.14.0.ebuild b/dev-ruby/octokit/octokit-4.14.0.ebuild
deleted file mode 100644
index b1c8864589a7..000000000000
--- a/dev-ruby/octokit/octokit-4.14.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend ">=dev-ruby/sawyer-0.8.0"
-ruby_add_bdepend "test? ( dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-4.16.0.ebuild b/dev-ruby/octokit/octokit-4.16.0.ebuild
deleted file mode 100644
index 469e4b38183e..000000000000
--- a/dev-ruby/octokit/octokit-4.16.0.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_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9
-	>=dev-ruby/sawyer-0.8.0
-"
-
-ruby_add_bdepend "test? ( dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-4.15.0.ebuild b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
index 469e4b38183e..0b3ff206b168 100644
--- a/dev-ruby/octokit/octokit-4.15.0.ebuild
+++ b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
@@ -17,21 +17,25 @@ SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S=octokit.rb-${PV}
 
 ruby_add_rdepend "
 	>=dev-ruby/faraday-0.9
-	>=dev-ruby/sawyer-0.8.0
+	=dev-ruby/sawyer-0.8*
 "
 
-ruby_add_bdepend "test? ( dev-ruby/mime-types
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
 	>=dev-ruby/netrc-0.7.7
 	dev-ruby/vcr:3
 	dev-ruby/webmock:3 )"
 
 all_ruby_prepare() {
-	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/helper.rb || die
 }
diff --git a/dev-ruby/origin/Manifest b/dev-ruby/origin/Manifest
index e3c637be00d2..5ebedd3987fc 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 789 BLAKE2B 395700003d85f85127fe08a7c10af2035f3b24c878d18a307889e84865c16285ea0ecf3d18d0646a8f507cd09e4e15c2a935030ce6d72dc9bb7a1e1a48b629e4 SHA512 a2701555e328434cdfb34681028cd10c5f2b3666a9c9a4075172bf47af995727600700bc599db2683a9a1da2ea0789c0ed877e90d4c87fb1eaff7ee3dd4af0c4
+EBUILD origin-2.3.1.ebuild 814 BLAKE2B c89701a5298cd448576ba6c04b900205980a186778670b1c47b3955163cffbca84c6dc33d614fe7543a3fd849dfc6f1a812034c733db56b79e7a1555ec605f73 SHA512 7512c4814f9e1fb332a7e18ebade8bb09527a97d5a9ca843a9e0121e234cc1fc32062902facc9c70ebe6987b6cf541007e60f1a42a610c47e90bec4abaff1c41
 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 da49a47b3807..0d553e3754c8 100644
--- a/dev-ruby/origin/origin-2.3.1.ebuild
+++ b/dev-ruby/origin/origin-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ IUSE=""
 
 ruby_add_bdepend "
 	test? (
+		dev-ruby/activesupport
 		|| ( dev-ruby/i18n:1 dev-ruby/i18n:0.9 dev-ruby/i18n:0.7 )
 		dev-ruby/tzinfo
 	)"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 425bd8ee9d24..bdd0c02a4f6e 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -11,5 +11,5 @@ EBUILD parser-2.7.0.4.ebuild 730 BLAKE2B 6e275cf8c0d6bf74bc85a3c71cb7a7a637db72e
 EBUILD parser-2.7.0.5.ebuild 730 BLAKE2B 6e275cf8c0d6bf74bc85a3c71cb7a7a637db72e054817dc364c1373c44503a63b55485b2cf7827fe54972a0f85134cba0578baeb3b0321c932499803c4b6c704 SHA512 bdfa44c4a1a537b28c429a9ca114598afbedf4515b18f5015799ee38433e38d41d6bd2e0c1d268140e2e3971a22b0f23786e39c2dc155fa458f20802895bf705
 EBUILD parser-2.7.1.0.ebuild 730 BLAKE2B 6e275cf8c0d6bf74bc85a3c71cb7a7a637db72e054817dc364c1373c44503a63b55485b2cf7827fe54972a0f85134cba0578baeb3b0321c932499803c4b6c704 SHA512 bdfa44c4a1a537b28c429a9ca114598afbedf4515b18f5015799ee38433e38d41d6bd2e0c1d268140e2e3971a22b0f23786e39c2dc155fa458f20802895bf705
 EBUILD parser-2.7.1.1.ebuild 730 BLAKE2B 6e275cf8c0d6bf74bc85a3c71cb7a7a637db72e054817dc364c1373c44503a63b55485b2cf7827fe54972a0f85134cba0578baeb3b0321c932499803c4b6c704 SHA512 bdfa44c4a1a537b28c429a9ca114598afbedf4515b18f5015799ee38433e38d41d6bd2e0c1d268140e2e3971a22b0f23786e39c2dc155fa458f20802895bf705
-EBUILD parser-2.7.1.2.ebuild 730 BLAKE2B 6e275cf8c0d6bf74bc85a3c71cb7a7a637db72e054817dc364c1373c44503a63b55485b2cf7827fe54972a0f85134cba0578baeb3b0321c932499803c4b6c704 SHA512 bdfa44c4a1a537b28c429a9ca114598afbedf4515b18f5015799ee38433e38d41d6bd2e0c1d268140e2e3971a22b0f23786e39c2dc155fa458f20802895bf705
+EBUILD parser-2.7.1.2.ebuild 770 BLAKE2B 8a19357a619c59631a53dd16cf04908196c45264616fda90e8bcc8e44226266cc97db519b85455a9b2f8eaf1316fdb234270db09a4c687f3bd9085a7487a53d2 SHA512 963009d84623585d8fc8c8a6a691c1d11154cdb07e5584bb3feebfdbb7f78be9adfbaa47e7ab50f63bbac31197092e6955fbfa7448cd54d78d08552964d7c812
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.7.1.2.ebuild b/dev-ruby/parser/parser-2.7.1.2.ebuild
index a1dfc9b62aad..a74e07888a7c 100644
--- a/dev-ruby/parser/parser-2.7.1.2.ebuild
+++ b/dev-ruby/parser/parser-2.7.1.2.ebuild
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+DEPEND+="test? ( =dev-util/ragel-6* )"
+
 ruby_add_bdepend "test? (
 	dev-ruby/minitest:5
 	dev-ruby/racc
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index dee477fc8d34..8267c7a62bf0 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1,4 +1,6 @@
 AUX posix-spawn-0.3.13-x86.patch 713 BLAKE2B 0c10ac73b938fe985d6c3f3f084c4f96d19293610254029267cd5b16111acbb5792de7cc5dd5195f79d5f957206140bcc7a7c47b171bd565f9eee5350352bcb6 SHA512 33f5ee510fdeb7b8b150aa61e9d3044a1571470e1187d4dd0483e700c09bfb4bfba9a52c2cde723ed568ac3d2d1cb27855a4ef09826b902946138055d4b04774
 DIST posix-spawn-0.3.13.gem 28160 BLAKE2B 68b1c241310c7b35bf8bea055e63a60320ae3fc877f9bc9f4e2dc0d30c1484eb5081be8c7d60309ed04900c410d52624dae6e37a0f134993f334526f2d9de98d SHA512 a9cd878571440cc0aaee541cbb97b6f4dcb03e48a8ef8588693f4c68990eb530e3b1685d615546763c9bba5d3109134442285023938eb2f116e9749f0da12bb9
+DIST posix-spawn-0.3.14.gem 29696 BLAKE2B 6c3cf234b8754b2757e0360f2b2bfd008628891ecec813dc3644f9a378317f3645908539588a3fbfae5a6fc4a0b9c5beb6fb925fdd9f6fb3cf8cdddbf6db448e SHA512 85d34d8301e1d0923831890d4ac3191e81cc4c716671bc3b71d44be92e9b0c278bd4ce17b9387fc10359266bbdee1e1aad5cb4bbf1c08ab385b023ba2fec74d7
 EBUILD posix-spawn-0.3.13-r1.ebuild 757 BLAKE2B 0ac5fff7f8066b38d8b5cb159a0155513507043db4a6ccc401feacbd7444d8a14dc82102b26fd2485a0d31e24a2ed440d24a5e25542ebf725364d7fcd885374d SHA512 1eb99911823490208687dcc57be900bb922abe5f2fe212f4c9690937946be8d9160813301c5efc321bd13bf51dd353f41bada776057585cd54d85b9e72fab34e
+EBUILD posix-spawn-0.3.14.ebuild 671 BLAKE2B 26786957457f1d945c7c029db74f160fb737c35b315298d7708f5d5d14cd4b8b383a680070e63fa5e3c792babb2eba4771b065225f4199c7c995c7681ef802b8 SHA512 784460b55c349c87eaa75051ae67d75b7e1048d8e334daa8e498c7344942d1165f204fb628cccaa4fd1bd49746f2299eebf4b3bfb4dad07e7053bbd0f61e28dc
 MISC metadata.xml 346 BLAKE2B cb818c5b61108ddb5acfcf890d8ba737a8cc949fe607d02a5cc7dd1d264ecc7d73a096d8d40b65872fddb0791d63aefbdd774906da4b65122cd1087e040c4cd3 SHA512 208a7646bd550d2ecd50aecda3f1891b46cc586f74479eb6a72be27c985bf2ef1f411b609e54e73f418c1653a205e1ecedcfe3f2c2ebdb719e56c60f7b1b48a7
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.14.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.14.ebuild
new file mode 100644
index 000000000000..d123fe204ec0
--- /dev/null
+++ b/dev-ruby/posix-spawn/posix-spawn-0.3.14.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library that implements a subset of the Ruby 1.9 Process::spawn"
+HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext
+	cp ext/*$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 3c2a59adeef0..5294d42bf300 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,5 +1,7 @@
 DIST rack-attack-5.4.2.gem 23040 BLAKE2B 7af950339f03139e6a3ac9e8349e6d2af5182a29f643a08a9ea0806349c02965d05e99d95421f14ba827c9c942a6824f710dbaf06adbb0aa07dde03d74e629ed SHA512 a4af12c2c436a3634108494e2a5b9c5751c0fa2e87af6efa326d9c09fdae54b5bd8a8974c48785dfef64565ff9ee0a6704c90acf1277c8e80849ff30f9fbb67b
 DIST rack-attack-6.2.2.gem 24064 BLAKE2B dd76a1f76b4f20e8bf01ac4bfda9af2daacbe972f7847399bd30b9472c8e0f66dbcc333b19eb2e482f91c38d9557ad76559b6a40b7f842faea43b7f88e24cd77 SHA512 c2e852f0871502d1f70be20e6d3d6a9ffe50e6203950624b7ea4f6f0c4c48239a8dbef417f6b7348146f3f6d5a028bffa133c29da6453eff57438d7993562822
+DIST rack-attack-6.3.1.gem 25088 BLAKE2B 97a6f36ad3571508f68b33090644db8fb21f6eb43f8ae16b0107dd3e0e1b8b728b6eaa43959dfa8b9781672147673b750c215c9ed01366de90175ba063d5d2b5 SHA512 e6c3fbc5a09cc3d15d06b450baf911b84dd412de7b1a9d0f67661da2106d1474ea2f7c2ec6a7cf5bbd9756642be519e618134c5c7888c41f44270afc4f8aff4a
 EBUILD rack-attack-5.4.2.ebuild 924 BLAKE2B 9bea5a9f9f54b9a6f54b17c2d0dfb84546c54b95ae9c994152a5f56440e3d3a0725e43c5c28d8a08bb6075fe7ccabfd38c96146c885e9c53572a3364262dee37 SHA512 4462b6e58fe4beab95ea2fc9b4468180877e77dfd664a25140725de53397ed04d4252a6b71fe2c8b86f5a66d5eb43bf7c5958ae6bdc5e5e0443c430b96d2840b
 EBUILD rack-attack-6.2.2.ebuild 893 BLAKE2B cd8bef8cd84821901751f7c4f8d4fc9b8182091f76861822b4dbde0768cd0b358172d59ed4542325f403112dc9e6495810455f30775890f93a54b407afd94f47 SHA512 65dff2e0e494a4c07930b936bc2f8bdc9bedb13f37a07cc529f02d1507119c42847b977f5cbcc7d94bdd291ca997130cd82cf3dbd0a38e753f6c8119e718d355
+EBUILD rack-attack-6.3.1.ebuild 1084 BLAKE2B 17031cde8c30de43e22459fa5e09deab1e9bc0e094683a57dea720d2e2e99924c8fcb515e170f4ca55c93d9dcf36555c411cbf270ee64f744043e2081c9f45c6 SHA512 176b03af7f8c41f9c7b13db8ed1e0642d411e65510c1df033169e3698dfcec256d6676ba94f99e8c69bf0b09f316197ba19cd7f7d441f3a1fee8a17fc2dcc62a
 MISC metadata.xml 349 BLAKE2B 5e0852caf34767613f144f3a6680223198c6cad55b7ea30d0778d788ce2293a2586bf0edc698dc0a5edc11d4e1d408576ce9d7c1eb3602e7fe7f10e2be33c1ba SHA512 9584ab20de3f1604d81e9be1baa8b4e355e5a43fba3a0cfc43a3d4f5e67df0d089a906b479b99150f76e54d07310d650ae96171d6ddeb8e3f00a446e2a95a795
diff --git a/dev-ruby/rack-attack/rack-attack-6.3.1.ebuild b/dev-ruby/rack-attack/rack-attack-6.3.1.ebuild
new file mode 100644
index 000000000000..118c935da464
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-6.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? (
+	dev-ruby/actionpack
+	dev-ruby/activesupport
+	dev-ruby/railties
+	dev-ruby/rack-test
+	dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
+	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+
+	# Avoid specs requiring a live redis service
+	sed -i -e '/should delete rack attack key/askip "requires redis service"' spec/rack_attack_spec.rb || die
+}
diff --git a/dev-ruby/radius/Manifest b/dev-ruby/radius/Manifest
index df68e97ccca6..cf5681807039 100644
--- a/dev-ruby/radius/Manifest
+++ b/dev-ruby/radius/Manifest
@@ -1,3 +1,3 @@
 DIST radius-0.7.5.gem 147456 BLAKE2B c62c06196bc42cd83b7d898744fd655c3332d14348318974de272491eb823861a650b5466958ea5e0b7be2a5a119c75a75a7e6c53975d7099ef1c45d912c7595 SHA512 2e1f94c45bfa23ffbcbc00b7dc6be04d4f085e513554e7a6c4193270ae2bc2ef952dac72e4995b6f7ce43e92363df3ca7e7b183758ccd1f8aafe64f82cacb074
-EBUILD radius-0.7.5.ebuild 533 BLAKE2B d9d952f2e9cd495ad31cb0a352ce1c650b4f08c787f2b09c9c8a21e9d929d6bbbafd3987448e417211b0cc5b5a0e8c527b0475fdf6a973e67aacce77eae0b4e9 SHA512 005584a220426c1ce0321d602356b7e37d0aa072b326faaec845b9061f67f8ed27b77b09ae66568502c8d453cc69df4d54e9912149c108d93538f446392f1cf6
+EBUILD radius-0.7.5.ebuild 579 BLAKE2B 7b268661366be6a834c30a0fcb0cdffda7ef63de8b39815c9d066539d3e3becbe892126dd66b3f981f15602ee0a5c3d9158f18328768546561a2712a9492ceff SHA512 0d0941967952b99dd10eca5f36abf46e8753ff425a0a2c05a3a63a2068f88dcb6c64a4bfdd00b71dd887c8681d39291b88d59f8e7951ad5993eb6588f17351f8
 MISC metadata.xml 338 BLAKE2B 9f40be1812f1b5df68280d3d0215238442df3ab392f054bc4394aecd1bdb688b194c40ec14d30ddbd5cb93890ce0b6d01b514e46c1451167fa10883aeae70f35 SHA512 4674778d8822f53f2a50ab0ff42d386d4e3fadd620747ac2c8bf6833669025076486b01b105ef15168cdc4c303c324d7dc773c94fe2e31bb343aef51e1a5c80c
diff --git a/dev-ruby/radius/radius-0.7.5.ebuild b/dev-ruby/radius/radius-0.7.5.ebuild
index 37012dc8126f..bd53d86afa98 100644
--- a/dev-ruby/radius/radius-0.7.5.ebuild
+++ b/dev-ruby/radius/radius-0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,4 +20,5 @@ ruby_add_bdepend "test? ( dev-ruby/kramdown )"
 
 all_ruby_prepare() {
 	sed -i -e "/simplecov/,/end/d" -e "/coveralls/d" test/test_helper.rb || die
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 }
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index d4edb3095444..919170fc0cbd 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.gem 6656 BLAKE2B ff439904b04a0e3d90e8d6c684d7ec758d40942c87aebaa3bd67da2a8a770125f25705f64eab6734c1745844b0b7f4ad5e425ccf4509bc62a1ef86ca3361620e SHA512 6960d9441d372bcfe55a18de2aeec6f7246af2a259a14b72f475771d02e44ae5a178fe14a7c05e05c9083c4d5277a5a834a2a46ddbdad1b0261dc9df1148ddc6
+DIST rails-5.2.4.3.gem 6656 BLAKE2B 36519aed8bc34ed303125857ebcc4cbc860b530f6de1a7e311c878533b69a2c7026ca39c7979e45411bd3e68256835abead35e4336a0130894c88115e030fcba SHA512 856b7a73bccba7ddc5f10d5acba025da0c7546a70f484d685f009adcda79f0f40c5cc21d1a99edfcb6114cc7643e806240d545fe6fcc6e8d97abf4d79644a695
 DIST rails-6.0.2.2.gem 6656 BLAKE2B 631342c885e93ee6ac69615051a6b244de0911669a479732897fe73a77b182a93ced8b00c18b53b6ceca14549d32468cee7170c6504bb61de2b6b9734cec8909 SHA512 af258bdd3c6aa8a5f511ed98dae5c97169a895aba32ee8db5fd36f4be506a3eab6595acab13cb5a6eda1e721f83881c372b25a4fdb20774fd7e247286744b502
+DIST rails-6.0.3.1.gem 6656 BLAKE2B 2b0d9aca0a05984688a66cc14065fe99987eeaf2ca79867f075e39ace35cc4eb909b3b42430de9289b7ba5b26c96506c9a9eddb570a8c8b57c52f1a9e7867d9b SHA512 f8d40fb0225e689b2c3ecf948d20e9c44db3d399a2bcd779397a3fcfa862c7735399a0d96fb5c19bf5654a56116941017abe3c5aacff99e403a785d9c44309e8
 DIST rails-6.0.3.gem 6656 BLAKE2B dc5349ca3969ddcb5322bade4b55e814e2204d7203203251e7dac6aa4dc3a051a005ae7d572ddb8d8710bfe60fa33c8b0a64aa6c2d66b9b7840a8ffc67f9f965 SHA512 668686b520dd7bc1808237553162b9a6e39607a08264afa58d6ffc67ed6f03047d067ec134d77be6bb35059eab34c5d712b8ad94a023d9df48024a6fd22366fb
 EBUILD rails-5.2.4.2.ebuild 1049 BLAKE2B f83e6236526c6ca1d7c61b8eb60022720cda90e152aa598df59556e1574756f72c4fc7c319da1d9fa97c671eb96bd73fa0ece185e26dac8138b30d341ff66d6f SHA512 719097b30a977f4d34b90ab785ba457a860dbbfd302630cb392ae1c24f355362cbeb76f00a8806ed9570ddd8c0545e9149c31893deb608b6374227381caefe05
+EBUILD rails-5.2.4.3.ebuild 1049 BLAKE2B f83e6236526c6ca1d7c61b8eb60022720cda90e152aa598df59556e1574756f72c4fc7c319da1d9fa97c671eb96bd73fa0ece185e26dac8138b30d341ff66d6f SHA512 719097b30a977f4d34b90ab785ba457a860dbbfd302630cb392ae1c24f355362cbeb76f00a8806ed9570ddd8c0545e9149c31893deb608b6374227381caefe05
 EBUILD rails-6.0.2.2.ebuild 853 BLAKE2B 07e8ae0f3c85f07a9cb9940a8c2db21356a8c4f96defd8b1e9ff699abdce492ce6475cb3215d13e639cf1d1c44cb3d42149d30899e7938f742c3800a08d5414f SHA512 70868a2ba88eb834c316aafc6813de9b50d72b4be72f53b76b7c92565df36e53a0e523149449f22a8b154ec636212eb5589cb0319a22987bccf4aa3d97b805ff
+EBUILD rails-6.0.3.1.ebuild 853 BLAKE2B 07e8ae0f3c85f07a9cb9940a8c2db21356a8c4f96defd8b1e9ff699abdce492ce6475cb3215d13e639cf1d1c44cb3d42149d30899e7938f742c3800a08d5414f SHA512 70868a2ba88eb834c316aafc6813de9b50d72b4be72f53b76b7c92565df36e53a0e523149449f22a8b154ec636212eb5589cb0319a22987bccf4aa3d97b805ff
 EBUILD rails-6.0.3.ebuild 853 BLAKE2B 07e8ae0f3c85f07a9cb9940a8c2db21356a8c4f96defd8b1e9ff699abdce492ce6475cb3215d13e639cf1d1c44cb3d42149d30899e7938f742c3800a08d5414f SHA512 70868a2ba88eb834c316aafc6813de9b50d72b4be72f53b76b7c92565df36e53a0e523149449f22a8b154ec636212eb5589cb0319a22987bccf4aa3d97b805ff
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-5.2.4.3.ebuild b/dev-ruby/rails/rails-5.2.4.3.ebuild
new file mode 100644
index 000000000000..218aaa26b3b9
--- /dev/null
+++ b/dev-ruby/rails/rails-5.2.4.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${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:*
+	asset-pipeline? (
+		dev-ruby/jquery-rails:*
+		>=dev-ruby/sass-rails-5.0:5.0
+		>=dev-ruby/uglifier-1.3.0:*
+		>=dev-ruby/coffee-rails-4.1.0:*
+	)"
+
+# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-6.0.3.1.ebuild b/dev-ruby/rails/rails-6.0.3.1.ebuild
new file mode 100644
index 000000000000..3be9b73306e0
--- /dev/null
+++ b/dev-ruby/rails/rails-6.0.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3:*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index c6b5173f7f7c..1ea17fe0fd01 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,7 +1,11 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
+DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD railties-5.2.4.2.ebuild 1652 BLAKE2B 9af4a3cbbda94f9aa3a4b6093baebeaf228417ea5fc3899be97552a22aa509f83d32996d2b7a0a3268283df90d2f78d012ed4644a7e003f7fa796e4280bcdb8e SHA512 61080f4ffee8ee0acb44ea527d32a422f441c1fa733a0ae64f0c148e9ef4508520cbfd08553a3a8ca4928e09d5df7672d139ddee3405b7b2773965c95f7bb7d0
+EBUILD railties-5.2.4.3.ebuild 1653 BLAKE2B b83c0c2314b8425935c11bf42dc0e50094ab45a74b0e5bd9bfdd0fec784cc6202076370385d0b1d0595682b8dd5ad2bfe16e5ab165f1148f7ab1a0e142db9e50 SHA512 de678fb77863cac8f23d8a58ee04359b35d76ba39ab0ed5fdb2660551b0aa3c0d530228743c7b49b79301f0bf59ab572b6e75c4cb792e7c7765432ab965e00a2
 EBUILD railties-6.0.2.2.ebuild 1600 BLAKE2B 440c867fa1a1dd8f8f0c4c3c9986b91ce4e7606221cb285d822f9f2d3d168190827405f0a7eeaf681002dc26fcb0ea97ec229030a513cde7b0e561812875ada4 SHA512 b6b45d1170b3cc69c575591ddb54e2d9686fae9293a59e867dc27a0ba51e596871ccdd081dd90c872bd38856892c42eff890b132f781ff4c22c58bf470a86b18
+EBUILD railties-6.0.3.1.ebuild 1607 BLAKE2B a692d83620a1ef55346d5d87fef2e0651edbf40d466865a979b6a14fbd776b71a7dc18b5fcba7304a1617a00c3934e583b8abe80e1ef8a96b323d23b93228894 SHA512 603feb43371a3e811a753d43285ba454235e25ec4128adae5e600fd30ce01dc233aaf2d7d505483bbead30727c2f44fe6a280def8cc1854b521a471e0bca295d
 EBUILD railties-6.0.3.ebuild 1607 BLAKE2B a692d83620a1ef55346d5d87fef2e0651edbf40d466865a979b6a14fbd776b71a7dc18b5fcba7304a1617a00c3934e583b8abe80e1ef8a96b323d23b93228894 SHA512 603feb43371a3e811a753d43285ba454235e25ec4128adae5e600fd30ce01dc233aaf2d7d505483bbead30727c2f44fe6a280def8cc1854b521a471e0bca295d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.2.4.3.ebuild b/dev-ruby/railties/railties-5.2.4.3.ebuild
new file mode 100644
index 000000000000..c2b5b1022e87
--- /dev/null
+++ b/dev-ruby/railties/railties-5.2.4.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.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/railties/railties-6.0.3.1.ebuild b/dev-ruby/railties/railties-6.0.3.1.ebuild
new file mode 100644
index 000000000000..828467ed5289
--- /dev/null
+++ b/dev-ruby/railties/railties-6.0.3.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.20.3
+	>=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-remote_task/Manifest b/dev-ruby/rake-remote_task/Manifest
index f577fedcd245..b798cc74f57f 100644
--- a/dev-ruby/rake-remote_task/Manifest
+++ b/dev-ruby/rake-remote_task/Manifest
@@ -1,3 +1,4 @@
 DIST rake-remote_task-2.4.3.gem 18944 BLAKE2B 65105ded7e7c98f13c33376887220fae849a0077fa05d65f17079512f1290b1049373d130b50c756523c1562a7fdd608cf28d7fe32355ce4b52e1e09982a6b98 SHA512 0c81a4156853e6a58c094723eb5748a6aba826c62624c9a04b63e505e8c4bfab1b8fdfb80c0d28d6ab84e6a06280c52b263b515c17cab9d248d1eb9abbe78ac8
+EBUILD rake-remote_task-2.4.3-r1.ebuild 672 BLAKE2B 2481ca698b7128261380bb639bb5305459e2cb5ae7dd3d177b4d9e9771cc1add933d7b4529730eed48fbe1cc3b095bce4aa3c8100263e2bdb93bab935311b916 SHA512 c7de14e66f2dfa21fecdd0b536695219de8a880d2abfc59986dd1543b4b16e273283a2bbbf5a9f8e576a3f9355dd82ed52adc0444940bb4096a2e46492521460
 EBUILD rake-remote_task-2.4.3.ebuild 639 BLAKE2B 7fa42e73abd9182916d71bccb19f00b684b36beb90989b36e004cf71e5fc0c03f72547feda8abd6c6c05653ce7b90b889a98dfcc6125f4a16636d1339c399b6d SHA512 8febcc66e63b263ceb196ef621fce873340c6be2dcd52bd4da96a2054c5b7c920a46139d011f9a456b90ab423b15a762c52e3b397862e7508c720fb9f5d809ca
 MISC metadata.xml 342 BLAKE2B 04e0152e9fe68dfd8f53e6de853f9525cacca92c39ce67736e1c5416e6f0a1cd49b8f7e9596e86427e90f686414c0b779722e73c40032d7254d06aa0969472ca SHA512 78f689de3b96954e2e465b5e1d560dc6033e844fc20dddf37e03687155f731245de09221c1725cc20883dfc848368b9a4282c021341208b2eea6fd679cd8006d
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.4.3-r1.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..93a9022ff549
--- /dev/null
+++ b/dev-ruby/rake-remote_task/rake-remote_task-2.4.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends Rake with remote task goodness"
+HOMEPAGE="https://github.com/seattlerb/rake-remote_task"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest )"
+ruby_add_rdepend ">=dev-ruby/open4-1.0 >=dev-ruby/rake-0.8 <dev-ruby/rake-13"
+
+RDEPEND+=" net-misc/rsync"
+DEPEND+=" test? ( net-misc/rsync )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rantly/Manifest b/dev-ruby/rantly/Manifest
new file mode 100644
index 000000000000..a353a7cff6eb
--- /dev/null
+++ b/dev-ruby/rantly/Manifest
@@ -0,0 +1,3 @@
+DIST rantly-2.0.0.gem 18944 BLAKE2B a124204157953780dfcc97c4777dc3fb7e152eb3f0e208dd18aff80f8252b4f41285ce7870d927433e034678e679e0a735b8796601dd061ce43693f2c3760d50 SHA512 f3eb10eb3fea3135797c57d40bfe6a2ac9d64d4f449850b89072c527913f13eca34507f62ce611831497954b1c28bf5592dc46b73b510503223d029b4b442b74
+EBUILD rantly-2.0.0.ebuild 485 BLAKE2B 155540d908d1f9014f2f033608d9facf7a610080733ea68a1d28828da26fb95d5d2d1ae0ebbfe576f54ad751e19e74e4d5927b650d30652aa7ff2f24c284259c SHA512 e3f7727516c80556e58ecea3543873cdf8ca7483436bad928d36375d049619a24884221ce13d95e3eab1eb91f05cbd210e6b8c616bbc043828c9bbf84222f886
+MISC metadata.xml 342 BLAKE2B 273b8b2ae7aae1dabd053e016a033ae13ff3324266239be086097683a31453ac17a1b70d8368d4b7de8c65ee142e10d80f57a017e4a3ec53386fb001e43eb5f9 SHA512 f70d2c424a55681b36fa019f7b0f5ed8fce8429772485ca91a08b6debb5604fbf613d77c6bc1c3c09b9aa078f20529e521b035bdb66ebaa80ba1e2ce2fbf930d
diff --git a/dev-ruby/rantly/metadata.xml b/dev-ruby/rantly/metadata.xml
new file mode 100644
index 000000000000..a17d9e1e71c4
--- /dev/null
+++ b/dev-ruby/rantly/metadata.xml
@@ -0,0 +1,11 @@
+<?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">rantly-rb/rantly</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rantly/rantly-2.0.0.ebuild b/dev-ruby/rantly/rantly-2.0.0.ebuild
new file mode 100644
index 000000000000..4c2e275a6cc1
--- /dev/null
+++ b/dev-ruby/rantly/rantly-2.0.0.ebuild
@@ -0,0 +1,21 @@
+# 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.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Imperative Random Data Generator and Quickcheck"
+HOMEPAGE="https://github.com/rantly-rb/rantly"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index ad86248922f6..4ea655d51d3c 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,7 +1,3 @@
-DIST rbpdf-1.19.8.tar.gz 12026547 BLAKE2B 4989bee6f35d74a703539c6d209c14730e2674d94454b1794172f147dd01af20bdea5c4ed3e68a047f7ddad17083d74ea061dc5b0c28e66acdbf56ab1e335dd3 SHA512 e3015e80b26f9de2727ebd1a97ff5fd3937b7e133d9d39c2e1b3e9fe326354ca66ef569fa35bdf4c8b495b40df1ceec26d043e6f86be8ce741068a2c28ff8a28
-DIST rbpdf-1.20.0.tar.gz 12026312 BLAKE2B add83c3bc2fde2dd0b839fedabcc49b40839d17a3c6b4eb0d17f688840a7fae1bef23660bc810176b23042475bf6ba40cac6f08f4f0468ba6f1dcc6ada4520da SHA512 5324bfc115e168a9ec4972aea21539d1e41a3799bf3beaa2cf0764734eb152f6325879ebb0aee80276825842d8c4d15fdc337874b1237342adc425554e96a9d4
 DIST rbpdf-1.20.1.tar.gz 12026190 BLAKE2B 5a468e974bc0a15a9a8f621a6ee635a8cf4f81cc94b88a6bf8afd90c4a665c0892381e903158e66ec4a68676491faa80fd99b7d4ffcf0c86defc4a4114603b08 SHA512 19b4fbd8a0c4650c73ba299721a0fe03a10f223da5e0dd2b97549972ea8f381b2d5b4837369d0667cd325392edae1ec795ec67bc852c9b3588ec0c5e686844d7
-EBUILD rbpdf-1.19.8.ebuild 1280 BLAKE2B 7337beecf56b9882621706b58f8c748fcba94c0cfe9a6a4fd4b27eb448f790f63a2f31df152567a76517274804d40e1270ae8a413e810368f4ee80822b84ab76 SHA512 21c0fc4a8b1e1531653dd58b724b18bf56f453bf14fe6258de5b01223739659970cef48352f2cee03cbcc13e79e1841d1384121115f1db65f676bb50926d885c
-EBUILD rbpdf-1.20.0.ebuild 1130 BLAKE2B a3c32d5223cb99869c4acc1eca9e79eec261ace090ba5c0e682954c35e377ee3cfa2996d4e1898dcddc76071ceaaba7eb5cd455e7f1002fc1491454d6e65c5de SHA512 44e796910ece15746156f52ffaba53c2c0ef31967fd434be569589be3e54b4761a8484c1e37f228200bdae6b4731ccffbc03f558ebb743a72e07a6db97cee9cd
-EBUILD rbpdf-1.20.1.ebuild 1130 BLAKE2B a3c32d5223cb99869c4acc1eca9e79eec261ace090ba5c0e682954c35e377ee3cfa2996d4e1898dcddc76071ceaaba7eb5cd455e7f1002fc1491454d6e65c5de SHA512 44e796910ece15746156f52ffaba53c2c0ef31967fd434be569589be3e54b4761a8484c1e37f228200bdae6b4731ccffbc03f558ebb743a72e07a6db97cee9cd
+EBUILD rbpdf-1.20.1-r2.ebuild 1198 BLAKE2B e1b250da894c41b4bd04fbf214d1c0743f4d9190e1dc9620cd9a9d9697116840f0c62cc3133d6bab4185615628cb62e6cd761c9973822bdc1c88ca192b89a9ed SHA512 b31f94e5f700e3936b5e7452718652e78fbfea440a5d9d20c9d0fc0c9441a810e230888043f3b707731748199869c3ea756b31cd6c40e73dd091cd97ed9da5ee
 MISC metadata.xml 417 BLAKE2B b48fb397e76caa8bfa35675062a6c4026ae44fe43cd305eb51c9470d9dce6654603742954145f3bd063f6ccc6f56162ca9affa6acc6698ac81432e0dde42a070 SHA512 c33c8dded82e45f867b4e93cb3be96cabf42152bfd6aa13f9144fae15b2b4f4b8f503d4aef4af8c2448584c2e71251c958b8dacb14c26da4a6c2b9b3ff442dc4
diff --git a/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
deleted file mode 100644
index cec0aa03e682..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-# Avoid the complexity of the "rake" recipe and run the tests manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "
-	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*"
-
-all_ruby_prepare() {
-	default
-
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
-	rm -f test/rbpdf_image_rmagick_test.rb \
-		|| die "failed to remove rmagick tests"
-
-	# Loosen very restrictive htmlentities dependency
-	sed -i -e '/htmlentities/ s/=/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
-}
diff --git a/dev-ruby/rbpdf/rbpdf-1.20.0.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.0.ebuild
deleted file mode 100644
index 0a1de1e4c101..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.20.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# Avoid the complexity of the "rake" recipe and run the tests manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "
-	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*"
-
-all_ruby_prepare() {
-	default
-
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
-	rm -f test/rbpdf_image_rmagick_test.rb \
-		|| die "failed to remove rmagick tests"
-}
-
-each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
-}
diff --git a/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
index 0a1de1e4c101..29f175a27c75 100644
--- a/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild
+++ b/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,11 @@ IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
 ruby_add_rdepend "
+	dev-ruby/actionview
 	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*"
+	=dev-ruby/rbpdf-font-1.19*
+	|| ( dev-ruby/mini_magick dev-ruby/rmagick )
+"
 
 all_ruby_prepare() {
 	default
diff --git a/dev-ruby/rinku/Manifest b/dev-ruby/rinku/Manifest
index afde499cdac6..c8d32285e231 100644
--- a/dev-ruby/rinku/Manifest
+++ b/dev-ruby/rinku/Manifest
@@ -1,7 +1,3 @@
-DIST rinku-2.0.4.gem 21504 BLAKE2B cabb91710eca3f6d4985042045c1ebd37063abc466a2071c9a1c2f16f6efcdb80914eec855cc5c0795b428b285fcd6d760437ab2716cb3358e9a8e96b7916367 SHA512 fab4b47a22153d96f71e8b3c6e91595ba3ce97002233b035ab8ebcd6fb46a8e4ca2f82e49ed6d7a510338bd2ebec1b2e67d9146e589535fc8a072ae69e39d58f
-DIST rinku-2.0.5.gem 22016 BLAKE2B 962b2e369ec91022f61d640ed604939e4a5db561cc594d54199ed83fd166302c2a0b5dba5976af4b7fb048ed6ab78e578a7ba33933005ecd19ac8be3269ed652 SHA512 7a0f3c906ddb190344033fbc19aeace137bc234a164fcbc4311ce31972f98398bc6fc10ad89926a212544a0c67369af333a9f7e1d865bfe1119447de44f6e588
 DIST rinku-2.0.6.gem 22016 BLAKE2B 9ba678996110a219e4a5121879597f5024c5bfe475af187d9557092ac871f16528e473b41d20742847127b9c7ae665b91e5db7b9aab42dddd32e2a51f20815bb SHA512 5acb6de775e050a92c7b1040af52c5399b3fea654f7569d58aa1b5db10e4f17a2e1ae7ecc05f3753be4e18bbdf63ccd8e62d4060c0c6693981c8bab7115b2ff7
-EBUILD rinku-2.0.4.ebuild 622 BLAKE2B 2f2e73bb2d048a87354b5295cdc778915e69d9c46184ce827291c2b11bee6008b97b86472fab70e2f4bad72bad259f2f7be68a051654b95927a24b763da69b94 SHA512 d1ba75824dc605f62d06f944aebb617c624fad0445ab3ed836080e44411036cc7e5956a120923e38f22e7d8f9bb46fb1c248b02ae77cbde8d2cab6b6c100fbe9
-EBUILD rinku-2.0.5.ebuild 622 BLAKE2B 2f2e73bb2d048a87354b5295cdc778915e69d9c46184ce827291c2b11bee6008b97b86472fab70e2f4bad72bad259f2f7be68a051654b95927a24b763da69b94 SHA512 d1ba75824dc605f62d06f944aebb617c624fad0445ab3ed836080e44411036cc7e5956a120923e38f22e7d8f9bb46fb1c248b02ae77cbde8d2cab6b6c100fbe9
-EBUILD rinku-2.0.6.ebuild 634 BLAKE2B 274b754a758fe81f46a51ca9f3449eca29b1067a878b9015a832c259b8b5453cc11607a7bbea1272a41ec93e37d6d051c325a2dff3d6cd85ecdf9b16bc1db5c8 SHA512 18e322cfb4ab93452b07d03fb1edbf0e726c87a75fd9bca238a1279238c8abf94e27e80399221fbb571f7fee7f0bd980eeb14807143b159ada8c19166f00ff01
+EBUILD rinku-2.0.6.ebuild 724 BLAKE2B f6e83ecd30f36718df510b266aeec779dabecab4be7c0c64b04af271bb11d31464dd2d1c8edabf41f5f42aa5fc5ee929a51be5b2db111580b822efd8ca52a3cd SHA512 41e6e1df598af779ae4fd95707988427d8d1263eb6c72790bd5e72b14ec9fc340d28370d051aabf9db6410167680704b40b0f697601476f381f0d3d99138b153
 MISC metadata.xml 335 BLAKE2B ac11d84fdaad5f557902d13fb489bf0bb00686e1f68adc8015255171847f7da151d72f1b6f8e8fca6106ea882cbdfeb8b9cc4834f248a5a0124160f0045739a2 SHA512 84c583662f162f0bdda4962c3a4ca5c12e70d7aa0ebb9a8f8001a997074953843b4c8137e75260ef4c63782a13bd0a53b4f8cd8e518fb0f817ca71faae9b4fa0
diff --git a/dev-ruby/rinku/rinku-2.0.4.ebuild b/dev-ruby/rinku/rinku-2.0.4.ebuild
deleted file mode 100644
index 7731dbfffa0c..000000000000
--- a/dev-ruby/rinku/rinku-2.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby library that does autolinking"
-HOMEPAGE="https://github.com/vmg/rinku"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/autolink_test.rb || die
-}
diff --git a/dev-ruby/rinku/rinku-2.0.5.ebuild b/dev-ruby/rinku/rinku-2.0.5.ebuild
deleted file mode 100644
index 7731dbfffa0c..000000000000
--- a/dev-ruby/rinku/rinku-2.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby library that does autolinking"
-HOMEPAGE="https://github.com/vmg/rinku"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/autolink_test.rb || die
-}
diff --git a/dev-ruby/rinku/rinku-2.0.6.ebuild b/dev-ruby/rinku/rinku-2.0.6.ebuild
index 22158d3edb46..311aafaed121 100644
--- a/dev-ruby/rinku/rinku-2.0.6.ebuild
+++ b/dev-ruby/rinku/rinku-2.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
@@ -17,6 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' test/autolink_test.rb || die
+}
+
 each_ruby_configure() {
 	${RUBY} -Cext/${PN} extconf.rb || die
 }
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 64cbb3adbcee..a4bf2198ed2a 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,13 +1,7 @@
-DIST rmagick-3.1.0.gem 1552896 BLAKE2B 192a09d080b328f5a2f942bf02f96a618f7f8fdf2dac899b66ece65f69b421aeb96edcbd660ef1e699db543c44b997a4330540086facc19c3fb96a1c285f644a SHA512 4fa02bf3fd3e3f423e638b700412c32cd30ac306c4126bdeaa6d192994f9f467837cf96cb98937cfba4a9180d6da2d94d4ee798dfc57378cc1861e8e27208057
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
-DIST rmagick-4.0.0.gem 1946624 BLAKE2B f1cec7bf1dffa94ca2803dfd64eb4a7b1cb269c935482ed42df3a8d9e3f9599b24e6d07f7268e5c641734c8e8a8984f2f0cf2a80ced0f29ee36d154a4eb1a341 SHA512 2b9e72a3f8560b8530397406d086c0d3ffa6c6ec0b8d3ec0eb9d05528f108da6023462948738bd1f420f130250fa4bf8757a9c94335b223ad1ea3e279797b0ae
-DIST rmagick-4.1.0.tar.gz 1977887 BLAKE2B 08d55b9bd154ced069dfd3bf58edd3d6ea9fb56fc99985fbe805bde8027e11439f27c8b4422c38ea6da8361ca7fb53189fd9b7bdd1b65e12a5b807a04f64859e SHA512 5354f4430b2bad7bcb07c75dffae680ad7773f9bdd1635485c947fa82a80e8a7708071933437722df475563be3d94f0bac832178eadcf1616d81ee4e78dd8ebe
 DIST rmagick-4.1.1.tar.gz 1978761 BLAKE2B 489d355237379b7efb5e1d82b71cb2e6f8607cd644933c4d1d1116f464604262388aaf8534ed322c6b44291aadc3abb75e1bca94110c01fcde228b6fd9bb9ab4 SHA512 08d5a730281e7aa44fa955c8af06649efc77702dbc979f5de34f2f3b39798d494a0df8860a25746d89256c7ecaeaa140e4e5d5cd60017ed4412075a790976a5e
 DIST rmagick-4.1.2.tar.gz 1978867 BLAKE2B f89aadb3d0dc5274376c2fef335cbcef3bdfec3fa9aa2f9e0d1982c9d2b5568689a427c3b2f7536c0585316c0f53ca7111c3da30f8136df4c878782668830847 SHA512 671ce8ef0d2387d6f0091a7a7a79a5ee9a5c5cd9340f5d29b4a35227c2293eae5e0e5c9ef16a83dc24ed0cb59cc7258427f8880484f7bb49dfaccb00d280e2b4
-EBUILD rmagick-3.1.0.ebuild 1556 BLAKE2B 7ccb8f7c5f1cbb569eab9840b138293d1b97e83a86d5f3b352e4166e074ac2787e1e952aa1323d94ad6f8c38bff28e6499503fe2bacb643c13aca43d1a0bf580 SHA512 8f0b01f3165d84c1062e186f74791989e192a47bcc8c5e762a7f6daa7df863daba24a0525f7b1f41e43c30a34a349bcb50830863a6c9fa21c77320aef5dc3e82
 EBUILD rmagick-3.2.0.ebuild 1582 BLAKE2B 2444e14e907adab5658013115801d453787186933c20b80dad6e25e439d4dbebc2d8579bee13f20d54f0105ebb7be8611df471803c0cb0616e5c7a90ed71c390 SHA512 a1410cac8299dd2debc536aa821b45f62c0db4cefc1dbbef044083c68f5db13753b628823cd2e68f0d177bd0e63841578e1511efe16e96dce037ec06c4dc12f4
-EBUILD rmagick-4.0.0.ebuild 1571 BLAKE2B 1ea72c8b636c67e248434986bd052386e66cea115d8a5bddf44ff22d542a371f72d3a9d8374e70c22da840bc22ce0e87b92f462ab34dda713df2ec2048226e92 SHA512 7f41467a28f7de463d1376f842badc3328d962b3aa8d7347b746c0f54bb8ec89fe74afc9b85b611c8a45ce90a66879966f934f22211419df7f0da01877b349d5
-EBUILD rmagick-4.1.0.ebuild 1706 BLAKE2B 8344f0a135f100960f79fbd1564e3d29d8c90cc161d1c48084b27b40ddac2a9c1dd7d376d5a1d2328205ce664dab4054caeaf91494de1901a27932faa7f9d1f9 SHA512 74bee173cc6739247cbcedabca764ca95ce34759cbacea2b8356c88d5080c38b2b9ee182058ddde10ac3f16a0d3784bb9c09a00ebdc3f41264a8b5458c2e0bc2
 EBUILD rmagick-4.1.1.ebuild 1811 BLAKE2B 47500f1d99dd0a063fcbdf136e0c1f22a35d653950d8bbd5da04357673c0e38ef6d96bfeb9e2e4e26d90a67a2ea5830040b8ef73e2b9e84faebbdb63776884f9 SHA512 9d7533a06af94eef5cd1b48a637dc685c73441bd5c469a2fdd0eb8921d42c7a140716c3e8b5028111a8d9fba114ab889587f1ac35a8fbbb5415a86dcde92c593
 EBUILD rmagick-4.1.2.ebuild 1826 BLAKE2B fa9d799597b5df2b3e961f5d13af93ff225ec2d5169507a8218f88defd0c58d0fe8e4ac753aaa4975104f6359dadc30ad51afed2b385c49bd459615589961227 SHA512 8bfcc4668a1cf4fbaa340c82f6ab3ce86d51ae8644722a4eac972ea73289271704c84bf9ca098d799b4985de54f61e1643ae7293f7741bdfe687bbcdbbe2bee2
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-3.1.0.ebuild b/dev-ruby/rmagick/rmagick-3.1.0.ebuild
deleted file mode 100644
index f65f3e18051a..000000000000
--- a/dev-ruby/rmagick/rmagick-3.1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/gemhome/rmagick"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.9.0:=[jpeg] =media-gfx/imagemagick-6*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-
-	# Avoid simplecov dependency
-	sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test || die
-	RSPEC_VERSION=3 ruby-ng_rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		dohtml -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-4.0.0.ebuild b/dev-ruby/rmagick/rmagick-4.0.0.ebuild
deleted file mode 100644
index 0b4aa2062622..000000000000
--- a/dev-ruby/rmagick/rmagick-4.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/gemhome/rmagick"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.9.0:=[jpeg] =media-gfx/imagemagick-6*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-
-	# Avoid simplecov dependency
-	sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test || die
-	RSPEC_VERSION=3 ruby-ng_rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-4.1.0.ebuild b/dev-ruby/rmagick/rmagick-4.1.0.ebuild
deleted file mode 100644
index e4794f1cff3f..000000000000
--- a/dev-ruby/rmagick/rmagick-4.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/rmagick/rmagick"
-SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="rmagick-${MY_PV}"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" >=media-gfx/imagemagick-6.9.0:=[jpeg]"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index 50e438ba9718..dc7bb52d42f2 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,5 +1,5 @@
 DIST roadie-rails-1.3.0.tar.gz 56899 BLAKE2B d4d4f1d56c581b0af894959ee985f522b6470ff27bf22c4589032b0cf049337556377bf5decbd3ca1882762d80371df372bd7c7ad811fb087bd720f26eeeb6c7 SHA512 af08f0a877993d5b3f6d13e80a4aacd4d2d13f8940a554f2f91289e119d754015773a67ef14052717244374e3636069fa8b39078cac2145c86cb35ec54ad53fd
 DIST roadie-rails-2.1.1.tar.gz 56419 BLAKE2B 6a54797c77267a61ab63d72743fbd3f98d4137d917ddebf0335c30d03e5efb9e2907679237eea168384b54ea93bbe9be3aad4dcbf6364d411ebaa6e2ba7638fb SHA512 ceffe9746cded4f5dca83c614dc6ffb65203455775df9f56a402837018c0a322c7edad37ca05c72bc70fa8d19cfb4f9eba5b2fde1cbff7f8b28312e95140f353
 EBUILD roadie-rails-1.3.0.ebuild 1102 BLAKE2B 0ca2e11901df251388ff9990d5c75581b0e0f51719c6417f2d1f1c44a75da17b477e323f5fb47f9bc13b5c9ba21eb4011df517a62fdf4c634202364c445fa886 SHA512 8d0c10f43763125fd47e43daf8e25c75e2f83f84ca3c9f9190175cf24b65d1ff4e9e374fbc2bce419f9cfa0ab8ea7b19fda09d04b0e290d6df2377978ecfc631
-EBUILD roadie-rails-2.1.1.ebuild 1105 BLAKE2B 2f3db4fc90878695d397b67f0837aa137d7a62fd39c2e3cce1ddc1aa2fb94ab1908c0ee78e77cfb0acaddffe99df5fea67ad9b593c213248c73195ced7758c6e SHA512 9807aeed4ca63f4d494539341d3839a9a1d767ae9569d05b7ce598bc4b51801ef856388798463a0c8e13d11cde94ecba0509e16bf553abf960df05d1f284391d
+EBUILD roadie-rails-2.1.1.ebuild 1152 BLAKE2B 2f45b36d39da532391e21c071a8b163d34e5ef9b16f2a81a34bba365ce58e352ad29c07b25ea0defd2e7b1fa2a57e7d1d6496323aea58fa9fded841823d5b7fb SHA512 26bf371328d17e0966e57314a89662fb57783d5c8f42365a34adac82eea2db33faf1073a23095bfc50f8e107a592e2a86f94fa22ef08b1095d158c7d5b670077
 MISC metadata.xml 334 BLAKE2B a90c3828ffee06b0b840e728c96e4a554aaba24f0b292fb2cc835348900a852579eaf74da7b588f07d4ebb985a37a530ab94b6f78dceae2ceea7ea056a944506 SHA512 0ebe3d25378f2e38ecea332a47c249238a8884c69372579f2fbd4c2017e07932062832091271a473641675f0adbb71c6f9d4ff49694533f11b5d609264c360dd
diff --git a/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild b/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild
index 7d87cf6e720e..8c1ce8a56fcc 100644
--- a/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild
+++ b/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild
@@ -28,6 +28,7 @@ ruby_add_rdepend ">=dev-ruby/roadie-3.1
 ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
+		|| ( dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
 		dev-ruby/rspec-rails
 		dev-ruby/rspec-collection_matchers )"
 
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index e33a004bdbba..7324a7445a7f 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,7 +1,9 @@
 DIST rouge-3.16.0.tar.gz 815138 BLAKE2B 9106bb9f62b0aa9ad879f6982389e0690eb1ed87e59a71ace601d38c680bac836001f632004ded9a718724f5efc96009b8f41d82a788570df7e04ec0098546c7 SHA512 f229feb414d3aac6db62d208f601828ff64a7d303b11df55c33e7fb0371cdbda5ce7312958ba8b1f886e3521c8beb465d62a042ef418f0e2f87808685321a58c
 DIST rouge-3.17.0.tar.gz 816264 BLAKE2B d8814594e4d61babfee59cc9a251a6dddf89c66b3664fbcedf2216943ccc887eadcb564e4bb829df2b7adcd898743c48514e2b779f23159a7d77a9f442782373 SHA512 3ed7f314ec27b966115371d4eff6f4e4880417f8de36b3dc80012ba0cdba18aeae7b58057dc1e02956e59bb14db8786a94262def85bbc85a699002aa90859f2f
 DIST rouge-3.18.0.tar.gz 882486 BLAKE2B aca9f22b84a168423cf66189a29ba51611854e03706619437b654a7e2c1fe99fd18b3f3e02f3a82ad7a9a771d6382204fc4758b8a33818ee485bed8bd60066f4 SHA512 ee37fe498fe5fd23e31fd0a0b2ed25d0742e9b2de36b3a923a39737825346c85f45043d85fe56f12f28db989c67ce9d96a8ac2a273150edb87773b870a80bfc8
+DIST rouge-3.19.0.tar.gz 919603 BLAKE2B 53cffee53d8c6bd8e27dc0278f9ef8e9bff2a01d568d2342847ce0afe71ec72a8394f6e9184f575e38abad7893c61a4553ca73c8072bdcdb91f347ffe63a65e5 SHA512 4a59e5bebfb0c58be82bcc23e7a9906d9ff5cba8a636b47b94be00194ab0ab6cfae4d584586ee037e160245630abada889aa85332398289a214b7a493a8e825d
 EBUILD rouge-3.16.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
 EBUILD rouge-3.17.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
 EBUILD rouge-3.18.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
+EBUILD rouge-3.19.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.19.0.ebuild b/dev-ruby/rouge/rouge-3.19.0.ebuild
new file mode 100644
index 000000000000..1ce32a97ce3b
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.19.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 8036613f85c7..b278f0784eb7 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -3,9 +3,11 @@ DIST rspec-rails-3.8.3.tar.gz 138053 BLAKE2B dab5764d65d484a8a808a2104a3ab093c2e
 DIST rspec-rails-3.9.0.tar.gz 142966 BLAKE2B 2f75b1a2e666c8b790be4aeb3add3814558718049a818bdcbd8ff07b5f837727d34628fbba68fd9ff832b864261cac2e545991daa5ad3f3b72304b411801295c SHA512 f0130bbfcc8367a1ef6d8f259ab04a623720068f205c2454117f988c8405885fd19056692b46d0a04d7ba2d0d24692acf8283a77bb5292054f990002fae10af0
 DIST rspec-rails-3.9.1.tar.gz 143459 BLAKE2B 87a691df63a438b15b5726a802632c16373c784cc66216c1b099ed7e36e0916fdfe7ca1fb964904678b779b8fa90f0659971c4af00f9ca3a1071adf2216466bd SHA512 247acda67672ea3fa0641ea36d6209c8876597c63180979713db257e02cb4282b122af4cc0aa540dae984acdb16afdc4359012360b951f0599710fe422cdccac
 DIST rspec-rails-4.0.0.tar.gz 153413 BLAKE2B 8362d971a1df19313a393754fc34f3ac7680794c2684e68710476a72749a26919aeec919cf4962217c834aef5533fa6849f7493e8a0e642071d2b3c03e0aebf3 SHA512 09c79418250086f8ea15649173edb17bb3ccceb77c899c323a46fa52b8515e739906c9ec30eb8f06f2c0c55c45f24cdfd0906a9c2f926fb6aae4dcb60fe2d899
+DIST rspec-rails-4.0.1.tar.gz 153383 BLAKE2B b2591fe27e992df11404f792e7efe1e18fa023e0b4b7c076f7ffc86e83228a013f06206c687167966413641aea654f57f0d1c0a057ecdfd9c1579fd38d08fcfd SHA512 97b06a8696181fb0209e376780860935f1c22cd9a2ae5977efd45217ab74e6cc0260687bb2ccd22f28cf69f2a73ded43c51ac8d43d0d0b6b0bd0fb3e547d920b
 EBUILD rspec-rails-3.8.2.ebuild 1431 BLAKE2B 7fc7098a39752a8243aa74197abbe1248c57764ef6a6d781eca82d10e1f6de42c83fc8da11d439f9525a6cb59ba63f0dc0ea5451ce46c9879eb76543ac5ec90d SHA512 45cb8ce308d0fa2d90e9b3b34d443bd60591f64e27a0f4f6a4a82c8489eb317fbc7774a0d39af318d10e8ca60949e1808b540c853c59307016359fc6110ce9a2
 EBUILD rspec-rails-3.8.3.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
 EBUILD rspec-rails-3.9.0.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
 EBUILD rspec-rails-3.9.1.ebuild 1511 BLAKE2B c7b77b6d1e9ec550b58e829db92d7746a45709c07a39c5af021188f0ac39ecfdcdd4425125f4f41b2da4d93622beaaaad2133e49a5457a4b46f9d287e4de4d97 SHA512 1a8f965898cf9a073b18d456834dd4c02bb25f68b53f7d818a354be2ae531b1b5d1f3c5cff1a044fa9b6953648d6907014f0ba5b2fcd81082c36a4dbe78d8421
 EBUILD rspec-rails-4.0.0.ebuild 1545 BLAKE2B 14fddb4cbe2447b8d569bbd6e0c0dd5e66abe05eb1c10eb31bc4aa5adcc15cb12bb51a54c6aaf316edafff675642ce5c9c636a0d20ed562c7d496750e9a9440c SHA512 48a8f19e71419fd966acfa794c6752c00aca0d201a73bcafa32a128f46d36f05a972f3891fcd78d8236ef2f6c83dd0b13c674974f56d524fbd77f87d8af01126
+EBUILD rspec-rails-4.0.1.ebuild 1367 BLAKE2B dd40fa8fe0db77774cbed7425290f70ec91834b72651d1ed6bef4917aa82872b16466be9093afa97d153249238babce110fbd3ab9ec5379a450a0a151ff5d556 SHA512 ee6d372407018a1b9688d5e14277adcec37e0d70e2a76f035d80b7a8df3d513c2214915d5e7361fcddc75d22b73e5d02751fed1eb108e58b15dcac7d4e7da2be
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild
new file mode 100644
index 000000000000..56a11789674a
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild
@@ -0,0 +1,54 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*
+	>=dev-ruby/actionpack-4.2:*
+	>=dev-ruby/railties-4.2:*
+	>=dev-ruby/rspec-3.9:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.2
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	echo "--require spec_helper" > .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index 48d67af7e49d..1000464be1b2 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-oembed-0.13.0.gem 4508672 BLAKE2B 154accd1025f9874a3367d8661ce54aa517ecd663faa47a7fa5714acb6846def05c159ca72aff98d77d03edfde84dd825f2be5447eec141268ed4e597c0a9448 SHA512 3998b4ae507320fe6c02b998b58fbf99c926b58d4e44597a81fba95f85b3cf3d9a4565cbd34b1c9d47f9dd01365ce6a1dc46a32fb9368abdd35fe5e69b34bc1e
+DIST ruby-oembed-0.13.1.gem 4509184 BLAKE2B 212cdb606a1155349c23c1c06f25fedbcc2436dc22a52c8f405b63e27457881617b41d79db15e92e5caac8094c7a9ea912f1b16d994448f5296d3c6117062f17 SHA512 d87f65f1d76d485488c81d4fa2b2df5580a03104a16e3af5e65e6987f4652b3f5652ebcb0a79eab882ef0e5cc9c7b35537032a849de7b848b609f13ca3b83dd8
 EBUILD ruby-oembed-0.13.0.ebuild 795 BLAKE2B 35cf25fb62924a8f66d2296490e51499c7066e73d2b802b142712876822d91a9f4995c40828718429891a7bf25738690559081ec6dd03b1dc862589857228955 SHA512 d9f831c5f7030f153a9263d7cbdc75acc26f90b24a1b108b168a315e2c392536d506f20c7e3a1c3f526f656f236028fb88b755b479d5272fdc7f56f63e0e5847
+EBUILD ruby-oembed-0.13.1.ebuild 795 BLAKE2B 35cf25fb62924a8f66d2296490e51499c7066e73d2b802b142712876822d91a9f4995c40828718429891a7bf25738690559081ec6dd03b1dc862589857228955 SHA512 d9f831c5f7030f153a9263d7cbdc75acc26f90b24a1b108b168a315e2c392536d506f20c7e3a1c3f526f656f236028fb88b755b479d5272fdc7f56f63e0e5847
 MISC metadata.xml 345 BLAKE2B 575c6ff6aaa60be02f4afbaa5b6855e9e0a8e24992c7ae7db0f3f23856403c3f223a4e6c861550a96b967585bc0f7aaf937b2a98c6fad69fd6ab69466e98613c SHA512 e0c3ea7c1c5057b74e8b03b5d314050ee21f8a235dafb981888ebec4d8cf866d13723ac1dd6a96a685380f9b30e61c513e1f83328c778a524ecb52f9adee8e03
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.13.1.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.13.1.ebuild
new file mode 100644
index 000000000000..32d0aa98300a
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.13.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby."
+HOMEPAGE="https://github.com/judofyr/ruby-oembed"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:5
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/webmock:3
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
+
+	# Avoid development dependencies
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 144458e63002..917a1f648d0e 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -11,10 +11,12 @@ DIST rubygems-3.0.4.tgz 883664 BLAKE2B d5ec493657c055561aa9c0c09719529857706db19
 DIST rubygems-3.0.6.tgz 887156 BLAKE2B 685cfb108cc684ecbbcee6fe341baa429ac28f331b3db444c5ed3557bc169147dddc8d226780a85842bf1de2e24f6a60b0464820afa2a6838221c22543a36daa SHA512 1ef1822a2b19790a36a6d242b7d4584222617baa27787ec58961a9cfeb2733f19f9085490ffc72ee375d3153c7114e050c42e68fc8039e727fe5961b09365ee5
 DIST rubygems-3.0.8.tgz 888058 BLAKE2B e5cf7985fb67f2d4647fffa7679241a8722d5b7c3262432cfb06ba36716d8acaca6df3704a85e24d2f14c56f260f507067f31c3ccdd9321b922e8f13d085398c SHA512 ac8906360bea6e089c987308b1ee661d2f1c68e1ed66dcb7c5afd7ebfe5bef81c5a01ab6113c5eb5b0738129105f3176e0c595a0883a952082a048b7f20a5dbf
 DIST rubygems-3.1.2.tgz 995386 BLAKE2B bddf5dfc3568402257a2218642e6a15fe904b837114b9ce3a1aad155b235e42d96b1b0d4c6be1ee2e71712b8f1876902c343afdcb6d191ae0a6560f582cb282c SHA512 707525a98d14d46e69922e1deecd3b6c4caa090ee8113ba43b3912dc615cd2b1e0a083ecd0876a08b69c209bc05bba67d179f70d65aca45a92ac543170f13d39
+DIST rubygems-3.1.3.tgz 996881 BLAKE2B 0dd3bad8420de742f5ce76db977bee800f1abf2beb48b9d8f32332c4d06814d5febb8df0a2e70f6c4f26a1aa6adbf802e041019ff1d15e2c1f8f9d2ab65974d0 SHA512 8ca0c869a53c4b99072f220bca3455edee6126effb2bc5abb9265758083688b523303e8d2ca0e6d612fbc40140c06570f990fff50cce104f443d86458b190c3b
 EBUILD rubygems-2.7.10.ebuild 4523 BLAKE2B a93a70350e32efe702f346e26416eb7043700e5f2ba437889463f1a2af0218c2eb3fdf2687fd10b834f9413ce2e8b9588eb94042ee33d18b577c680d410796ed SHA512 2ebbe7993a7492c54e85eda668bf9349270ec4fa57a7ec8e90597a8e2a3ea955ad925e21b01352c386e29f95e77df015fac9258a16b9d7823b7629bf2e4410ed
 EBUILD rubygems-3.0.3.ebuild 4664 BLAKE2B 3372409e3fe986a43e17fe649ba20545ce15fde78323658eb58176a78ed242f2ae30ad45879748ed760dc38378f3b1f13fb56a570cc0080baff6d2fb006e5266 SHA512 6cbb277a47aeb7c09956c3e385fd2bc379a9191018f3b631cfe34c32513cf0bcfbb7de98f861ee20bd418c07b9c0c7ee7bfed63e32f6758722782a1cbc4de3c9
 EBUILD rubygems-3.0.4-r1.ebuild 2519 BLAKE2B 7a76a3c3d984445c0c2908547246bc69f74f67cd1876ba573f8af95675a6083a1d89a534bbf17b8641565deeae14474f10b83a68c56291f8f7d2733c6c7ccde8 SHA512 cabe1a62f9deceb944afaa9f7290f536b5edd1f452a556995c0c9524d793c1032327748e9820018ff6048c975af7d90f50981ab57322d717882ab5b9b4b5902d
 EBUILD rubygems-3.0.6.ebuild 2520 BLAKE2B 2c647d1d469e7861046b1d45b5084e2d2187b8611021f349287a34bc15270d15adc394029e2140ce94e9a4d2d71b413ab115ae09b280a590204b04e5184692ee SHA512 ecaf23ec49cadb371f4474b5cf2b9321a2a40efc20f92ff2afb7ad0d282915d70a24acacc4b53bee85d98e0b0aeb6e20c58e082d7d05123caca7f029ee487cf8
 EBUILD rubygems-3.0.8.ebuild 2654 BLAKE2B b60639ca7ebc7f1f2523c59c6431be637599376e3a52798316dfb539f8f2bf53a7077d92e48d82bbb2190c73dc2d24f6113c9aa418e9e9768c00ba108c090c8f SHA512 e44d8b97cfc1d75ebd77f2628649aad2f333e8237ed428b6956e0c6194bd8e8a5549f1767dab1e9193c526f6688c22f25fe00e427a77d325192ce52b7a822244
 EBUILD rubygems-3.1.2.ebuild 2865 BLAKE2B ec864cc48f38323c1048178edaf3a79efa5f21ff83e52a2cb60e5514531abee9587d1c06ef27748e3e9bafc9fc78deaf827c9eabefa54b99fc1c34aa26a86aa2 SHA512 49bbfb43fdbc9162ad98c8469113d43756f1494b1d259d8bda189f49dc4995650e05283f3126caee5b67deef562f54b343987557959f065344e6a9367a23d777
+EBUILD rubygems-3.1.3.ebuild 2865 BLAKE2B ec864cc48f38323c1048178edaf3a79efa5f21ff83e52a2cb60e5514531abee9587d1c06ef27748e3e9bafc9fc78deaf827c9eabefa54b99fc1c34aa26a86aa2 SHA512 49bbfb43fdbc9162ad98c8469113d43756f1494b1d259d8bda189f49dc4995650e05283f3126caee5b67deef562f54b343987557959f065344e6a9367a23d777
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-3.1.3.ebuild b/dev-ruby/rubygems/rubygems-3.1.3.ebuild
new file mode 100644
index 000000000000..54e32ae28236
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.1.3.ebuild
@@ -0,0 +1,103 @@
+# 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 ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc History.txt README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(25|26|...)"
+	ewarn
+}
diff --git a/dev-ruby/sawyer/Manifest b/dev-ruby/sawyer/Manifest
index 0b9f673c889f..9f9b96817719 100644
--- a/dev-ruby/sawyer/Manifest
+++ b/dev-ruby/sawyer/Manifest
@@ -1,3 +1,3 @@
 DIST sawyer-0.8.2.tar.gz 15059 BLAKE2B 11a82158493fba69695b4eee15db223a07ebd81f8e39910553ef197a253a3342cffd00045385706c56c6f5e46bf4e20872cf61028acaf02d6f81fa2f640fc09b SHA512 fdaf88d33d87922bd0d44de919b920938b7072ad437db4b98370c507e22e4229ec0c68c613944fd2e20dde060ae5d34de6c001568eb7d1f38098831ca29b0c13
-EBUILD sawyer-0.8.2.ebuild 707 BLAKE2B b79f43b5396530aa729510a91fa76882b454d6b2f044c2236041e015b861323b270c7cce2ad81476e8a976cc11ed7d178d8ffad6b95c6d0c588b11d75a873ab3 SHA512 51e3a82e9790f08fbfb950ef31f443a36ad5e3f66ad6fbe916c997b6186e9496de5fec8f8781c0a4f60ab271877dbf48876a2a982ea52d22bd9001c6e2de4d21
+EBUILD sawyer-0.8.2.ebuild 709 BLAKE2B 9bab550f1dd1beb65eeb15b2cc5d24037e1b865c2189e3e6fff047838426c7e184091f1b1a0d74774f5e9d53510f7cb10a7443187e15dc39b340a0f32fb31095 SHA512 381e426f169625f2c8f53f6d6f702f05f947e24699d05e1ba3471746bdf72f28161d7955948016911fd6ef13dee5646d38f574801d17fc03919208ccacf7fe11
 MISC metadata.xml 343 BLAKE2B cc1ee84d088f5dee301ce54b35dc657a5755376424dd112af7a3b1e92044b5f337e63ff1d9429ef5386f4f473a6bb1b8862fd674b8d8214fbcbfd57b1706cb6a SHA512 e8a9c944a7e5e4c4be4baa2dece6b6ec683591551624cd5e97adeb90d8698cbe6a38a173a9c37a856b77830b5aa2ee182b5a0c25d083959837c04b366d835538
diff --git a/dev-ruby/sawyer/sawyer-0.8.2.ebuild b/dev-ruby/sawyer/sawyer-0.8.2.ebuild
index 71b54f56e4c6..8848eb45b332 100644
--- a/dev-ruby/sawyer/sawyer-0.8.2.ebuild
+++ b/dev-ruby/sawyer/sawyer-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	<dev-ruby/faraday-2.0
+	<dev-ruby/faraday-2.0:*
 	>=dev-ruby/addressable-2.3.5"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 0a81728cf784..ece2dc57ef7a 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -3,9 +3,11 @@ DIST tins-1.20.3.gem 305664 BLAKE2B 26c78cf94acba6651c631b274a98cc7e19d3e215a450
 DIST tins-1.21.1.gem 305664 BLAKE2B 1a86b55f0334d4e28fe4d4e67c12103ab4ed53056fb00d9d375ffc9b8213419bf277c37d23970e99c6bd7d3a2035cdde661dd63524b81082739d01271370be9c SHA512 25288e3c8e633bc9cef11b988bf778e75a304a52146a4501cd3ebbeee4c845a6be795d4ce7d01b24ff4a9a122fc16afbc20d9d88f7b1559c9b433d8f9282e29d
 DIST tins-1.22.2.gem 306688 BLAKE2B c5b0aed29b763d37707de47a57419d9af934a0949417003707fd13a7e9e4a0d82fb905843ceac75a384c6ca9592471c15bc28ea63af4890ce54076f5c2f67d7c SHA512 6b93242d9c63a84de690c381086fd454714cdb0e82ce6eda4deb5d66a8b9ca4bbc5e2c502c258045b06aecb76487eddd019ca267b872717df36cdaf840ae97e7
 DIST tins-1.24.1.gem 306688 BLAKE2B 64020840eca05dc90402310d2f66a8af2a029954ae8f7b37275c257fc402cc7a6c4f75d8a8f506edf49531b6e1d16112db63094f76736e2e3ee213fb88c92b98 SHA512 3df7a43e63f42d48033410affc5b5990864c563c294678b9070bb4dc9c9d47d3783d4e8fc9c4280f6e00304781dae40585df73a8deaac1f228bfc5dadb961b38
+DIST tins-1.25.0.gem 306688 BLAKE2B 1dfbcfeea4fa88d1a227c5b15dce5f8fbf2bdd8b526d6ec6aae14a309bb8267c89e02b861e0f89c6b0f22638cfce5fde53b07f4bc61838530672b6c9dda2b95a SHA512 e8afd89f39647f0722db3128fdb4e826f8beac5f4c081a4fc95c6e8c9a59129f523af81f953dcffd513172c17173c6ffdc0ce2c215b6073c3b94659c998dc3d0
 EBUILD tins-1.20.2.ebuild 624 BLAKE2B e01cc5c9685cc233eef19fbda20bc71eece5224684868b6e4cb5994b61540e90a8c75dbea2a69186d127fbc98489d08b08a7045941a6dd1002445bce5482974f SHA512 e4da5368edbc0f6efa2c0f6ceeaa26921bc4ac2fe89f8721daa90986b4b4444fc684c1b2ad515274a8110fabce6f89ca243e9400c816bae1d45575eec73fea87
 EBUILD tins-1.20.3.ebuild 623 BLAKE2B ab21997e181eebdc37240c8bc08ad090a73aafe22466a92b73a8867e60a23d47da4a9434074a7ca7cfd7df1c26598980e3ee16adb6017ec38d3b5cd6c15d1ed7 SHA512 ecd8a147bfdd8d618e10ee6cb461b031455133a3f38c1e62e36fa90ae3907cb9ea94a438f6eecb8b0d3ed291b499b4392176951e9d046a13e68aa8e3af5eb089
 EBUILD tins-1.21.1.ebuild 623 BLAKE2B ab21997e181eebdc37240c8bc08ad090a73aafe22466a92b73a8867e60a23d47da4a9434074a7ca7cfd7df1c26598980e3ee16adb6017ec38d3b5cd6c15d1ed7 SHA512 ecd8a147bfdd8d618e10ee6cb461b031455133a3f38c1e62e36fa90ae3907cb9ea94a438f6eecb8b0d3ed291b499b4392176951e9d046a13e68aa8e3af5eb089
 EBUILD tins-1.22.2.ebuild 598 BLAKE2B e07a09b9a60ff60d623ca8ed3ee86c0053566aff02610271b776aa0c90e78e1d5252e6bcc502cea6b989ec691d50b34fe68d8eb8e12d525a41c60abd6ef95f18 SHA512 1957b049fdef634bb43bdc3b197e5445cf70608dddac80190d1270e991de8eedcb949da4ab209658c96fd5b11b022c198ff37a1a5eed3d183c5f6508c9ead330
 EBUILD tins-1.24.1.ebuild 842 BLAKE2B 8d7a0334cbca086b1c1ffebd2f6ed0db3f302b6a670c6eaf12b21472b91ba4e02b32e9bff0e85f9c10483bdd2429e8e77ce615d572fb45e2309d8c1d6e53ff19 SHA512 8a404b386187e2ac21abb936c31f8d91dfaa282b0bf79fdb7ac7f8999e246fa5e58f46d0111f8c5285b8a983a1757731cf922b515eba34bbf52d586f1a09f8c7
+EBUILD tins-1.25.0.ebuild 842 BLAKE2B 8d7a0334cbca086b1c1ffebd2f6ed0db3f302b6a670c6eaf12b21472b91ba4e02b32e9bff0e85f9c10483bdd2429e8e77ce615d572fb45e2309d8c1d6e53ff19 SHA512 8a404b386187e2ac21abb936c31f8d91dfaa282b0bf79fdb7ac7f8999e246fa5e58f46d0111f8c5285b8a983a1757731cf922b515eba34bbf52d586f1a09f8c7
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.25.0.ebuild b/dev-ruby/tins/tins-1.25.0.ebuild
new file mode 100644
index 000000000000..cde93a82c4cc
--- /dev/null
+++ b/dev-ruby/tins/tins-1.25.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Earlier versions of ruby bundled this dependency
+USE_RUBY="ruby26 ruby27" ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby24|*ruby25)
+			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index 15e29355bd87..88681ceb541e 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1,3 +1,3 @@
 DIST travis-1.8.10.gem 194048 BLAKE2B fa3daaa50e4c7024f6eac7978cecba526378022451deca9148a10b6f28528dc4ee5a42cc794628860b2861aafce0dc62c207023fc1f61676b48e00022112c834 SHA512 ca8adfb2d1541e157d1fa19837ce6d7a75ce491e0a3402447642f9f3b1f0c19ec16344016ed494947e3fde4e838669e4e5ba48087baea3f097605bef700dde55
-EBUILD travis-1.8.10.ebuild 1191 BLAKE2B 25f520f5df5bfc134d4b4039e402e2227a69489580988eb25624aa60980364c3db05ff1062dfa4c606b155888d6fe39ed6a24d62fb2a1826484e49dd37650480 SHA512 0d21635f4a7a57b4bb07e6f05e2749ae9d9197509fff5a8ec9cd6852c5f7c473bd8b19cdfe395798e6475e1308410d3c790ae31d21d408aa9bf30232ae55990a
+EBUILD travis-1.8.10.ebuild 1195 BLAKE2B ed819145c8b4fd76e324b2a247a0f7e21ab7f138051308116d05511b43199341bdb0122cae00a876015ca7f2d8473aaf3406e5699c5306e9613ec23de7960e64 SHA512 4d80ced9d4f80603be4c6496695fb74656aae2b0120f4d26f44674e14e728ad08c8f67b6aad54d79d8210539c6cc7c216a41c5d95e6f54ac5c0225788d0d4dee
 MISC metadata.xml 335 BLAKE2B 028a3eb98175d899ca2cb4412a35af5c9d9e1dbe43a1065346c7a529087790e3e3482fe7aa489ee4803f7ddff115bb654c62d865957fe80cce7952d316e7bb30 SHA512 2706c228bc0da2e813ab70918226cf82561b8f3f7c186ce5c97a7d74237e2448029bc0ee74b18295996a0c3d09107e7453cfff8257aff91def14ef30468919fa
diff --git a/dev-ruby/travis/travis-1.8.10.ebuild b/dev-ruby/travis/travis-1.8.10.ebuild
index 0fe6741042e9..96e98c44ed44 100644
--- a/dev-ruby/travis/travis-1.8.10.ebuild
+++ b/dev-ruby/travis/travis-1.8.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,8 +29,8 @@ ruby_add_bdepend "
 
 ruby_add_rdepend "
 	dev-ruby/backports
-	>dev-ruby/faraday-0.9
-	>=dev-ruby/faraday_middleware-0.9.1
+	>dev-ruby/faraday-0.9:*
+	>=dev-ruby/faraday_middleware-0.9.1:*
 	>dev-ruby/gh-0.13
 	>=dev-ruby/highline-1.6:0
 	>dev-ruby/launchy-2.1
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index ef6a44b5922e..c358757cedbe 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,7 +1,9 @@
 DIST websocket-driver-0.6.5.tar.gz 24737 BLAKE2B 137c16a69309a1aad07fff663ff95a888a151f0fa20e78e754ae62ddfc8c2bdbfda926d7f4c53549e92646d018df7f374721e95246eb2985012e6b219970c4c6 SHA512 6915fdefac26a24e1f7d3d9a7e6bc6afc84b491150290a75a14243c233f5029d7d6e90a803b34bd6a8e8717322c6ae6fd4d3f3dad7a50c8eb18f17c3f2e9bbd0
 DIST websocket-driver-0.7.0.tar.gz 25557 BLAKE2B 5d8af63c50b9c61b05e822a3bef7bd9c15a25875afa2cb0eb909f174801ff10445452c11d83790d9053438ea5556d91739bba27b2c1d6b5dc93397fbfa64bfd6 SHA512 cc022a53c546e66eb2b7ab04ff2a809ad22087343807f0e31c51e36e028123d808cbfc1956bc8e14d1fd913661664302a41ae5abc9a34562562da2e5cba58368
 DIST websocket-driver-0.7.1.tar.gz 25722 BLAKE2B 6046fe93a52ef958fa22402f67d544cb4375248997cc5104bd6ff46fde40493f3b342a29aec5a803e5d884528ee593f605e30150eb1e770508ef26b2af126cda SHA512 77e285eb038c0bff612f24f2edb79747ab37d167d861a7e580827da2ff5bc371cbb76041dbe47224384e58c1beaea7ef78cd875d08f218fb1ca9c4657783efaa
+DIST websocket-driver-0.7.2.tar.gz 25998 BLAKE2B a14af62a6189a4ec476352fd587e210e6ecf7f48845e06aae87a3bf78d7f55a1dd50177b29d5759416c6debf24b8d249fa2cf41f1a282044ecef8cd6fa963adf SHA512 05a0ae12e8fcf1c6734bedd8837857d71387844cbfbb768d8b81d8b890e3735c272b7a397ee9f3d20db82939a06694e4bbc6a42d06436911997588917b7fe7af
 EBUILD websocket-driver-0.6.5.ebuild 963 BLAKE2B 3ef1c98fee0e175e302a46841bee7b371b2e3430ea57565ae781128d2c654d64d5b08f61c4601cf5491c293efabdb4b437c89a2b09002eec7e04663c9e1bfc23 SHA512 419ee174c8e39baf21159308e94e2bce1f81772cf37c82ddedc65e12e2baee99b009911bda70719bbbc2da0ae1d58be449a3c362da50adfeff40a21355e28eeb
 EBUILD websocket-driver-0.7.0.ebuild 965 BLAKE2B cf010791994544a16f3125071cc81532acc4fe43fe2035718804b4c88a255d9a00358b093e7f412ac07e8fdc38834aaa981b87b45b35f2c21f80753c815231f0 SHA512 de8c8becb7bce6ef95175e0e7a2cf035ce28dac05c39d94760f1bb0b04025507dd3c956b353a3da086b3270ed3f51d595ee1859d9caed3453f75514180767a7e
 EBUILD websocket-driver-0.7.1.ebuild 965 BLAKE2B 8c805fe5ddd4fa1342508dbe276cfed5c32c833c627b5e5045af1f36e85caa8abceaaa61287877d9559522574c5968f2581c725a834785af3de7975cf545df4a SHA512 6be0394f9f25d57ed20e9abef98c7b1191346e21a3f2c4e347051e0318ce17e699149d0f7ab5e503a1c64a7523491372db18c2968c11ab49a6c6dce378810d02
+EBUILD websocket-driver-0.7.2.ebuild 940 BLAKE2B 28fd1f2b91e9bb351dfaf95b2a30dbd9b4eb85fcf6fae7bbd8cbc41754e2bc7cfef491f9d7441be6c9840a30d88c20e9583ff80ead5c30e6b546fbd3c5753d3b SHA512 1fe910ecb8e284e9328340241c6ece931404f0f6416ceeb70d8e54c6be437150a0a2b3e1bb44a4eb73d62dff0e0119ded544f1d93506f5d3a1aa7c98b6e3138f
 MISC metadata.xml 352 BLAKE2B 97504816fa7ecfb7afa7a4cdc75e592d5c31b7bf46e6e7813ac374eb7ac64e34c95a6dc46f6effebce6e712fbd5e66b561cd5d74af2c000603dc4583d9eebbb7 SHA512 22d85a04b0817950a9da710f66781f849f9fbdf4f4cf0af3728abfbbff745c2040bdf0ff0362634954502f0bee00fc2107f9186928adc7936497902bd865ee21
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.2.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.2.ebuild
new file mode 100644
index 000000000000..8513f92d88d6
--- /dev/null
+++ b/dev-ruby/websocket-driver/websocket-driver-0.7.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A complete implementation of the WebSocket protocols"
+HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
+SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/websocket-driver extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/websocket-driver
+	cp ext/websocket-driver/websocket_mask.so lib/ || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-ruby
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)